From 73bd98e0f4bee5f1dbba4ac3abcdf120abd857ea Mon Sep 17 00:00:00 2001
From: Hooray Hu <304327508@qq.com>
Date: Wed, 29 Nov 2023 14:07:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AC=A1=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E9=9A=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                     | 11 -----------
 src/layouts/components/SubSidebar/index.vue     | 16 +---------------
 src/layouts/components/Topbar/Toolbar/index.vue | 14 +-------------
 3 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 0427bd59..4a2f93e0 100755
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,10 +5,8 @@ import hotkeys from 'hotkeys-js'
 import elementPlusLocaleZhCN from 'element-plus/es/locale/lang/zh-cn.mjs'
 import eventBus from './utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
-import useMenuStore from '@/store/modules/menu'
 
 const settingsStore = useSettingsStore()
-const menuStore = useMenuStore()
 const { auth } = useAuth()
 
 // 侧边栏主导航当前实际宽度
@@ -26,15 +24,6 @@ const subSidebarActualWidth = computed(() => {
   if (settingsStore.settings.menu.subMenuCollapse && settingsStore.mode !== 'mobile') {
     actualWidth = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--g-sub-sidebar-collapse-width'))
   }
-  if (
-    menuStore.sidebarMenus.length === 1
-    && (
-      !menuStore.sidebarMenus[0].children
-      || menuStore.sidebarMenus[0]?.children.every(item => item.meta?.sidebar === false)
-    )
-  ) {
-    actualWidth = 0
-  }
   return `${actualWidth}px`
 })
 
diff --git a/src/layouts/components/SubSidebar/index.vue b/src/layouts/components/SubSidebar/index.vue
index 2279ff61..952108f3 100755
--- a/src/layouts/components/SubSidebar/index.vue
+++ b/src/layouts/components/SubSidebar/index.vue
@@ -18,25 +18,11 @@ const sidebarScrollTop = ref(0)
 function onSidebarScroll(e: Event) {
   sidebarScrollTop.value = (e.target as HTMLElement).scrollTop
 }
-
-const enableSidebar = computed(() => {
-  return settingsStore.mode === 'mobile' || (
-    ['side', 'head', 'single'].includes(settingsStore.settings.menu.menuMode)
-    && menuStore.sidebarMenus.length !== 0
-    && !(
-      menuStore.sidebarMenus.length === 1
-      && (
-        !menuStore.sidebarMenus[0].children
-        || menuStore.sidebarMenus[0]?.children.every(item => item.meta?.sidebar === false)
-      )
-    )
-  )
-})
 </script>
 
 <template>
   <div
-    v-if="enableSidebar" class="sub-sidebar-container" :class="{
+    class="sub-sidebar-container" :class="{
       'is-collapse': settingsStore.mode === 'pc' && settingsStore.settings.menu.subMenuCollapse,
     }"
   >
diff --git a/src/layouts/components/Topbar/Toolbar/index.vue b/src/layouts/components/Topbar/Toolbar/index.vue
index 3fcabe9d..2d6ab27b 100755
--- a/src/layouts/components/Topbar/Toolbar/index.vue
+++ b/src/layouts/components/Topbar/Toolbar/index.vue
@@ -4,7 +4,6 @@ import Breadcrumb from '../../Breadcrumb/index.vue'
 import BreadcrumbItem from '../../Breadcrumb/item.vue'
 import Tools from '../../Tools/index.vue'
 import useSettingsStore from '@/store/modules/settings'
-import useMenuStore from '@/store/modules/menu'
 
 defineOptions({
   name: 'Toolbar',
@@ -13,20 +12,9 @@ defineOptions({
 const route = useRoute()
 
 const settingsStore = useSettingsStore()
-const menuStore = useMenuStore()
 
 const enableSubMenuCollapseButton = computed(() => {
-  return settingsStore.mode === 'mobile' || (
-    ['side', 'head', 'single'].includes(settingsStore.settings.menu.menuMode)
-    && settingsStore.settings.menu.enableSubMenuCollapseButton
-    && !(
-      menuStore.sidebarMenus.length === 1
-      && (
-        !menuStore.sidebarMenus[0].children
-        || menuStore.sidebarMenus[0]?.children.every(item => item.meta?.sidebar === false)
-      )
-    )
-  )
+  return settingsStore.mode === 'mobile' || settingsStore.settings.menu.enableSubMenuCollapseButton
 })
 
 const breadcrumbList = computed(() => {