From 129c58d8c7029be261da2f52b8806c61ee77cf25 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Sun, 22 Mar 2020 16:36:00 +0800
Subject: [PATCH] =?UTF-8?q?[UPDATE]=E4=BF=AE=E5=A4=8DNavbar=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue              |  3 ++-
 src/layout/components/Sidebar/SidebarItem.vue |  2 +-
 src/styles/sidebar.scss                       | 12 ++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index c562a347e..507485447 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -86,8 +86,9 @@ export default {
   height: 50px;
   line-height: 50px;
 }
-.el-submenu /deep/ .el-submenu__title{
+.el-submenu-right /deep/ .el-submenu__title{
   height: 50px;
+  padding: 0 20px !important;
   line-height: 50px;
 }
 
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index c16ec8839..1fae43560 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -8,7 +8,7 @@
       </app-link>
     </template>
 
-    <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
+    <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body class="el-submenu-sidebar">
       <template slot="title">
         <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="translate(item.meta.title)" />
       </template>
diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index 3dad4c39a..1b3840e62 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -75,8 +75,8 @@
       color: $subMenuActiveText !important;
     }
 
-    & .nest-menu .el-submenu>.el-submenu__title,
-    & .el-submenu .el-menu-item {
+    & .nest-menu .el-submenu-sidebar>.el-submenu__title,
+    & .el-submenu-sidebar .el-menu-item {
       min-width: $sideBarWidth !important;
       background-color: $subMenuBg !important;
 
@@ -108,7 +108,7 @@
       }
     }
 
-    .el-submenu {
+    .el-submenu-sidebar {
       overflow: hidden;
 
       &>.el-submenu__title {
@@ -125,7 +125,7 @@
     }
 
     .el-menu--collapse {
-      .el-submenu {
+      .el-submenu-sidebar {
         &>.el-submenu__title {
           &>span {
             height: 0;
@@ -139,7 +139,7 @@
     }
   }
 
-  .el-menu--collapse .el-menu .el-submenu {
+  .el-menu--collapse .el-menu .el-submenu-sidebar {
     min-width: $sideBarWidth !important;
   }
 
@@ -180,7 +180,7 @@
     }
   }
 
-  .nest-menu .el-submenu>.el-submenu__title,
+  .nest-menu .el-submenu-sidebar>.el-submenu__title,
   .el-menu-item {
     &:hover {
       // you can use $subMenuHover