From b1e631f00fa3bee5b92f2f7592d2c3ea5411b847 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 30 Jul 2024 17:06:02 +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=E9=83=A8=E5=88=86=E6=83=85=E5=86=B5=E4=BE=9D?=
 =?UTF-8?q?=E7=84=B6=E5=8F=AF=E4=BB=A5=E5=B0=86=E7=BB=84=E5=90=88=E9=80=89?=
 =?UTF-8?q?=E5=85=A5=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/data-visualization/RealTimeListTree.vue    | 4 ++--
 .../src/components/data-visualization/canvas/Shape.vue        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
index bcc8e0a910..76dd03d7c1 100644
--- a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
+++ b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
@@ -39,7 +39,7 @@ const areaDataPush = component => {
     component.isShow &&
     component.canvasId === 'canvas-main' &&
     component.category !== 'hidden' &&
-    component.component !== 'GroupArea'
+    !['Group', 'GroupArea'].includes(component.component)
   ) {
     areaData.value.components.push(component)
   }
@@ -75,7 +75,7 @@ const shiftDataPush = curClickIndex => {
         !component.isLock &&
         component.isShow &&
         component.category !== 'hidden' &&
-        component.component !== 'GroupArea'
+        !['Group', 'GroupArea'].includes(component.component)
     )
   areaData.value.components.push(...shiftAreaComponents)
   dvMainStore.setCurComponent({ component: null, index: null })
diff --git a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
index e31e79a85b..134566a607 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
@@ -413,7 +413,7 @@ const areaDataPush = component => {
     !component.isLock &&
     component.isShow &&
     component.canvasId === 'canvas-main' &&
-    component.component !== 'GroupArea'
+    !['Group', 'GroupArea'].includes(component.component)
   ) {
     areaData.value.components.push(component)
   }