diff --git a/components/form/demo/mix.md b/components/form/demo/mix.md index bdb2c680c0..986c5cf4f1 100644 --- a/components/form/demo/mix.md +++ b/components/form/demo/mix.md @@ -17,6 +17,7 @@ var Dropdown = antd.Dropdown; var Slider = antd.Slider; var Checkbox = antd.Checkbox; var Radio = antd.Radio; +var RadioGroup = antd.RadioGroup; var menu = @@ -101,15 +102,12 @@ React.render(
- - - + + 选项一 + 选项二 + 选项三 + 选项四 +
diff --git a/components/radio/demo/radiogroup.md b/components/radio/demo/radiogroup.md index 2fad188dd4..659386814e 100644 --- a/components/radio/demo/radiogroup.md +++ b/components/radio/demo/radiogroup.md @@ -8,9 +8,9 @@ RadioGroup 组合。 ````jsx var Radio = antd.Radio; -var RadioGroup=antd.RadioGroup; +var RadioGroup = antd.RadioGroup; -var Group = React.createClass({ +var App = React.createClass({ getInitialState: function () { return { selectedValue:"a" @@ -25,15 +25,14 @@ var Group = React.createClass({ render() { return
- A - B - C - D + A + B + C + D 你选中的:  {this.state.selectedValue}
} }); -React.render(, document.getElementById('components-radio-demo-radiogroup')); - +React.render(, document.getElementById('components-radio-demo-radiogroup')); ```` diff --git a/components/radio/group.jsx b/components/radio/group.jsx index eb81e205d5..aa143170be 100644 --- a/components/radio/group.jsx +++ b/components/radio/group.jsx @@ -26,14 +26,14 @@ var AntRadioGroup = React.createClass({ if (radio.props) { return ; } return radio; }); return (
- {children} + {children}
); }, @@ -41,9 +41,10 @@ var AntRadioGroup = React.createClass({ this.setState({ selectedValue: ev.target.value }); - this.props.onChange(ev); + if (typeof this.props.onChange === 'function') { + this.props.onChange(ev); + } } }); module.exports = AntRadioGroup; - diff --git a/components/radio/index.jsx b/components/radio/index.jsx index b66782798d..1f06a282a3 100644 --- a/components/radio/index.jsx +++ b/components/radio/index.jsx @@ -8,10 +8,9 @@ var AntRadio = React.createClass({ }; }, render() { - return ( ); diff --git a/package.json b/package.json index 07838ec1df..60f103999d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "antd", - "version": "0.7.0-beta2", + "version": "0.7.0-beta1", "title": "Ant Design", "description": "一个设计&前端框架", "homepage": "http://ant.design/", diff --git a/style/components/radio.less b/style/components/radio.less index 7fe9b62c2e..d51e7814a6 100644 --- a/style/components/radio.less +++ b/style/components/radio.less @@ -4,8 +4,8 @@ @radioDuration: .3s; .@{radioGroupPrefixCls} { - & label{ - margin-right: 10px; + label { + margin-right: 16px; } }