diff options
author | Wei Zhu <yesmeck@gmail.com> | 2018-02-01 14:20:33 +0800 |
---|---|---|
committer | Wei Zhu <yesmeck@gmail.com> | 2018-02-01 14:20:33 +0800 |
commit | c50a40056d80c52f328566d51cc49cbcdc5f0a95 (patch) | |
tree | 571e224e324c18164323917778c1a202c7c36068 /src/TimePicker.jsx | |
parent | 73a24157501c8d75aac94b3f6c913c754d46e94f (diff) | |
parent | 4e70ea0da45e572cd660f79ac98b6a25c640cb36 (diff) | |
download | time-picker-c50a40056d80c52f328566d51cc49cbcdc5f0a95.tar.gz time-picker-c50a40056d80c52f328566d51cc49cbcdc5f0a95.tar.zst time-picker-c50a40056d80c52f328566d51cc49cbcdc5f0a95.zip |
Merge branch 'abyr-readonly_header_input'
Diffstat (limited to 'src/TimePicker.jsx')
-rw-r--r-- | src/TimePicker.jsx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx index e3c5a79..7659bc7 100644 --- a/src/TimePicker.jsx +++ b/src/TimePicker.jsx | |||
@@ -18,6 +18,7 @@ export default class Picker extends Component { | |||
18 | clearText: PropTypes.string, | 18 | clearText: PropTypes.string, |
19 | value: PropTypes.object, | 19 | value: PropTypes.object, |
20 | defaultOpenValue: PropTypes.object, | 20 | defaultOpenValue: PropTypes.object, |
21 | inputReadOnly: PropTypes.bool, | ||
21 | disabled: PropTypes.bool, | 22 | disabled: PropTypes.bool, |
22 | allowEmpty: PropTypes.bool, | 23 | allowEmpty: PropTypes.bool, |
23 | defaultValue: PropTypes.object, | 24 | defaultValue: PropTypes.object, |
@@ -60,6 +61,7 @@ export default class Picker extends Component { | |||
60 | clearText: 'clear', | 61 | clearText: 'clear', |
61 | prefixCls: 'rc-time-picker', | 62 | prefixCls: 'rc-time-picker', |
62 | defaultOpen: false, | 63 | defaultOpen: false, |
64 | inputReadOnly: false, | ||
63 | style: {}, | 65 | style: {}, |
64 | className: '', | 66 | className: '', |
65 | popupClassName: '', | 67 | popupClassName: '', |
@@ -167,7 +169,7 @@ export default class Picker extends Component { | |||
167 | getPanelElement() { | 169 | getPanelElement() { |
168 | const { | 170 | const { |
169 | prefixCls, placeholder, disabledHours, | 171 | prefixCls, placeholder, disabledHours, |
170 | disabledMinutes, disabledSeconds, hideDisabledOptions, | 172 | disabledMinutes, disabledSeconds, hideDisabledOptions, inputReadOnly, |
171 | allowEmpty, showHour, showMinute, showSecond, defaultOpenValue, clearText, | 173 | allowEmpty, showHour, showMinute, showSecond, defaultOpenValue, clearText, |
172 | addon, use12Hours, focusOnOpen, onKeyDown, hourStep, minuteStep, secondStep, | 174 | addon, use12Hours, focusOnOpen, onKeyDown, hourStep, minuteStep, secondStep, |
173 | } = this.props; | 175 | } = this.props; |
@@ -177,6 +179,7 @@ export default class Picker extends Component { | |||
177 | prefixCls={`${prefixCls}-panel`} | 179 | prefixCls={`${prefixCls}-panel`} |
178 | ref={this.savePanelRef} | 180 | ref={this.savePanelRef} |
179 | value={this.state.value} | 181 | value={this.state.value} |
182 | inputReadOnly={inputReadOnly} | ||
180 | onChange={this.onPanelChange} | 183 | onChange={this.onPanelChange} |
181 | onClear={this.onPanelClear} | 184 | onClear={this.onPanelClear} |
182 | defaultOpenValue={defaultOpenValue} | 185 | defaultOpenValue={defaultOpenValue} |