Merge from master

This commit is contained in:
afc163 2016-01-12 11:58:19 +08:00
commit ec6d38b749
2 changed files with 27 additions and 1 deletions

View File

@ -4,6 +4,12 @@
---
## 0.11.3 `fixing`
- 修复 TimePicker 受控模式点选即关闭面板的问题。[#818](https://github.com/ant-design/ant-design/issues/818)
- 修复一个两栏的 TimePicker 点击右边空白处无法关闭面板的问题。[#826](https://github.com/ant-design/ant-design/issues/826)
- 修复 Table `pagination.onChange` 指定无效的问题。[#824](https://github.com/ant-design/ant-design/issues/824)
## 0.11.2
`2015-01-03`

View File

@ -76,7 +76,8 @@ ReactDOM.render(
<FormItem
label="Datepicker"
labelCol={{span: 5}}
validateStatus="error">
validateStatus="error"
help>
<Col span="6">
<DatePicker />
</Col>
@ -90,6 +91,25 @@ ReactDOM.render(
<p className="ant-form-explain">请输入正确选项</p>
</Col>
</FormItem>
<FormItem
label="Datepicker"
labelCol={{span: 5}}>
<Col span="6">
<FormItem validateStatus="error">
<DatePicker />
<p className="ant-form-explain">请输入正确选项</p>
</FormItem>
</Col>
<Col span="1">
<p className="ant-form-split">-</p>
</Col>
<Col span="6">
<FormItem>
<DatePicker />
</FormItem>
</Col>
</FormItem>
</Form>
, mountNode);
````