mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-08-01 05:06:53 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #986 from ant-design/fix-formItem

Browse Source 
fix: should not set required to label #985
This commit is contained in:
afc163 2016-02-03 14:01:31 +08:00
commit c0154d3e47
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/form/FormItem.jsx
View File

@ -114,8 +114,13 @@ class FormItem extends React.Component {
this.isRequired() :
props.required;
const className = classNames({
[this._getLayoutClass(labelCol)]: true,
[`${props.prefixCls}-item-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;

2
components/form/demo/horizontal-form.md
View File

@ -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>

15
style/components/form.less
View File

@ -4,7 +4,14 @@
label {
position: relative;
&[required]:before {
> .@{iconfont-css-prefix} {
vertical-align: top;
font-size: @font-size-base;
}
}
.@{css-prefix}form-item-required:before {
display: inline-block;
margin-right: 4px;
content: "*";
@ -13,12 +20,6 @@ label {
color: @label-required-color;
}
> .@{iconfont-css-prefix} {
vertical-align: top;
font-size: @font-size-base;
}
}
// Input styles
.@{css-prefix}input {
.input;