Browse Source

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.
pull/4086/head
No name 2 years ago
committed by GitHub
parent
commit
7b6531a309
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 8
      src/store/modules/app.ts

8
src/store/modules/app.ts

@ -16,6 +16,7 @@ import { Persistent } from '@/utils/cache/persistent';
import { darkMode } from '@/settings/designSetting';
import { resetRouter } from '@/router';
import { deepMerge } from '@/utils';
import setting from '@/settings/projectSetting';
interface AppState {
darkMode?: ThemeEnum;
@ -40,7 +41,12 @@ export const useAppStore = defineStore({
return state.pageLoading;
},
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 {

Loading…
Cancel
Save