1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-09 23:17:21 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Fix the problem that the theme color display is abnormal after t… (#8330)

Browse source 
…he upgrade
This commit is contained in:
ssongliu 2025-04-07 15:41:51 +08:00 • committed by GitHub
parent 5cdc316293
commit afbfd6b66c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/views/login/components/login-form.vue
View file

@ -413,8 +413,7 @@ const getSetting = async () => {
i18n.warnHtmlMessage = false; i18n.warnHtmlMessage = false;
globalStore.setOpenMenuTabs(res.data.menuTabs === 'Enable'); globalStore.setOpenMenuTabs(res.data.menuTabs === 'Enable');
globalStore.updateLanguage(res.data.language); globalStore.updateLanguage(res.data.language);
let theme = globalStore.themeConfig.theme === res.data.theme ? res.data.theme : globalStore.themeConfig.theme; globalStore.setThemeConfig({ ...themeConfig.value, theme: res.data.theme, panelName: res.data.panelName });
globalStore.setThemeConfig({ ...themeConfig.value, theme: theme, panelName: res.data.panelName });
} catch (error) {} } catch (error) {}
}; };

3
frontend/src/views/setting/panel/index.vue
View file

@ -327,6 +327,7 @@ const search = async () => {
form.apiKeyValidityTime = res.data.apiKeyValidityTime; form.apiKeyValidityTime = res.data.apiKeyValidityTime;
form.hideMenu = res.data.hideMenu; form.hideMenu = res.data.hideMenu;
form.systemIP = res.data.systemIP; form.systemIP = res.data.systemIP;
form.theme = res.data.theme;
if (isMasterProductPro.value) { if (isMasterProductPro.value) {
const xpackRes = await getXpackSetting(); const xpackRes = await getXpackSetting();
@ -340,7 +341,7 @@ const search = async () => {
form.proxyDocker = xpackRes.data.proxyDocker; form.proxyDocker = xpackRes.data.proxyDocker;
} }
} else { } else {
form.theme = globalStore.themeConfig.theme || res.data.theme || 'light'; globalStore.themeConfig.theme = form.theme;
} }
}; };