From 3d64e5b3b6ec03bafee6403ce778414598f0f800 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 28 Aug 2024 16:27:19 +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=E5=BC=B9=E7=AA=97=E5=8C=BA=E5=9F=9F=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=E6=97=B6,=E5=A4=96=E9=83=A8=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=BE=9D=E7=84=B6=E5=8F=AF=E4=BB=A5=E4=BD=BF=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/data-visualization/RealTimeListTree.vue | 6 +++++-
 .../src/store/modules/data-visualization/dvMain.ts         | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
index 577ea402b0..35f63c43f5 100644
--- a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
+++ b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
@@ -262,6 +262,10 @@ const areaClick = area => {
   dvMainStore.setCurComponent({ component: null, index: null })
   dvMainStore.canvasStateChange({ key: 'curPointArea', value: area })
 }
+
+const canvasChange = () => {
+  snapshotStore.recordSnapshotCache()
+}
 </script>
 
 <template>
@@ -270,7 +274,7 @@ const areaClick = area => {
     <button hidden="true" id="close-button"></button>
     <div class="layer-area" @click="areaClick('hidden')" :class="{ activated: hiddenAreaActive }">
       <span>弹窗区域({{ popComponentData.length }})</span>
-      <el-switch v-model="canvasStyleData.popupAvailable" size="small" />
+      <el-switch v-model="canvasStyleData.popupAvailable" @change="canvasChange" size="small" />
     </div>
     <el-row class="list-wrap">
       <div class="list-container" @contextmenu="handleContextMenu">
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 b1680230c6..60115bd1a1 100644
--- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
@@ -23,6 +23,7 @@ import {
 } from '@/custom-component/component-list'
 import { get, set } from 'lodash-es'
 import { viewFieldTimeTrans } from '@/utils/viewUtils'
+import { isMainCanvas } from '@/utils/canvasUtils'
 
 export const dvMainStore = defineStore('dataVisualization', {
   state: () => {
@@ -971,7 +972,11 @@ export const dvMainStore = defineStore('dataVisualization', {
       }
     },
     trackOuterFilterCursor(element, params, preActiveComponentIds, trackInfo, source) {
-      if (!['UserView', 'VQuery'].includes(element.component)) {
+      // 弹窗区域禁用时 在弹窗区域的组件不生效
+      if (
+        !['UserView', 'VQuery'].includes(element.component) ||
+        (element.category === 'hidden' && !this.canvasStyleData.popupAvailable)
+      ) {
         return
       }
       const currentFilters = [] // 外部参数信息