From b42fb9f1895b3985162406fa41bec6ec3f501cdc Mon Sep 17 00:00:00 2001
From: Benjy Cui <benjytrys@gmail.com>
Date: Tue, 2 Feb 2016 19:08:17 +0800
Subject: [PATCH 1/3] fix: should not set required to label #985

---
 components/form/FormItem.jsx | 7 ++++++-
 style/components/form.less   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/components/form/FormItem.jsx b/components/form/FormItem.jsx
index c3c28167eb..d9c248f776 100644
--- a/components/form/FormItem.jsx
+++ b/components/form/FormItem.jsx
@@ -114,8 +114,13 @@ class FormItem extends React.Component {
       this.isRequired() :
       props.required;
 
+    const className = classNames({
+      [this._getLayoutClass(labelCol)]: true,
+      required: required,
+    });
+
     return props.label ? (
-      <label htmlFor={props.id || this.getId()} className={this._getLayoutClass(labelCol)} required={required} key="label">
+      <label htmlFor={props.id || this.getId()} className={className} key="label">
         {props.label}
       </label>
     ) : null;
diff --git a/style/components/form.less b/style/components/form.less
index 0d013c6846..a2901ecce7 100644
--- a/style/components/form.less
+++ b/style/components/form.less
@@ -4,7 +4,7 @@
 
 label {
   position: relative;
-  &[required]:before {
+  &.required:before {
     display: inline-block;
     margin-right: 4px;
     content: "*";

From 51c33b9c51047152b7eb0f69890aeb2dee0d90a7 Mon Sep 17 00:00:00 2001
From: Benjy Cui <benjytrys@gmail.com>
Date: Tue, 2 Feb 2016 20:47:52 +0800
Subject: [PATCH 2/3] fix: add prefix

---
 components/form/FormItem.jsx |  2 +-
 style/components/form.less   | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/components/form/FormItem.jsx b/components/form/FormItem.jsx
index d9c248f776..6c8cfd10ca 100644
--- a/components/form/FormItem.jsx
+++ b/components/form/FormItem.jsx
@@ -116,7 +116,7 @@ class FormItem extends React.Component {
 
     const className = classNames({
       [this._getLayoutClass(labelCol)]: true,
-      required: required,
+      'label-required': required,
     });
 
     return props.label ? (
diff --git a/style/components/form.less b/style/components/form.less
index a2901ecce7..ad306cc78f 100644
--- a/style/components/form.less
+++ b/style/components/form.less
@@ -4,14 +4,6 @@
 
 label {
   position: relative;
-  &.required:before {
-    display: inline-block;
-    margin-right: 4px;
-    content: "*";
-    font-family: SimSun;
-    font-size: @font-size-base;
-    color: @label-required-color;
-  }
 
   > .@{iconfont-css-prefix} {
     vertical-align: top;
@@ -19,6 +11,15 @@ label {
   }
 }
 
+.label-required:before {
+  display: inline-block;
+  margin-right: 4px;
+  content: "*";
+  font-family: SimSun;
+  font-size: @font-size-base;
+  color: @label-required-color;
+}
+
 // Input styles
 .@{css-prefix}input {
   .input;

From b4c997f0165b5da29e7b4c97017f9b92162d21db Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 3 Feb 2016 14:00:38 +0800
Subject: [PATCH 3/3] fix required prefixCls

---
 components/form/FormItem.jsx            | 2 +-
 components/form/demo/horizontal-form.md | 4 ++--
 style/components/form.less              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/form/FormItem.jsx b/components/form/FormItem.jsx
index 6c8cfd10ca..2b7a03524e 100644
--- a/components/form/FormItem.jsx
+++ b/components/form/FormItem.jsx
@@ -116,7 +116,7 @@ class FormItem extends React.Component {
 
     const className = classNames({
       [this._getLayoutClass(labelCol)]: true,
-      'label-required': required,
+      [`${props.prefixCls}-item-required`]: required,
     });
 
     return props.label ? (
diff --git a/components/form/demo/horizontal-form.md b/components/form/demo/horizontal-form.md
index c7b7a260a4..7e6bd219ca 100644
--- a/components/form/demo/horizontal-form.md
+++ b/components/form/demo/horizontal-form.md
@@ -36,7 +36,7 @@ let Demo = React.createClass({
         <FormItem
           label="您的性别："
           labelCol={{ span: 6 }}
-          wrapperCol={{ span: 14 }}d>
+          wrapperCol={{ span: 14 }}>
             <RadioGroup {...getFieldProps('gender', { initialValue: 'female' })}>
               <Radio value="male">男的</Radio>
               <Radio value="female">女的</Radio>
@@ -50,7 +50,7 @@ let Demo = React.createClass({
           <Input type="textarea" placeholder="随便写" {...getFieldProps('remark')} />
         </FormItem>
         <FormItem
-          wrapperCol={{ span: 14, offset: 6 }} >
+          wrapperCol={{ span: 14, offset: 6 }}>
           <label>
             <Checkbox {...getFieldProps('agreement')} />同意
           </label>
diff --git a/style/components/form.less b/style/components/form.less
index ad306cc78f..6ba8d870cf 100644
--- a/style/components/form.less
+++ b/style/components/form.less
@@ -11,7 +11,7 @@ label {
   }
 }
 
-.label-required:before {
+.@{css-prefix}form-item-required:before {
   display: inline-block;
   margin-right: 4px;
   content: "*";