From 142684a46dfae59863eac09959c6fc13474de006 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Sat, 28 Mar 2026 17:24:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E4=BE=9D=E8=B5=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/permission.ts               | 2 +-
 core/core-frontend/src/permissionMobile.ts         | 2 +-
 core/core-frontend/src/store/modules/appearance.ts | 3 ++-
 core/core-frontend/src/utils/canvasUtils.ts        | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/permission.ts b/core/core-frontend/src/permission.ts
index baf4937623..d7624906cb 100644
--- a/core/core-frontend/src/permission.ts
+++ b/core/core-frontend/src/permission.ts
@@ -13,7 +13,6 @@ import { interactiveStoreWithOut } from '@/store/modules/interactive'
 import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
 import { useEmbedded } from '@/store/modules/embedded'
 import { useLoading } from '@/hooks/web/useLoading'
-const appearanceStore = useAppearanceStoreWithOut()
 const { wsCache } = useCache()
 const permissionStore = usePermissionStoreWithOut()
 const interactiveStore = interactiveStoreWithOut()
@@ -28,6 +27,7 @@ const whiteList = ['/login', '/de-link', '/chart-view', '/admin-login', '/401']
 const embeddedWindowWhiteList = ['/dvCanvas', '/dashboard', '/preview', '/dataset-embedded-form']
 const embeddedRouteWhiteList = ['/dataset-embedded', '/dataset-form', '/dataset-embedded-form']
 router.beforeEach(async (to, from, next) => {
+  const appearanceStore = useAppearanceStoreWithOut()
   if (['/chart-view'].includes(to.path) || to.path.startsWith('/de-link/')) {
     open()
   }
diff --git a/core/core-frontend/src/permissionMobile.ts b/core/core-frontend/src/permissionMobile.ts
index 10ca1a915e..b302751e3e 100644
--- a/core/core-frontend/src/permissionMobile.ts
+++ b/core/core-frontend/src/permissionMobile.ts
@@ -11,7 +11,6 @@ import { useLinkStoreWithOut } from '@/store/modules/link'
 import { useLoading } from '@/hooks/web/useLoading'
 import { h } from 'vue'
 
-const appearanceStore = useAppearanceStoreWithOut()
 const permissionStore = usePermissionStoreWithOut()
 const { wsCache } = useCache()
 const userStore = useUserStoreWithOut()
@@ -65,6 +64,7 @@ router.beforeEach(async (to, _, next) => {
   }
   start()
   loadStart()
+  const appearanceStore = useAppearanceStoreWithOut()
   await appearanceStore.setAppearance()
   if (to.name === 'link') {
     next()
diff --git a/core/core-frontend/src/store/modules/appearance.ts b/core/core-frontend/src/store/modules/appearance.ts
index e981fca83e..900096b278 100644
--- a/core/core-frontend/src/store/modules/appearance.ts
+++ b/core/core-frontend/src/store/modules/appearance.ts
@@ -8,7 +8,6 @@ import colorTree from 'less/lib/less/tree/color.js'
 import { useEmbedded } from '@/store/modules/embedded'
 import { setTitle } from '@/utils/utils'
 
-const embeddedStore = useEmbedded()
 const basePath = import.meta.env.VITE_API_BASEPATH
 const baseUrl = basePath + '/appearance/image/'
 import { isBtnShow } from '@/utils/utils'
@@ -164,6 +163,7 @@ export const useAppearanceStore = defineStore('appearanceStore', {
       this.fontList = res || []
     },
     setCurrentFont(name) {
+      const embeddedStore = useEmbedded()
       const currentFont = this.fontList.find(ele => ele.name === name)
       if (currentFont) {
         let fontStyleElement = document.querySelector(`#de-custom_font${name}`)
@@ -203,6 +203,7 @@ export const useAppearanceStore = defineStore('appearanceStore', {
       this.loaded = data
     },
     async setAppearance(isDataEaseBi?: boolean) {
+      const embeddedStore = useEmbedded()
       const desktop = wsCache.get('app.desktop')
       if (desktop) {
         this.loaded = true
diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index eaa10e7d82..664ecb9da3 100644
--- a/core/core-frontend/src/utils/canvasUtils.ts
+++ b/core/core-frontend/src/utils/canvasUtils.ts
@@ -47,7 +47,6 @@ import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
 import { useCache } from '@/hooks/web/useCache'
 import { isDesktop } from '@/utils/ModelUtil'
 const { t } = useI18n()
-const appearanceStore = useAppearanceStoreWithOut()
 const { wsCache } = useCache()
 
 const getNewInnerPadding = (commonGap = 0) => {
@@ -453,6 +452,7 @@ export function initCanvasDataPrepare(dvId, params, callBack) {
       dvInfo.type === 'dashboard' && canvasStyleResult['dashboard'].gap === 'yes'
         ? canvasStyleResult['dashboard'].gapSize
         : 0
+    const appearanceStore = useAppearanceStoreWithOut()
     appearanceStore.setCurrentFont(canvasStyleResult.fontFamily)
     document.documentElement.style.setProperty(
       '--de-canvas_custom_font',