From cffe10f9c6f1671f0f44ac679b9c1397f4509cab Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 27 Jun 2018 02:08:03 +0800
Subject: [PATCH] no message

Former-commit-id: 2f5d58844c24eb05f017c650b60acd6067c43420 [formerly 2f5d58844c24eb05f017c650b60acd6067c43420 [formerly 2f5d58844c24eb05f017c650b60acd6067c43420 [formerly 2f5d58844c24eb05f017c650b60acd6067c43420 [formerly 6299153b12cdbd01d8217a4cf005cfad11a40515 [formerly 5c9ea3a263a6421c4e9259831298260ae49fc904]]]]]
Former-commit-id: 9449cb8a9a4f665879a6bf4301d415b455d17217
Former-commit-id: fa7519a6f28ead44173a22a597778dd94ff7c174
Former-commit-id: f5005bec58a6f852f0bcea1af753dcf1032a10be [formerly b5044b4652175883fd1e82e442bf9f0ad0a112c7]
Former-commit-id: 25d09a2444458855f5ff26ee25694cce56f7f96a
Former-commit-id: ca4f2231cc5dce21f33327836c4675ea9c13a482
Former-commit-id: a22cfed8e2114178b242287583ad1e85ef9ceaf2
Former-commit-id: 80a7c7aa277d538b41797d758a99a020595344ff
Former-commit-id: 68b6f82fa09b1c021d4e3f218915cccfb679c2ad
---
 .../components/-menu-header/index.vue             |  8 ++++++--
 .../components/-menu-side/index.vue               | 15 +++++++++++----
 .../d2-layout-main/components/-menu-sub/index.vue |  9 ++++++---
 .../core/d2-layout-main/components/mixin/menu.js  |  1 +
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/components/core/d2-layout-main/components/-menu-header/index.vue b/src/components/core/d2-layout-main/components/-menu-header/index.vue
index 9e7d070e..6edaecd1 100644
--- a/src/components/core/d2-layout-main/components/-menu-header/index.vue
+++ b/src/components/core/d2-layout-main/components/-menu-header/index.vue
@@ -10,14 +10,18 @@
 <script>
 import menus from '@/menu/index.js'
 import menuMixin from '../mixin/menu'
+// 组件
+import d2LayoutMainMenuItem from '../-menu-item/index.vue'
+import d2LayoutMainMenuSub from '../-menu-sub/index.vue'
+
 export default {
   name: 'd2-layout-main-menu-header',
   mixins: [
     menuMixin
   ],
   components: {
-    'd2-layout-main-menu-item': () => import('../-menu-item/index.vue'),
-    'd2-layout-main-menu-sub': () => import('../-menu-sub/index.vue')
+    'd2-layout-main-menu-item': d2LayoutMainMenuItem,
+    'd2-layout-main-menu-sub': d2LayoutMainMenuSub
   },
   data () {
     return {
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 9f2d6bfd..4f43e424 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
@@ -5,6 +5,7 @@
         <el-menu
           :collapse="collapse"
           :unique-opened="true"
+          :default-active="active"
           @select="handleMenuSelect">
           <template v-for="(menu, menuIndex) in menus">
             <d2-layout-main-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
@@ -23,11 +24,19 @@
 <script>
 import { side } from '@/menu/index.js'
 import menuMixin from '../mixin/menu'
+// 组件
+import d2LayoutMainMenuItem from '../-menu-item/index.vue'
+import d2LayoutMainMenuSub from '../-menu-sub/index.vue'
+
 export default {
   name: 'd2-layout-main-menu-side',
   mixins: [
     menuMixin
   ],
+  components: {
+    'd2-layout-main-menu-item': d2LayoutMainMenuItem,
+    'd2-layout-main-menu-sub': d2LayoutMainMenuSub
+  },
   props: {
     collapse: {
       type: Boolean,
@@ -35,13 +44,10 @@ export default {
       default: false
     }
   },
-  components: {
-    'd2-layout-main-menu-item': () => import('../-menu-item/index.vue'),
-    'd2-layout-main-menu-sub': () => import('../-menu-sub/index.vue')
-  },
   data () {
     return {
       menus: [],
+      active: '',
       asideHeight: 300
     }
   },
@@ -51,6 +57,7 @@ export default {
         const path = val[0].path
         const _side = side.filter(menu => menu.path === path)
         this.menus = _side.length > 0 ? _side[0].children : []
+        this.active = val[val.length - 1].path
       },
       immediate: true
     }
diff --git a/src/components/core/d2-layout-main/components/-menu-sub/index.vue b/src/components/core/d2-layout-main/components/-menu-sub/index.vue
index 63769d81..d4074819 100644
--- a/src/components/core/d2-layout-main/components/-menu-sub/index.vue
+++ b/src/components/core/d2-layout-main/components/-menu-sub/index.vue
@@ -13,8 +13,14 @@
 
 <script>
 import _uniqueid from 'lodash.uniqueid'
+// 组件
+import d2LayoutMainMenuItem from '../-menu-item/index.vue'
+
 export default {
   name: 'd2-layout-main-menu-sub',
+  components: {
+    'd2-layout-main-menu-item': d2LayoutMainMenuItem
+  },
   props: {
     menu: {
       type: Object,
@@ -26,9 +32,6 @@ export default {
     return {
       uniqueid: _uniqueid('d2-menu-empty-')
     }
-  },
-  components: {
-    'd2-layout-main-menu-item': () => import('../-menu-item/index.vue')
   }
 }
 </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 d4544be5..19e86eaf 100644
--- a/src/components/core/d2-layout-main/components/mixin/menu.js
+++ b/src/components/core/d2-layout-main/components/mixin/menu.js
@@ -4,6 +4,7 @@ export default {
       if (/^d2-menu-empty-\d+$/.test(index)) {
         this.$message('功能正在开发')
       } else {
+        console.log(index)
         this.$router.push(index)
       }
     }