From 70565335c2f492e7f15ce689b233f3d34cea136b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 16 Apr 2024 13:08:28 +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=E7=BB=84=E5=90=88=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96=E5=90=8E=E5=86=8D=E7=82=B9=E5=87=BB=E7=BB=84?=
 =?UTF-8?q?=E5=90=88=E6=8C=89=E9=92=AE,=E6=97=B6=E9=97=B4=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=9A=84=E7=BB=84=E5=90=88=E7=BB=84=E4=BB=B6=E8=BF=98?=
 =?UTF-8?q?=E6=98=AF=E5=8E=9F=E6=9D=A5=E5=A4=A7=E5=B0=8F=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/compose.ts             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core-frontend/src/store/modules/data-visualization/compose.ts b/core/core-frontend/src/store/modules/data-visualization/compose.ts
index 78f277edc4..fae03ec5af 100644
--- a/core/core-frontend/src/store/modules/data-visualization/compose.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/compose.ts
@@ -104,7 +104,7 @@ export const composeStore = defineStore('compose', {
         areaData.components = []
         return
       }
-      if (areaData.components.length > 0 && areaData.style.width === 0) {
+      if (areaData.components.length > 0) {
         // 计算组合区域
         this.calcComposeArea()
       }

From 55698cdcc8b68792a756b65adb6054bca1120535 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 16 Apr 2024 13:27:09 +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=E5=9C=A8=E7=82=B9=E9=80=89=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8E=E7=BB=84=E5=90=88=E9=83=A8=E5=88=86=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=88=A0=E9=99=A4=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E7=BB=84=E4=BB=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/data-visualization/canvas/CanvasCore.vue  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
index 6f2bb96b5a..94cc340f4c 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
@@ -1362,7 +1362,10 @@ const groupAreaChange = (showArea, style?) => {
       groupArea.style.height = style.height
       dvMainStore.addComponent({ component: groupArea, index: undefined })
     } else {
-      dvMainStore.deleteComponentById(100000001)
+      const groupAreaHis = componentData.value.filter(ele => ele.id === 100000001)
+      if (groupAreaHis && groupAreaHis.length > 0) {
+        dvMainStore.deleteComponentById(100000001)
+      }
     }
   })
 }