diff --git a/src/logics/initAppConfig.ts b/src/logics/initAppConfig.ts index 38935cd..563d6ae 100644 --- a/src/logics/initAppConfig.ts +++ b/src/logics/initAppConfig.ts @@ -50,6 +50,7 @@ export function initAppConfigStore() { appStore.setProjectConfig(projCfg) // init dark mode + appStore.setDarkMode(darkMode as ThemeEnum) updateDarkTheme(darkMode) if (darkMode === ThemeEnum.DARK) { updateHeaderBgColor() diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts index 7e30169..ebe4a26 100644 --- a/src/store/modules/app.ts +++ b/src/store/modules/app.ts @@ -80,12 +80,11 @@ export const useAppStore = defineStore('app', { setDarkMode(mode: ThemeEnum): void { this.darkMode = mode - console.info(mode) this.setThemeConfig() localStorage.setItem(APP_DARK_MODE_KEY_, mode) }, + setThemeConfig(color?: string): void { - console.info(this.darkMode) let themeConfig = reactive({ algorithm: antdTheme.defaultAlgorithm, token: { @@ -109,7 +108,6 @@ export const useAppStore = defineStore('app', { components: {}, } } - console.info(themeConfig) this.themeConfig = themeConfig }, @@ -122,8 +120,9 @@ export const useAppStore = defineStore('app', { }, setProjectConfig(config: DeepPartial): void { - this.projectConfig = deepMerge(this.projectConfig || {}, config) + this.projectConfig = deepMerge(this.projectConfig, config) Persistent.setLocal(PROJ_CFG_KEY, this.projectConfig) + this.setThemeConfig(config.themeColor) }, setMenuSetting(setting: Partial): void {