From 54a5cc07c43d71922bab93495e84e7afba0f74d9 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 5 Sep 2024 15:50:30 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20=E5=B5=8C?=
 =?UTF-8?q?=E5=85=A5=E5=BC=8F=E6=94=AF=E6=8C=81=E5=A4=9A=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/panel/DashboardPreview.vue      | 20 ++++++++++---------
 .../src/pages/panel/ViewWrapper.vue           |  4 ++--
 core/core-frontend/src/pages/panel/main.ts    |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/core/core-frontend/src/pages/panel/DashboardPreview.vue b/core/core-frontend/src/pages/panel/DashboardPreview.vue
index 1bd4fd15fb..add52bfdce 100644
--- a/core/core-frontend/src/pages/panel/DashboardPreview.vue
+++ b/core/core-frontend/src/pages/panel/DashboardPreview.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { ref, reactive, onBeforeMount, nextTick } from 'vue'
+import { ref, reactive, onBeforeMount, nextTick, inject } from 'vue'
 import { initCanvasData, initCanvasDataMobile } from '@/utils/canvasUtils'
 import { interactiveStoreWithOut } from '@/store/modules/interactive'
 import { useEmbedded } from '@/store/modules/embedded'
@@ -20,6 +20,8 @@ const { wsCache } = useCache()
 const interactiveStore = interactiveStoreWithOut()
 const embeddedStore = useEmbedded()
 const dashboardPreview = ref(null)
+const embeddedParams = inject('embeddedParams') as object
+
 const { t } = useI18n()
 const state = reactive({
   canvasDataPreview: null,
@@ -34,14 +36,14 @@ const checkPer = async resourceId => {
   if (!window.DataEaseBi || !resourceId) {
     return true
   }
-  const request = { busiFlag: embeddedStore.busiFlag }
+  const request = { busiFlag: embeddedParams.busiFlag }
   await interactiveStore.setInteractive(request)
-  const key = embeddedStore.busiFlag === 'dataV' ? 'screen-weight' : 'panel-weight'
+  const key = embeddedParams.busiFlag === 'dataV' ? 'screen-weight' : 'panel-weight'
   return check(wsCache.get(key), resourceId, 1)
 }
 const isPc = ref(true)
 onBeforeMount(async () => {
-  const checkResult = await checkPer(embeddedStore.dvId)
+  const checkResult = await checkPer(embeddedParams.dvId)
   if (!checkResult) {
     return
   }
@@ -53,14 +55,14 @@ onBeforeMount(async () => {
   }
   // 添加外部参数
   let attachParams
-  await getOuterParamsInfo(embeddedStore.dvId).then(rsp => {
+  await getOuterParamsInfo(embeddedParams.dvId).then(rsp => {
     dvMainStore.setNowPanelOuterParamsInfo(rsp.data)
   })
 
   // div嵌入
-  if (embeddedStore.outerParams) {
+  if (embeddedParams.outerParams) {
     try {
-      const outerPramsParse = JSON.parse(embeddedStore.outerParams)
+      const outerPramsParse = JSON.parse(embeddedParams.outerParams)
       attachParams = outerPramsParse.attachParams
       dvMainStore.setEmbeddedCallBack(outerPramsParse.callBackFlag || 'no')
     } catch (e) {
@@ -76,8 +78,8 @@ onBeforeMount(async () => {
   const req = isPc.value ? initCanvasData : initCanvasDataMobile
 
   req(
-    embeddedStore.dvId,
-    embeddedStore.busiFlag,
+    embeddedParams.dvId,
+    embeddedParams.busiFlag,
     function ({
       canvasDataResult,
       canvasStyleResult,
diff --git a/core/core-frontend/src/pages/panel/ViewWrapper.vue b/core/core-frontend/src/pages/panel/ViewWrapper.vue
index 0e6ded51b0..f6abd0d2f3 100644
--- a/core/core-frontend/src/pages/panel/ViewWrapper.vue
+++ b/core/core-frontend/src/pages/panel/ViewWrapper.vue
@@ -13,7 +13,7 @@ import { XpackComponent } from '@/components/plugin'
 const { wsCache } = useCache()
 const interactiveStore = interactiveStoreWithOut()
 const embeddedStore = useEmbedded()
-const injectChartId = inject('embeddedParams') as string
+const embeddedParams = inject('embeddedParams') as object
 const config = ref()
 const viewInfo = ref()
 const userViewEnlargeRef = ref()
@@ -74,7 +74,7 @@ onBeforeMount(async () => {
       ElMessage.error(t('visualization.outer_param_decode_error'))
     }
   }
-  const chartId = injectChartId || embeddedStore.chartId
+  const chartId = embeddedParams?.chartId || embeddedStore.chartId
 
   initCanvasData(
     embeddedStore.dvId,
diff --git a/core/core-frontend/src/pages/panel/main.ts b/core/core-frontend/src/pages/panel/main.ts
index e643fdb163..668c0acf3d 100644
--- a/core/core-frontend/src/pages/panel/main.ts
+++ b/core/core-frontend/src/pages/panel/main.ts
@@ -77,7 +77,7 @@ const setupAll = async (
   resourceId: string
 ): Promise<App<Element>> => {
   const app = createApp(AppElement, { componentName: type })
-  app.provide('embeddedParams', chartId)
+  app.provide('embeddedParams', { chartId, resourceId, dvId, pid, busiFlag, outerParams })
   await setupI18n(app)
   setupStore(app)
   setupRouter(app)