From b282fc3f61627478377a33fbc6712dff62e35312 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 20:14:42 +0800
Subject: [PATCH] no message

Former-commit-id: 02ac02536e51d18a326e0c245493c2c8463b176f [formerly 85de0c7eb30b7113692c6f17d7c6fa64ae46b388] [formerly 02ac02536e51d18a326e0c245493c2c8463b176f [formerly 85de0c7eb30b7113692c6f17d7c6fa64ae46b388] [formerly 02ac02536e51d18a326e0c245493c2c8463b176f [formerly 85de0c7eb30b7113692c6f17d7c6fa64ae46b388] [formerly 85de0c7eb30b7113692c6f17d7c6fa64ae46b388 [formerly e34aa936be18eff22179a1c83c037b63b5ea9c15 [formerly 3f5d3d2d1b26943366a435af82aa3d6c2a49933d]]]]]
Former-commit-id: 84d14fe2b07b1d3385731f5f033fda5da5d67a10
Former-commit-id: e7c1007be2d49ae2f70f32c9507c118484608ffb
Former-commit-id: 3035850965a00de2bf7f2be0493690da7e3a6b06 [formerly 1eca63099818cbdae450aeb83cb9f9e4c3674f00]
Former-commit-id: 1d5d1d89ff0fed9bf428d4eaa24da88a1a8d3b44
Former-commit-id: 30ca02893ec87fb93a1145a397ce7b32d9e7a218
Former-commit-id: 12ef57ba36ef26bcbb038f0fe805ff67b81d1386
Former-commit-id: 81d0e81655ccc418430c935e932b4ab44ce7e5cf
Former-commit-id: 43410c9f50803e6c424dc8db35dc9eba33f9cee4
---
 .../components/-menu-side/index.vue           | 35 ++++++-------------
 .../d2-layout-main/components/mixin/menu.js   |  3 --
 2 files changed, 11 insertions(+), 27 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 afeb81f0..7700492b 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,20 +1,16 @@
 <template>
   <div style="height: 100%;">
-    <el-scrollbar v-if="menus.length > 0">
-      <div :style="{ height: `${asideHeight}px` }">
-        <el-menu
-          :collapse="collapse"
-          :unique-opened="true"
-          :default-active="active"
-          ref="menu"
-          @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>
+    <el-menu
+      :collapse="collapse"
+      :unique-opened="true"
+      :default-active="active"
+      ref="menu"
+      @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 v-if="menus.length === 0 && !collapse" class="menu-empty">
       <d2-icon name="hdd-o"/>
       <span>当前目录没有菜单</span>
@@ -68,19 +64,10 @@ export default {
       immediate: true
     }
   },
-  mounted () {
-    this.updateAsideHeight()
-    window.onresize = () => {
-      this.updateAsideHeight()
-    }
-  },
   beforeDestroy () {
     window.onresize = function () {}
   },
   methods: {
-    updateAsideHeight () {
-      this.asideHeight = this.$el.offsetHeight
-    }
   }
 }
 </script>
diff --git a/src/components/core/d2-layout-main/components/mixin/menu.js b/src/components/core/d2-layout-main/components/mixin/menu.js
index 6c39a2be..efd488b1 100644
--- a/src/components/core/d2-layout-main/components/mixin/menu.js
+++ b/src/components/core/d2-layout-main/components/mixin/menu.js
@@ -1,9 +1,6 @@
 export default {
   methods: {
     handleMenuSelect (index, indexPath) {
-      console.group('handleMenuSelect')
-      console.log('index: ', index)
-      console.groupEnd()
       if (/^d2-menu-empty-\d+$/.test(index)) {
         this.$message('功能正在开发')
       } else {