From 24c861b2af3dd14ba7c4efdded3a1f35fc569d3d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 22 May 2024 13:42:32 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B5=8C=E5=85=A5=E5=BC=8Fiframe=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?ID=E6=A0=A1=E9=AA=8C=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/de-frame/ComponentFrame.vue   |  2 +-
 .../src/store/modules/data-visualization/dvMain.ts |  9 ++++++++-
 .../src/views/data-visualization/PreviewCanvas.vue | 14 +++++++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/custom-component/de-frame/ComponentFrame.vue b/core/core-frontend/src/custom-component/de-frame/ComponentFrame.vue
index 8b464bee89..65980cbeb7 100644
--- a/core/core-frontend/src/custom-component/de-frame/ComponentFrame.vue
+++ b/core/core-frontend/src/custom-component/de-frame/ComponentFrame.vue
@@ -3,7 +3,7 @@
     <div v-if="element.frameLinks.src" class="main-frame">
       <iframe
         v-if="state.frameShow"
-        id="iframe"
+        :id="'iframe-' + element.id"
         :src="element.frameLinks.src"
         scrolling="auto"
         frameborder="0"
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 511d4e20b3..071c680b1b 100644
--- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
@@ -850,10 +850,11 @@ export const dvMainStore = defineStore('dataVisualization', {
       })
     },
     // 添加外部参数的过滤条件
-    addOuterParamsFilter(params) {
+    addOuterParamsFilter(params, source = 'inner') {
       // params 结构 {key1:value1,key2:value2}
       const curComponentData = this.componentData
       if (params) {
+        const preActiveComponentIds = []
         const trackInfo = this.nowPanelOuterParamsInfo
         for (let index = 0; index < curComponentData.length; index++) {
           const element = curComponentData[index]
@@ -906,6 +907,7 @@ export const dvMainStore = defineStore('dataVisualization', {
                 // 不存在该条件 且 条件有效 直接保存该条件
                 // !filterExist && vValid && currentFilters.push(condition)
                 currentFilters.push(condition)
+                preActiveComponentIds.push(element.id)
               }
               if (element.component === 'VQuery') {
                 element.propValue.forEach(filterItem => {
@@ -951,6 +953,11 @@ export const dvMainStore = defineStore('dataVisualization', {
             curComponentData[index] = element
           })
         }
+        if (source === 'outer') {
+          preActiveComponentIds.forEach(viewId => {
+            useEmitt().emitter.emit('query-data-' + viewId)
+          })
+        }
       }
     },
     trackFilterCursor(element, checkQDList, trackInfo, preActiveComponentIds, viewId) {
diff --git a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
index 260bddcab7..7bc91bcc59 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
@@ -122,12 +122,16 @@ const loadCanvasDataAsync = async (dvId, dvType) => {
     }
   )
 }
+
+// 目标校验： 需要校验targetDvId 是否是当前可视化资源ID
 const winMsgHandle = event => {
-  const msgInfo = JSON.parse(event.data.info)
-  if (msgInfo.type === 'attachParams') {
+  console.info('PostMessage Params Received')
+  const msgInfo = event.data
+  // 校验targetDvId
+  if (msgInfo && msgInfo.type === 'attachParams' && msgInfo.targetDvId === state.dvInfo.id + '') {
     const attachParam = msgInfo.params
     if (attachParam) {
-      dvMainStore.addOuterParamsFilter(attachParam)
+      dvMainStore.addOuterParamsFilter(attachParam, 'outer')
     }
   }
 }
@@ -142,11 +146,11 @@ onMounted(async () => {
     return
   }
   dvMainStore.setPublicLinkStatus(props.publicLinkStatus)
-  window.addEventListener('embedParamsMessage', winMsgHandle)
+  window.addEventListener('message', winMsgHandle)
 })
 
 onUnmounted(() => {
-  window.removeEventListener('embedParamsMessage', winMsgHandle)
+  window.removeEventListener('message', winMsgHandle)
 })
 
 defineExpose({