Browse Source

fix: 修复边栏无法打开问题,deepMerge函数有问题未修复

pull/2873/head
jinmao88 3 years ago
parent
commit
a0fdceeae7
  1. 4
      src/hooks/setting/useMenuSetting.ts
  2. 4
      src/store/modules/app.ts

4
src/hooks/setting/useMenuSetting.ts

@ -123,7 +123,7 @@ export function useMenuSetting() {
// Set menu configuration // Set menu configuration
function setMenuSetting(menuSetting: Partial<MenuSetting>): void { function setMenuSetting(menuSetting: Partial<MenuSetting>): void {
appStore.setProjectConfig({ menuSetting }); appStore.setMenuSetting(menuSetting);
} }
function toggleCollapsed() { function toggleCollapsed() {
@ -133,9 +133,7 @@ export function useMenuSetting() {
} }
return { return {
setMenuSetting, setMenuSetting,
toggleCollapsed, toggleCollapsed,
getMenuFixed, getMenuFixed,
getRealWidth, getRealWidth,
getMenuType, getMenuType,

4
src/store/modules/app.ts

@ -82,6 +82,10 @@ export const useAppStore = defineStore({
this.projectConfig = deepMerge(this.projectConfig || {}, config); this.projectConfig = deepMerge(this.projectConfig || {}, config);
Persistent.setLocal(PROJ_CFG_KEY, this.projectConfig); Persistent.setLocal(PROJ_CFG_KEY, this.projectConfig);
}, },
setMenuSetting(setting: Partial<MenuSetting>): void {
this.projectConfig.menuSetting = deepMerge(this.projectConfig.menuSetting, setting);
Persistent.setLocal(PROJ_CFG_KEY, this.projectConfig);
},
async resetAllState() { async resetAllState() {
resetRouter(); resetRouter();

Loading…
Cancel
Save