Merge pull request dataease#10967 from dataease/pr@v2.8@fix_hidden-area

ziyujiahao · web-flow · commit f2069aa6f026 · 2024-07-15T22:24:21.000+08:00
fix(数据大屏): 数据大屏隐藏区域相关问题优化
diff --git a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
@@ -12,13 +12,15 @@ import ContextMenuAsideDetails from '@/components/data-visualization/canvas/Cont
 import ComposeShow from '@/components/data-visualization/canvas/ComposeShow.vue'
 import { composeStoreWithOut } from '@/store/modules/data-visualization/compose'
 import RealTimeGroup from '@/components/data-visualization/RealTimeGroup.vue'
+import { contextmenuStoreWithOut } from '@/store/modules/data-visualization/contextmenu'
 const dropdownMore = ref(null)
 const lockStore = lockStoreWithOut()
 
 const dvMainStore = dvMainStoreWithOut()
 const snapshotStore = snapshotStoreWithOut()
 const layerStore = layerStoreWithOut()
 const composeStore = composeStoreWithOut()
+const contextmenuStore = contextmenuStoreWithOut()
 
 const { areaData, isCtrlOrCmdDown, isShiftDown, laterIndex } = storeToRefs(composeStore)
 
@@ -78,6 +80,7 @@ const hiddenAreaOnClick = (e, element) => {
 }
 
 const onClick = (e, index) => {
+  contextmenuStore.hideContextMenu()
   // 初始化点击是 laterIndex=0
   if (!curComponent.value) {
     composeStore.setLaterIndex(null)
@@ -198,12 +201,24 @@ const getIconName = item => {
   }
 }
 
+const menuAsideHiddenClose = (param, element) => {
+  const iconDom = document.getElementById('close-button')
+  if (iconDom) {
+    iconDom.click()
+  }
+  if (param?.opt === 'rename') {
+    setTimeout(() => {
+      editComponentName(element)
+    }, 200)
+  }
+}
+
 const menuAsideClose = (param, index) => {
   const iconDom = document.getElementById('close-button')
   if (iconDom) {
     iconDom.click()
   }
-  if (param.opt === 'rename') {
+  if (param?.opt === 'rename') {
     setTimeout(() => {
       editComponentName(getComponent(index))
     }, 200)
@@ -292,15 +307,18 @@ const areaClick = area => {
                     effect="dark"
                     :hide-timeout="0"
                   >
-                    <span :class="'dropdownMore-' + index" @click="onClick(transformIndex(index))">
+                    <span
+                      :class="'dropdownMore-' + index"
+                      @click="hiddenAreaOnClick($event, element)"
+                    >
                       <el-icon class="component-base">
                         <Icon name="dv-more" class="opt-icon"></Icon>
                       </el-icon>
                     </span>
                     <template #dropdown>
                       <context-menu-aside-details
                         :element="element"
-                        @close="menuAsideClose($event, index)"
+                        @close="menuAsideHiddenClose($event, element)"
                       ></context-menu-aside-details>
                     </template>
                   </el-dropdown>
@@ -545,7 +563,6 @@ const areaClick = area => {
           justify-content: flex-end;
           align-items: center;
           flex-grow: 1;
-          cursor: none;
           i {
             font-size: 16px;
             cursor: pointer;
diff --git a/core/core-frontend/src/store/modules/data-visualization/copy.ts b/core/core-frontend/src/store/modules/data-visualization/copy.ts
@@ -108,6 +108,7 @@ export const copyStore = defineStore('copy', {
           // 旧-新ID映射关系
           const idMap = {}
           const newComponent = deepCopyHelper(data, idMap)
+          newComponent['category'] = 'base'
           if (newComponent.canvasId.includes('Group')) {
             newComponent.canvasId = 'canvas-main'
           }

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ export const copyStore = defineStore('copy', {`
`108`	`108`	`// 旧-新ID映射关系`
`109`	`109`	`const idMap = {}`
`110`	`110`	`const newComponent = deepCopyHelper(data, idMap)`
	`111`	`+ newComponent['category'] = 'base'`
`111`	`112`	`if (newComponent.canvasId.includes('Group')) {`
`112`	`113`	`newComponent.canvasId = 'canvas-main'`
`113`	`114`	`}`