From 8236f7c53b0d340d9e1de2c93d5a84eab249afd8 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Tue, 25 Apr 2023 16:27:18 +0800
Subject: [PATCH] =?UTF-8?q?improve:=20=E4=BE=A7=E8=BE=B9=E6=A0=8F=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/layout/component/aside.vue | 27 +++++++++----------
 .../src/layout/component/columnsAside.vue     |  3 ---
 .../admin/src/layout/navMenu/vertical.vue     |  5 ++++
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/template/admin/src/layout/component/aside.vue b/template/admin/src/layout/component/aside.vue
index c2d0cc66f..b82cfebc2 100644
--- a/template/admin/src/layout/component/aside.vue
+++ b/template/admin/src/layout/component/aside.vue
@@ -28,20 +28,19 @@ export default {
   components: { Vertical, Logo },
   data() {
     return {
-      menuList: [],
+      // menuList: [],
       clientWidth: '',
       catName: '',
     };
   },
   computed: {
     // 设置左侧菜单的具体宽度
-    // menuList() {
-    //   this.$store.state.menus.childMenuList.length > 0
-    //     ? (this.$store.state.themeConfig.themeConfig.isCollapse = false)
-    //     : (this.$store.state.themeConfig.themeConfig.isCollapse = true);
-    //   console.log(this.$store.state.menus.childMenuList, 'this.$store.state.menus.childMenuList');
-    //   return this.$store.state.menus.childMenuList;
-    // },
+    menuList() {
+      this.$store.state.menus.childMenuList.length > 0
+        ? (this.$store.state.themeConfig.themeConfig.isCollapse = false)
+        : (this.$store.state.themeConfig.themeConfig.isCollapse = true);
+      return this.$store.state.menus.childMenuList;
+    },
     setCollapseWidth() {
       let { layout, isCollapse } = this.$store.state.themeConfig.themeConfig;
       let asideBrColor = '';
@@ -76,12 +75,12 @@ export default {
   created() {
     this.initMenuFixed(document.body.clientWidth);
     this.setFilterRoutes();
-    this.bus.$on('setSendColumnsChildren', (res) => {
-      this.menuList = res || [];
-      this.menuList.length > 0
-        ? (this.$store.state.themeConfig.themeConfig.isCollapse = false)
-        : (this.$store.state.themeConfig.themeConfig.isCollapse = true);
-    });
+    // this.bus.$on('setSendColumnsChildren', (res) => {
+    //   this.menuList = res || [];
+    //   this.menuList.length > 0
+    //     ? (this.$store.state.themeConfig.themeConfig.isCollapse = false)
+    //     : (this.$store.state.themeConfig.themeConfig.isCollapse = true);
+    // });
     this.bus.$on('layoutMobileResize', (res) => {
       this.initMenuFixed(res.clientWidth);
     });
diff --git a/template/admin/src/layout/component/columnsAside.vue b/template/admin/src/layout/component/columnsAside.vue
index 2e4bba10c..8d0118f7d 100644
--- a/template/admin/src/layout/component/columnsAside.vue
+++ b/template/admin/src/layout/component/columnsAside.vue
@@ -70,8 +70,6 @@ export default {
       return this.$store.state.themeConfig.themeConfig.Layout;
     },
     routesList() {
-      console.log('大哥');
-
       this.$store.state.routesList.routesList;
     },
   },
@@ -81,7 +79,6 @@ export default {
   },
   mounted() {
     this.bus.$on('routesListChange', () => {
-      console.log('变了大哥');
       this.setFilterRoutes();
     });
     this.setFilterRoutes();
diff --git a/template/admin/src/layout/navMenu/vertical.vue b/template/admin/src/layout/navMenu/vertical.vue
index 01befed33..52a31c3eb 100644
--- a/template/admin/src/layout/navMenu/vertical.vue
+++ b/template/admin/src/layout/navMenu/vertical.vue
@@ -2,6 +2,7 @@
   <div>
     <el-menu
       router
+      :class="setColumnsAsideStyle"
       background-color="transparent"
       :default-active="activePath || defaultActive"
       :collapse="setIsCollapse"
@@ -69,6 +70,10 @@ export default {
   },
   computed: {
     ...mapState('menu', ['activePath']),
+    // 设置分栏高亮风格
+    setColumnsAsideStyle() {
+      return this.$store.state.themeConfig.themeConfig.columnsAsideStyle;
+    },
     // 获取布局配置信息
     getThemeConfig() {
       return this.$store.state.themeConfig.themeConfig;