From 53f950ab96a2011bbedfed016c7f6e3657465ac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Wed, 4 Sep 2019 16:14:23 +0800
Subject: [PATCH] Dropdown will not trigger @on-click event when set disabled
 prop to DropdownItem

---
 examples/routers/dropdown.vue             | 14 +++++++++-----
 src/components/dropdown/dropdown-item.vue |  7 ++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/examples/routers/dropdown.vue b/examples/routers/dropdown.vue
index e82c54c3..0cd301df 100644
--- a/examples/routers/dropdown.vue
+++ b/examples/routers/dropdown.vue
@@ -1,14 +1,14 @@
 <template>
     <div>
-        <Dropdown trigger="hover">
+        <Dropdown trigger="hover" @on-click="handleClick">
             <a href="javascript:void(0)">
                 下拉菜单
                 <Icon type="ios-arrow-down"></Icon>
             </a>
             <DropdownMenu slot="list">
-                <DropdownItem>驴打滚</DropdownItem>
-                <DropdownItem selected>炸酱面</DropdownItem>
-                <DropdownItem disabled>豆汁儿</DropdownItem>
+                <DropdownItem name="1">驴打滚</DropdownItem>
+                <DropdownItem selected name="2">炸酱面</DropdownItem>
+                <DropdownItem disabled name="3">豆汁儿</DropdownItem>
                 <DropdownItem>冰糖葫芦</DropdownItem>
                 <DropdownItem divided>北京烤鸭</DropdownItem>
             </DropdownMenu>
@@ -43,6 +43,10 @@
 </template>
 <script>
     export default {
-
+        methods: {
+            handleClick (n) {
+                console.log(n);
+            }
+        }
     }
 </script>
diff --git a/src/components/dropdown/dropdown-item.vue b/src/components/dropdown/dropdown-item.vue
index 494c6585..da8509a4 100644
--- a/src/components/dropdown/dropdown-item.vue
+++ b/src/components/dropdown/dropdown-item.vue
@@ -37,14 +37,11 @@
         },
         methods: {
             handleClick () {
+                if (this.disabled) return;
                 const $parent = findComponentUpward(this, 'Dropdown');
                 const hasChildren = this.$parent && this.$parent.$options.name === 'Dropdown';
 
-                if (this.disabled) {
-                    this.$nextTick(() => {
-                        $parent.currentVisible = true;
-                    });
-                } else if (hasChildren) {
+                if (hasChildren) {
                     this.$parent.$emit('on-haschild-click');
                 } else {
                     if ($parent && $parent.$options.name === 'Dropdown') {