diff --git a/components/time-picker/demo/addon.md b/components/time-picker/demo/addon.md index ddbc4e4c58..becc0adf6c 100644 --- a/components/time-picker/demo/addon.md +++ b/components/time-picker/demo/addon.md @@ -13,7 +13,6 @@ title: Render addon contents to timepicker panel's bottom. - ````jsx import { TimePicker, Button } from 'antd'; diff --git a/components/time-picker/demo/basic.md b/components/time-picker/demo/basic.md index 69f780bc93..632963fe6e 100644 --- a/components/time-picker/demo/basic.md +++ b/components/time-picker/demo/basic.md @@ -1,6 +1,6 @@ --- order: 0 -title: +title: zh-CN: 基本 en-US: Basic --- @@ -9,9 +9,9 @@ title: 最简单的用法。 -## en-US +## en-US -The most basic usage. +The most basic usage. ````jsx import { TimePicker } from 'antd'; diff --git a/components/time-picker/demo/disable-options.md b/components/time-picker/demo/disable-options.md index e7efeba8a5..e3c56505fa 100644 --- a/components/time-picker/demo/disable-options.md +++ b/components/time-picker/demo/disable-options.md @@ -1,6 +1,6 @@ --- order: 5 -title: +title: zh-CN: 禁止选项 en-US: Specify the time that cannot be selected --- @@ -8,7 +8,7 @@ title: 限制选择 `20:30` 到 `23:30` 这个时间段。 -## en-US +## en-US You can't select the time from `20:30` to `23:30`. diff --git a/components/time-picker/demo/disabled.md b/components/time-picker/demo/disabled.md index ea9e82d612..d496c93346 100644 --- a/components/time-picker/demo/disabled.md +++ b/components/time-picker/demo/disabled.md @@ -1,6 +1,6 @@ --- order: 4 -title: +title: zh-CN: 禁用 en-US: disabled --- diff --git a/components/time-picker/demo/hide-options.md b/components/time-picker/demo/hide-options.md index 00ca58ec13..2bbb6c5c27 100644 --- a/components/time-picker/demo/hide-options.md +++ b/components/time-picker/demo/hide-options.md @@ -1,6 +1,6 @@ --- order: 6 -title: +title: zh-CN: 只显示部分选项 en-US: Show part of options. --- diff --git a/components/time-picker/demo/size.md b/components/time-picker/demo/size.md index c3ca214076..890f234181 100644 --- a/components/time-picker/demo/size.md +++ b/components/time-picker/demo/size.md @@ -1,6 +1,6 @@ --- -order: 2 -title: +order: 2 +title: zh-CN: 三种大小 en-US: Three sizes --- diff --git a/components/time-picker/demo/value.md b/components/time-picker/demo/value.md index b75c0f2968..c09f9d8213 100644 --- a/components/time-picker/demo/value.md +++ b/components/time-picker/demo/value.md @@ -1,6 +1,6 @@ --- order: 1 -title: +title: zh-CN: 受控组件 en-US: Under control --- @@ -11,7 +11,7 @@ value 和 onChange 需要配合使用。 ## en-US -`Value` and `onChange` should be used together, +`Value` and `onChange` should be used together, ````jsx import { TimePicker } from 'antd'; diff --git a/components/time-picker/demo/without-seconds.md b/components/time-picker/demo/without-seconds.md index c1d8aaafb7..1bc24c791e 100644 --- a/components/time-picker/demo/without-seconds.md +++ b/components/time-picker/demo/without-seconds.md @@ -1,6 +1,6 @@ --- order: 3 -title: +title: zh-CN: 不展示秒 en-US: Hide the seconds options --- @@ -18,6 +18,7 @@ import { TimePicker } from 'antd'; import moment from 'moment'; const format = 'HH:mm'; + ReactDOM.render( , mountNode); diff --git a/components/time-picker/index.tsx b/components/time-picker/index.tsx index 0aaa63ca9a..ee9f2d7e33 100644 --- a/components/time-picker/index.tsx +++ b/components/time-picker/index.tsx @@ -107,6 +107,7 @@ export default class TimePicker extends React.Component { value={this.state.value} placeholder={props.placeholder || this.getLocale().placeholder} showHour={props.format.indexOf('HH') > -1} + showMinute={props.format.indexOf('mm') > -1} showSecond={props.format.indexOf('ss') > -1} onChange={this.handleChange} addon={(panel) => ( diff --git a/package.json b/package.json index 7b8a80cc83..93ee223941 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "rc-switch": "~1.4.2", "rc-table": "~5.0.0", "rc-tabs": "~7.0.5", - "rc-time-picker": "~2.1.0", + "rc-time-picker": "~2.2.0", "rc-tooltip": "~3.4.2", "rc-tree": "~1.4.0", "rc-tree-select": "~1.8.0",