From d8ba39ebf21408340db4842e08ed25239b44cbf4 Mon Sep 17 00:00:00 2001
From: zhaojisen <1301338853@qq.com>
Date: Fri, 24 May 2024 10:35:16 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E6=95=B4=E5=90=88=E6=94=B9=E9=80=A0?=
 =?UTF-8?q?=20menu=20=E6=A0=B7=E5=BC=8F=E4=BB=A5=E5=8F=8A=20table=20button?=
 =?UTF-8?q?=20=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DataActions/index.vue          |   4 +-
 src/layout/components/NavLeft/SidebarItem.vue |  20 +-
 src/layout/components/NavLeft/index.vue       | 244 +++++++++---------
 src/layout/components/Page/PageHeading.vue    |  53 ++--
 src/styles/menu.scss                          | 239 ++++++++---------
 src/styles/sidebar.scss                       |  90 -------
 src/styles/variables.scss                     |   2 +-
 7 files changed, 275 insertions(+), 377 deletions(-)

diff --git a/src/components/DataActions/index.vue b/src/components/DataActions/index.vue
index 46186b51e..2b298e7b5 100644
--- a/src/components/DataActions/index.vue
+++ b/src/components/DataActions/index.vue
@@ -250,10 +250,8 @@ $color-drop-menu-border: #e4e7ed;
   .el-button {
     display: flex;
     align-items: center;
-    height: 20px !important;
-    padding: 2px 6px;
+    padding: 3px 6px;
     color: $btn-text-color;
-    border-color: var(--color-primary);
   }
 
   ::v-deep .action-item.el-dropdown .el-button {
diff --git a/src/layout/components/NavLeft/SidebarItem.vue b/src/layout/components/NavLeft/SidebarItem.vue
index 286444643..3d0089a2b 100644
--- a/src/layout/components/NavLeft/SidebarItem.vue
+++ b/src/layout/components/NavLeft/SidebarItem.vue
@@ -13,7 +13,7 @@
         >
           <item
             :children="item.children"
-            :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)"
+            :icon="onlyOneChild.meta.icon||(item.meta && item.meta.icon)"
             :title="getItemTitle(onlyOneChild)"
           />
         </el-menu-item>
@@ -73,11 +73,13 @@ export default {
     // To fix https://github.com/PanJiaChen/vue-admin-template/issues/237
     // TODO: refactor with render function
     this.onlyOneChild = null
-    return {}
+    return {
+    }
   },
   methods: {
     needHidden(item) {
       let hidden = item.hidden
+
       if (typeof item.hidden === 'function') {
         hidden = item.hidden()
       }
@@ -121,7 +123,7 @@ export default {
 
       // Show parent if there are no child router to display
       if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
+        this.onlyOneChild = { ...parent, path: '', noShowingChildren: true }
         return true
       }
 
@@ -139,15 +141,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss" scoped>
->>> .submenu-item.el-submenu {
-//  border-left: 4px solid transparent;
-}
-
-.el-submenu.is-active {
-  &>>> .svg-icon {
-    color: var(--menu-text-active)!important;
-  }
-}
-</style>
diff --git a/src/layout/components/NavLeft/index.vue b/src/layout/components/NavLeft/index.vue
index ef4b3fff3..6b27b351a 100644
--- a/src/layout/components/NavLeft/index.vue
+++ b/src/layout/components/NavLeft/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="{'has-logo': showLogo, 'show-orgs': showOrgs, 'collapsed': isCollapse}">
+  <div class="left-side-wrapper" :class="{'has-logo': showLogo, 'show-orgs': showOrgs, 'collapsed': isCollapse}">
     <div class="nav-header">
       <div class="active-mobile">
         <Organization v-if="$hasLicense()" class="organization" />
@@ -11,12 +11,12 @@
             trigger="hover"
           >
             <span slot="reference" style="width: 100%">
-              <span class="icon-zone">
-                <svg-icon class="icon" icon-class="switch" />
-              </span>
               <span v-show="!isCollapse" class="view-title">
                 {{ isRouteMeta.title || '' }}
               </span>
+              <span class="icon-zone">
+                <svg-icon class="icon" icon-class="switch" />
+              </span>
             </span>
             <ViewSwitcher mode="vertical" @view-change="handleViewChange" />
           </el-popover>
@@ -127,6 +127,7 @@ export default {
   mounted() {
     // this.setViewIconAttention()
     this.setLeastMenuOpen()
+    console.log('currentViewRoute', this.currentViewRoute.children)
   },
   methods: {
     toggleSideBar() {
@@ -163,114 +164,144 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  @import "~@/styles/variables.scss";
+@import "~@/styles/variables.scss";
 
-  .left-menu >>> .el-submenu__title * {
-    vertical-align: inherit;
-  }
+$mobileHeight: 40px;
+$origin-color: #ffffff;
 
+.left-side-wrapper {
   .nav-header {
-    overflow: hidden;
-    background-color: var(--color-primary);
-  }
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    align-items: center;
 
-  .nav-logo {
-    height: 50px;
-  }
+    .active-mobile {
+      display: none;
 
-  .hover-switch-view {
-    background: var(--menu-hover) !important;
-    color: var(--color-primary);
-    text-align: center;
-  }
+      ::v-deep .organization {
+        height: $mobileHeight;
+        padding-left: 20px;
+        background: var(--color-primary-dark-1);
+        color: $origin-color;
 
-  .collapsed {
-    text-align: left;
+        .el-input--prefix {
+          display: flex;
+          align-items: center;
+          height: 40px;
+          line-height: 40px;
+        }
 
-    .nav-title {
-      &:hover {
-        background-color: var(--menu-hover);
+        .svg-icon {
+          color: $origin-color !important;
+          margin-right: 0 !important;
+        }
       }
 
-      .switch-view {
-        .icon-zone {
-          float: none;
-          padding: 0;
-        }
-        .switch-view .icon {
-          margin-left: 0;
+      & >>> .title-label {
+        color: $origin-color !important;
+      }
+
+      .mobile-view-switch {
+        &>>> .el-menu-item.is-active {
+          color: var(--menu-text-active) !important;
+          .svg-icon {
+            color: var(--menu-text-active) !important;
+          }
         }
       }
     }
-  }
 
-  .nav-title {
-    box-sizing: border-box;
-    height: 48px;
-    padding: 14px;
-    font-size: 16px;
-    font-weight: 500;
-    color: #1F2329;
-    overflow: hidden;
-    white-space: nowrap;
-    cursor: pointer;
-    background-color: var(--menu-bg);
-    transition: all 0.3s;
+    .nav-title {
+      display: flex;
+      align-items: center;
+      width: 100%;
+      height: 50px;
+      font-size: 18px;
+      font-weight: 500;
+      overflow: hidden;
+      white-space: nowrap;
+      cursor: pointer;
+      transition: all 0.3s;
+      color: var(--color-text-primary);
+      background-color: var(--menu-bg);
+      //border-bottom: 1px solid rgba(31, 35, 41, .15);
 
-    .switch-view {
-      padding: 6px;
-      right: 16px;
-      transform: translateY(-50%);
-      z-index: 1;
-      line-height: 10px;
-      border-radius: 2px;
+      .switch-view {
+        width: 100%;
+        padding: 6px;
 
-      .icon-zone {
-        float: right;
-        padding: 4px;
+        ::v-deep .el-popover__reference {
+          display: flex;
+          justify-content: center;
+          align-items: center;
 
-        &:hover {
-          color: var(--color-primary);
+          .view-title {
+            margin-left: 15px;
+            width: calc(100% - 10px);
+            display: inline-block
+          }
+
+          .icon-zone {
+            margin-right: 5px;
+
+            &:hover {
+              color: var(--color-primary);
+            }
+
+            .icon {
+              margin-right: 0 !important;
+            }
+          }
         }
+      }
 
-        .icon {
-          margin-right: 0 !important;
-        }
+      .hover-switch-view {
+        background: var(--menu-hover) !important;
+        color: var(--color-primary);
+        text-align: center;
       }
     }
   }
 
   .nav-footer {
-    display: block;
-    width: 100%;
-    height: 48px;
-    line-height: 48px;
-    margin-top: 2px;
-    box-sizing: border-box;
+    display: flex;
+    justify-content: flex-end;
     border-top: 1px solid rgba(31, 35, 41, 0.15);
     background-color: $subMenuBg;
 
     .toggle-bar {
-      width: 55px;
-      height: 100%;
-      bottom: 0;
-      left: 0;
-      top: auto;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 50px;
+      height: 50px;
       border: 0;
-      z-index: 1000;
-      position: relative;
       cursor: pointer;
-    }
 
-    .toggle-bar:hover {
-      background-color: $subMenuHover;
+      ::v-deep .hamburger-container {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100%;
+        height: 100%;
+        padding: 0 !important;
+
+        .svg-icon {
+          margin-right: 0 !important;
+          transform: translateY(-25%);
+        }
+      }
+
+      &:hover {
+        background-color: $subMenuHover;
+      }
     }
   }
 
   .is-show {
     display: block!important;;
   }
-
   .mobile-menu {
     display: none;
     position: absolute;
@@ -283,59 +314,26 @@ export default {
     z-index: 100;
   }
 
-  .show-switch-view {
-    display: none;
-  }
-
-  .view-title {
-    margin-left: 5px;
-    width: calc(100% - 10px);
-    display: inline-block
-  }
-
-  $mobileHeight: 40px;
-
-  .active-mobile {
-    display: none;
-
-    & >>> .organization {
-      height: $mobileHeight;
-      line-height: $mobileHeight;
-      padding-left: 20px;
-      background: var(--color-primary-dark-1);
-      color: #fff;
-      border-bottom: 1px solid rgba(31, 35, 41, .15);
-
-      .el-input--prefix .el-input__inner {
-        height: $mobileHeight!important;
-        line-height: $mobileHeight!important;
+  &.collapsed .nav-title .switch-view {
+    ::v-deep .el-popover__reference {
+      .icon-zone {
+        margin-right: 0;
       }
-      .svg-icon {
-        color: #FFF!important;
-        margin-right: 0!important;
+
+      .switch-view .icon {
+        margin-left: 0;
       }
     }
 
-    & >>> .title-label {
-      color: white !important;
-    }
-
-    .mobile-view-switch {
-      &>>> .el-menu-item.is-active {
-        color: var(--menu-text-active)!important;
-        .svg-icon {
-          color: var(--menu-text-active)!important;
-        }
-      }
+    &:hover {
+      color: var(--color-primary);
     }
   }
+}
 
-  @media screen and (max-width: 992px) {
-    .active-mobile {
-      display: block;
-    }
-    .show-switch-view {
-      display: block!important;
-    }
+@media screen and (max-width: 992px) {
+  ::v-deep .active-mobile {
+    display: block !important;
   }
+}
 </style>
diff --git a/src/layout/components/Page/PageHeading.vue b/src/layout/components/Page/PageHeading.vue
index 037f58eac..9509d9373 100644
--- a/src/layout/components/Page/PageHeading.vue
+++ b/src/layout/components/Page/PageHeading.vue
@@ -6,14 +6,12 @@
       <PasswordExpireTip />
     </slot>
     <div class="page-heading">
-      <el-row :gutter="0">
+      <el-row :gutter="0" type="flex">
         <el-col :span="16" class="page-heading-left">
           <slot><h2>{{ title }}</h2></slot>
         </el-col>
-        <el-col :span="8">
-          <div class="page-heading-right">
-            <slot name="rightSide" />
-          </div>
+        <el-col :span="8" class="page-heading-right">
+          <slot name="rightSide" />
         </el-col>
       </el-row>
     </div>
@@ -47,34 +45,35 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+$origin-color: #ffffff;
+
 .page-heading {
-  position: relative;
+  display: flex;
+  align-items: center;
   height: 50px;
-  line-height: 50px;
-  background-color: #ffffff;
-  border-bottom: solid 1px #ebeef5;
+  background-color: $origin-color;
+  border-bottom: 1px solid rgba(31, 35, 41, .15);
 
   .el-row {
     width: 100%;
-    position: absolute;
-    top: 50%;
-    transform: translateY(-50%);
     padding: 0 24px;
+
+    .page-heading-left,
+    h2 {
+      display: flex;
+      align-items: center;
+      font-size: 16px;
+      font-weight: 500;
+      color: var(--color-text-primary);
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    .page-heading-right {
+      display: flex;
+      justify-content: flex-end;
+    }
   }
 }
-
-.page-heading-left,
-h2 {
-  font-size: 16px;
-  font-weight: 600;
-  line-height: 2;
-  color: var(--color-text-primary);
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-
-.page-heading-right {
-  float: right;
-}
 </style>
diff --git a/src/styles/menu.scss b/src/styles/menu.scss
index d2e4d5f3f..5f63f284e 100644
--- a/src/styles/menu.scss
+++ b/src/styles/menu.scss
@@ -1,55 +1,142 @@
 @import "./variables";
 
+$icon-width: 14px;
+$single-menu-height: 45px;
+@mixin hover_active {
+  background-color: var(--menu-hover);
+  color: var(--menu-text-active);
+}
+
+.el-menu {
+  border-right: none !important;
+}
+
 .left-menu.el-menu {
-  .el-menu--inline {
-    background-color: $subMenuBg;
-  }
+  .submenu-item {
+    &.el-submenu-sidebar {
+      // 有子菜单项的 title
+      .el-submenu__title {
+        height: 30px;
+        font-size: 11px;
+        cursor: default;
+        font-weight: 600;
+        line-height: 30px;
+        letter-spacing: .05em;
+        color: var(--color-text-primary) !important;
 
-  .el-menu-item, .el-submenu {
-    font-weight: 600;
-  }
+        .svg-icon {
+          display: none;
+        }
 
-  .el-submenu, .el-menu-item.submenu-title-noDropdown {
-    background-color: $menuBg;
-
-    .el-submenu__title {
-      color: $menuText;
-      font-weight: 400;
-
-      &:hover {
-        color: $menuActiveText;
-        background-color: $menuHover;
+        &:hover {
+          background-color: #ffffff;
+        }
       }
 
-      i {
-        color: $menuActiveText;
+      // 子菜单项
+      .el-menu--inline {
+        background-color: $subMenuBg;
+
+        .nest-menu {
+          display: flex;
+
+          .el-menu-item {
+            display: flex;
+            justify-content: flex-start;
+            align-items: center;
+            height: 45px;
+            padding: 20px !important;
+            line-height: 45px;
+            min-width: 200px;
+            font-size: 12px;
+
+            &:hover,
+            &.is-active {
+              @include hover_active
+            }
+
+            .svg-icon {
+              overflow: hidden;
+              width: $icon-width;
+              height: $icon-width;
+            }
+
+            span {
+              padding-left: 10px;
+            }
+          }
+        }
       }
     }
-  }
 
-  .el-menu-item, .el-submenu-sidebar .el-menu-item {
-    background-color: $subMenuBg;
-    color: $menuText;
-    list-style: circle inside;
+    // 当前菜单样式
+    &.is-active .el-submenu__title {
+      color: $menuActiveText;
+    }
 
+    // 没有子菜单的项
     &.submenu-title-noDropdown {
-      list-style: none;
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+      height: $single-menu-height;
+      line-height: $single-menu-height;
+      min-width: 200px;
+      font-size: 12px;
+
+      &:hover,
+      &.is-active {
+       @include hover_active
+      }
+
+      .svg-icon {
+        //display: none;
+        width: $icon-width;
+        height: $icon-width;
+      }
 
       span {
-        padding-left: 0;
+        padding-left: 10px;
+      }
+    }
+  }
+
+  // 折叠状态下
+  &.el-menu--collapse {
+    width: 100% !important;
+
+    .submenu-title-noDropdown,
+    .submenu-title-noDropdown .el-tooltip {
+      display: flex !important;
+      align-items: center !important;
+      min-width: 54px !important;
+
+      .svg-icon {
+        display: block
       }
     }
 
-    &.is-active {
-      color: $subMenuActiveText;
-      font-weight: 500;
-      list-style-type: disc;
-    }
+    .submenu-item {
+      &.is-active {
+        cursor: pointer;
+        @include hover_active
+      }
 
-    &:hover {
-      background-color: $subMenuHover !important;
-      color: $subMenuActiveText;
-      list-style-type: disc;
+      .el-submenu__title {
+        display: flex;
+        align-items: center;
+        height: $single-menu-height;
+
+        &:hover,
+        &.is-active {
+          cursor: pointer;
+          @include hover_active
+        }
+
+        .svg-icon {
+          display: block;
+        }
+      }
     }
   }
 
@@ -62,90 +149,6 @@
     color: $menuActiveText;
   }
 
-  .el-menu-item, .el-submenu__title {
-    height: 45px;
-    line-height: 45px;
-    font-weight: 400;
-    font-size: 13px;
-  }
-
-  .el-submenu .el-menu-item {
-    height: 35px;
-    line-height: 35px;
-    padding: 0 52px;
-    min-width: 200px;
-    font-size: 12px;
-  }
-
-  .nest-menu .el-submenu__title {
-    height: 30px;
-    line-height: 30px;
-    padding: 0 52px;
-    min-width: 200px;
-  }
-
-  .nest-menu li.is-opened, .nest-menu li.is-active {
-    border-left: none;
-  }
-
-  .el-menu-item * {
-    vertical-align: inherit ;
-  }
-
-  .el-menu-item:hover, .el-menu-item:focus {
-    color: $subMenuActiveText;
-  }
-
-  .navbar li.is-active, .navbar li.is-opened {
-    border: none;
-  }
-
-  .submenu-item.el-submenu.is-opened {
-    border-top: dotted 1px #ecedf2;
-  }
-
-  .nest-menu li.is-active {
-    border: none;
-  }
-
-  .el-submenu-sidebar.submenu-item.el-submenu.is-active {
-    .el-submenu__title,.nest-menu, .el-menu-item {
-      &:before {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 0;
-        bottom: 0;
-        width: 3px;
-        background-color: var(--menu-text-active);
-      }
-    }
-  }
-
-  .submenu-item.is-active.submenu-title-noDropdown {
-    &:before {
-      content: '';
-      position: absolute;
-      top: 0;
-      left: 0;
-      bottom: 0;
-      width: 3px;
-      background-color: var(--menu-text-active);
-    }
-  }
-
-  .el-submenu-sidebar .el-menu-item {
-    background-color: $subMenuBg;
-  }
-
-  .el-submenu.is-opened {
-    background-color: $subMenuBg;
-
-    & .nest-menu {
-      background-color: $subMenuBg;
-    }
-  }
-
   .nest-menu:last-child {
     padding-bottom: 10px;
   }
diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index 301d85cb0..d4c7b1c4f 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -57,47 +57,6 @@
       width: 100%;
       overflow: hidden;
     }
-
-    .svg-icon {
-      margin-right: 16px;
-      vertical-align: -0.15em;
-      fill: currentColor;
-      overflow: hidden;
-      width: 14px;
-      height: 14px;
-    }
-
-    .el-menu {
-      border: none;
-      height: 100%;
-      width: 100% !important;
-    }
-
-    // menu hover
-    .submenu-title-noDropdown,
-    .el-submenu__title {
-      font-weight: 500;
-      font-size: 13px;
-
-      i {
-        color: inherit;
-        font-weight: 500;
-      }
-
-      &:hover {
-        //background-color: $menuHover !important;
-      }
-    }
-
-    .is-active > .el-submenu__title {
-      color: $menuActiveText !important;
-    }
-
-    & .nest-menu .el-submenu-sidebar > .el-submenu__title,
-    & .el-submenu-sidebar .el-menu-item {
-      min-width: $sideBarWidth !important;
-      background-color: $subMenuBg;
-    }
   }
 
   .hideSidebar {
@@ -141,10 +100,6 @@
     }
   }
 
-  .el-menu--collapse .el-menu .el-submenu-sidebar {
-    min-width: $sideBarWidth !important;
-  }
-
   // mobile responsive
   .mobile {
     .main-container {
@@ -173,48 +128,3 @@
   }
 }
 
-// when menu collapsed
-.el-menu--vertical {
-  & > .el-menu {
-    .svg-icon {
-      margin-right: 16px;
-    }
-  }
-
-
-  .nest-menu .el-submenu-sidebar > .el-submenu__title,
-  .el-menu-item {
-    &:hover {
-      background-color: $menuHover !important;
-    }
-  }
-
-  // the scroll bar appears when the subMenu is too long
-  > .el-menu--popup {
-    max-height: 100vh;
-    overflow: hidden;
-
-    &::-webkit-scrollbar-track-piece {
-      background: #d3dce6;
-    }
-
-    &::-webkit-scrollbar {
-      width: 6px;
-    }
-
-    &::-webkit-scrollbar-thumb {
-      background: #99a9bf;
-      border-radius: 20px;
-    }
-
-    .el-menu-item {
-      height: 36px;
-      line-height: 36px;
-
-      &.is-active {
-        color: var(--color-primary);
-        border-left: 4px solid var(--color-primary);
-      }
-    }
-  }
-}
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index af75bd03f..868a56ca5 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -23,8 +23,8 @@ $menuHover: var(--menu-hover);
 $subMenuBg: var(--submenu-bg);
 $subMenuHover: var(--menu-hover);
 $subMenuActiveText: var(--menu-text-active);
-$sideBarWidth: 200px;
 
+$sideBarWidth: 200px;
 $headerHeight: 40px;
 
 :export {