diff --git a/CHANGE.md b/CHANGE.md
index a6caf9f1..ab869d7b 100644
--- a/CHANGE.md
+++ b/CHANGE.md
@@ -1,3 +1,5 @@
+### Button
+可以考虑是否支持 @click，而不用 @click.native
 ### Input
 使用 v-model
 ### RadioGroup
diff --git a/src/components/dropdown/dropdown-item.vue b/src/components/dropdown/dropdown-item.vue
index 463dce11..0bd902c0 100644
--- a/src/components/dropdown/dropdown-item.vue
+++ b/src/components/dropdown/dropdown-item.vue
@@ -42,7 +42,7 @@
 
                 if (this.disabled) {
                     this.$nextTick(() => {
-                        $parent.visible = true;
+                        $parent.currentVisible = true;
                     });
                 } else if (hasChildren) {
                     this.$parent.$emit('on-haschild-click');
diff --git a/src/components/dropdown/dropdown.vue b/src/components/dropdown/dropdown.vue
index db972b43..280f9923 100644
--- a/src/components/dropdown/dropdown.vue
+++ b/src/components/dropdown/dropdown.vue
@@ -99,7 +99,7 @@
                 this.currentVisible = false;
             },
             hasParent () {
-                const $parent = this.$parent.$parent;
+                const $parent = this.$parent.$parent.$parent;
                 if ($parent && $parent.$options.name === 'Dropdown') {
                     return $parent;
                 } else {
@@ -135,35 +135,6 @@
                 const $parent = this.hasParent();
                 if ($parent) $parent.$emit('on-haschild-click');
             });
-        },
-//        events: {
-//            'on-click' (key) {
-//                const $parent = this.hasParent();
-//                if ($parent ) $parent.$emit('on-click', key);
-//            },
-//            'on-hover-click' () {
-//                const $parent = this.hasParent();
-//                if ($parent) {
-//                    this.$nextTick(() => {
-//                        if (this.trigger === 'custom') return false;
-//                        this.currentVisible = false;
-//                    });
-//                    $parent.$emit('on-hover-click');
-//                } else {
-//                    this.$nextTick(() => {
-//                        if (this.trigger === 'custom') return false;
-//                        this.currentVisible = false;
-//                    });
-//                }
-//            },
-//            'on-haschild-click' () {
-//                this.$nextTick(() => {
-//                    if (this.trigger === 'custom') return false;
-//                    this.currentVisible = true;
-//                });
-//                const $parent = this.hasParent();
-//                if ($parent) $parent.$emit('on-haschild-click');
-//            }
-//        }
+        }
     };
 </script>
diff --git a/src/styles/components/dropdown.less b/src/styles/components/dropdown.less
index d70f0963..3bc27155 100644
--- a/src/styles/components/dropdown.less
+++ b/src/styles/components/dropdown.less
@@ -14,7 +14,7 @@
     }
 
     &-rel{
-        display: inline-block;
+        //display: inline-block;
         position: relative;
     }
 
diff --git a/test/routers/dropdown.vue b/test/routers/dropdown.vue
index 00466278..52d76856 100644
--- a/test/routers/dropdown.vue
+++ b/test/routers/dropdown.vue
@@ -1,26 +1,32 @@
 <template>
-    <Dropdown>
-        <a href="javascript:void(0)">
-            北京小吃
-            <Icon type="arrow-down-b"></Icon>
-        </a>
-        <Dropdown-menu slot="list">
-            <Dropdown-item>驴打滚</Dropdown-item>
-            <Dropdown-item>炸酱面</Dropdown-item>
-            <Dropdown-item>豆汁儿</Dropdown-item>
-            <Dropdown placement="right-start">
-                <Dropdown-item>
-                    北京烤鸭
-                    <Icon type="ios-arrow-right"></Icon>
-                </Dropdown-item>
-                <Dropdown-menu slot="list">
-                    <Dropdown-item>挂炉烤鸭</Dropdown-item>
-                    <Dropdown-item>焖炉烤鸭</Dropdown-item>
-                </Dropdown-menu>
-            </Dropdown>
-            <Dropdown-item>冰糖葫芦</Dropdown-item>
-        </Dropdown-menu>
-    </Dropdown>
+    <div>
+        <Dropdown>
+            <a href="javascript:void(0)">
+                下拉菜单
+                <Icon type="arrow-down-b"></Icon>
+            </a>
+            <Dropdown-menu slot="list">
+                <Dropdown-item>驴打滚</Dropdown-item>
+                <Dropdown-item>炸酱面</Dropdown-item>
+                <Dropdown-item disabled>豆汁儿</Dropdown-item>
+                <Dropdown-item>冰糖葫芦</Dropdown-item>
+                <Dropdown-item divided>北京烤鸭</Dropdown-item>
+            </Dropdown-menu>
+        </Dropdown>
+        <Dropdown style="margin-left: 20px">
+            <Button type="primary">
+                下拉菜单
+                <Icon type="arrow-down-b"></Icon>
+            </Button>
+            <Dropdown-menu slot="list">
+                <Dropdown-item>驴打滚</Dropdown-item>
+                <Dropdown-item>炸酱面</Dropdown-item>
+                <Dropdown-item disabled>豆汁儿</Dropdown-item>
+                <Dropdown-item>冰糖葫芦</Dropdown-item>
+                <Dropdown-item divided>北京烤鸭</Dropdown-item>
+            </Dropdown-menu>
+        </Dropdown>
+    </div>
 </template>
 <script>
     export default {