From e5816b6662350ee414d6fe5badeebb6eb55438f3 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 24 Jun 2018 20:05:39 +0800
Subject: [PATCH] no message

Former-commit-id: 8a1755ca0dcc8730efd569c2f81f185df6071c36 [formerly 8a1755ca0dcc8730efd569c2f81f185df6071c36 [formerly 8a1755ca0dcc8730efd569c2f81f185df6071c36 [formerly 8a1755ca0dcc8730efd569c2f81f185df6071c36 [formerly df1117176f0bb8c0291f548531e3270868ef5b6f [formerly bf229dc1d82cdd84f89799288123e416794e2c5d]]]]]
Former-commit-id: 30d0c4842a866cafe6f12ac5a6c0f03725f94c57
Former-commit-id: 361765d210a03afd3203dda72d7e801b19bd53c0
Former-commit-id: 3635d3028c922e9c65cdd1ac35d1d47c516bc052 [formerly d18e6852e714c4083a05db0cb2bb57c970939c53]
Former-commit-id: ee9ad60751422f6811a4c07fc8122903ca860f62
Former-commit-id: ffb1b001445d45a6a091d44ace3041e0c3decd43
Former-commit-id: 85972f59ea5e030b7765c54f8a6a7b9e6c7f6f9f
Former-commit-id: 07a2c3c6a8af21af66fec9be7b6a89ae20169f0f
Former-commit-id: beffca784e0142abd067b7138853f137471177c5
---
 .../components/-menu-side/index.vue           | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/components/core/d2-layout-main/components/-menu-side/index.vue b/src/components/core/d2-layout-main/components/-menu-side/index.vue
index 19a56ce2..3dfd76e0 100644
--- a/src/components/core/d2-layout-main/components/-menu-side/index.vue
+++ b/src/components/core/d2-layout-main/components/-menu-side/index.vue
@@ -1,14 +1,18 @@
 <template>
-  <div>
-    <el-menu
-      :collapse="collapse"
-      :unique-opened="true"
-      @select="handleMenuSelect">
-      <template v-for="(menu, menuIndex) in menus">
-        <d2-layout-main-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
-        <d2-layout-main-menu-sub v-else :menu="menu" :key="menuIndex"/>
-      </template>
-    </el-menu>
+  <div style="height: 100%;">
+    <el-scrollbar>
+      <div :style="{ height: `${asideHeight}px` }">
+        <el-menu
+          :collapse="collapse"
+          :unique-opened="true"
+          @select="handleMenuSelect">
+          <template v-for="(menu, menuIndex) in menus">
+            <d2-layout-main-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
+            <d2-layout-main-menu-sub v-else :menu="menu" :key="menuIndex"/>
+          </template>
+        </el-menu>
+      </div>
+    </el-scrollbar>
     <div v-if="menus.length === 0 && !collapse" class="menu-empty">
       <d2-icon name="hdd-o"/>
       <span>当前目录没有菜单</span>
@@ -37,7 +41,8 @@ export default {
   },
   data () {
     return {
-      menus: []
+      menus: [],
+      asideHeight: 300
     }
   },
   watch: {
@@ -48,6 +53,14 @@ export default {
       },
       immediate: true
     }
+  },
+  mounted () {
+    this.updateAsideHeight()
+  },
+  methods: {
+    updateAsideHeight () {
+      this.asideHeight = this.$el.offsetHeight
+    }
   }
 }
 </script>