Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(comp:transfer): removing items absent from datasource works now #1054

Merged
merged 1 commit into from
Aug 5, 2022
Merged

fix(comp:transfer): removing items absent from datasource works now #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/components/transfer/docs/Index.zh.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ subtitle: 穿梭框
| `clearIcon` | 清除图标 | `string \| #clearIcon` | `clear` | ✅ | - |
| `customAdditional` | 自定义选项的额外属性 | `TransferCustomAdditional` | - | - | 例如 `class`, 或者原生事件 |
| `dataSource` | 源数据数组 | `TransferData[]` | `[]` | - | - |
| `defaultTargetData` | 初始默认目标列表数据 | `TransferData` | - | - | 仅用于设置初始数据，不可响应式变更 |
| `disabled` | 是否禁用穿梭框 | `boolean` | `false` | - | - |
| `empty` | 空状态的配置 | `string \| EmptyProps` | - | - | - |
| `getKey` | 数据项 `key` 的取值 | `string \| (item: unknown) => string \| number` | - | - | 默认取数据的 `key` 属性 |
Expand Down
2 changes: 1 addition & 1 deletion packages/components/transfer/src/Transfer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default defineComponent({

const showSelectAll = computed(() => props.showSelectAll ?? config.showSelectAll)
const { source: sourceSearchable, target: targetSearchable } = useSearchable(props, config)
const transferDataStrategies = useTransferDataStrategies()
const transferDataStrategies = useTransferDataStrategies(props.defaultTargetData)
const transferPaginationContext = usePagination(props)
const transferDataContext = useTransferData(props, config, transferDataStrategies, transferPaginationContext)
const transferSelectStateContext = useTransferSelectState(props, transferDataContext)
Expand Down
4 changes: 3 additions & 1 deletion packages/components/transfer/src/composables/useTransferData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ export function useTransferData<T extends TransferData = TransferData>(
transferDataStrategies: TransferDataStrategies<T>,
transferPaginationContext: TransferPaginationContext,
): TransferDataContext<T> {
const getKey = useGetKey(props, config, 'transfer')
const _getKey = useGetKey(props, config, 'transfer')
const getKey = computed(() => (data: T) => _getKey.value(data) ?? data.key)

const {
genDataKeys,
genDataKeyMap,
Expand Down
13 changes: 9 additions & 4 deletions packages/components/transfer/src/composables/useTransferDataStrategies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ import { VKey } from '@idux/cdk/utils'

import { TRANSFER_DATA_STRATEGIES } from '../token'

function createDefaultStrategies<T extends TransferData = TransferData>(): TransferDataStrategies<T> {
function createDefaultStrategies<T extends TransferData = TransferData>(
defaultTargetData: T[] | undefined,
): TransferDataStrategies<T> {
const cachedDataKeyMap: Map<VKey, T> = new Map()
onUnmounted(() => {
cachedDataKeyMap.clear()
Expand Down Expand Up @@ -46,7 +48,8 @@ function createDefaultStrategies<T extends TransferData = TransferData>(): Trans
const targetData: T[] = []

selectedKeySet.forEach(key => {
const data = dataKeyMap.get(key) ?? cachedDataKeyMap.get(key)
const data =
dataKeyMap.get(key) ?? cachedDataKeyMap.get(key) ?? defaultTargetData?.find(data => getKey(data) === key)
if (data && !cachedDataKeyMap.has(key)) {
cachedDataKeyMap.set(key, data)
}
Expand Down Expand Up @@ -96,9 +99,11 @@ function createDefaultStrategies<T extends TransferData = TransferData>(): Trans
}
}

export function useTransferDataStrategies<T extends TransferData = TransferData>(): TransferDataStrategies<T> {
export function useTransferDataStrategies<T extends TransferData = TransferData>(
defaultTargetData: T[] | undefined,
): TransferDataStrategies<T> {
const strategies = inject<TransferDataStrategies<T> | null>(TRANSFER_DATA_STRATEGIES, null)
const defaultStrategies = createDefaultStrategies<T>()
const defaultStrategies = createDefaultStrategies<T>(defaultTargetData)

return strategies
? { ...(defaultStrategies as TransferDataStrategies<T>), ...strategies }
Expand Down
1 change: 1 addition & 0 deletions packages/components/transfer/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ export const transferProps = {
type: Array as PropType<TransferData[]>,
default: (): TransferData[] => [],
},
defaultTargetData: Array as PropType<TransferData[]>,
disabled: {
type: Boolean,
default: false,
Expand Down
2 changes: 1 addition & 1 deletion packages/pro/transfer/docs/Index.zh.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ subtitle: 高级穿梭框
| `clearIcon` | 清除图标 | `string \| #clearIcon` | `clear` | ✅ | - |
| `dataSource` | 源数据数组 | `TransferData[]` | `[]` | - | - |
| `disabled` | 是否禁用穿梭框 | `boolean` | `false` | - | - |
| `defaultTargetData` | 初始默认目标列表数据 | `TransferData` | - | - | 用于展示正确的初始已选列表数据，仅在 `type` 为 `'tree'` 下生效 |
| `defaultTargetData` | 初始默认目标列表数据 | `TransferData` | - | - | 仅用于设置初始数据，不可响应式变更 |
| `empty` | 空状态的配置 | `string \| EmptyProps` | - | - | - |
| `flatTargetData` | 是否平展开已选树数据 | `boolean` | `false` | - | 平展开后仅将树的叶子节点数据以列表展示，仅在 `type` 为 `'tree'` 下生效 |
| `getKey` | 数据项 `key` 的取值 | `string \| (item: unknown) => string \| number` | - | - | 默认取数据的 `key` 属性 |
Expand Down
1 change: 1 addition & 0 deletions packages/pro/transfer/src/ProTransfer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ export default defineComponent({
return () => {
const transferProps = {
dataSource: dataSource.value,
defaultTargetData: props.defaultTargetData,
value: targetKeys.value,
sourceSelectedKeys: props.sourceSelectedKeys,
targetSelectedKeys: props.targetSelectedKeys,
Expand Down