fix: 修复许可证失效主题切换错误问题 (#7075)

1Panel-dev · Nov 15, 2024 · eea4cf6 · eea4cf6
1 parent 3a400dd
commit eea4cf6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/frontend/src/components/license-import/index.vue b/frontend/src/components/license-import/index.vue
@@ -90,6 +90,7 @@ const submit = async () => {
             globalStore.isProductPro = true;
             const xpackRes = await getXpackSetting();
             if (xpackRes) {
+                globalStore.themeConfig.theme = xpackRes.data.theme;
                 globalStore.themeConfig.themeColor = xpackRes.data.themeColor;
             }
             loading.value = false;

diff --git a/frontend/src/views/setting/panel/index.vue b/frontend/src/views/setting/panel/index.vue
@@ -300,14 +300,14 @@ const search = async () => {
     if (isProductPro.value) {
         const xpackRes = await getXpackSetting();
         if (xpackRes) {
-            form.theme = xpackRes.data.theme || globalStore.themeConfig.theme;
+            form.theme = xpackRes.data.theme || globalStore.themeConfig.theme || 'light';
             form.themeColor = JSON.parse(xpackRes.data.themeColor);
             globalStore.themeConfig.themeColor = xpackRes.data.themeColor;
             globalStore.themeConfig.theme = form.theme;
             form.proxyDocker = xpackRes.data.proxyDocker;
         }
     } else {
-        form.theme = res.data.theme;
+        form.theme = globalStore.themeConfig.theme || res.data.theme || 'light';
     }
 };
 
@@ -395,10 +395,6 @@ const onSave = async (key: string, val: any) => {
             }
             globalStore.themeConfig.primary = color;
             setPrimaryColor(color);
-            MsgSuccess(i18n.t('commons.msg.operationSuccess'));
-            loading.value = false;
-            await search();
-            return;
         }
     }
     if (key === 'MenuTabs') {