From 18bd0695b9c73e8e33d8da753910cc01f9cbfe28 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 19 Mar 2024 18:40:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20?=
 =?UTF-8?q?=E9=BC=A0=E6=A0=87=E9=80=89=E4=B8=AD=E4=B8=80=E4=BA=9B=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E5=90=8E=EF=BC=8C=E5=8C=BA=E5=9F=9F=E5=86=85=E7=9A=84?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=8F=AF=E9=80=9A=E8=BF=87=E6=BB=91=E5=8A=A8?=
 =?UTF-8?q?=E9=BC=A0=E6=A0=87=EF=BC=8C=E6=89=B9=E9=87=8F=E7=A7=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/RealTimeListTree.vue   |  1 +
 .../data-visualization/canvas/CanvasCore.vue  | 35 ++++++++++++----
 .../data-visualization/canvas/Shape.vue       | 40 ++++++++++++++-----
 .../src/custom-component/component-list.ts    | 13 ++++++
 .../src/custom-component/group-area/Attr.vue  | 13 ++++++
 .../custom-component/group-area/Component.vue | 13 ++++++
 .../modules/data-visualization/dvMain.ts      | 14 ++++++-
 core/core-frontend/src/utils/components.ts    |  6 ++-
 .../src/views/data-visualization/index.vue    | 15 +++++--
 9 files changed, 127 insertions(+), 23 deletions(-)
 create mode 100644 core/core-frontend/src/custom-component/group-area/Attr.vue
 create mode 100644 core/core-frontend/src/custom-component/group-area/Component.vue

diff --git a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
index 1a62abadfc..db7ed3259b 100644
--- a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
+++ b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
@@ -221,6 +221,7 @@ const handleContextMenu = e => {
           <template #item="{ index }">
             <div>
               <div
+                v-show="getComponent(index)?.component !== 'GroupArea'"
                 :title="getComponent(index)?.name"
                 class="component-item"
                 :class="{
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 ef70bb6328..7ea4c7132c 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
@@ -9,7 +9,7 @@ import {
   syncShapeItemStyle
 } from '@/utils/style'
 import $ from 'jquery'
-import { _$, isPreventDrop } from '@/utils/utils'
+import { _$, deepCopy, isPreventDrop } from '@/utils/utils'
 import ContextMenu from './ContextMenu.vue'
 import MarkLine from './MarkLine.vue'
 import Area from './Area.vue'
@@ -26,6 +26,7 @@ import DragShadow from '@/components/data-visualization/canvas/DragShadow.vue'
 import {
   canvasSave,
   findDragComponent,
+  findNewComponent,
   isGroupCanvas,
   isMainCanvas,
   isSameCanvas
@@ -396,6 +397,7 @@ const hideArea = () => {
     },
     components: []
   })
+  groupAreaChange(false)
 }
 
 const createGroup = () => {
@@ -442,19 +444,23 @@ const createGroup = () => {
   width.value = right - left
   height.value = bottom - top
 
+  const areaDataStyle = {
+    left,
+    top,
+    width: width.value,
+    height: height.value
+  }
+
   // 设置选中区域位移大小信息和区域内的组件数据
   composeStore.setAreaData({
-    style: {
-      left,
-      top,
-      width: width.value,
-      height: height.value
-    },
+    style: areaDataStyle,
     components: areaData
   })
   // 如果有组件被group选中 取消当前画布选中的组件
   if (areaData.length > 0) {
     dvMainStore.setCurComponent({ component: null, index: null })
+    isShowArea.value = false
+    groupAreaChange(true, areaDataStyle)
   }
 }
 
@@ -1346,6 +1352,21 @@ const contextMenuShow = computed(() => {
 
 const markLineShow = computed(() => isMainCanvas(canvasId.value))
 
+const groupAreaChange = (showArea, style?) => {
+  nextTick(() => {
+    if (showArea) {
+      const groupArea = findNewComponent('GroupArea', 'GroupArea')
+      groupArea.style.left = style.left
+      groupArea.style.top = style.top
+      groupArea.style.width = style.width
+      groupArea.style.height = style.height
+      dvMainStore.addComponent({ component: groupArea, index: undefined })
+    } else {
+      dvMainStore.deleteComponentById(100000001)
+    }
+  })
+}
+
 onMounted(() => {
   if (isMainCanvas(canvasId.value)) {
     initSnapshotTimer()
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 2be761af1a..a936f7abe7 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
@@ -1,5 +1,11 @@
 <template>
-  <div class="shape" ref="shapeInnerRef" :id="domId" @dblclick="handleDbClick">
+  <div
+    class="shape"
+    :class="{ 'shape-group-area': isGroupArea }"
+    ref="shapeInnerRef"
+    :id="domId"
+    @dblclick="handleDbClick"
+  >
     <div v-if="showCheck" class="del-from-mobile" @click="delFromMobile">
       <el-icon>
         <Icon name="mobile-checkbox"></Icon>
@@ -49,6 +55,7 @@
       </div>
       <div
         v-for="item in isActive() ? getPointList() : []"
+        v-show="!isGroupArea"
         :key="item"
         class="shape-point"
         :style="getPointStyle(item)"
@@ -280,6 +287,10 @@ const angleToCursor = [
   { start: 293, end: 338, cursor: 'w' }
 ]
 
+const isGroupArea = computed(() => {
+  return curComponent.value?.component === 'GroupArea'
+})
+
 const active = computed(() => {
   return curComponent.value?.id === element.value.id
 })
@@ -518,16 +529,19 @@ const handleMouseDownOnShape = e => {
       isFirst = false
     }
     // 修改当前组件样式
-    dvMainStore.setShapeStyle(pos)
+    dvMainStore.setShapeStyle(pos, areaData.value.components)
     // 等更新完当前组件的样式并绘制到屏幕后再判断是否需要吸附
-    // 如果不使用 $nextTick，吸附后将无法移动
-    nextTick(() => {
-      // 触发元素移动事件，用于显示标线、吸附功能
-      // 后面两个参数代表鼠标移动方向
-      // curY - startY > 0 true 表示向下移动 false 表示向上移动
-      // curX - startX > 0 true 表示向右移动 false 表示向左移动
-      eventBus.emit('move', { isDownward: curY - startY > 0, isRightward: curX - startX > 0 })
-    })
+    // GroupArea是分组视括租金 不需要进行吸附
+    // 如果不使用 nextTick，吸附后将无法移动
+    if (!isGroupArea.value) {
+      nextTick(() => {
+        // 触发元素移动事件，用于显示标线、吸附功能
+        // 后面两个参数代表鼠标移动方向
+        // curY - startY > 0 true 表示向下移动 false 表示向上移动
+        // curX - startX > 0 true 表示向右移动 false 表示向左移动
+        eventBus.emit('move', { isDownward: curY - startY > 0, isRightward: curX - startX > 0 })
+      })
+    }
   }
 
   const up = () => {
@@ -754,7 +768,7 @@ const commonBackgroundSvgInner = computed(() => {
 })
 
 const componentBackgroundStyle = computed(() => {
-  if (element.value.commonBackground) {
+  if (element.value.commonBackground && element.value.component !== 'GroupArea') {
     const {
       backgroundColorSelect,
       backgroundColor,
@@ -937,6 +951,10 @@ onMounted(() => {
   }
 }
 
+.shape-group-area {
+  z-index: 15;
+}
+
 .shape-shadow {
   top: 0;
   left: 0;
diff --git a/core/core-frontend/src/custom-component/component-list.ts b/core/core-frontend/src/custom-component/component-list.ts
index bbe7523519..efa0b16a69 100644
--- a/core/core-frontend/src/custom-component/component-list.ts
+++ b/core/core-frontend/src/custom-component/component-list.ts
@@ -78,6 +78,19 @@ export const commonAttr = {
 
 // 编辑器左侧组件列表
 const list = [
+  {
+    id: 100000001,
+    component: 'GroupArea',
+    name: '组合区域',
+    label: '组合区域',
+    propValue: '&nbsp;',
+    icon: 'icon_graphical',
+    innerType: 'GroupArea',
+    style: {
+      width: 200,
+      height: 200
+    }
+  },
   {
     component: 'VQuery',
     name: '查询',
diff --git a/core/core-frontend/src/custom-component/group-area/Attr.vue b/core/core-frontend/src/custom-component/group-area/Attr.vue
new file mode 100644
index 0000000000..50031ca63e
--- /dev/null
+++ b/core/core-frontend/src/custom-component/group-area/Attr.vue
@@ -0,0 +1,13 @@
+<template>
+  <div class="attr-list de-collapse-style">
+    <CommonAttr :element="curComponent"></CommonAttr>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
+import CommonAttr from '@/custom-component/common/CommonAttr.vue'
+import { storeToRefs } from 'pinia'
+const dvMainStore = dvMainStoreWithOut()
+const { curComponent } = storeToRefs(dvMainStore)
+</script>
diff --git a/core/core-frontend/src/custom-component/group-area/Component.vue b/core/core-frontend/src/custom-component/group-area/Component.vue
new file mode 100644
index 0000000000..2796c3490e
--- /dev/null
+++ b/core/core-frontend/src/custom-component/group-area/Component.vue
@@ -0,0 +1,13 @@
+<template>
+  <div class="area"></div>
+</template>
+
+<script setup lang="ts"></script>
+
+<style lang="less" scoped>
+.area {
+  width: 100%;
+  height: 100%;
+  border: 1px solid #70c0ff;
+}
+</style>
diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
index 49ac16b00a..d50d88048d 100644
--- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
@@ -254,7 +254,19 @@ export const dvMainStore = defineStore('dataVisualization', {
       this.bashMatrixInfo = bashMatrixInfo
     },
 
-    setShapeStyle({ top, left, width, height, rotate }) {
+    setShapeStyle({ top, left, width, height, rotate }, areaDataComponents = []) {
+      if (this.curComponent.component === 'GroupArea' && areaDataComponents.length > 0) {
+        const topOffset = top - this.curComponent.style.top
+        const leftOffset = left - this.curComponent.style.left
+        const widthOffset = width - this.curComponent.style.width
+        const heightOffset = height - this.curComponent.style.height
+        areaDataComponents.forEach(component => {
+          component.style.top = component.style.top + topOffset
+          component.style.left = component.style.left + leftOffset
+          component.style.width = component.style.width + widthOffset
+          component.style.height = component.style.height + heightOffset
+        })
+      }
       if (this.dvInfo.type === 'dashboard') {
         if (top) this.curComponent.style.top = top < 0 ? 0 : Math.round(top)
         if (left) this.curComponent.style.left = left < 0 ? 0 : Math.round(left)
diff --git a/core/core-frontend/src/utils/components.ts b/core/core-frontend/src/utils/components.ts
index cc24b37536..c0f16138c1 100644
--- a/core/core-frontend/src/utils/components.ts
+++ b/core/core-frontend/src/utils/components.ts
@@ -23,6 +23,8 @@ import SvgTriangle from '@/custom-component/svgs/svg-triangle/Component.vue'
 import SvgTriangleAttr from '@/custom-component/svgs/svg-triangle/Attr.vue'
 import DeTimeClock from '@/custom-component/de-time-clock/Component.vue'
 import DeTimeClockAttr from '@/custom-component/de-time-clock/Attr.vue'
+import GroupArea from '@/custom-component/group-area/Component.vue'
+import GroupAreaAttr from '@/custom-component/group-area/Attr.vue'
 export const componentsMap = {
   VText: VText,
   VQuery,
@@ -48,7 +50,9 @@ export const componentsMap = {
   SvgTriangle: SvgTriangle,
   SvgTriangleAttr: SvgTriangleAttr,
   DeTimeClock: DeTimeClock,
-  DeTimeClockAttr: DeTimeClockAttr
+  DeTimeClockAttr: DeTimeClockAttr,
+  GroupArea: GroupArea,
+  GroupAreaAttr: GroupAreaAttr
 }
 
 export default function findComponent(key) {
diff --git a/core/core-frontend/src/views/data-visualization/index.vue b/core/core-frontend/src/views/data-visualization/index.vue
index 2154c9e972..8ccde05245 100644
--- a/core/core-frontend/src/views/data-visualization/index.vue
+++ b/core/core-frontend/src/views/data-visualization/index.vue
@@ -279,6 +279,15 @@ onUnmounted(() => {
 
 const previewStatus = computed(() => editMode.value === 'preview')
 
+const commonPropertiesShow = computed(
+  () => curComponent.value && !['UserView', 'GroupArea'].includes(curComponent.value.component)
+)
+const canvasPropertiesShow = computed(
+  () => !curComponent.value || ['GroupArea'].includes(curComponent.value.component)
+)
+const viewsPropertiesShow = computed(
+  () => curComponent.value && ['UserView'].includes(curComponent.value.component)
+)
 eventBus.on('handleNew', handleNew)
 </script>
 
@@ -331,7 +340,7 @@ eventBus.on('handleNew', handleNew)
       <!-- 右侧侧组件列表 -->
       <div style="width: auto; height: 100%" ref="leftSidebarRef">
         <dv-sidebar
-          v-if="curComponent && !['UserView'].includes(curComponent.component)"
+          v-if="commonPropertiesShow"
           :title="'属性'"
           :width="240"
           :side-name="'componentProp'"
@@ -342,7 +351,7 @@ eventBus.on('handleNew', handleNew)
           <component :is="findComponent(curComponent['component'] + 'Attr')" />
         </dv-sidebar>
         <dv-sidebar
-          v-show="!curComponent"
+          v-show="canvasPropertiesShow"
           :title="'大屏配置'"
           :width="240"
           :side-name="'canvas'"
@@ -353,7 +362,7 @@ eventBus.on('handleNew', handleNew)
           <canvas-attr></canvas-attr>
         </dv-sidebar>
         <editor
-          v-show="curComponent && ['UserView'].includes(curComponent.component)"
+          v-show="viewsPropertiesShow"
           :view="canvasViewInfo[curComponent ? curComponent.id : 'default']"
           themes="dark"
           :dataset-tree="state.datasetTree"