aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorafc163 <afc163@gmail.com>2017-02-20 16:16:21 +0800
committerafc163 <afc163@gmail.com>2017-02-20 16:16:21 +0800
commit56fb7b1b9cc2e36e6af5a3f33ccb55ac7dcb475e (patch)
treede0425ad22d2521cd1b999e4c789336e97f69a3e /src
parent46e5fd60344c4fa718117e82153773ab0d15ebfc (diff)
parentbb87d05e6372596c8e8e1f2ebf657df6b9a8d826 (diff)
downloadtime-picker-56fb7b1b9cc2e36e6af5a3f33ccb55ac7dcb475e.tar.gz
time-picker-56fb7b1b9cc2e36e6af5a3f33ccb55ac7dcb475e.tar.zst
time-picker-56fb7b1b9cc2e36e6af5a3f33ccb55ac7dcb475e.zip
Merge branch 'adam187-feature/autocomplete'
Diffstat (limited to 'src')
-rw-r--r--src/TimePicker.jsx3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx
index da47ac4..7d2395d 100644
--- a/src/TimePicker.jsx
+++ b/src/TimePicker.jsx
@@ -42,6 +42,7 @@ const Picker = React.createClass({
42 onClose: PropTypes.func, 42 onClose: PropTypes.func,
43 addon: PropTypes.func, 43 addon: PropTypes.func,
44 name: PropTypes.string, 44 name: PropTypes.string,
45 autoComplete: PropTypes.string,
45 }, 46 },
46 47
47 getDefaultProps() { 48 getDefaultProps() {
@@ -190,6 +191,7 @@ const Picker = React.createClass({
190 prefixCls, placeholder, placement, align, 191 prefixCls, placeholder, placement, align,
191 disabled, transitionName, style, className, showHour, 192 disabled, transitionName, style, className, showHour,
192 showMinute, showSecond, getPopupContainer, name, 193 showMinute, showSecond, getPopupContainer, name,
194 showSecond, getPopupContainer, autoComplete,
193 } = this.props; 195 } = this.props;
194 const { open, value } = this.state; 196 const { open, value } = this.state;
195 let popupClassName; 197 let popupClassName;
@@ -221,6 +223,7 @@ const Picker = React.createClass({
221 readOnly 223 readOnly
222 onKeyDown={this.onKeyDown} 224 onKeyDown={this.onKeyDown}
223 disabled={disabled} value={value && value.format(this.getFormat()) || ''} 225 disabled={disabled} value={value && value.format(this.getFormat()) || ''}
226 autoComplete={autoComplete}
224 /> 227 />
225 <span className={`${prefixCls}-icon`}/> 228 <span className={`${prefixCls}-icon`}/>
226 </span> 229 </span>