From ed066dc0bdfa9a7c3a3d55b8b4f70cd07e2e8d8a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 30 五月 2025 09:26:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into dev

---
 src/assets/styles/sidebar.scss |   46 ++++++++++++++++++++++++++++++++++++----------
 1 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index c2f4c4b..3135b4e 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -26,6 +26,7 @@
     overflow: hidden;
     -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
     box-shadow: none;
+    margin: 0 auto;
 
     // reset element-ui css
     .horizontal-collapse-transition {
@@ -53,24 +54,29 @@
     .is-horizontal {
       display: none;
     }
-
     a {
       display: inline-block;
-      width: 100%;
+      width: 80px;
+      height: 80px;
       overflow: hidden;
+      margin-top: 20px;
     }
 
+
     .svg-icon {
-      margin-right: 16px;
+      //margin-right: 16px;
     }
 
     .el-menu {
       border: none;
       height: 100%;
       width: 100% !important;
+      padding: 0 20px !important;
     }
 
     .el-menu-item, .menu-title {
+      line-height: 20px;
+      font-size: 14px;
       overflow: hidden !important;
       text-overflow: ellipsis !important;
       white-space: nowrap !important;
@@ -83,30 +89,47 @@
     // menu hover
     .sub-menu-title-noDropdown,
     .el-sub-menu__title {
+      border-radius: 10px 10px 10px 10px;
       &:hover {
         background-color: #ffffff !important;
+        border-radius: 10px 10px 10px 10px;
+        color: $base-menu-color-active !important;
       }
     }
 
     & .theme-dark .is-active > .el-sub-menu__title {
       color: $base-menu-color-active !important;
     }
-
+    & .nest-menu > a {
+      right: 20px;
+      position: relative;
+    }
+    & .nest-menu> .el-sub-menu > .el-sub-menu__title {
+      right: 20px;
+      position: relative;
+    }
     & .nest-menu .el-sub-menu>.el-sub-menu__title,
     & .el-sub-menu .el-menu-item {
-      min-width: $base-sidebar-width !important;
 
+
+      height: 80px;
+      min-width: 80px !important;
+      border-radius: 10px 10px 10px 10px;
       &:hover {
         background-color: #ffffff !important;
+        border-radius: 10px 10px 10px 10px;
+        color: $base-menu-color-active !important;
       }
     }
 
     & .theme-dark .nest-menu .el-sub-menu>.el-sub-menu__title,
     & .theme-dark .el-sub-menu .el-menu-item {
       background-color: $base-sub-menu-background;
-
+      border-radius: 10px 10px 10px 10px;
       &:hover {
         background-color: #ffffff !important;
+        border-radius: 10px 10px 10px 10px;
+        color: $base-menu-color-active !important;
       }
     }
   }
@@ -121,14 +144,14 @@
     }
 
     .sub-menu-title-noDropdown {
-      padding: 0 !important;
+      padding: 0 0 0 20px !important;
       position: relative;
 
       .el-tooltip {
         padding: 0 !important;
 
         .svg-icon {
-          margin-left: 20px;
+          //margin-left: 20px;
         }
       }
     }
@@ -140,7 +163,7 @@
         padding: 0 !important;
 
         .svg-icon {
-          margin-left: 20px;
+          //margin-left: 20px;
         }
 
       }
@@ -205,15 +228,18 @@
 .el-menu--vertical {
   &>.el-menu {
     .svg-icon {
-      margin-right: 16px;
+      //margin-right: 16px;
     }
   }
 
   .nest-menu .el-sub-menu>.el-sub-menu__title,
   .el-menu-item {
+    border-radius: 10px 10px 10px 10px;
     &:hover {
       // you can use $sub-menuHover
       background-color: #ffffff !important;
+      border-radius: 10px 10px 10px 10px;
+      color: $base-menu-color-active !important;
     }
   }
 

--
Gitblit v1.9.3