Merge pull request #11166 from dataease/pr@dev-v2@fix_group

Pr@dev v2@fix group

core/core-frontend/src/components/data-visualization/RealTimeListTree.vue

@@ -33,7 +33,13 @@ const transformIndex = index => {
   return componentData.value.length - 1 - index
 }
 const areaDataPush = component => {
-  if (component && !component.isLock && component.isShow && component.canvasId === 'canvas-main') {
+  if (
+    component &&
+    !component.isLock &&
+    component.isShow &&
+    component.canvasId === 'canvas-main' &&
+    component.category !== 'hidden'
+  ) {
     areaData.value.components.push(component)
   }
 }
@@ -63,7 +69,11 @@ const shiftDataPush = curClickIndex => {
   const shiftAreaComponents = componentData.value
     .slice(indexBegin, indexEnd + 1)
     .filter(
-      component => !areaDataIdArray.includes(component.id) && !component.isLock && component.isShow
+      component =>
+        !areaDataIdArray.includes(component.id) &&
+        !component.isLock &&
+        component.isShow &&
+        component.category !== 'hidden'
     )
   areaData.value.components.push(...shiftAreaComponents)
   dvMainStore.setCurComponent({ component: null, index: null })

core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue

@@ -1382,7 +1382,6 @@ const groupAreaClickChange = async () => {
   if (areaData.value.components.length > 1) {
     // 重新计算边界
     composeStore.calcComposeArea()
-    const hist2 = dvMainStore.componentData.filter(ele => ele.component === 'GroupArea')
     if (groupAreaHis.length === 0) {
       // 如果不存在 新建视括组件
       groupAreaCom = findNewComponent('GroupArea', 'GroupArea')