fix: 抽离全局设置的位置

This commit is contained in:
mtruning
2022-01-15 16:07:46 +08:00
parent 3758db4cb6
commit 551a1f2d01
12 changed files with 46 additions and 59 deletions
-2
View File
@@ -9,6 +9,4 @@ export interface DesignStateType {
appTheme: string
//系统内置风格
appThemeList: string[]
// 侧边栏是否全收缩
asideAllCollapsed: boolean
}
+1 -11
View File
@@ -1,7 +1,6 @@
import { defineStore } from 'pinia'
import { store } from '@/store'
import { theme, asideCollapsedWidth } from '@/settings/designSetting'
import { asideAllCollapsed } from '@/settings/systemSetting'
import { theme } from '@/settings/designSetting'
import { DesignStateType } from './designStore.d'
import { setLocalStorage, getLocalStorage } from '@/utils'
import { StorageEnum } from '@/enums/storageEnum'
@@ -25,8 +24,6 @@ export const useDesignStore = defineStore({
appTheme,
// 颜色列表
appThemeList,
// 侧边栏
asideAllCollapsed
},
getters: {
getDarkTheme(e): boolean {
@@ -37,9 +34,6 @@ export const useDesignStore = defineStore({
},
getAppThemeList(): string[] {
return this.appThemeList
},
getAsideCollapsedWidth(): string {
return this.asideAllCollapsed ? '0' : asideCollapsedWidth
}
},
actions: {
@@ -48,10 +42,6 @@ export const useDesignStore = defineStore({
this.themeName = this.darkTheme ? ThemeEnum.dark : ThemeEnum.light
setLocalStorage(GO_DESIGN_STORE, this.$state)
},
changeAsideAllCollapsed(): void {
this.asideAllCollapsed = !this.asideAllCollapsed
setLocalStorage(GO_DESIGN_STORE, this.$state)
}
}
})
-2
View File
@@ -2,6 +2,4 @@ import { LangEnum } from '@/enums/styleEnum'
export interface LangStateType {
// 当前语言
lang: LangEnum,
// 是否刷新
isReload: boolean
}
+3 -10
View File
@@ -5,6 +5,8 @@ import { LangEnum } from '@/enums/styleEnum'
import i18n from '@/i18n/index'
import { setLocalStorage, getLocalStorage, reloadRoutePage } from '@/utils'
import { StorageEnum } from '@/enums/storageEnum'
import { useSettingStore } from '@/store/modules/settingStore/settingStore'
const settingStore = useSettingStore()
const { GO_LANG_STORE } = StorageEnum
@@ -16,29 +18,20 @@ export const useLangStore = defineStore({
state: (): LangStateType =>
storageLang || {
lang,
isReload: false
},
getters: {
getLang(): LangEnum {
return this.lang
},
getReload(): boolean {
return this.isReload
}
},
actions: {
changeReload(value: boolean): void {
this.isReload = value
setLocalStorage(GO_LANG_STORE, this.$state)
},
changeLang(lang: LangEnum): void {
if (this.lang === lang) return
this.lang = lang
i18n.global.locale = lang
setLocalStorage(GO_LANG_STORE, this.$state)
if (this.getReload) {
if (settingStore.getChangeLangReload) {
reloadRoutePage()
}
}
+5 -1
View File
@@ -1,7 +1,11 @@
export enum SettingStoreEnums {
HIDE_PACKAGE_ONE_CATEGORY = 'hidePackageOneCategory',
HIDE_PACKAGE_ONE_CATEGORY = 'hidePackageOneCategory',
CHANGE_LANG_RELOAD = 'changeLangReload',
ASIDE_ALL_COLLAPSED = 'asideAllCollapsed',
}
export interface SettingStoreType {
[SettingStoreEnums.HIDE_PACKAGE_ONE_CATEGORY]: boolean
[SettingStoreEnums.CHANGE_LANG_RELOAD]: boolean
[SettingStoreEnums.ASIDE_ALL_COLLAPSED]: boolean
}
+18 -2
View File
@@ -1,5 +1,10 @@
import { defineStore } from 'pinia'
import { hidePackageOneCategory } from '@/settings/systemSetting'
import {
hidePackageOneCategory,
changeLangReload,
asideAllCollapsed
} from '@/settings/systemSetting'
import { asideCollapsedWidth } from '@/settings/designSetting'
import { SettingStoreType } from './settingStore.d'
import { setLocalStorage, getLocalStorage } from '@/utils'
import { StorageEnum } from '@/enums/storageEnum'
@@ -13,15 +18,26 @@ export const useSettingStore = defineStore({
state: (): SettingStoreType =>
storageSetting || {
hidePackageOneCategory,
changeLangReload,
asideAllCollapsed
},
getters: {
getHidePackageOneCategory(): boolean {
return this.hidePackageOneCategory
},
getChangeLangReload(): boolean {
return this.changeLangReload
},
getAsideAllCollapsed(): boolean {
return this.asideAllCollapsed
},
getAsideCollapsedWidth(): string {
return this.asideAllCollapsed ? '0' : asideCollapsedWidth
}
},
actions: {
setItem(key: string, value: boolean): void {
;(this as any)[key] = value
; (this as any)[key] = value
setLocalStorage(GO_SYSTEM_SETTING, this.$state)
},
},