From 60a77bdccf5bab8d66486543ea62b37791e94443 Mon Sep 17 00:00:00 2001
From: yiminghe <yiminghe@gmail.com>
Date: Tue, 26 Jan 2016 15:38:58 +0800
Subject: [PATCH 1/2] support extra for FormItem

---
 components/form/FormItem.jsx | 7 ++++---
 package.json                 | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/components/form/FormItem.jsx b/components/form/FormItem.jsx
index 65df9dd4f5..4efe754cec 100644
--- a/components/form/FormItem.jsx
+++ b/components/form/FormItem.jsx
@@ -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
         )
       ),
     ];
diff --git a/package.json b/package.json
index 630dbe93a4..79dca5231c 100644
--- a/package.json
+++ b/package.json
@@ -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/",

From a35c0275514ad0b773e92da7d643080e007cd03e Mon Sep 17 00:00:00 2001
From: yiminghe <yiminghe@gmail.com>
Date: Tue, 26 Jan 2016 15:40:47 +0800
Subject: [PATCH 2/2] support extra for FormItem

---
 components/form/FormItem.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/form/FormItem.jsx b/components/form/FormItem.jsx
index 4efe754cec..b2afacdd26 100644
--- a/components/form/FormItem.jsx
+++ b/components/form/FormItem.jsx
@@ -53,7 +53,7 @@ class FormItem extends React.Component {
     }
   }
 
-  renderValidateWrapper(c1, c2 ,c3) {
+  renderValidateWrapper(c1, c2, c3) {
     let classes = '';
     const form = this.context.form;
     const props = this.props;