diff --git a/src/components/AppleControlBtn/index.vue b/src/components/AppleControlBtn/index.vue
index 21d1063f..7af2fe18 100644
--- a/src/components/AppleControlBtn/index.vue
+++ b/src/components/AppleControlBtn/index.vue
@@ -112,8 +112,8 @@ const handleClick = (key: 'close' | 'remove' | 'resize' | 'fullResize') => {
font-weight: bold;
border-radius: 50%;
&.mini {
- width: 10px;
- height: 10px;
+ width: 8px;
+ height: 8px;
margin: 0 2px;
}
&.disabled {
diff --git a/src/components/SystemSet/index.vue b/src/components/SystemSet/index.vue
index e161bde1..49d53c2c 100644
--- a/src/components/SystemSet/index.vue
+++ b/src/components/SystemSet/index.vue
@@ -38,8 +38,6 @@
diff --git a/src/settings/designSetting.ts b/src/settings/designSetting.ts
index 879d077a..a6b90067 100644
--- a/src/settings/designSetting.ts
+++ b/src/settings/designSetting.ts
@@ -43,6 +43,9 @@ export const asideWidth = '270'
// 侧边栏折叠后的宽度,支持全部折叠会覆盖为 0
export const asideCollapsedWidth = '60'
+// 弹窗是否可以通过点击遮罩关闭
+export const maskClosable = false
+
// 修改边框圆角
export const borderRadius = '6px'
diff --git a/src/settings/systemSetting.ts b/src/settings/systemSetting.ts
index e2320de8..696f200e 100644
--- a/src/settings/systemSetting.ts
+++ b/src/settings/systemSetting.ts
@@ -1,10 +1,10 @@
// * 系统全局设置
-// 侧边栏是否支持全持全部折叠
+// 侧边栏折叠是否隐藏全部
export const asideAllCollapsed = true
-// 弹窗是否可以通过点击遮罩关闭
-export const maskClosable = false
-
// 拖拽页面左侧表单分类只有一项的时候是否隐藏
-export const hidePackageOneCategory = true
\ No newline at end of file
+export const hidePackageOneCategory = true
+
+// 切换语言是否进行路由刷新
+export const changeLangReload = true
diff --git a/src/store/modules/designStore/designStore.d.ts b/src/store/modules/designStore/designStore.d.ts
index 9f47719a..1dd4a42e 100644
--- a/src/store/modules/designStore/designStore.d.ts
+++ b/src/store/modules/designStore/designStore.d.ts
@@ -9,6 +9,4 @@ export interface DesignStateType {
appTheme: string
//系统内置风格
appThemeList: string[]
- // 侧边栏是否全收缩
- asideAllCollapsed: boolean
}
diff --git a/src/store/modules/designStore/designStore.ts b/src/store/modules/designStore/designStore.ts
index fa78d04b..b9465d3d 100644
--- a/src/store/modules/designStore/designStore.ts
+++ b/src/store/modules/designStore/designStore.ts
@@ -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)
- }
}
})
diff --git a/src/store/modules/langStore/langStore.d.ts b/src/store/modules/langStore/langStore.d.ts
index 24c65a47..0d71c8d0 100644
--- a/src/store/modules/langStore/langStore.d.ts
+++ b/src/store/modules/langStore/langStore.d.ts
@@ -2,6 +2,4 @@ import { LangEnum } from '@/enums/styleEnum'
export interface LangStateType {
// 当前语言
lang: LangEnum,
- // 是否刷新
- isReload: boolean
}
diff --git a/src/store/modules/langStore/langStore.ts b/src/store/modules/langStore/langStore.ts
index 2fe01f2f..9eb7bdeb 100644
--- a/src/store/modules/langStore/langStore.ts
+++ b/src/store/modules/langStore/langStore.ts
@@ -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()
}
}
diff --git a/src/store/modules/settingStore/settingStore.d.ts b/src/store/modules/settingStore/settingStore.d.ts
index 794364db..1b47a98d 100644
--- a/src/store/modules/settingStore/settingStore.d.ts
+++ b/src/store/modules/settingStore/settingStore.d.ts
@@ -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
}
diff --git a/src/store/modules/settingStore/settingStore.ts b/src/store/modules/settingStore/settingStore.ts
index ffa48682..166f9638 100644
--- a/src/store/modules/settingStore/settingStore.ts
+++ b/src/store/modules/settingStore/settingStore.ts
@@ -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)
},
},
diff --git a/src/utils/plugin.ts b/src/utils/plugin.ts
index 93e12efe..7944023a 100644
--- a/src/utils/plugin.ts
+++ b/src/utils/plugin.ts
@@ -1,7 +1,7 @@
import { icon } from '@/plugins'
import { DialogEnum } from '@/enums/pluginEnum'
import { dialogIconSize } from '@/settings/designSetting'
-import { maskClosable } from '@/settings/systemSetting'
+import { maskClosable } from '@/settings/designSetting'
import { DialogReactive } from 'naive-ui'
const { InformationCircleIcon } = icon.ionicons5
import { renderIcon } from '@/utils'
diff --git a/src/views/project/layout/components/Sider/index.vue b/src/views/project/layout/components/Sider/index.vue
index cbe62069..1b297f38 100644
--- a/src/views/project/layout/components/Sider/index.vue
+++ b/src/views/project/layout/components/Sider/index.vue
@@ -22,7 +22,6 @@
:collapsed-width="getAsideCollapsedWidth"
:collapsed-icon-size="22"
:default-expanded-keys="defaultExpandedKeys"
- @update:value="handleUpdateValue"
/>
@@ -39,11 +38,11 @@ import { Create } from '../Create/index'
import { AsideFooter } from '../AsideFooter/index'
import { asideWidth, asideCollapsedWidth } from '@/settings/designSetting'
import { useRoute } from 'vue-router'
-import { useDesignStore } from '@/store/modules/designStore/designStore'
+import { useSettingStore } from '@/store/modules/settingStore/settingStore'
import { menuOptionsInit, expandedKeys } from './menu'
const collapsed = ref(false)
-const { getAsideCollapsedWidth } = toRefs(useDesignStore())
+const { getAsideCollapsedWidth } = toRefs(useSettingStore())
const route = useRoute()
const routeRame = computed(() => route.name)