From 0dd4b99da4a0cc2043a81d0702aabf641fe50c49 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 26 Aug 2024 09:53:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20=E5=B5=8C?=
 =?UTF-8?q?=E5=85=A5=E5=BC=8F=E5=A4=9A=E8=A7=86=E5=9B=BE=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/pages/panel/ViewWrapper.vue | 11 ++++++-----
 core/core-frontend/src/pages/panel/main.ts         |  3 +--
 core/core-frontend/src/store/modules/embedded.ts   |  2 --
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/core/core-frontend/src/pages/panel/ViewWrapper.vue b/core/core-frontend/src/pages/panel/ViewWrapper.vue
index 7ea15dfcbd..69691f4a53 100644
--- a/core/core-frontend/src/pages/panel/ViewWrapper.vue
+++ b/core/core-frontend/src/pages/panel/ViewWrapper.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { ref, onBeforeMount, reactive } from 'vue'
+import { ref, onBeforeMount, reactive, inject } from 'vue'
 import { initCanvasData } from '@/utils/canvasUtils'
 import { interactiveStoreWithOut } from '@/store/modules/interactive'
 import { useEmbedded } from '@/store/modules/embedded'
@@ -13,6 +13,7 @@ import { XpackComponent } from '@/components/plugin'
 const { wsCache } = useCache()
 const interactiveStore = interactiveStoreWithOut()
 const embeddedStore = useEmbedded()
+const chartId = inject('embeddedParams') as string
 const config = ref()
 const viewInfo = ref()
 const userViewEnlargeRef = ref()
@@ -86,8 +87,8 @@ onBeforeMount(async () => {
         dvMainStore.addOuterParamsFilter(attachParams, canvasDataResult)
       }
 
-      viewInfo.value = canvasViewInfoPreview[embeddedStore.chartId]
-      console.log(embeddedStore.chartId, 'embeddedStore.chartId')
+      console.log('chartId', chartId)
+      viewInfo.value = canvasViewInfoPreview[chartId]
       ;(
         (canvasDataResult as unknown as Array<{
           id: string
@@ -95,14 +96,14 @@ onBeforeMount(async () => {
           propValue: Array<{ id: string }>
         }>) || []
       ).some(ele => {
-        if (ele.id === embeddedStore.chartId) {
+        if (ele.id === chartId) {
           config.value = ele
           return true
         }
 
         if (ele.component === 'Group') {
           return (ele.propValue || []).some(itx => {
-            if (itx.id === embeddedStore.chartId) {
+            if (itx.id === chartId) {
               config.value = itx
               return true
             }
diff --git a/core/core-frontend/src/pages/panel/main.ts b/core/core-frontend/src/pages/panel/main.ts
index 9eca751edb..d3cd323367 100644
--- a/core/core-frontend/src/pages/panel/main.ts
+++ b/core/core-frontend/src/pages/panel/main.ts
@@ -78,6 +78,7 @@ const setupAll = async (
   resourceId: string
 ): Promise<App<Element>> => {
   const app = createApp(AppElement, { componentName: type })
+  app.provide('embeddedParams', chartId)
   await setupI18n(app)
   setupStore(app)
   setupRouter(app)
@@ -91,8 +92,6 @@ const setupAll = async (
   embeddedStore.setBaseUrl(baseUrl)
   embeddedStore.setDvId(dvId)
   embeddedStore.setPid(pid)
-  console.log(chartId, 'chartId')
-  embeddedStore.setChartId(chartId)
   embeddedStore.setResourceId(resourceId)
   const directive = await import('@/directive')
   directive.installDirective(app)
diff --git a/core/core-frontend/src/store/modules/embedded.ts b/core/core-frontend/src/store/modules/embedded.ts
index 419074fbbe..f7060d4d80 100644
--- a/core/core-frontend/src/store/modules/embedded.ts
+++ b/core/core-frontend/src/store/modules/embedded.ts
@@ -1,6 +1,5 @@
 import { defineStore } from 'pinia'
 import { store } from '../index'
-import { cloneDeep } from 'lodash-es'
 
 interface AppState {
   type: string
@@ -199,6 +198,5 @@ export const userStore = defineStore('embedded', {
 })
 
 export const useEmbedded = () => {
-  console.log('cloneDeep', cloneDeep(store))
   return userStore(store)
 }