From 8859315dfe6c51217958d054820634498c70a414 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 28 Aug 2024 11:03:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A7=E5=B1=8F=E9=A2=84=E8=A7=88=E5=90=8E?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=BF=9B=E5=85=A5=E7=BC=96=E8=BE=91=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=AF=BC=E8=87=B4=E7=9A=84Tab=E6=97=B6=E9=92=9F?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=AD=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom-component/de-tabs/Component.vue | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/core/core-frontend/src/custom-component/de-tabs/Component.vue b/core/core-frontend/src/custom-component/de-tabs/Component.vue index 198667440f..56e17c599e 100644 --- a/core/core-frontend/src/custom-component/de-tabs/Component.vue +++ b/core/core-frontend/src/custom-component/de-tabs/Component.vue @@ -292,31 +292,33 @@ const componentMoveIn = component => { if (editableTabsValue.value === tabItem.name) { //获取主画布当前组件的index const curIndex = findComponentIndexById(component.id) - // 从主画布中移除 - if (isDashboard()) { - eventBus.emit('removeMatrixItem-canvas-main', curIndex) - dvMainStore.setCurComponent({ component: null, index: null }) - component.canvasId = element.value.id + '--' + tabItem.name - const refInstance = currentInstance.refs['tabCanvas_' + index][0] - if (refInstance) { - const matrixBase = refInstance.getBaseMatrixSize() //矩阵基础大小 - canvasChangeAdaptor(component, matrixBase) - component.x = 1 - component.y = 200 - component.style.left = 0 - component.style.top = 0 + if (curIndex > -1) { + // 从主画布中移除 + if (isDashboard()) { + eventBus.emit('removeMatrixItem-canvas-main', curIndex) + dvMainStore.setCurComponent({ component: null, index: null }) + component.canvasId = element.value.id + '--' + tabItem.name + const refInstance = currentInstance.refs['tabCanvas_' + index][0] + if (refInstance) { + const matrixBase = refInstance.getBaseMatrixSize() //矩阵基础大小 + canvasChangeAdaptor(component, matrixBase) + component.x = 1 + component.y = 200 + component.style.left = 0 + component.style.top = 0 + tabItem.componentData.push(component) + nextTick(() => { + refInstance.addItemBox(component) //在适当的时候初始化布局组件 + }) + } + } else { + // 从主画布删除 + dvMainStore.deleteComponent(curIndex) + dvMainStore.setCurComponent({ component: null, index: null }) + component.canvasId = element.value.id + '--' + tabItem.name + dataVTabComponentAdd(component, element.value.style) tabItem.componentData.push(component) - nextTick(() => { - refInstance.addItemBox(component) //在适当的时候初始化布局组件 - }) } - } else { - // 从主画布删除 - dvMainStore.deleteComponent(curIndex) - dvMainStore.setCurComponent({ component: null, index: null }) - component.canvasId = element.value.id + '--' + tabItem.name - dataVTabComponentAdd(component, element.value.style) - tabItem.componentData.push(component) } } })