diff options
author | MG12 <wuzhao.mail@gmail.com> | 2015-11-17 23:43:48 +0800 |
---|---|---|
committer | MG12 <wuzhao.mail@gmail.com> | 2015-11-17 23:43:48 +0800 |
commit | aa2be65d742c42382b17c02d69a756762793ce39 (patch) | |
tree | 8078a36f395f0f1d601b98fc6c2c096d303828d5 | |
parent | 15bb18d90f02d146141cdde45a5a2b5a6a575202 (diff) | |
download | time-picker-aa2be65d742c42382b17c02d69a756762793ce39.tar.gz time-picker-aa2be65d742c42382b17c02d69a756762793ce39.tar.zst time-picker-aa2be65d742c42382b17c02d69a756762793ce39.zip |
fix bug0.4.0
-rw-r--r-- | HISTORY.md | 2 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | src/TimePicker.jsx | 4 |
3 files changed, 4 insertions, 4 deletions
@@ -3,7 +3,7 @@ History | |||
3 | 3 | ||
4 | --- | 4 | --- |
5 | 5 | ||
6 | 0.3.2 / 2015-11-17 | 6 | 0.3.3 / 2015-11-17 |
7 | ------------------ | 7 | ------------------ |
8 | 8 | ||
9 | `fix` fix some bugs. | 9 | `fix` fix some bugs. |
diff --git a/package.json b/package.json index 0ead0b1..13c2ded 100644 --- a/package.json +++ b/package.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "rc-time-picker", | 2 | "name": "rc-time-picker", |
3 | "version": "0.3.2", | 3 | "version": "0.3.3", |
4 | "description": "React TimePicker", | 4 | "description": "React TimePicker", |
5 | "keywords": [ | 5 | "keywords": [ |
6 | "react", | 6 | "react", |
diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx index f0a3316..02ed5a2 100644 --- a/src/TimePicker.jsx +++ b/src/TimePicker.jsx | |||
@@ -130,7 +130,7 @@ const Picker = React.createClass({ | |||
130 | }, | 130 | }, |
131 | 131 | ||
132 | render() { | 132 | render() { |
133 | const { prefixCls, placement, align, disabled, transitionName, children, formatter } = this.props; | 133 | const { prefixCls, placeholder, placement, align, disabled, transitionName, children, formatter } = this.props; |
134 | const { open, value } = this.state; | 134 | const { open, value } = this.state; |
135 | 135 | ||
136 | return ( | 136 | return ( |
@@ -147,7 +147,7 @@ const Picker = React.createClass({ | |||
147 | onPopupVisibleChange={this.onVisibleChange} | 147 | onPopupVisibleChange={this.onVisibleChange} |
148 | > | 148 | > |
149 | <span className={`${prefixCls}-picker`}> | 149 | <span className={`${prefixCls}-picker`}> |
150 | <input ref="picker" type="text" placeholder="请选择时间" readOnly disabled={disabled} value={value && formatter.format(value)} /> | 150 | <input ref="picker" type="text" placeholder={placeholder} readOnly disabled={disabled} value={value && formatter.format(value)} /> |
151 | <span className={`${prefixCls}-picker-icon`} /> | 151 | <span className={`${prefixCls}-picker-icon`} /> |
152 | </span> | 152 | </span> |
153 | </Trigger> | 153 | </Trigger> |