From 50276cb60275d15c2d370c5a1be2705067c7b275 Mon Sep 17 00:00:00 2001
From: xiaoMingTongXue <40878104+cMing1997@users.noreply.github.com>
Date: Wed, 10 Jan 2024 09:24:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(layout):=20=E4=BF=AE=E5=A4=8D=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=A8=A1=E5=BC=8F,?=
 =?UTF-8?q?=E5=88=86=E5=89=B2=E8=8F=9C=E5=8D=95=E7=9A=84=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=AD=A5,=E5=AF=BC=E8=87=B4=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=86=85=E5=AE=B9=E5=8C=BA=E5=9F=9F=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E8=A2=AB=E9=81=AE=E6=8C=A1=E7=9A=84=E9=97=AE=E9=A2=98=20(#3519?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: chengmingrui <chengmingrui@oneaiops.com>
---
 src/layouts/default/setting/handler.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/layouts/default/setting/handler.ts b/src/layouts/default/setting/handler.ts
index 8883bbfd..8028cb2c 100644
--- a/src/layouts/default/setting/handler.ts
+++ b/src/layouts/default/setting/handler.ts
@@ -1,3 +1,4 @@
+import { MenuTypeEnum } from '@/enums/menuEnum';
 import { HandlerEnum } from './enum';
 import { updateHeaderBgColor, updateSidebarBgColor } from '@/logics/theme/updateBackground';
 import { updateColorWeak } from '@/logics/theme/updateColorWeak';
@@ -7,6 +8,7 @@ import { useAppStore } from '@/store/modules/app';
 import { ProjectConfig } from '#/config';
 import { updateDarkTheme } from '@/logics/theme/dark';
 import { useRootSetting } from '@/hooks/setting/useRootSetting';
+import projectSetting from '@/settings/projectSetting';
 
 export function baseHandler(event: HandlerEnum, value: any) {
   const appStore = useAppStore();
@@ -22,10 +24,15 @@ export function handler(event: HandlerEnum, value: any): DeepPartial<ProjectConf
   const appStore = useAppStore();
 
   const { getThemeColor, getDarkMode } = useRootSetting();
+  const { menuSetting } = projectSetting;
   switch (event) {
     case HandlerEnum.CHANGE_LAYOUT:
       const { mode, type, split } = value;
-      const splitOpt = split === undefined ? { split } : {};
+      const isMixSidebar = type === MenuTypeEnum.MIX;
+      const mixSideSplitOpt =
+        menuSetting.type === MenuTypeEnum.MIX ? { split: menuSetting.split } : { split };
+      const otherSplitOpt = { split: false };
+      const splitOpt = isMixSidebar ? mixSideSplitOpt : otherSplitOpt;
 
       return {
         menuSetting: {