From 81d34b1b8215092117b65ca96392500567c32f4e Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Sun, 18 Feb 2024 17:52:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20DIV?=
 =?UTF-8?q?=E5=B5=8C=E5=85=A5=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/pages/panel/App.vue   |  8 ++------
 core/core-frontend/src/pages/panel/main.ts   | 15 ++++++++++-----
 core/core-frontend/src/store/modules/user.ts | 12 +++++++-----
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/core/core-frontend/src/pages/panel/App.vue b/core/core-frontend/src/pages/panel/App.vue
index ce0fe78001..125fc067fb 100644
--- a/core/core-frontend/src/pages/panel/App.vue
+++ b/core/core-frontend/src/pages/panel/App.vue
@@ -1,11 +1,7 @@
 <script setup lang="ts">
-import { shallowRef, defineAsyncComponent, onBeforeMount } from 'vue'
+import { shallowRef, defineAsyncComponent } from 'vue'
 import { propTypes } from '@/utils/propTypes'
-import { useAppStoreWithOut } from '@/store/modules/app'
-const appStore = useAppStoreWithOut()
-onBeforeMount(() => {
-  appStore.setIsDataEaseBi(true)
-})
+
 const VisualizationEditor = defineAsyncComponent(
   () => import('@/views/data-visualization/index.vue')
 )
diff --git a/core/core-frontend/src/pages/panel/main.ts b/core/core-frontend/src/pages/panel/main.ts
index 20ae94cf5d..8d1a392fb4 100644
--- a/core/core-frontend/src/pages/panel/main.ts
+++ b/core/core-frontend/src/pages/panel/main.ts
@@ -58,7 +58,6 @@ import AppElement from './App.vue'
 import { setupI18n } from '@/plugins/vue-i18n'
 import { setupStore } from '@/store'
 import { useEmbedded } from '@/store/modules/embedded'
-import { useUserStoreWithOut } from '@/store/modules/user'
 import { setupElementPlus, setupElementPlusIcons } from '@/plugins/element-plus'
 import { setupRouter } from '@/router/embedded'
 
@@ -88,8 +87,12 @@ const setupAll = async (
   embeddedStore.setPid(pid)
   embeddedStore.setChartId(chartId)
   embeddedStore.setResourceId(resourceId)
-  const userStore = useUserStoreWithOut()
-  await userStore.setUser()
+  const res = await import('@/store/modules/user')
+  const userStore = res.userStore()
+  userStore.setUser()
+  const appRes = await import('@/store/modules/app')
+  const appStore = appRes.useAppStoreWithOut()
+  appStore.setIsDataEaseBi(true)
   app.mount(dom)
   return app
 }
@@ -151,9 +154,11 @@ class DataEaseBi {
   }
 
   destroy() {
-    const userStore = useUserStoreWithOut()
+    import('@/store/modules/user').then(res => {
+      const userStore = res.userStore()
+      userStore.setUser()
+    })
     const embeddedStore = useEmbedded()
-    userStore.clear()
     embeddedStore.setType(null)
     embeddedStore.setBusiFlag(null)
     embeddedStore.setToken(null)
diff --git a/core/core-frontend/src/store/modules/user.ts b/core/core-frontend/src/store/modules/user.ts
index a6b2693656..63faa0b3cc 100644
--- a/core/core-frontend/src/store/modules/user.ts
+++ b/core/core-frontend/src/store/modules/user.ts
@@ -2,8 +2,6 @@ import { defineStore } from 'pinia'
 import { store } from '../index'
 import { useCache } from '@/hooks/web/useCache'
 import { useLocaleStoreWithOut } from './locale'
-
-import { userInfo } from '@/api/user'
 const { wsCache } = useCache()
 const locale = useLocaleStoreWithOut()
 interface UserState {
@@ -49,9 +47,13 @@ export const userStore = defineStore('user', {
   actions: {
     async setUser() {
       const desktop = wsCache.get('app.desktop')
-      const res = desktop
-        ? { data: { uid: '1', name: 'DataEase 用户', oid: '1', language: 'zh-CN' } }
-        : await userInfo()
+      let res = null
+      if (desktop) {
+        res = { data: { uid: '1', name: 'DataEase 用户', oid: '1', language: 'zh-CN' } }
+      } else {
+        const user = await import('@/api/user')
+        res = await user.userInfo()
+      }
       const data = res.data
       data.token = wsCache.get('user.token')
       data.exp = wsCache.get('user.exp')