From 61e9a5b5372af70cd2721e05c2917a011710d0a6 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 4 Nov 2024 10:23:13 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E4=BB=8E=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=86=85=E6=96=B0Tab=E9=A1=B5=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=8C=87=E5=AE=9A=E5=BF=BD=E7=95=A5=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dashboard/DbToolbar.vue         |  2 +-
 .../src/views/data-visualization/PreviewCanvas.vue | 14 +++++++++-----
 .../src/views/data-visualization/PreviewHead.vue   |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/components/dashboard/DbToolbar.vue b/core/core-frontend/src/components/dashboard/DbToolbar.vue
index 9f44ec5270..1b362b4d50 100644
--- a/core/core-frontend/src/components/dashboard/DbToolbar.vue
+++ b/core/core-frontend/src/components/dashboard/DbToolbar.vue
@@ -138,7 +138,7 @@ const previewOuter = () => {
     return
   }
   canvasSave(() => {
-    const url = '#/preview?dvId=' + dvInfo.value.id
+    const url = '#/preview?ignoreParams=true&dvId=' + dvInfo.value.id
     const newWindow = window.open(url, '_blank')
     initOpenHandler(newWindow)
   })
diff --git a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
index 52856b5142..d9680094d2 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
@@ -44,7 +44,7 @@ const props = defineProps({
   ticketArgs: propTypes.string.def(null)
 })
 
-const loadCanvasDataAsync = async (dvId, dvType) => {
+const loadCanvasDataAsync = async (dvId, dvType, ignoreParams = false) => {
   const jumpInfoParam = embeddedStore.jumpInfoParam || router.currentRoute.value.query.jumpInfoParam
   let jumpParam
   // 获取外部跳转参数
@@ -124,9 +124,11 @@ const loadCanvasDataAsync = async (dvId, dvType) => {
       if (jumpParam) {
         dvMainStore.addViewTrackFilter(jumpParam)
       }
-      state.initState = false
-      dvMainStore.addOuterParamsFilter(attachParam)
-      state.initState = true
+      if (!ignoreParams) {
+        state.initState = false
+        dvMainStore.addOuterParamsFilter(attachParam)
+        state.initState = true
+      }
       if (props.publicLinkStatus) {
         // 设置浏览器title为当前仪表板名称
         document.title = dvInfo.name
@@ -161,12 +163,14 @@ onMounted(async () => {
   })
   await new Promise(r => (p = r))
   const dvId = embeddedStore.dvId || router.currentRoute.value.query.dvId
+  // 检查外部参数
+  const ignoreParams = router.currentRoute.value.query.ignoreParams === 'true'
   const { dvType, callBackFlag, taskId, showWatermark } = router.currentRoute.value.query
   if (!!taskId) {
     dvMainStore.setCanvasAttachInfo({ taskId, showWatermark })
   }
   if (dvId) {
-    loadCanvasDataAsync(dvId, dvType)
+    await loadCanvasDataAsync(dvId, dvType, ignoreParams)
     return
   }
   dvMainStore.setEmbeddedCallBack(callBackFlag || 'no')
diff --git a/core/core-frontend/src/views/data-visualization/PreviewHead.vue b/core/core-frontend/src/views/data-visualization/PreviewHead.vue
index be8fd8c83c..3e39e6a03c 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewHead.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewHead.vue
@@ -35,7 +35,7 @@ const preview = () => {
     baseUrl = baseUrl.replace('oidcbi/', '')
     baseUrl = baseUrl.replace('casbi/', '')
   }
-  const url = baseUrl + '#/preview?dvId=' + dvInfo.value.id
+  const url = baseUrl + '#/preview?&ignoreParams=true&dvId=' + dvInfo.value.id
   const newWindow = window.open(url, '_blank')
   initOpenHandler(newWindow)
 }