diff --git a/src/enums/cacheEnum.ts b/src/enums/cacheEnum.ts index 4a5cc11b..492420a4 100644 --- a/src/enums/cacheEnum.ts +++ b/src/enums/cacheEnum.ts @@ -17,7 +17,7 @@ export const LOCK_INFO_KEY = 'LOCK__INFO__KEY__'; export const MULTIPLE_TABS_KEY = 'MULTIPLE_TABS__KEY__'; -export const APP_DARK_MODE_KEY_ = '__APP__DARK__MODE__'; +export const APP_DARK_MODE_KEY = '__APP__DARK__MODE__'; // base global local key export const APP_LOCAL_CACHE_KEY = 'COMMON__LOCAL__KEY__'; diff --git a/src/hooks/core/useContext.ts b/src/hooks/core/useContext.ts index 2729526e..04a94333 100644 --- a/src/hooks/core/useContext.ts +++ b/src/hooks/core/useContext.ts @@ -22,11 +22,11 @@ export function createContext( key: InjectionKey = Symbol(), options: CreateContextOptions = {}, ) { - const { readonly = true, createProvider = false, native = false } = options; + const { readonly = true, createProvider = true, native = false } = options; const state = reactive(context); const provideData = readonly ? defineReadonly(state) : state; - !createProvider && provide(key, native ? context : provideData); + createProvider && provide(key, native ? context : provideData); return { state, diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts index 12f45571..06df314d 100644 --- a/src/store/modules/app.ts +++ b/src/store/modules/app.ts @@ -11,7 +11,7 @@ import { defineStore } from 'pinia'; import { store } from '/@/store'; import { ThemeEnum } from '/@/enums/appEnum'; -import { APP_DARK_MODE_KEY_, PROJ_CFG_KEY } from '/@/enums/cacheEnum'; +import { APP_DARK_MODE_KEY, PROJ_CFG_KEY } from '/@/enums/cacheEnum'; import { Persistent } from '/@/utils/cache/persistent'; import { darkMode } from '/@/settings/designSetting'; import { resetRouter } from '/@/router'; @@ -40,7 +40,7 @@ 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) || darkMode; }, getBeforeMiniInfo(state): BeforeMiniState { @@ -71,7 +71,7 @@ export const useAppStore = defineStore({ setDarkMode(mode: ThemeEnum): void { this.darkMode = mode; - localStorage.setItem(APP_DARK_MODE_KEY_, mode); + localStorage.setItem(APP_DARK_MODE_KEY, mode); }, setBeforeMiniInfo(state: BeforeMiniState): void { @@ -79,11 +79,11 @@ export const useAppStore = defineStore({ }, setProjectConfig(config: DeepPartial): void { - this.projectConfig = deepMerge(this.projectConfig || {}, config); + this.projectConfig = deepMerge(this.projectConfig || {}, config) as ProjectConfig; Persistent.setLocal(PROJ_CFG_KEY, this.projectConfig); }, setMenuSetting(setting: Partial): void { - this.projectConfig.menuSetting = deepMerge(this.projectConfig.menuSetting, setting); + this.projectConfig!.menuSetting = deepMerge(this.projectConfig!.menuSetting, setting); Persistent.setLocal(PROJ_CFG_KEY, this.projectConfig); }, diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts index 2868c070..74bae528 100644 --- a/src/utils/http/axios/index.ts +++ b/src/utils/http/axios/index.ts @@ -77,7 +77,6 @@ const transform: AxiosTransform = { case ResultEnum.TIMEOUT: timeoutMsg = t('sys.api.timeoutMessage'); const userStore = useUserStoreWithOut(); - userStore.setToken(undefined); userStore.logout(true); break; default: diff --git a/src/views/sys/login/LoginForm.vue b/src/views/sys/login/LoginForm.vue index 4ccf5ecc..f204d5a5 100644 --- a/src/views/sys/login/LoginForm.vue +++ b/src/views/sys/login/LoginForm.vue @@ -52,18 +52,18 @@ {{ t('sys.login.registerButton') }} --> - + - + - +