diff --git a/src/components/ScrollBar/index.vue b/src/components/ScrollBar/index.vue deleted file mode 100644 index dc32f5c0..00000000 --- a/src/components/ScrollBar/index.vue +++ /dev/null @@ -1,57 +0,0 @@ - - - - - diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index d69c4347..26cece0c 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -1,18 +1,13 @@ #app { - // 主体区域 .main-container { min-height: 100%; transition: margin-left .28s; margin-left: 180px; } - - // 侧边栏 + // 侧边栏 .sidebar-container { - .horizontal-collapse-transition { - transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; - } - transition: width .28s; + transition: width 0.28s; width: 180px !important; height: 100%; position: fixed; @@ -22,19 +17,33 @@ left: 0; z-index: 1001; overflow: hidden; + //reset element-ui css + .horizontal-collapse-transition { + transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; + } + .scrollbar-wrapper { + height: calc(100% + 15px); + .el-scrollbar__view { + height: 100%; + } + } + .is-horizontal { + display: none; + } a { display: inline-block; width: 100%; + overflow: hidden; } .svg-icon { margin-right: 16px; } .el-menu { border: none; + height: 100%; width: 100% !important; } } - .hideSidebar { .sidebar-container { width: 36px !important; @@ -50,22 +59,28 @@ } } .el-submenu { + overflow: hidden; &>.el-submenu__title { padding-left: 10px !important; - &>span { - height: 0; - width: 0; - overflow: hidden; - visibility: hidden; - display: inline-block; - } .el-submenu__icon-arrow { display: none; } } } + .el-menu--collapse { + .el-submenu { + &>.el-submenu__title { + &>span { + height: 0; + width: 0; + overflow: hidden; + visibility: hidden; + display: inline-block; + } + } + } + } } - .sidebar-container .nest-menu .el-submenu>.el-submenu__title, .sidebar-container .el-submenu .el-menu-item { min-width: 180px !important; @@ -84,7 +99,6 @@ margin-left: 0px; } .sidebar-container { - top: 50px; transition: transform .28s; width: 180px !important; } @@ -95,7 +109,6 @@ } } } - .withoutAnimation { .main-container, .sidebar-container { diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue index 8c2dba8f..284de9c1 100644 --- a/src/views/layout/Layout.vue +++ b/src/views/layout/Layout.vue @@ -1,5 +1,6 @@