From 419343364d7c76cefa620197d7298d682884613e Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Mon, 24 Jun 2024 13:54:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E8=B7=9F=E9=9A=8F=E7=B3=BB=E7=BB=9F=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98=20(#5547)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refs #5527
---
 frontend/src/utils/xpack.ts | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/frontend/src/utils/xpack.ts b/frontend/src/utils/xpack.ts
index 8901ab466..4506ff790 100644
--- a/frontend/src/utils/xpack.ts
+++ b/frontend/src/utils/xpack.ts
@@ -1,8 +1,10 @@
 import { getLicenseStatus, getSettingInfo } from '@/api/modules/setting';
 import { useTheme } from '@/hooks/use-theme';
 import { GlobalStore } from '@/store';
+import { computed } from 'vue';
 const globalStore = GlobalStore();
 const { switchTheme } = useTheme();
+const themeConfig = computed(() => globalStore.themeConfig);
 
 export function resetXSetting() {
     globalStore.themeConfig.title = '';
@@ -43,14 +45,6 @@ export async function getXpackSetting() {
     }
 }
 
-const loadDataFromDB = async () => {
-    const res = await getSettingInfo();
-    document.title = res.data.panelName;
-    globalStore.entrance = res.data.securityEntrance;
-    globalStore.setDefaultNetwork(res.data.defaultNetwork);
-    globalStore.setOpenMenuTabs(res.data.menuTabs === 'enable');
-};
-
 export async function loadProductProFromDB() {
     const res = await getLicenseStatus();
     if (!res.data) {
@@ -64,9 +58,16 @@ export async function loadProductProFromDB() {
             globalStore.productProExpires = Number(res.data.productPro);
         }
     }
+
+    const res2 = await getSettingInfo();
+    document.title = res2.data.panelName;
+    globalStore.entrance = res2.data.securityEntrance;
+    globalStore.setDefaultNetwork(res2.data.defaultNetwork);
+    globalStore.setOpenMenuTabs(res2.data.menuTabs === 'enable');
+    globalStore.updateLanguage(res2.data.language);
+    globalStore.setThemeConfig({ ...themeConfig.value, theme: res2.data.theme, panelName: res2.data.panelName });
     switchTheme();
     initFavicon();
-    loadDataFromDB();
 }
 
 export async function getXpackSettingForTheme() {