diff --git a/components/form/demo/input-group.md b/components/form/demo/input-group.md index 7a3ef42887..f71f7702cc 100644 --- a/components/form/demo/input-group.md +++ b/components/form/demo/input-group.md @@ -6,7 +6,7 @@ title: 输入框组合 各类输入框的组合展现。 ````jsx -import { Form, Input, Select, Row, Col } from 'antd'; +import { Form, Input, Select, Col } from 'antd'; const FormItem = Form.Item; const InputGroup = Input.Group; const Option = Select.Option; @@ -68,27 +68,23 @@ ReactDOM.render( label="电话号码:" labelCol={{ span: 6 }} wrapperCol={{ span: 16 }}> - +

--

- - - - - - - - - - - - + + -
+ + + + + + + diff --git a/components/form/index.md b/components/form/index.md index 3d87be99c2..c043bb5a16 100644 --- a/components/form/index.md +++ b/components/form/index.md @@ -137,6 +137,10 @@ CustomizedForm = Form.create({})(CustomizedForm); #### Input.Group +| 参数 | 说明 | 类型 | 可选值 | 默认值 | +|-----------|------------------------------------------|------------|-------|--------| +| size | `Input.Group` 中所有的 `Input` 的大小 | string | {'large','default','small'} | 'default' | + ```html diff --git a/components/form/style/index.less b/components/form/style/index.less index 49d0f66285..5c33e4399b 100644 --- a/components/form/style/index.less +++ b/components/form/style/index.less @@ -122,12 +122,6 @@ form { } } - .ant-input, - .ant-input-group .ant-input, - .ant-input-group .ant-input-group-addon { - .input-lg(); - } - textarea.ant-input { height: auto; } diff --git a/components/input/Group.jsx b/components/input/Group.jsx index 8d01d9a962..871e9a8c8e 100644 --- a/components/input/Group.jsx +++ b/components/input/Group.jsx @@ -4,6 +4,8 @@ import classNames from 'classnames'; export default function Group(props) { const className = classNames({ 'ant-input-group': true, + 'ant-input-group-lg': props.size === 'large', + 'ant-input-group-sm': props.size === 'small', [props.className]: !!props.className, }); return (