mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-27 20:49:53 +08:00
Code Issues Actions 39 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-27 14:48:51 +08:00
commit 3958b2e640
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/form/FormItem.jsx
View File

@ -119,7 +119,7 @@ class FormItem extends React.Component {
const context = this.context;
const props = this.props;
let children = null;
if (context.form && props.id && props.fieldOption) {
if (context.form && props.id) {
const child = React.Children.only(props.children);
const size = {};
if (typeof child.type === 'function' && !child.props.size) {

2
package.json
View File

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