From e89cb41aaa75b6c0b39a4a6dc46f7e73cc70448b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 6 Jan 2025 17:12:22 +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=E9=BB=98=E8=AE=A4=E5=80=BC=E4=BE=9D=E7=84=B6?=
 =?UTF-8?q?=E5=BD=B1=E5=93=8D=E5=A4=A7=E5=B1=8F=E6=95=B0=E6=8D=AE=E7=AD=89?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/RealTimeListTree.vue   | 11 +++++++++-
 core/core-frontend/src/hooks/web/useFilter.ts | 22 +++++++++++++++----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
index eda406b46d..44f8fd9378 100644
--- a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
+++ b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
@@ -82,6 +82,7 @@ import RealTimeTab from '@/components/data-visualization/RealTimeTab.vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import circlePackingOrigin from '@/assets/svg/circle-packing-origin.svg'
 import { checkJoinGroup } from '@/utils/canvasUtils'
+import { useEmitt } from '@/hooks/web/useEmitt'
 const dropdownMore = ref(null)
 const lockStore = lockStoreWithOut()
 
@@ -392,6 +393,10 @@ const areaClick = area => {
   dvMainStore.canvasStateChange({ key: 'curPointArea', value: area })
 }
 
+const popupAvailableChange = () => {
+  useEmitt().emitter.emit('calcData-all')
+  canvasChange()
+}
 const canvasChange = () => {
   snapshotStore.recordSnapshotCache('canvasChange')
 }
@@ -403,7 +408,11 @@ const canvasChange = () => {
     <button hidden="true" id="close-button"></button>
     <div class="layer-area" @click="areaClick('hidden')" :class="{ activated: hiddenAreaActive }">
       <span>{{ t('visualization.pop_area') }}({{ popComponentData.length }})</span>
-      <el-switch v-model="canvasStyleData.popupAvailable" @change="canvasChange" size="small" />
+      <el-switch
+        v-model="canvasStyleData.popupAvailable"
+        @change="popupAvailableChange"
+        size="small"
+      />
     </div>
     <el-row class="list-wrap">
       <div class="list-container" @contextmenu="handleContextMenu">
diff --git a/core/core-frontend/src/hooks/web/useFilter.ts b/core/core-frontend/src/hooks/web/useFilter.ts
index 3160e72a43..d96bb87517 100644
--- a/core/core-frontend/src/hooks/web/useFilter.ts
+++ b/core/core-frontend/src/hooks/web/useFilter.ts
@@ -3,7 +3,7 @@ import { storeToRefs } from 'pinia'
 import { getDynamicRange, getCustomTime } from '@/custom-component/v-query/time-format'
 import { getCustomRange } from '@/custom-component/v-query/time-format-dayjs'
 const dvMainStore = dvMainStoreWithOut()
-const { componentData } = storeToRefs(dvMainStore)
+const { componentData, canvasStyleData } = storeToRefs(dvMainStore)
 
 const getDynamicRangeTime = (type: number, selectValue: any, timeGranularityMultiple: string) => {
   const timeType = (timeGranularityMultiple || '').split('range')[0]
@@ -130,18 +130,32 @@ const getValueByDefaultValueCheckOrFirstLoad = (
 }
 
 export const useFilter = (curComponentId: string, firstLoad = false) => {
+  // 弹窗区域过滤组件是否生效
+  const popupAvailable = canvasStyleData.value.popupAvailable
   const filter = []
-  const queryComponentList = componentData.value.filter(ele => ele.component === 'VQuery')
+  const queryComponentList = componentData.value.filter(
+    ele =>
+      ele.component === 'VQuery' &&
+      (popupAvailable || (!popupAvailable && ele.category !== 'hidden'))
+  )
   searchQuery(queryComponentList, filter, curComponentId, firstLoad)
   componentData.value.forEach(ele => {
     if (ele.component === 'Group') {
-      const list = ele.propValue.filter(item => item.innerType === 'VQuery')
+      const list = ele.propValue.filter(
+        item =>
+          item.innerType === 'VQuery' &&
+          (popupAvailable || (!popupAvailable && ele.category !== 'hidden'))
+      )
       searchQuery(list, filter, curComponentId, firstLoad)
 
       list.forEach(element => {
         if (element.innerType === 'DeTabs') {
           element.propValue.forEach(itx => {
-            const elementArr = itx.componentData.filter(item => item.innerType === 'VQuery')
+            const elementArr = itx.componentData.filter(
+              item =>
+                item.innerType === 'VQuery' &&
+                (popupAvailable || (!popupAvailable && ele.category !== 'hidden'))
+            )
             searchQuery(elementArr, filter, curComponentId, firstLoad)
           })
         }