From c5118acb7d828ad8bb6a861e3439e4c3cd725d34 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 30 Jul 2024 13:49: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=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E8=AE=BE=E7=BD=AE=E7=82=B9=E9=80=89=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E6=97=B6=E5=8F=AF=E8=83=BD=E5=8F=AA=E5=8F=AF=E4=BB=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=83=8C=E6=99=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/data-visualization/RealTimeListTree.vue    | 6 ++++--
 .../src/components/data-visualization/canvas/Shape.vue    | 8 +++++++-
 core/core-frontend/src/views/data-visualization/index.vue | 1 -
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
index 9d8ade415b..bcc8e0a910 100644
--- a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
+++ b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
@@ -38,7 +38,8 @@ const areaDataPush = component => {
     !component.isLock &&
     component.isShow &&
     component.canvasId === 'canvas-main' &&
-    component.category !== 'hidden'
+    component.category !== 'hidden' &&
+    component.component !== 'GroupArea'
   ) {
     areaData.value.components.push(component)
   }
@@ -73,7 +74,8 @@ const shiftDataPush = curClickIndex => {
         !areaDataIdArray.includes(component.id) &&
         !component.isLock &&
         component.isShow &&
-        component.category !== 'hidden'
+        component.category !== 'hidden' &&
+        component.component !== 'GroupArea'
     )
   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 6387da7b24..e31e79a85b 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
@@ -408,7 +408,13 @@ const handleBoardMouseDownOnShape = e => {
 }
 
 const areaDataPush = component => {
-  if (component && !component.isLock && component.isShow && component.canvasId === 'canvas-main') {
+  if (
+    component &&
+    !component.isLock &&
+    component.isShow &&
+    component.canvasId === 'canvas-main' &&
+    component.component !== 'GroupArea'
+  ) {
     areaData.value.components.push(component)
   }
 }
diff --git a/core/core-frontend/src/views/data-visualization/index.vue b/core/core-frontend/src/views/data-visualization/index.vue
index a4cd931d35..5f102a55b1 100644
--- a/core/core-frontend/src/views/data-visualization/index.vue
+++ b/core/core-frontend/src/views/data-visualization/index.vue
@@ -169,7 +169,6 @@ const handleDragOver = e => {
 }
 
 const handleMouseDown = e => {
-  console.log('====handleMouseDown===' + e)
   // e.stopPropagation()
   dvMainStore.setClickComponentStatus(false)
   // 点击画布的空区域 提前清空curComponent 防止右击菜单内容抖动