From 851dcc912f8b2d3bff3a66cdeb26bfe22dfc9ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9E=E4=BB=99?= <615206459@qq.com>
Date: Thu, 1 Aug 2024 00:43:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/pages/main/components/bmenu.tsx      | 13 ++--
 .../base/pages/main/components/slider.vue     | 72 +++++--------------
 2 files changed, 24 insertions(+), 61 deletions(-)

diff --git a/src/modules/base/pages/main/components/bmenu.tsx b/src/modules/base/pages/main/components/bmenu.tsx
index 08a874f..22428e5 100644
--- a/src/modules/base/pages/main/components/bmenu.tsx
+++ b/src/modules/base/pages/main/components/bmenu.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, h, VNode } from "vue";
+import { defineComponent, h } from "vue";
 import { useBase, Menu } from "/$/base";
 import { useCool } from "/@/cool";
 
@@ -28,12 +28,12 @@ export default defineComponent({
 					.filter((e) => e.isShow)
 					.map((e) => {
 						const item = (e: Menu.Item) => {
-							return (
-								<div class="wrap">
+							return [
+								<el-icon>
 									<cl-svg name={e.icon} />
-									<span v-show={!app.isFold || index != 1}>{e.meta?.label}</span>
-								</div>
-							);
+								</el-icon>,
+								<span v-show={!app.isFold || index != 1}>{e.meta?.label}</span>
+							];
 						};
 
 						if (e.type == 0) {
@@ -72,7 +72,6 @@ export default defineComponent({
 								}
 							);
 						}
-
 					});
 			}
 
diff --git a/src/modules/base/pages/main/components/slider.vue b/src/modules/base/pages/main/components/slider.vue
index 508ac95..2afbc04 100644
--- a/src/modules/base/pages/main/components/slider.vue
+++ b/src/modules/base/pages/main/components/slider.vue
@@ -6,7 +6,9 @@
 		</div>
 
 		<div class="app-slider__container">
-			<b-menu />
+			<el-scrollbar>
+				<b-menu />
+			</el-scrollbar>
 		</div>
 	</div>
 </template>
@@ -50,79 +52,41 @@ const { app } = useBase();
 
 	&__container {
 		height: calc(100% - 80px);
-		overflow-y: auto;
-
-		&::-webkit-scrollbar {
-			width: 0;
-			height: 0;
-		}
 	}
 
 	&__menu {
-		&.el-popper {
-			&.is-light {
-				border: 0;
-			}
-		}
-
 		.el-menu {
 			border-right: 0;
 			background-color: transparent;
 
-			&--popup {
-				.cl-svg,
-				span {
-					color: #000;
-				}
-			}
-
-			.el-sub-menu__title,
-			&-item {
-				&.is-active,
-				&:hover {
-					background-color: var(--color-primary) !important;
-
-					.cl-svg,
-					span {
-						color: #fff;
-					}
-				}
-			}
-
-			.el-sub-menu__title,
-			&-item,
-			&__title {
-				color: #eee;
-				letter-spacing: 0.5px;
+			.el-menu-item,
+			.el-menu__title,
+			.el-sub-menu__title {
 				height: 50px;
-				line-height: 50px;
-
-				.wrap {
-					width: 100%;
-					box-sizing: border-box;
-					padding: 0 4px;
-				}
+				color: #fff;
 
 				.cl-svg {
 					font-size: 16px;
 				}
 
 				span {
-					display: inline-block;
 					font-size: 12px;
-					letter-spacing: 1px;
-					margin-left: 10px;
 					user-select: none;
+					letter-spacing: 1px;
+				}
+
+				&.is-active,
+				&:hover {
+					background-color: var(--color-primary);
+					color: #fff;
 				}
 			}
 
-			&--collapse {
-				.wrap {
-					text-align: center;
-				}
-
+			&--popup {
+				.el-menu-item,
+				.el-menu__title,
 				.el-sub-menu__title {
-					padding: 0;
+					color: var(--el-text-color-primary);
 				}
 			}
 		}