From 7b6531a309cc94819570a54a18da37f4ec70a436 Mon Sep 17 00:00:00 2001
From: No name <88119911+doraemonxxx@users.noreply.github.com>
Date: Tue, 6 Aug 2024 10:58:26 +0800
Subject: [PATCH] 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.
---
 src/store/modules/app.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index df55b0001..3b0e7c2dc 100644
--- a/src/store/modules/app.ts
+++ b/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 {