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: 解决主题色切换报错的问题 (#5287)

Browse source
This commit is contained in:
ssongliu 2024-06-05 10:29:08 +08:00 • committed by GitHub
parent 7fb41f43cc
commit 296ae1c2e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/api/index.ts
View file

@ -68,7 +68,7 @@ class RequestHttp {
return; return;
} }
if (data.code == ResultEnum.EXPIRED) { if (data.code == ResultEnum.EXPIRED) {
globalStore.errStatus = 'err-entrance'; router.push({ name: 'Expired' });
return; return;
} }
if (data.code == ResultEnum.ERRXPACK) { if (data.code == ResultEnum.ERRXPACK) {

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

@ -357,6 +357,7 @@ const onSave = async (key: string, val: any) => {
globalStore.themeConfig.theme = val; globalStore.themeConfig.theme = val;
} }
switchTheme(); switchTheme();
if (globalStore.isProductPro) {
updateXpackSettingByKey('Theme', val === 'dark-gold' ? 'dark-gold' : ''); updateXpackSettingByKey('Theme', val === 'dark-gold' ? 'dark-gold' : '');
if (val === 'dark-gold') { if (val === 'dark-gold') {
MsgSuccess(i18n.t('commons.msg.operationSuccess')); MsgSuccess(i18n.t('commons.msg.operationSuccess'));
@ -365,6 +366,7 @@ const onSave = async (key: string, val: any) => {
return; return;
} }
} }
}
if (key === 'MenuTabs') { if (key === 'MenuTabs') {
globalStore.setOpenMenuTabs(val === 'enable'); globalStore.setOpenMenuTabs(val === 'enable');
} }

2
frontend/src/views/setting/panel/proxy/index.vue
View file

@ -106,7 +106,7 @@ interface DialogProps {
passwdKeep: string; passwdKeep: string;
} }
const acceptParams = (params: DialogProps): void => { const acceptParams = (params: DialogProps): void => {
form.proxyUrl = params.url; form.proxyUrl = params.url || '127.0.0.1';
form.proxyType = params.type; form.proxyType = params.type;
form.proxyPortItem = params.port ? Number(params.port) : 7890; form.proxyPortItem = params.port ? Number(params.port) : 7890;
form.proxyUser = params.user; form.proxyUser = params.user;