From 5df01b4cf5c554bcd022a540174c7a0ef702c2c2 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 6 Jun 2024 09:55:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20?=
 =?UTF-8?q?=E5=B5=8C=E5=85=A5=E5=BC=8F=E8=B7=B3=E8=BD=AC=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/components/views/index.vue            | 8 ++++++++
 .../src/views/data-visualization/PreviewCanvas.vue        | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue
index 15dd7bb8a8..2a790578a2 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -419,6 +419,10 @@ const jumpClick = param => {
             return
           }
 
+          if (isIframe.value) {
+            embeddedStore.clearState()
+          }
+
           if (iframeSelf) {
             router.push(parseUrl(url))
             return
@@ -438,6 +442,10 @@ const jumpClick = param => {
         divEmbedded('Iframe')
         return
       }
+
+      if (isIframe.value) {
+        embeddedStore.clearState()
+      }
       windowsJump(url, jumpInfo.jumpType)
     }
   } else {
diff --git a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
index 2ff8f9574f..b48d8e7e5a 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
@@ -73,6 +73,7 @@ const loadCanvasDataAsync = async (dvId, dvType) => {
       ElMessage.error(t('visualization.outer_param_decode_error'))
     }
   }
+  console.log('PreviewCanvas', dvId, jumpParam, attachParam)
 
   initCanvasData(
     dvId,
@@ -107,6 +108,7 @@ let p = null
 const XpackLoaded = () => p(true)
 onMounted(async () => {
   await new Promise(r => (p = r))
+  console.log('embeddedStore', embeddedStore, router)
   const dvId = embeddedStore.dvId || router.currentRoute.value.query.dvId
   const { dvType, callBackFlag } = router.currentRoute.value.query
   if (dvId) {

From 1e8a307abf7884bdc9b39656a80e5963e80aeebb Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 6 Jun 2024 10:22:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(X-Pack):=20=E5=AE=9A=E6=97=B6=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A-=E6=89=8B=E5=8A=A8=E8=A7=A6=E5=8F=91=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=A7=92=E8=89=B2=E6=8E=A5=E5=8F=97=E8=80=85=E6=97=A0?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 de-xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/de-xpack b/de-xpack
index 53654f4d70..e55d5ef12d 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 53654f4d703b81f2b261922419a0d13ce8b0b0c7
+Subproject commit e55d5ef12d98a142487a29b62343332f4884a3a2