From 2a7765f93d23cab86afdb80e89bf656fe5207dac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Sun, 1 Jul 2018 11:37:30 +0800
Subject: [PATCH] update Menu

---
 src/components/button/button.vue  |  2 +-
 src/components/menu/menu-item.vue | 31 ++++++++++++++++++++++---------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/components/button/button.vue b/src/components/button/button.vue
index d2c7be0a..626ff7ff 100644
--- a/src/components/button/button.vue
+++ b/src/components/button/button.vue
@@ -102,7 +102,7 @@
         },
         methods: {
             // Ctrl or CMD and click, open in new window when use `to`
-            handleClickLink (event, new_window) {
+            handleClickLink (event, new_window = false) {
                 this.$emit('click', event);
 
                 this.handleCheckClick(event, new_window);
diff --git a/src/components/menu/menu-item.vue b/src/components/menu/menu-item.vue
index 23e2b969..4be3d704 100644
--- a/src/components/menu/menu-item.vue
+++ b/src/components/menu/menu-item.vue
@@ -1,5 +1,13 @@
 <template>
-    <a v-if="to" :href="linkUrl" :target="target" :class="classes" @click="handleClickItem" :style="itemStyle"><slot></slot></a>
+    <a
+        v-if="to"
+        :href="linkUrl"
+        :target="target"
+        :class="classes"
+        @click.exact="handleClickItem($event, false)"
+        @click.ctrl="handleClickItem($event, true)"
+        @click.meta="handleClickItem($event, true)"
+        :style="itemStyle"><slot></slot></a>
     <li v-else :class="classes" @click.stop="handleClickItem" :style="itemStyle"><slot></slot></li>
 </template>
 <script>
@@ -46,18 +54,23 @@
             }
         },
         methods: {
-            handleClickItem (event) {
+            handleClickItem (event, new_window = false) {
                 if (this.disabled) return;
 
-                let parent = findComponentUpward(this, 'Submenu');
-
-                if (parent) {
-                    this.dispatch('Submenu', 'on-menu-item-select', this.name);
+                if (new_window) {
+                    // 如果是 new_window，直接新开窗口就行，无需发送状态
+                    this.handleCheckClick(event, new_window);
                 } else {
-                    this.dispatch('Menu', 'on-menu-item-select', this.name);
-                }
+                    let parent = findComponentUpward(this, 'Submenu');
 
-                this.handleCheckClick(event);
+                    if (parent) {
+                        this.dispatch('Submenu', 'on-menu-item-select', this.name);
+                    } else {
+                        this.dispatch('Menu', 'on-menu-item-select', this.name);
+                    }
+
+                    this.handleCheckClick(event, new_window);
+                }
             }
         },
         mounted () {