Merge pull request #6479 from dataease/dev-v2

Dev v2

core/core-frontend/src/components/visualization/ComponentEditBar.vue

@@ -287,7 +287,7 @@ const showEditPosition = computed(() => {
   if (showPosition.value === 'canvas') {
     const baseLeft = element.value.x - 1
     const baseRight = pcMatrixCount.value.x - (element.value.x + element.value.sizeX - 1)
-    if (baseLeft === 0 && baseRight === 0) {
+    if ((baseLeft === 0 && baseRight === 0) || baseRight < 0) {
       return 'bar-main-right-inner'
     } else if (baseRight === 0) {
       return 'bar-main-left-outer'

core/core-frontend/src/views/canvas/DeCanvas.vue

@@ -175,14 +175,16 @@ const addItemBox = component => {
 }
 
 const moveOutFromTab = component => {
-  component.canvasId = canvasId.value
-  dvMainStore.addComponent({
-    component,
-    index: undefined,
-    isFromGroup: true,
-    componentData: componentData.value
-  })
-  addItemBox(component)
+  setTimeout(() => {
+    component.canvasId = canvasId.value
+    dvMainStore.addComponent({
+      component,
+      index: undefined,
+      isFromGroup: true,
+      componentData: componentData.value
+    })
+    addItemBox(component)
+  }, 500)
 }
 
 // 全局监听按键事件