From a0fdceeae7e25049eef6dc7dc920876f02329c3c Mon Sep 17 00:00:00 2001 From: jinmao88 <50581550+jinmao88@users.noreply.github.com> Date: Sat, 17 Jun 2023 09:44:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=BE=B9=E6=A0=8F?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?deepMerge=E5=87=BD=E6=95=B0=E6=9C=89=E9=97=AE=E9=A2=98=E6=9C=AA?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/setting/useMenuSetting.ts | 4 +--- src/store/modules/app.ts | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/hooks/setting/useMenuSetting.ts b/src/hooks/setting/useMenuSetting.ts index 3566bfd2..e3c62ed6 100644 --- a/src/hooks/setting/useMenuSetting.ts +++ b/src/hooks/setting/useMenuSetting.ts @@ -123,7 +123,7 @@ export function useMenuSetting() { // Set menu configuration function setMenuSetting(menuSetting: Partial): void { - appStore.setProjectConfig({ menuSetting }); + appStore.setMenuSetting(menuSetting); } function toggleCollapsed() { @@ -133,9 +133,7 @@ export function useMenuSetting() { } return { setMenuSetting, - toggleCollapsed, - getMenuFixed, getRealWidth, getMenuType, diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts index 39563b68..12f45571 100644 --- a/src/store/modules/app.ts +++ b/src/store/modules/app.ts @@ -82,6 +82,10 @@ export const useAppStore = defineStore({ this.projectConfig = deepMerge(this.projectConfig || {}, config); Persistent.setLocal(PROJ_CFG_KEY, this.projectConfig); }, + setMenuSetting(setting: Partial): void { + this.projectConfig.menuSetting = deepMerge(this.projectConfig.menuSetting, setting); + Persistent.setLocal(PROJ_CFG_KEY, this.projectConfig); + }, async resetAllState() { resetRouter();