zuaa
/
vue-vben-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: The projectSettings default dark mode is not taking effect (#4052) 

The projectSettings default dark mode is not taking effect. In the getDarkMode function, setting.menuSetting.theme should be present must be higher priority than darkMode.
This commit is contained in:
No name 2024-08-06 10:58:26 +08:00 committed by GitHub
parent 65651fc25c
commit 7b6531a309
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/store/modules/app.ts
View File

@ -16,6 +16,7 @@ import { Persistent } from '@/utils/cache/persistent';
import { darkMode } from '@/settings/designSetting'; import { darkMode } from '@/settings/designSetting';
import { resetRouter } from '@/router'; import { resetRouter } from '@/router';
import { deepMerge } from '@/utils'; import { deepMerge } from '@/utils';
import setting from '@/settings/projectSetting';
interface AppState { interface AppState {
darkMode?: ThemeEnum; darkMode?: ThemeEnum;
@ -40,7 +41,12 @@ export const useAppStore = defineStore({
return state.pageLoading; return state.pageLoading;
}, },
getDarkMode(state): 'light' | 'dark' | string { getDarkMode(state): 'light' | 'dark' | string {
return state.darkMode || localStorage.getItem(APP_DARK_MODE_KEY) || darkMode; return (
state.darkMode ||
localStorage.getItem(APP_DARK_MODE_KEY) ||
setting.menuSetting.theme ||
darkMode
);
}, },
getBeforeMiniInfo(state): BeforeMiniState { getBeforeMiniInfo(state): BeforeMiniState {