From 9fd5d922acfebb956f2fcd88f8eb693501907a9e Mon Sep 17 00:00:00 2001 From: lan Date: Mon, 25 Mar 2024 00:14:45 +0800 Subject: [PATCH] fix(projects):fixed the issue where switching the layout mode from mobile to vertical would not restore the user-defined layout mode. --- src/store/modules/app/index.ts | 6 ++++-- src/typings/app.d.ts | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/store/modules/app/index.ts b/src/store/modules/app/index.ts index c58cb640..3f2f6377 100644 --- a/src/store/modules/app/index.ts +++ b/src/store/modules/app/index.ts @@ -82,10 +82,12 @@ export const useAppStore = defineStore(SetupStoreId.App, () => { watch( isMobile, newValue => { + setSiderCollapse(newValue); if (newValue) { - setSiderCollapse(true); - + themeStore.layout.userMode = themeStore.layout.mode; themeStore.setThemeLayout('vertical'); + } else { + themeStore.setThemeLayout(themeStore.layout.userMode); } }, { immediate: true } diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts index 13cc492f..9d1a5a9e 100644 --- a/src/typings/app.d.ts +++ b/src/typings/app.d.ts @@ -28,6 +28,8 @@ declare namespace App { layout: { /** Layout mode */ mode: UnionKey.ThemeLayoutMode; + /** User Config mode */ + userMode: UnionKey.ThemeLayoutMode; /** Scroll mode */ scrollMode: UnionKey.ThemeScrollMode; };