diff --git a/package.json b/package.json index bf37a0dc..30dc32ce 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "codemirror": "5.32.0", "dropzone": "5.2.0", "echarts": "3.8.5", - "element-ui": "2.0.8", + "element-ui": "2.3.2", "file-saver": "1.3.3", "font-awesome": "4.7.0", "js-cookie": "2.2.0", diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 2fed2b1d..5151993a 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -2,18 +2,21 @@ // 主体区域 .main-container { min-height: 100%; - transition: margin-left 0.28s; + transition: margin-left .28s; margin-left: 180px; } // 侧边栏 .sidebar-container { - transition: width 0.28s; - width: 180px!important; + transition: width .28s; + // background: red; + width: 180px !important; height: 100%; position: fixed; + font-size: 0px; top: 0; bottom: 0; left: 0; z-index: 1001; + overflow: hidden; a { display: inline-block; width: 100%; @@ -23,78 +26,49 @@ } .el-menu { border: none; - width: 100%; + width: 100% !important; } } .hideSidebar { - .sidebar-container,.sidebar-container .el-menu { - width: 36px!important; - // overflow: inherit; + .sidebar-container { + width: 36px !important; } .main-container { margin-left: 36px; } - } - .hideSidebar { .submenu-title-noDropdown { - padding-left: 10px!important; + padding-left: 10px !important; position: relative; - span { - height: 0; - width: 0; - overflow: hidden; - visibility: hidden; - transition: opacity .3s cubic-bezier(.55, 0, .1, 1); - opacity: 0; - display: inline-block; - } - &:hover { - span { - display: block; - border-radius: 3px; - z-index: 1002; - width: 140px; - height: 56px; - visibility: visible; - position: absolute; - right: -145px; - text-align: left; - text-indent: 20px; - top: 0px; - background-color: $subMenuBg!important; - opacity: 1; - } + .el-tooltip { + padding: 0 10px !important; } } .el-submenu { &>.el-submenu__title { - padding-left: 10px!important; + padding-left: 10px !important; &>span { - display: none; + height: 0; + width: 0; + overflow: hidden; + visibility: hidden; + display: inline-block; } .el-submenu__icon-arrow { display: none; } } - .nest-menu { - .el-submenu__icon-arrow { - display: block!important; - } - span { - display: inline-block!important; - } - } } } .nest-menu .el-submenu>.el-submenu__title, .el-submenu .el-menu-item { - min-width: 180px!important; - background-color: $subMenuBg!important; + min-width: 180px !important; + background-color: $subMenuBg !important; &:hover { - background-color: $menuHover!important; + background-color: $menuHover !important; } } - .el-menu--collapse .el-menu .el-submenu{ - min-width: 180px!important; + .el-menu--collapse .el-menu .el-submenu { + min-width: 180px !important; } } + diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue index e60313f9..cddcd61d 100644 --- a/src/views/layout/components/Sidebar/SidebarItem.vue +++ b/src/views/layout/components/Sidebar/SidebarItem.vue @@ -2,17 +2,18 @@