Browse Source

fix[Sidebar]: fixed collapse animation problem

Pan 6 years ago
parent
commit
4bbdf5ee0e

+ 15 - 5
src/styles/sidebar.scss

@@ -83,19 +83,26 @@
83 83
 
84 84
   .hideSidebar {
85 85
     .sidebar-container {
86
-      width: 36px !important;
86
+      width: 54px !important;
87 87
     }
88 88
 
89 89
     .main-container {
90
-      margin-left: 36px;
90
+      margin-left: 54px;
91
+    }
92
+
93
+    .svg-icon {
94
+      margin-right: 0px;
91 95
     }
92 96
 
93 97
     .submenu-title-noDropdown {
94
-      padding-left: 10px !important;
98
+      padding: 0 !important;
95 99
       position: relative;
96 100
 
97 101
       .el-tooltip {
98
-        padding: 0 10px !important;
102
+        padding: 0 !important;
103
+        .svg-icon {
104
+          margin-left: 20px;
105
+        }
99 106
       }
100 107
     }
101 108
 
@@ -103,7 +110,10 @@
103 110
       overflow: hidden;
104 111
 
105 112
       &>.el-submenu__title {
106
-        padding-left: 10px !important;
113
+        padding: 0 !important;
114
+        .svg-icon {
115
+          margin-left: 20px;
116
+        }
107 117
 
108 118
         .el-submenu__icon-arrow {
109 119
           display: none;

+ 2 - 1
src/styles/variables.scss

@@ -9,9 +9,10 @@ $menuHover:#263445;
9 9
 $subMenuBg:#1f2d3d;
10 10
 $subMenuHover:#001528;
11 11
 
12
-$sideBarWidth: 180px;
12
+$sideBarWidth: 210px;
13 13
 
14 14
 // the :export directive is the magic sauce for webpack
15
+// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
15 16
 :export {
16 17
   menuText: $menuText;
17 18
   menuActiveText: $menuActiveText;

+ 1 - 1
src/views/layout/components/Sidebar/index.vue

@@ -1,12 +1,12 @@
1 1
 <template>
2 2
   <el-scrollbar wrap-class="scrollbar-wrapper">
3 3
     <el-menu
4
-      :show-timeout="200"
5 4
       :default-active="$route.path"
6 5
       :collapse="isCollapse"
7 6
       :background-color="variables.menuBg"
8 7
       :text-color="variables.menuText"
9 8
       :active-text-color="variables.menuActiveText"
9
+      :collapse-transition="false"
10 10
       mode="vertical"
11 11
     >
12 12
       <sidebar-item v-for="route in routes" :key="route.path" :item="route" :base-path="route.path"/>