From f274f3e3d9db0fcd024bc8f3800ff6ba70817f77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=95?=
 <Leopoldthecoder@users.noreply.github.com>
Date: Wed, 31 Jan 2018 11:22:32 +0800
Subject: [PATCH] Dropdown: remove transition delay when trigger is click
 (#9573)

---
 examples/docs/en-US/dropdown.md    | 4 ++--
 examples/docs/es/dropdown.md       | 4 ++--
 examples/docs/zh-CN/dropdown.md    | 4 ++--
 packages/dropdown/src/dropdown.vue | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/docs/en-US/dropdown.md b/examples/docs/en-US/dropdown.md
index 3c18e7f1a..9f5dd058a 100644
--- a/examples/docs/en-US/dropdown.md
+++ b/examples/docs/en-US/dropdown.md
@@ -328,8 +328,8 @@ Besides default size, Dropdown component provides three additional sizes for you
 | placement    | placement of pop menu | string | top/top-start/top-end/bottom/bottom-start/bottom-end  | bottom-end |
 | trigger       | how to trigger     | string  |    hover/click  |  hover |
 | hide-on-click | whether to hide menu after clicking menu-item     | boolean          | — | true |
-| show-timeout | Delay time before show a dropdown     | number          | — | 250 |
-| hide-timeout | Delay time before hide a dropdown     | number          | — | 150 |
+| show-timeout | Delay time before show a dropdown (only works when trigger is `hover`) | number | — | 250 |
+| hide-timeout | Delay time before hide a dropdown (only works when trigger is `hover`) | number | — | 150 |
 
 ### Dropdown Events
 | Event Name | Description | Parameters |
diff --git a/examples/docs/es/dropdown.md b/examples/docs/es/dropdown.md
index e7ca4df22..49060b0cf 100644
--- a/examples/docs/es/dropdown.md
+++ b/examples/docs/es/dropdown.md
@@ -330,8 +330,8 @@ Además del tamaño predeterminado, el componente Dropdown proporciona tres tama
 | placement     | colocación del menú                      | string  | top/top-start/top-end/bottom/bottom-start/bottom-end | bottom-end  |
 | trigger       | cómo detonar                             | string  | hover/click                              | hover       |
 | hide-on-click | si se oculta el menú después de hacer clic en el elemento | boolean | —                                        | true        |
-| show-timeout  | Tiempo de retardo antes de mostrar un dropdown | number  | —                                        | 250         |
-| hide-timeout  | Tiempo de retardo antes de ocultar un dropdown | number  | —                                        | 150         |
+| show-timeout  | Tiempo de retardo antes de mostrar un dropdown (only works when trigger is `hover`) | number  | —                                        | 250         |
+| hide-timeout  | Tiempo de retardo antes de ocultar un dropdown (only works when trigger is `hover`) | number  | —                                        | 150         |
 
 ### Dropdown Eventos
 | Nombre         | Descripción                              | Parametros                               |
diff --git a/examples/docs/zh-CN/dropdown.md b/examples/docs/zh-CN/dropdown.md
index 23d020808..63a6f85fe 100644
--- a/examples/docs/zh-CN/dropdown.md
+++ b/examples/docs/zh-CN/dropdown.md
@@ -334,8 +334,8 @@ Dropdown 组件提供除了默认值以外的三种尺寸，可以在不同场
 | placement    | 菜单弹出位置     | string | top/top-start/top-end/bottom/bottom-start/bottom-end  | bottom-end |
 | trigger       | 触发下拉的行为     | string          | hover, click  | hover |
 | hide-on-click | 是否在点击菜单项后隐藏菜单     | boolean          | — | true |
-| show-timeout  | 展开下拉菜单的延时     | number          | — | 250 |
-| hide-timeout  | 收起下拉菜单的延时     | number          | — | 150 |
+| show-timeout  | 展开下拉菜单的延时（仅在 trigger 为 hover 时有效）| number          | — | 250 |
+| hide-timeout  | 收起下拉菜单的延时（仅在 trigger 为 hover 时有效）| number          | — | 150 |
 
 ### Dropdown Events
 | 事件名称      | 说明    | 回调参数      |
diff --git a/packages/dropdown/src/dropdown.vue b/packages/dropdown/src/dropdown.vue
index 2313eca4f..55b72702e 100644
--- a/packages/dropdown/src/dropdown.vue
+++ b/packages/dropdown/src/dropdown.vue
@@ -115,7 +115,7 @@
         clearTimeout(this.timeout);
         this.timeout = setTimeout(() => {
           this.visible = true;
-        }, this.showTimeout);
+        }, this.trigger === 'click' ? 0 : this.showTimeout);
       },
       hide() {
         if (this.triggerElm.disabled) return;
@@ -124,7 +124,7 @@
         clearTimeout(this.timeout);
         this.timeout = setTimeout(() => {
           this.visible = false;
-        }, this.hideTimeout);
+        }, this.trigger === 'click' ? 0 : this.hideTimeout);
       },
       handleClick() {
         if (this.triggerElm.disabled) return;