From 3e15719ff3102b14a80c7271e75a1d565e6ba5a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Thu, 23 May 2019 20:38:17 +0800
Subject: [PATCH] [new feature] DropdownMenu: add duration prop

---
 docs/markdown/changelog.zh-CN.md | 4 ++++
 packages/dropdown-item/index.js  | 4 ++--
 packages/dropdown-menu/en-US.md  | 1 +
 packages/dropdown-menu/index.js  | 4 ++++
 packages/dropdown-menu/zh-CN.md  | 1 +
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md
index c7e389265..b744135de 100644
--- a/docs/markdown/changelog.zh-CN.md
+++ b/docs/markdown/changelog.zh-CN.md
@@ -10,6 +10,10 @@
 
 - 新增`filter`属性
 
+##### DropdownMenu
+
+- 新增`duration`属性
+
 ##### DropdownItem
 
 - 新增`title-class`属性
diff --git a/packages/dropdown-item/index.js b/packages/dropdown-item/index.js
index 6bd1e077f..4797b711b 100644
--- a/packages/dropdown-item/index.js
+++ b/packages/dropdown-item/index.js
@@ -55,7 +55,7 @@ export default sfc({
   },
 
   render(h) {
-    const { top, zIndex, overlay, activeColor, closeOnClickOverlay } = this.parent;
+    const { top, zIndex, overlay, duration, activeColor, closeOnClickOverlay } = this.parent;
 
     const Options = this.options.map(option => {
       const active = option.value === this.value;
@@ -86,7 +86,7 @@ export default sfc({
         <Popup
           vModel={this.showPopup}
           position="top"
-          duration={this.transition ? 0.2 : 0}
+          duration={this.transition ? duration : 0}
           class={bem('content')}
           overlay={overlay}
           closeOnClickOverlay={closeOnClickOverlay}
diff --git a/packages/dropdown-menu/en-US.md b/packages/dropdown-menu/en-US.md
index f80b83ee7..ede54c0fd 100644
--- a/packages/dropdown-menu/en-US.md
+++ b/packages/dropdown-menu/en-US.md
@@ -84,6 +84,7 @@ export default {
 |------|------|------|------|------|
 | active-color | Active color of title and option | `String` | `#1989fa` |
 | z-index | z-index of menu item | `Number` | `10` |
+| duration | Transition duration, unit second | `Number` | `0.2` |
 | overlay | Whether to show overlay | `Boolean` | `true` |
 | close-on-click-overlay | Whether to close when click overlay | `Boolean` | `true` |
 
diff --git a/packages/dropdown-menu/index.js b/packages/dropdown-menu/index.js
index 49ed91a45..74216200c 100644
--- a/packages/dropdown-menu/index.js
+++ b/packages/dropdown-menu/index.js
@@ -20,6 +20,10 @@ export default sfc({
       type: Number,
       default: 10
     },
+    duration: {
+      type: Number,
+      default: 0.2
+    },
     activeColor: {
       type: String,
       default: BLUE
diff --git a/packages/dropdown-menu/zh-CN.md b/packages/dropdown-menu/zh-CN.md
index 2469197cd..8c9df5853 100644
--- a/packages/dropdown-menu/zh-CN.md
+++ b/packages/dropdown-menu/zh-CN.md
@@ -95,6 +95,7 @@ export default {
 |------|------|------|------|------|
 | active-color | 菜单标题和选项的选中态颜色 | `String` | `#1989fa` | - |
 | z-index | 菜单栏 z-index 层级 | `Number` | `10` | - |
+| duration | 动画时长，单位秒 | `Number` | `0.2` | 2.0.0 |
 | overlay | 是否显示遮罩层 | `Boolean` | `true` | - |
 | close-on-click-overlay | 是否在点击遮罩层后关闭菜单 | `Boolean` | `true` | - |