From f9bfacc2723164650cd38d4193a3b0b01782f216 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 2 Jan 2025 16:48:42 +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=E9=97=AE=E9=A2=98=E6=8E=92=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/pages/panel/App.vue           | 10 +++++++---
 core/core-frontend/src/views/chart/ChartView.vue     |  9 ++++++---
 .../src/views/chart/components/views/index.vue       | 12 ++----------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/core/core-frontend/src/pages/panel/App.vue b/core/core-frontend/src/pages/panel/App.vue
index 8055e8bd47..49fe9bc718 100644
--- a/core/core-frontend/src/pages/panel/App.vue
+++ b/core/core-frontend/src/pages/panel/App.vue
@@ -53,9 +53,11 @@ const componentMap = {
 
 const isDataFilling = ref(false)
 const dataFillingPath = ref('')
+const showComponent = ref(false)
 
 const changeCurrentComponent = val => {
   isDataFilling.value = false
+  showComponent.value = true
   currentComponent.value = undefined
   if (val && val.includes('DataFilling')) {
     if (val === 'DataFilling') {
@@ -70,7 +72,10 @@ const changeCurrentComponent = val => {
       isDataFilling.value = true
     })
   } else {
-    currentComponent.value = componentMap[val]
+    nextTick(() => {
+      currentComponent.value = componentMap[val]
+      showComponent.value = false
+    })
   }
 }
 
@@ -79,13 +84,12 @@ useEmitt({
   callback: changeCurrentComponent
 })
 
-//currentComponent.value = componentMap[props.componentName]
 onMounted(() => {
   changeCurrentComponent(props.componentName)
 })
 </script>
 <template>
-  <component :is="currentComponent" v-if="!isDataFilling"></component>
+  <component :is="currentComponent" v-if="!isDataFilling && !showComponent"></component>
   <template v-else>
     <component :is="currentComponent" :jsname="dataFillingPath"></component>
   </template>
diff --git a/core/core-frontend/src/views/chart/ChartView.vue b/core/core-frontend/src/views/chart/ChartView.vue
index f1000c9fae..c8183af362 100644
--- a/core/core-frontend/src/views/chart/ChartView.vue
+++ b/core/core-frontend/src/views/chart/ChartView.vue
@@ -12,7 +12,7 @@ import { XpackComponent } from '@/components/plugin'
 import { useEmitt } from '@/hooks/web/useEmitt'
 
 const currentComponent = shallowRef()
-
+const Preview = defineAsyncComponent(() => import('@/views/data-visualization/PreviewCanvas.vue'))
 const VisualizationEditor = defineAsyncComponent(
   () => import('@/views/data-visualization/index.vue')
 )
@@ -36,6 +36,7 @@ const componentMap = {
   DashboardEditor,
   VisualizationEditor,
   ViewWrapper,
+  Preview,
   Dashboard,
   Dataset,
   Datasource,
@@ -77,8 +78,10 @@ const initIframe = (name: string) => {
       showComponent.value = true
     })
   } else {
-    currentComponent.value = componentMap[name || 'ViewWrapper']
-    showComponent.value = true
+    nextTick(() => {
+      currentComponent.value = componentMap[name || 'ViewWrapper']
+      showComponent.value = true
+    })
   }
 }
 
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 d37a946b57..b9b15539fe 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -36,7 +36,6 @@ import DrillPath from '@/views/chart/components/views/components/DrillPath.vue'
 import { ElIcon, ElInput, ElMessage } from 'element-plus-secondary'
 import { useFilter } from '@/hooks/web/useFilter'
 import { useCache } from '@/hooks/web/useCache'
-import { parseUrl } from '@/utils/ParseUrl'
 
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { cloneDeep } from 'lodash-es'
@@ -533,20 +532,13 @@ const jumpClick = param => {
           }
           const currentUrl = window.location.href
           localStorage.setItem('beforeJumpUrl', currentUrl)
-          if (isIframe.value || isDataEaseBi.value) {
-            embeddedStore.clearState()
-          }
-          if (divSelf) {
+          console.log('embeddedStore', embeddedStore)
+          if (divSelf || iframeSelf) {
             embeddedStore.setDvId(jumpInfo.targetDvId)
             embeddedStore.setJumpInfoParam(encodeURIComponent(Base64.encode(JSON.stringify(param))))
             divEmbedded('Preview')
             return
           }
-
-          if (iframeSelf) {
-            router.push(parseUrl(url))
-            return
-          }
           windowsJump(url, jumpInfo.jumpType, jumpInfo.windowSize)
         }
       } else {