From ff270c6ed35db0f09fecf34568a8083951f58c26 Mon Sep 17 00:00:00 2001
From: cshaptx4869 <994774638@qq.com>
Date: Fri, 5 Jul 2024 11:39:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E5=88=87=E6=8D=A2=E9=A1=B6=E9=83=A8=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E6=A8=A1=E5=BC=8F=E6=97=B6=E7=9A=84=E9=81=AE=E7=BD=A9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Settings/index.vue                 | 2 --
 src/layout/components/Sidebar/components/SidebarMenu.vue | 8 +++++---
 src/layout/index.vue                                     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index d7f670a3..49b44715 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -96,8 +96,6 @@ function changeLayout(layout: string) {
   settingsStore.changeLayout(layout);
   if (layout === LayoutEnum.MIX) {
     route.name && againActiveTop(route.name as string);
-  } else if (layout === LayoutEnum.TOP) {
-    appStore.openSideBar();
   }
 }
 
diff --git a/src/layout/components/Sidebar/components/SidebarMenu.vue b/src/layout/components/Sidebar/components/SidebarMenu.vue
index 444fa0d7..418c9cda 100644
--- a/src/layout/components/Sidebar/components/SidebarMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenu.vue
@@ -8,14 +8,13 @@
     :active-text-color="variables['menu-active-text']"
     :unique-opened="false"
     :collapse-transition="false"
-    :mode="layout === 'top' ? 'horizontal' : 'vertical'"
+    :mode="mode"
   >
     <SidebarMenuItem
       v-for="route in menuList"
       :key="route.path"
       :item="route"
       :base-path="resolvePath(route.path)"
-      :is-collapse="!appStore.sidebar.opened"
     />
   </el-menu>
 </template>
@@ -25,11 +24,11 @@ import { useSettingsStore, useAppStore } from "@/store";
 import { isExternal } from "@/utils/index";
 import path from "path-browserify";
 import variables from "@/styles/variables.module.scss";
+import { LayoutEnum } from "@/enums/LayoutEnum";
 
 const settingsStore = useSettingsStore();
 const appStore = useAppStore();
 const currentRoute = useRoute();
-const layout = computed(() => settingsStore.layout);
 const props = defineProps({
   menuList: {
     required: true,
@@ -43,6 +42,9 @@ const props = defineProps({
     required: true,
   },
 });
+const mode = computed(() => {
+  return settingsStore.layout === LayoutEnum.TOP ? "horizontal" : "vertical";
+});
 
 /**
  * 解析路径
diff --git a/src/layout/index.vue b/src/layout/index.vue
index d37e8c2e..31c701e0 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -38,7 +38,7 @@
     <!-- 左侧和顶部布局 -->
     <div v-else :class="{ hasTagsView: showTagsView }" class="main-container">
       <div :class="{ 'fixed-header': fixedHeader }">
-        <NavBar v-if="layout === 'left'" />
+        <NavBar v-if="layout === LayoutEnum.LEFT" />
         <TagsView v-if="showTagsView" />
       </div>
       <AppMain />