From a6842851a844e63a8766d63c5410a8e2f27a7d45 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 20 八月 2024 11:56:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/layout/components/Sidebar/index.vue |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 056aa5e..d464186 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,25 +1,20 @@
 <template>
-  <div
-    :class="{ 'has-logo': showLogo }"
-    :style="{
-      backgroundColor:
-        settings.sideTheme === 'theme-dark'
-          ? variables.menuBackground
-          : variables.menuLightBackground,
-    }"
-  >
+  <div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
     <logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
       <el-menu
         :default-active="activeMenu"
         :collapse="isCollapse"
+        :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
+        :text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor"
         :unique-opened="true"
+        :active-text-color="settings.theme"
         :collapse-transition="false"
         mode="vertical"
       >
         <sidebar-item
           v-for="(route, index) in sidebarRouters"
-          :key="route.path + index"
+          :key="route.path  + index"
           :item="route"
           :base-path="route.path"
         />
@@ -56,7 +51,7 @@
     },
     isCollapse() {
       return !this.sidebar.opened;
-    },
-  },
+    }
+  }
 };
 </script>

--
Gitblit v1.8.0