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

Merge branch 'master' of github.com:ant-design/ant-design

Browse Source
This commit is contained in:
afc163 2016-10-20 12:04:53 +08:00
commit 7a6b21d02b
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/form/Form.tsx
View File

@ -103,8 +103,9 @@ export default class Form extends React.Component<FormProps, any> {
static Item = FormItem; static Item = FormItem;
static create = (options?: FormCreateOption): ComponentDecorator => { static create = (options?: FormCreateOption): ComponentDecorator => {
const formWrapper = createDOMForm(assign({}, options, { const formWrapper = createDOMForm(assign({
fieldNameProp: 'id', fieldNameProp: 'id',
}, options, {
fieldMetaProp: FIELD_META_PROP, fieldMetaProp: FIELD_META_PROP,
})); }));

4
components/table/demo/reset-filter.md
View File

@ -10,9 +10,7 @@ title:
使用受控属性对筛选和排序状态进行控制。 使用受控属性对筛选和排序状态进行控制。
> 1. columns 中定义了 fileredValue 和 sortOrder 属性即视为受控模式。 > 1. columns 中定义了 fileredValue 和 sortOrder 属性即视为受控模式。
> 2. 只支持同时对一列进行排序，请保证只有一列的 sortOrder 属性是生效的。 > 2. 只支持同时对一列进行排序，请保证只有一列的 sortOrder 属性是生效的。
> 3. 务必指定 `column.key`。 > 3. 务必指定 `column.key`。
## en-US ## en-US
@ -20,9 +18,7 @@ title:
Control filters and sorters by `fileredValue` and `sortOrder`. Control filters and sorters by `fileredValue` and `sortOrder`.
> 1. Defining `fileredValue` or `sortOrder` means that it is in the controlled mode. > 1. Defining `fileredValue` or `sortOrder` means that it is in the controlled mode.
> 2. Make sure `sortOrder` is assigned for only one column. > 2. Make sure `sortOrder` is assigned for only one column.
> 3. `column.key` is required. > 3. `column.key` is required.
````jsx ````jsx