mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-01-18 14:13:37 +08:00
Code Issues Actions 32 Packages Projects Releases Wiki Activity

Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0

Browse Source
This commit is contained in:
afc163 2016-01-26 16:42:08 +08:00
commit 5a0f033159
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/form/FormItem.jsx
View File

@ -53,7 +53,7 @@ class FormItem extends React.Component {
}
}
renderValidateWrapper(c1, c2) {
renderValidateWrapper(c1, c2, c3) {
let classes = '';
const form = this.context.form;
const props = this.props;
@ -74,7 +74,7 @@ class FormItem extends React.Component {
}
return (
<div className={this.props.prefixCls + '-item-control ' + classes}>
{c1}{c2}
{c1}{c2}{c3}
</div>
);
}
@ -130,7 +130,8 @@ class FormItem extends React.Component {
this.renderWrapper(
this.renderValidateWrapper(
children,
this.renderHelp()
this.renderHelp(),
props.extra
)
),
];

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "antd",
"version": "0.12.0-beta.22",
"version": "0.12.0-beta.23",
"title": "Ant Design",
"description": "一个 UI 设计语言",
"homepage": "http://ant.design/",