From d1e20f5a8c069f978829b724517f8e6cbc9f02c4 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 14 Jun 2018 21:09:00 +0800
Subject: [PATCH] no message

Former-commit-id: a1ece084dff76af5402a847ca255ab5b64f693a8 [formerly a1ece084dff76af5402a847ca255ab5b64f693a8 [formerly a1ece084dff76af5402a847ca255ab5b64f693a8 [formerly a1ece084dff76af5402a847ca255ab5b64f693a8 [formerly aeefbe3ca9e19f8ae39a9a5e9e10665a9e094727 [formerly d9fc6a593a30a6178e4614059b7ac11c3268fd55]]]]]
Former-commit-id: 057bb1a59c369e1dfa1c3229c3995aaf75a80ced
Former-commit-id: ea5bc1dd6945f4c6def3fc2cc187728a574c2cfe
Former-commit-id: cab8088b7765d6fe38870435049d6a55e8a2f522 [formerly 41c40e3ba7b35067d7cd1da167b3b5188ce016b3]
Former-commit-id: 7f3da8a663556c9fb561db76d5644642021eb9a0
Former-commit-id: 924c13e408e0a47593efd973ba8216a1dab710e5
Former-commit-id: 54463c5d10dbfe4515998975ff0a5a7b8a0274db
Former-commit-id: c36d2b1d53ae540878e465398ab6e516e4c2a67d
Former-commit-id: 7d1569ae237f685bdc0bb3ed6784b45f50e7d5ba
---
 src/assets/style/theme/theme.scss            | 11 +----------
 src/components/core/d2-layout-main/index.vue |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 107541e4..ac7fc46a 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -5,15 +5,6 @@
   background-size: cover;
   background-position: center;
   position: relative;
-  // &:before {
-  //   content: '';
-  //   position: absolute;
-  //   top: 0px;
-  //   right: 0px;
-  //   bottom: 0px;
-  //   left: 0px;
-  //   background-color: rgba(#000, .5);
-  // }
   // [布局] 顶栏
   .el-header {
     padding: 0px;
@@ -78,7 +69,7 @@
     // 侧边栏
     .el-aside {
       transition: width .3s;
-      overflow: inherit;
+      overflow: auto;
       // [菜单] 正常状态
       .el-menu {
         @extend %unable-select;
diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index 9183ffa6..089e8fcf 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -20,7 +20,7 @@
     <!-- 下面 主体 -->
     <el-container>
       <!-- 主体 侧边栏 -->
-      <el-aside :style="{width: collapse ? asideWidthCollapse : asideWidth}">
+      <el-aside ref="aside" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
         <d2-layout-main-menu-side :collapse="collapse"/>
       </el-aside>
       <!-- 主体 -->