From 164f7bcb6ba76d73912ce19738a693e4e1c99c8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Tue, 28 Aug 2018 10:42:57 +0800
Subject: [PATCH] update Menu

---
 examples/routers/menu.vue         | 67 +++++++++++++++----------------
 src/components/menu/menu-item.vue |  4 +-
 src/components/menu/menu.vue      |  3 ++
 3 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/examples/routers/menu.vue b/examples/routers/menu.vue
index 1f041501..95678578 100644
--- a/examples/routers/menu.vue
+++ b/examples/routers/menu.vue
@@ -1,46 +1,45 @@
 <template>
-    <Menu active-name="1-2" :open-names="['1']">
-        <Submenu name="1">
+    <Menu mode="horizontal" :theme="theme1" active-name="3-4" @on-select="hs">
+        <MenuItem name="1" to="/button" target="_blank">
+            <Icon type="ios-paper" />
+            内容管理
+        </MenuItem>
+        <MenuItem name="2">
+            <Icon type="ios-people" />
+            用户管理
+        </MenuItem>
+        <Submenu name="3">
             <template slot="title">
-                <Icon type="ios-analytics"></Icon>
-                Navigation One
+                <Icon type="ios-stats" />
+                统计分析
             </template>
-            <MenuGroup title="Item 1">
-                <MenuItem name="1-1">我是菜单一</MenuItem>
-                <MenuItem name="1-2">我是菜单二</MenuItem>
+            <MenuGroup title="使用">
+                <MenuItem name="3-1">新增和启动</MenuItem>
+                <MenuItem name="3-2">活跃分析</MenuItem>
+                <MenuItem name="3-3">时段分析</MenuItem>
             </MenuGroup>
-            <MenuGroup title="Item 2">
-                <MenuItem name="1-3">我是菜单三</MenuItem>
-                <MenuItem name="1-4">我是菜单四</MenuItem>
+            <MenuGroup title="留存">
+                <MenuItem name="3-4">用户留存</MenuItem>
+                <MenuItem name="3-5">流失用户</MenuItem>
             </MenuGroup>
         </Submenu>
-        <Submenu name="2">
-            <template slot="title">
-                <Icon type="ios-filing"></Icon>
-                Navigation Two
-            </template>
-            <MenuItem name="2-1">我是菜单五</MenuItem>
-            <MenuItem name="2-2">我是菜单六</MenuItem>
-            <Submenu name="3">
-                <template slot="title">Submenu</template>
-                <MenuItem name="3-1">我是菜单七</MenuItem>
-                <MenuItem name="3-2">我是菜单八</MenuItem>
-            </Submenu>
-        </Submenu>
-        <Submenu name="4">
-            <template slot="title">
-                <Icon type="ios-gear"></Icon>
-                Navigation Three
-            </template>
-            <MenuItem name="4-1">Option 9</MenuItem>
-            <MenuItem name="4-2">Option 10</MenuItem>
-            <MenuItem name="4-3">Option 11</MenuItem>
-            <MenuItem name="4-4">Option 12</MenuItem>
-        </Submenu>
+        <MenuItem name="4">
+            <Icon type="ios-construct" />
+            综合设置
+        </MenuItem>
     </Menu>
 </template>
 <script>
     export default {
-
+        data () {
+            return {
+                theme1: 'light'
+            }
+        },
+        methods: {
+            hs (n) {
+                console.log(n);
+            }
+        }
     }
 </script>
diff --git a/src/components/menu/menu-item.vue b/src/components/menu/menu-item.vue
index 4be3d704..961be0a7 100644
--- a/src/components/menu/menu-item.vue
+++ b/src/components/menu/menu-item.vue
@@ -57,9 +57,11 @@
             handleClickItem (event, new_window = false) {
                 if (this.disabled) return;
 
-                if (new_window) {
+                if (new_window || this.target === '_blank') {
                     // 如果是 new_window，直接新开窗口就行，无需发送状态
                     this.handleCheckClick(event, new_window);
+                    let parentMenu = findComponentUpward(this, 'Menu');
+                    if (parentMenu) parentMenu.handleEmitSelectEvent(this.name);
                 } else {
                     let parent = findComponentUpward(this, 'Submenu');
 
diff --git a/src/components/menu/menu.vue b/src/components/menu/menu.vue
index 8553a81c..66586887 100644
--- a/src/components/menu/menu.vue
+++ b/src/components/menu/menu.vue
@@ -127,6 +127,9 @@
                         else item.opened = false;
                     });
                 }
+            },
+            handleEmitSelectEvent (name) {
+                this.$emit('on-select', name);
             }
         },
         mounted () {