refactor: code optimization (#2961)

This commit is contained in:
舜岳
2023-08-13 09:14:38 +08:00
committed by GitHub
parent 5dd3babc4e
commit b660f96220
5 changed files with 11 additions and 12 deletions

View File

@@ -17,7 +17,7 @@ export const LOCK_INFO_KEY = 'LOCK__INFO__KEY__';
export const MULTIPLE_TABS_KEY = 'MULTIPLE_TABS__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 // base global local key
export const APP_LOCAL_CACHE_KEY = 'COMMON__LOCAL__KEY__'; export const APP_LOCAL_CACHE_KEY = 'COMMON__LOCAL__KEY__';

View File

@@ -22,11 +22,11 @@ export function createContext<T>(
key: InjectionKey<T> = Symbol(), key: InjectionKey<T> = Symbol(),
options: CreateContextOptions = {}, options: CreateContextOptions = {},
) { ) {
const { readonly = true, createProvider = false, native = false } = options; const { readonly = true, createProvider = true, native = false } = options;
const state = reactive(context); const state = reactive(context);
const provideData = readonly ? defineReadonly(state) : state; const provideData = readonly ? defineReadonly(state) : state;
!createProvider && provide(key, native ? context : provideData); createProvider && provide(key, native ? context : provideData);
return { return {
state, state,

View File

@@ -11,7 +11,7 @@ import { defineStore } from 'pinia';
import { store } from '/@/store'; import { store } from '/@/store';
import { ThemeEnum } from '/@/enums/appEnum'; 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 { Persistent } from '/@/utils/cache/persistent';
import { darkMode } from '/@/settings/designSetting'; import { darkMode } from '/@/settings/designSetting';
import { resetRouter } from '/@/router'; import { resetRouter } from '/@/router';
@@ -40,7 +40,7 @@ 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) || darkMode;
}, },
getBeforeMiniInfo(state): BeforeMiniState { getBeforeMiniInfo(state): BeforeMiniState {
@@ -71,7 +71,7 @@ export const useAppStore = defineStore({
setDarkMode(mode: ThemeEnum): void { setDarkMode(mode: ThemeEnum): void {
this.darkMode = mode; this.darkMode = mode;
localStorage.setItem(APP_DARK_MODE_KEY_, mode); localStorage.setItem(APP_DARK_MODE_KEY, mode);
}, },
setBeforeMiniInfo(state: BeforeMiniState): void { setBeforeMiniInfo(state: BeforeMiniState): void {
@@ -79,11 +79,11 @@ export const useAppStore = defineStore({
}, },
setProjectConfig(config: DeepPartial<ProjectConfig>): void { setProjectConfig(config: DeepPartial<ProjectConfig>): void {
this.projectConfig = deepMerge(this.projectConfig || {}, config); this.projectConfig = deepMerge(this.projectConfig || {}, config) as ProjectConfig;
Persistent.setLocal(PROJ_CFG_KEY, this.projectConfig); Persistent.setLocal(PROJ_CFG_KEY, this.projectConfig);
}, },
setMenuSetting(setting: Partial<MenuSetting>): void { setMenuSetting(setting: Partial<MenuSetting>): void {
this.projectConfig.menuSetting = deepMerge(this.projectConfig.menuSetting, setting); this.projectConfig!.menuSetting = deepMerge(this.projectConfig!.menuSetting, setting);
Persistent.setLocal(PROJ_CFG_KEY, this.projectConfig); Persistent.setLocal(PROJ_CFG_KEY, this.projectConfig);
}, },

View File

@@ -77,7 +77,6 @@ const transform: AxiosTransform = {
case ResultEnum.TIMEOUT: case ResultEnum.TIMEOUT:
timeoutMsg = t('sys.api.timeoutMessage'); timeoutMsg = t('sys.api.timeoutMessage');
const userStore = useUserStoreWithOut(); const userStore = useUserStoreWithOut();
userStore.setToken(undefined);
userStore.logout(true); userStore.logout(true);
break; break;
default: default:

View File

@@ -52,18 +52,18 @@
{{ t('sys.login.registerButton') }} {{ t('sys.login.registerButton') }}
</Button> --> </Button> -->
</FormItem> </FormItem>
<ARow class="enter-x"> <ARow class="enter-x" :gutter="[16, 16]">
<ACol :md="8" :xs="24"> <ACol :md="8" :xs="24">
<Button block @click="setLoginState(LoginStateEnum.MOBILE)"> <Button block @click="setLoginState(LoginStateEnum.MOBILE)">
{{ t('sys.login.mobileSignInFormTitle') }} {{ t('sys.login.mobileSignInFormTitle') }}
</Button> </Button>
</ACol> </ACol>
<ACol :md="8" :xs="24" class="!my-2 !md:my-0 xs:mx-0 md:mx-2"> <ACol :md="8" :xs="24">
<Button block @click="setLoginState(LoginStateEnum.QR_CODE)"> <Button block @click="setLoginState(LoginStateEnum.QR_CODE)">
{{ t('sys.login.qrSignInFormTitle') }} {{ t('sys.login.qrSignInFormTitle') }}
</Button> </Button>
</ACol> </ACol>
<ACol :md="6" :xs="24"> <ACol :md="8" :xs="24">
<Button block @click="setLoginState(LoginStateEnum.REGISTER)"> <Button block @click="setLoginState(LoginStateEnum.REGISTER)">
{{ t('sys.login.registerButton') }} {{ t('sys.login.registerButton') }}
</Button> </Button>