From 67f071ad79fb1a2cc5ce67006930387c4b020544 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 6 Jun 2024 10:47:50 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC-=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=88=B0=E5=8F=A6=E4=B8=80=E4=B8=AA=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=EF=BC=8C=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 2a790578a2..52443ebec1 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -411,18 +411,17 @@ const jumpClick = param => {
           const url = `${embeddedBaseUrl}#/preview?dvId=${
             jumpInfo.targetDvId
           }&jumpInfoParam=${encodeURIComponent(Base64.encode(JSON.stringify(param)))}`
-          if (divSelf) {
+
+          if (isIframe.value || isDataEaseBi.value) {
             embeddedStore.clearState()
+          }
+          if (divSelf) {
             embeddedStore.setDvId(jumpInfo.targetDvId)
             embeddedStore.setJumpInfoParam(encodeURIComponent(Base64.encode(JSON.stringify(param))))
             divEmbedded('Preview')
             return
           }
 
-          if (isIframe.value) {
-            embeddedStore.clearState()
-          }
-
           if (iframeSelf) {
             router.push(parseUrl(url))
             return
@@ -436,16 +435,16 @@ const jumpClick = param => {
       const colList = [...param.dimensionList, ...param.quotaList]
       let url = setIdValueTrans('id', 'value', jumpInfo.content, colList)
       url = checkAddHttp(url)
-      if (divSelf) {
+
+      if (isIframe.value || isDataEaseBi.value) {
         embeddedStore.clearState()
+      }
+      if (divSelf) {
         embeddedStore.setOuterUrl(url)
         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 b48d8e7e5a..add5e237ce 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
@@ -73,8 +73,6 @@ const loadCanvasDataAsync = async (dvId, dvType) => {
       ElMessage.error(t('visualization.outer_param_decode_error'))
     }
   }
-  console.log('PreviewCanvas', dvId, jumpParam, attachParam)
-
   initCanvasData(
     dvId,
     dvType,
@@ -108,7 +106,6 @@ 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) {