From d12d21c46deede13af4b5588e756054b91b623c9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 02 九月 2023 12:46:07 +0800
Subject: [PATCH] !38 fix #I7WUYJ 菜单切换主题为浅色主题后颜色不正常 Merge pull request !38 from ahaos/tspr

---
 src/layout/components/Sidebar/index.vue |   57 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index fad0d02..fff3736 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,3 +1,25 @@
+<template>
+  <div :class="{ 'has-logo': showLogo }" :style="{ backgroundColor: bgColor }">
+    <logo v-if="showLogo" :collapse="isCollapse" />
+    <el-scrollbar :class="sideTheme" wrap-class="scrollbar-wrapper">
+      <transition :enter-active-class="proxy?.animate.menuSearchAnimate.enter" mode="out-in">
+        <el-menu
+          :default-active="activeMenu as string"
+          :collapse="isCollapse"
+          :background-color="bgColor"
+          :text-color="textColor"
+          :unique-opened="true"
+          :active-text-color="theme"
+          :collapse-transition="false"
+          mode="vertical"
+        >
+          <sidebar-item v-for="(route, index) in sidebarRouters" :key="route.path + index" :item="route" :base-path="route.path" />
+        </el-menu>
+      </transition>
+    </el-scrollbar>
+  </div>
+</template>
+
 <script setup lang="ts">
 import Logo from './Logo.vue'
 import SidebarItem from './SidebarItem.vue'
@@ -5,7 +27,6 @@
 import useAppStore from '@/store/modules/app'
 import useSettingsStore from '@/store/modules/settings'
 import usePermissionStore from '@/store/modules/permission'
-import { ComponentInternalInstance } from "vue";
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const route = useRoute();
@@ -20,36 +41,14 @@
 const isCollapse = computed(() => !appStore.sidebar.opened);
 
 const activeMenu = computed(() => {
-  const { meta, path } = route;
-  // if set path, the sidebar will highlight the path you set
-  if (meta.activeMenu) {
-    return meta.activeMenu;
-	}
-  return path;
+    const { meta, path } = route;
+    // if set path, the sidebar will highlight the path you set
+    if (meta.activeMenu) {
+        return meta.activeMenu;
+    }
+    return path;
 })
 
 const bgColor = computed(() => sideTheme.value === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground);
 const textColor = computed(() => sideTheme.value === 'theme-dark' ? variables.menuColor : variables.menuLightColor);
 </script>
-
-<template>
-	<div :class="{ 'has-logo': showLogo }" :style="{ backgroundColor: bgColor }">
-		<logo v-if="showLogo" :collapse="isCollapse" />
-		<el-scrollbar :class="sideTheme" wrap-class="scrollbar-wrapper">
-			<transition :enter-active-class="proxy?.animate.menuSearchAnimate.enter" mode="out-in">
-				<el-menu
-					:default-active="activeMenu as string"
-					:collapse="isCollapse"
-					:background-color="bgColor"
-					:text-color="textColor"
-					:unique-opened="true"
-					:active-text-color="theme"
-					:collapse-transition="false"
-					mode="vertical"
-				>
-					<sidebar-item v-for="(route, index) in sidebarRouters" :key="route.path + index" :item="route" :base-path="route.path" />
-				</el-menu>
-			</transition>
-		</el-scrollbar>
-	</div>
-</template>

--
Gitblit v1.9.3