Resolve conflict with feature branch

This commit is contained in:
afc163 2019-05-07 18:10:23 +08:00
commit 64156260dd
No known key found for this signature in database
GPG Key ID: 738F973FCE5C6B48
2 changed files with 16 additions and 16 deletions

View File

@ -33,7 +33,7 @@ One or more elements can be selected from either column, one click on the proper
| render | The function to generate the item shown on a column. Based on an record (element of the dataSource array), this function should return a React element which is generated from that record. Also, it can return a plain object with `value` and `label`, `label` is a React element and `value` is for title | Function(record) | | |
| selectedKeys | A set of keys of selected items. | string\[] | \[] | |
| showSearch | If included, a search box is shown on each column. | boolean | false | |
| showSelectAll | Show select all checkbox on the header | boolean | true | 3.17.0 |
| showSelectAll | Show select all checkbox on the header | boolean | true | 3.18.0 |
| style | A custom CSS style used for rendering wrapper element. | object | | |
| targetKeys | A set of keys of elements that are listed on the right column. | string\[] | \[] | |
| titles | A set of titles that are sorted from left to right. | string\[] | - | |
@ -44,16 +44,16 @@ One or more elements can be selected from either column, one click on the proper
### Render Props
New in 3.17.0. Transfer accept `children` to customize render list, using follow props:
New in 3.18.0. Transfer accept `children` to customize render list, using follow props:
| Property | Description | Type | Version |
| --------------- | ----------------------- | ----------------------------------- | ------- |
| direction | List render direction | 'left' \| 'right' | 3.17.0 |
| disabled | Disable list or not | boolean | 3.17.0 |
| filteredItems | Filtered items | TransferItem[] | 3.17.0 |
| onItemSelect | Select item | (key: string, selected: boolean) | 3.17.0 |
| onItemSelectAll | Select a group of items | (keys: string[], selected: boolean) | 3.17.0 |
| selectedKeys | Selected items | string[] | 3.17.0 |
| direction | List render direction | 'left' \| 'right' | 3.18.0 |
| disabled | Disable list or not | boolean | 3.18.0 |
| filteredItems | Filtered items | TransferItem[] | 3.18.0 |
| onItemSelect | Select item | (key: string, selected: boolean) | 3.18.0 |
| onItemSelectAll | Select a group of items | (keys: string[], selected: boolean) | 3.18.0 |
| selectedKeys | Selected items | string[] | 3.18.0 |
#### example

View File

@ -35,7 +35,7 @@ title: Transfer
| render | 每行数据渲染函数,该函数的入参为 `dataSource` 中的项,返回值为 ReactElement。或者返回一个普通对象其中 `label` 字段为 ReactElement`value` 字段为 title | Function(record) | | |
| selectedKeys | 设置哪些项应该被选中 | string\[] | \[] | |
| showSearch | 是否显示搜索框 | boolean | false | |
| showSelectAll | 是否展示全选勾选框 | boolean | true | 3.17.0 |
| showSelectAll | 是否展示全选勾选框 | boolean | true | 3.18.0 |
| targetKeys | 显示在右侧框数据的 key 集合 | string\[] | \[] | |
| titles | 标题集合,顺序从左至右 | string\[] | \['', ''] | |
| onChange | 选项在两栏之间转移时的回调函数 | (targetKeys, direction, moveKeys): void | | |
@ -45,16 +45,16 @@ title: Transfer
### Render Props
3.17.0 新增。Transfer 支持接收 `children` 自定义渲染列表,并返回以下参数:
3.18.0 新增。Transfer 支持接收 `children` 自定义渲染列表,并返回以下参数:
| 参数 | 说明 | 类型 | 版本 |
| --------------- | -------------- | ----------------------------------- | ------ |
| direction | 渲染列表的方向 | 'left' \| 'right' | 3.17.0 |
| disabled | 是否禁用列表 | boolean | 3.17.0 |
| filteredItems | 过滤后的数据 | TransferItem[] | 3.17.0 |
| onItemSelect | 勾选条目 | (key: string, selected: boolean) | 3.17.0 |
| onItemSelectAll | 勾选一组条目 | (keys: string[], selected: boolean) | 3.17.0 |
| selectedKeys | 选中的条目 | string[] | 3.17.0 |
| direction | 渲染列表的方向 | 'left' \| 'right' | 3.18.0 |
| disabled | 是否禁用列表 | boolean | 3.18.0 |
| filteredItems | 过滤后的数据 | TransferItem[] | 3.18.0 |
| onItemSelect | 勾选条目 | (key: string, selected: boolean) | 3.18.0 |
| onItemSelectAll | 勾选一组条目 | (keys: string[], selected: boolean) | 3.18.0 |
| selectedKeys | 选中的条目 | string[] | 3.18.0 |
#### 参考示例