aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Panel.jsx
diff options
context:
space:
mode:
author偏右 <afc163@gmail.com>2016-11-11 14:02:21 +0800
committerGitHub <noreply@github.com>2016-11-11 14:02:21 +0800
commite59f4eae17cbfd7eed19cd385ec64312ffe266c4 (patch)
tree81fc9b6ec28ca54204cf6ed2ef035b5d7ee194ab /src/Panel.jsx
parent614f6c90232d890984d0f4f2f13ff41fdb144b27 (diff)
parent37c36c09e0a4d693a2ec5623ff2ebc8d9ee16a06 (diff)
downloadtime-picker-e59f4eae17cbfd7eed19cd385ec64312ffe266c4.tar.gz
time-picker-e59f4eae17cbfd7eed19cd385ec64312ffe266c4.tar.zst
time-picker-e59f4eae17cbfd7eed19cd385ec64312ffe266c4.zip
Merge pull request #25 from react-component/feat-show-minute
Feat show minute
Diffstat (limited to 'src/Panel.jsx')
-rw-r--r--src/Panel.jsx4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Panel.jsx b/src/Panel.jsx
index 0ed60e9..fddea1c 100644
--- a/src/Panel.jsx
+++ b/src/Panel.jsx
@@ -34,6 +34,7 @@ const Panel = React.createClass({
34 onEsc: PropTypes.func, 34 onEsc: PropTypes.func,
35 allowEmpty: PropTypes.bool, 35 allowEmpty: PropTypes.bool,
36 showHour: PropTypes.bool, 36 showHour: PropTypes.bool,
37 showMinute: PropTypes.bool,
37 showSecond: PropTypes.bool, 38 showSecond: PropTypes.bool,
38 onClear: PropTypes.func, 39 onClear: PropTypes.func,
39 addon: PropTypes.func, 40 addon: PropTypes.func,
@@ -88,7 +89,7 @@ const Panel = React.createClass({
88 render() { 89 render() {
89 const { 90 const {
90 prefixCls, className, placeholder, disabledHours, disabledMinutes, 91 prefixCls, className, placeholder, disabledHours, disabledMinutes,
91 disabledSeconds, hideDisabledOptions, allowEmpty, showHour, showSecond, 92 disabledSeconds, hideDisabledOptions, allowEmpty, showHour, showMinute, showSecond,
92 format, defaultOpenValue, clearText, onEsc, addon, 93 format, defaultOpenValue, clearText, onEsc, addon,
93 } = this.props; 94 } = this.props;
94 const { 95 const {
@@ -130,6 +131,7 @@ const Panel = React.createClass({
130 format={format} 131 format={format}
131 onChange={this.onChange} 132 onChange={this.onChange}
132 showHour={showHour} 133 showHour={showHour}
134 showMinute={showMinute}
133 showSecond={showSecond} 135 showSecond={showSecond}
134 hourOptions={hourOptions} 136 hourOptions={hourOptions}
135 minuteOptions={minuteOptions} 137 minuteOptions={minuteOptions}