From a60aa76a071dabac668454d600a6646ddd39f30c Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 23 Sep 2024 14:59:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=BF=AB=E6=8D=B7=E9=94=AE=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=A4=9A=E9=80=89=E5=8C=BA=E5=9F=9F=E4=BB=85=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=9C=80=E6=9C=89=E4=B8=80=E4=B8=AA=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/utils/DeShortcutKey.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-frontend/src/utils/DeShortcutKey.ts b/core/core-frontend/src/utils/DeShortcutKey.ts index 13fcc990e7..dc6a7758bb 100644 --- a/core/core-frontend/src/utils/DeShortcutKey.ts +++ b/core/core-frontend/src/utils/DeShortcutKey.ts @@ -235,7 +235,7 @@ function preview() { } function deleteComponent() { - if (curComponent.value) { + if (curComponent.value && curComponent.value.component !== 'GroupArea') { const curInfo = getCurInfo() if (curInfo) { dvMainStore.deleteComponent(curInfo.index, curInfo.componentData) From 761fa81e4b01c676a77e2acd82d7c5327137eeef Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 23 Sep 2024 15:02:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=BF=AB=E6=8D=B7?= =?UTF-8?q?=E9=94=AE=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C=E4=B8=8D=E5=87=86?= =?UTF-8?q?=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/store/modules/data-visualization/copy.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/core-frontend/src/store/modules/data-visualization/copy.ts b/core/core-frontend/src/store/modules/data-visualization/copy.ts index 48bfcb8825..18e5224515 100644 --- a/core/core-frontend/src/store/modules/data-visualization/copy.ts +++ b/core/core-frontend/src/store/modules/data-visualization/copy.ts @@ -77,7 +77,7 @@ export const copyStore = defineStore('copy', { }) }, copy() { - if (curComponent.value) { + if (curComponent.value && curComponent.value.component !== 'GroupArea') { this.copyDataInfo([curComponent.value]) } else if (composeStore.areaData.components.length) { this.copyDataInfo(composeStore.areaData.components) @@ -136,7 +136,7 @@ export const copyStore = defineStore('copy', { snapshotStore.recordSnapshotCache() }, cut(curComponentData = componentData.value) { - if (curComponent.value) { + if (curComponent.value && curComponent.value.component !== 'GroupArea') { this.copyDataInfo([curComponent.value]) dvMainStore.deleteComponentById(curComponent.value.id, curComponentData) } else if (composeStore.areaData.components.length) {