From dd8eeb2a3565cae917c8c7d8ea48b1dcff4bf4d9 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Fri, 28 Apr 2023 16:33:40 +0800
Subject: [PATCH] =?UTF-8?q?improve:=20=E8=8F=9C=E5=8D=95=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/layout/component/aside.vue            | 1 +
 template/admin/src/layout/navBars/breadcrumb/setings.vue | 3 ++-
 template/admin/src/layout/navMenu/horizontal.vue         | 8 ++++++--
 template/admin/src/layout/navMenu/subItem.vue            | 4 ++--
 template/admin/src/layout/navMenu/vertical.vue           | 4 ++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/template/admin/src/layout/component/aside.vue b/template/admin/src/layout/component/aside.vue
index fd0b8dc82..1cac525f0 100644
--- a/template/admin/src/layout/component/aside.vue
+++ b/template/admin/src/layout/component/aside.vue
@@ -120,6 +120,7 @@ export default {
     // 设置菜单导航是否固定（移动端）
     initMenuFixed(clientWidth) {
       this.clientWidth = clientWidth;
+      this.$emit('routesListChange');
     },
   },
   // 页面销毁时
diff --git a/template/admin/src/layout/navBars/breadcrumb/setings.vue b/template/admin/src/layout/navBars/breadcrumb/setings.vue
index b2283e2ef..f7483915f 100644
--- a/template/admin/src/layout/navBars/breadcrumb/setings.vue
+++ b/template/admin/src/layout/navBars/breadcrumb/setings.vue
@@ -275,7 +275,7 @@
             </el-radio-group>
           </div>
         </div>
-        <div class="layout-breadcrumb-seting-bar-flex mt15">
+        <div class="layout-breadcrumb-seting-bar-flex mt15" v-if="getThemeConfig.layout === 'columns'">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveColumnsAsideStyle') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
             <el-radio-group v-model="getThemeConfig.columnsAsideStyle" size="mini" @change="setLocalThemeConfig">
@@ -535,6 +535,7 @@ export default {
       if (this.$store.state.themeConfig.themeConfig.layout === layout) return false;
       this.$store.state.themeConfig.themeConfig.layout = layout;
       this.$store.state.themeConfig.themeConfig.isDrawer = false;
+      this.$store.state.themeConfig.themeConfig.columnsAsideStyle = 'columns-card';
       // this.initSetLayoutChange();
       this.setLocalTheme(this.$store.state.themeConfig.themeConfig.themeStyle);
     },
diff --git a/template/admin/src/layout/navMenu/horizontal.vue b/template/admin/src/layout/navMenu/horizontal.vue
index 47ed47b37..0c2c9f98b 100644
--- a/template/admin/src/layout/navMenu/horizontal.vue
+++ b/template/admin/src/layout/navMenu/horizontal.vue
@@ -9,14 +9,18 @@
         @select="onHorizontalSelect"
       >
         <template v-for="val in menuList">
-          <el-submenu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
+          <el-submenu
+            :index="val.path"
+            v-if="val.is_show && val.children && val.children.length > 0"
+            :key="val.path"
+          >
             <template slot="title">
               <Icon :type="val.icon ? val.icon : ''" />
               <span>{{ $t(val.title) }}</span>
             </template>
             <SubItem :chil="val.children" />
           </el-submenu>
-          <template v-else>
+          <template v-else-if="val.is_show">
             <el-menu-item :index="val.path" :key="val.path">
               <template slot="title" v-if="!val.isLink || (val.isLink && val.isIframe)">
                 <Icon :type="val.icon ? val.icon : ''" />
diff --git a/template/admin/src/layout/navMenu/subItem.vue b/template/admin/src/layout/navMenu/subItem.vue
index 3a43a9cce..496aa40d4 100644
--- a/template/admin/src/layout/navMenu/subItem.vue
+++ b/template/admin/src/layout/navMenu/subItem.vue
@@ -7,14 +7,14 @@
 <template>
   <div>
     <template v-for="val in chil">
-      <el-submenu :index="val.path" :key="val.path" v-if="!val.is_show_path && val.children && val.children.length > 0">
+      <el-submenu :index="val.path" :key="val.path" v-if="val.is_show && val.children && val.children.length > 0">
         <template slot="title">
           <i class="ivu-icon" :class="val.icon"></i>
           <span>{{ $t(val.title) }}</span>
         </template>
         <sub-item :chil="val.children" />
       </el-submenu>
-      <template v-else-if="!val.is_show_path">
+      <template v-else-if="val.is_show">
         <el-menu-item :index="val.path" :key="val.path">
           <template v-if="!val.isLink || (val.isLink && val.isIframe)">
             <i class="ivu-icon" :class="val.icon ? val.icon : ''"></i>
diff --git a/template/admin/src/layout/navMenu/vertical.vue b/template/admin/src/layout/navMenu/vertical.vue
index 52a31c3eb..fad24b305 100644
--- a/template/admin/src/layout/navMenu/vertical.vue
+++ b/template/admin/src/layout/navMenu/vertical.vue
@@ -12,7 +12,7 @@
       <template v-for="val in menuList">
         <el-submenu
           :index="val.path"
-          v-if="!val.is_show_path && val.children && val.children.length > 0"
+          v-if="val.is_show && val.children && val.children.length > 0"
           :key="val.path"
         >
           <template slot="title">
@@ -26,7 +26,7 @@
           </template>
           <SubItem :chil="val.children" />
         </el-submenu>
-        <template v-else-if="!val.is_show_path">
+        <template v-else-if="val.is_show">
           <el-menu-item :index="val.path" :key="val.path">
             <Icon
               :class="