From b9cbb21f558e9f3d2bd31cb901637f121563ef43 Mon Sep 17 00:00:00 2001 From: Wei Zhu Date: Thu, 19 May 2016 20:40:47 +0800 Subject: [PATCH 1/2] defaultDuration should be 4.5 seconds (#1778) --- components/notification/demo/basic.md | 2 +- components/notification/index.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/notification/demo/basic.md b/components/notification/demo/basic.md index 0a28fc8a8b..3af76162ca 100644 --- a/components/notification/demo/basic.md +++ b/components/notification/demo/basic.md @@ -3,7 +3,7 @@ order: 0 title: 基本 --- -最简单的用法，五秒后自动关闭。 +最简单的用法，4.5 秒后自动关闭。 ````jsx import { Button, notification } from 'antd'; diff --git a/components/notification/index.jsx b/components/notification/index.jsx index 5da374e524..ca377333ed 100644 --- a/components/notification/index.jsx +++ b/components/notification/index.jsx @@ -5,7 +5,7 @@ import warning from 'warning'; let defaultTop = 24; let notificationInstance; -let defaultDuration = 45; +let defaultDuration = 4.5; function getNotificationInstance() { if (notificationInstance) { From f15a28c9f0ee50b26f256af579111c58a0fd5017 Mon Sep 17 00:00:00 2001 From: Leon Shi Date: Thu, 19 May 2016 23:37:22 +0800 Subject: [PATCH 2/2] docs: update Select's documentation (#1780) --- components/select/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/components/select/index.md b/components/select/index.md index 60e89c8e3c..b7168aeeb3 100644 --- a/components/select/index.md +++ b/components/select/index.md @@ -42,6 +42,7 @@ english: Select | size | 选择框大小，可选 `large` `small` | String | default | | showSearch | 在选择框中显示搜索框 | boolean | false | | disabled | 是否禁用 | boolean | false | +| defaultActiveFirstOption | 是否默认高亮第一个选项。 | boolean | true | getPopupContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试修改为滚动的区域，并相对其定位。[示例](http://codepen.io/anon/pen/xVBOVQ?editors=001) | Function(triggerNode) | () => document.body | | labelInValue | 是否把每个选项的 label 包装到 value 中，决定 Select 的 value 类型。 | boolean | false |