mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-29 13:47:02 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge branch 'feature-2.7' of github.com:ant-design/ant-design into feature-2.7

Browse Source
This commit is contained in:
afc163 2017-01-09 11:54:44 +08:00
commit 1835961af1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/form/index.en-US.md
View File

@ -115,7 +115,7 @@ Note:
| required | Whether provided or not, it will be generated by the validation rule. | boolean | false |
| validateStatus | The validation status. If not provided, it will be generated by validation rule. options: 'success' 'warning' 'error' 'validating' | string | |
| hasFeedback | Used with `validateStatus`, this option specifies the validation status icon. Recommended to be used only with `Input`. | boolean | false |
| colon | Used with `label`, whether to display `:` after label text. | boolean | true |
<style>
.code-box-demo .ant-form:not(.ant-form-inline):not(.ant-form-vertical) {
max-width: 540px;

3
components/form/index.zh-CN.md
View File

@ -13,7 +13,7 @@ title: Form
我们为 `form` 提供了以下两种排列方式：
- 水平排列：标签和表单控件水平排列；（默认）
- 水质排列：标签和表单控件上下垂直排列；
- 垂直排列：标签和表单控件上下垂直排列；
- 行内排列：表单项水平行内排列。
## 表单域
@ -116,6 +116,7 @@ CustomizedForm = Form.create({})(CustomizedForm);
| required | 是否必填，如不设置，则会根据校验规则自动生成 | boolean | false |
| validateStatus | 校验状态，如不设置，则会根据校验规则自动生成，可选：'success' 'warning' 'error' 'validating' | string | |
| hasFeedback | 配合 validateStatus 属性使用，展示校验状态图标，建议只配合 Input 组件使用 | boolean | false |
| colon | 配合 label 属性使用，表示是否显示 label 后面的分号 | boolean | true |
<style>
.code-box-demo .ant-form:not(.ant-form-inline):not(.ant-form-vertical) {