From fd340e278aa53cd95b06a6b69d4f4303a94f9b09 Mon Sep 17 00:00:00 2001 From: sallerli1 Date: Mon, 19 Sep 2022 11:21:14 +0800 Subject: [PATCH] fix(pro:transfer): modify treeProps and tableProps type treeProps and tableProps type shoud be consistent with table and tree --- packages/pro/transfer/docs/Api.zh.md | 32 +++++++++++++--------------- packages/pro/transfer/src/types.ts | 32 +++++++++++++--------------- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/packages/pro/transfer/docs/Api.zh.md b/packages/pro/transfer/docs/Api.zh.md index daf794d06..9a605e578 100644 --- a/packages/pro/transfer/docs/Api.zh.md +++ b/packages/pro/transfer/docs/Api.zh.md @@ -62,24 +62,22 @@ export interface TransferPaginationProps { onChange?: (isSource: boolean, pageIndex: number, pageSize: number) => void } -export interface ProTransferTableProps { - sourceColumns: TableColumn[] - targetColumns: TableColumn[] - tableLayout?: 'auto' | 'fixed' - ellipsis?: boolean - borderless?: boolean -} +export type ProTransferTableProps = { + sourceColumns: TableColumn[] + targetColumns: TableColumn[] +} & Pick -export interface ProTransferTreeProps { - showLine?: boolean - childrenKey?: string - expandIcon?: string - labelKey?: string - leafLineIcon?: string - loadChildren?: (node: TreeTransferData) => TreeTransferData[] - onExpand?: MaybeArray<(expanded: boolean, node: TreeNode) => void> - onExpandedChange?: MaybeArray<(expendedKeys: VKey[], expendedNodes: TreeNode[]) => void> -} +export type ProTransferTreeProps = Pick< + TreeProps, + | 'showLine' + | 'childrenKey' + | 'expandIcon' + | 'labelKey' + | 'leafLineIcon' + | 'loadChildren' + | 'onExpand' + | 'onExpandedChange' +> ``` #### ProTransferSlots diff --git a/packages/pro/transfer/src/types.ts b/packages/pro/transfer/src/types.ts index 672458768..15b30e832 100644 --- a/packages/pro/transfer/src/types.ts +++ b/packages/pro/transfer/src/types.ts @@ -10,7 +10,7 @@ import type { VirtualScrollToFn } from '@idux/cdk/scroll' import type { ExtractInnerPropTypes, ExtractPublicPropTypes, MaybeArray, VKey } from '@idux/cdk/utils' import type { EmptyProps } from '@idux/components/empty' -import type { TableColumn } from '@idux/components/table' +import type { TableColumn, TableProps } from '@idux/components/table' import type { SearchFn, TransferData, @@ -18,7 +18,7 @@ import type { TransferPaginationProps, TransferScroll, } from '@idux/components/transfer' -import type { TreeNode } from '@idux/components/tree' +import type { TreeProps } from '@idux/components/tree' import type { DefineComponent, HTMLAttributes, PropType } from 'vue' export type ProTransferTypes = 'table' | 'tree' @@ -28,24 +28,22 @@ export type TreeTransferData = TransferData & { [key in C]?: TreeTransferData[] } -export interface ProTransferTableProps { +export type ProTransferTableProps = { sourceColumns: TableColumn[] targetColumns: TableColumn[] - tableLayout?: 'auto' | 'fixed' - ellipsis?: boolean - borderless?: boolean -} +} & Pick -export interface ProTransferTreeProps { - showLine?: boolean - childrenKey?: string - expandIcon?: string - labelKey?: string - leafLineIcon?: string - loadChildren?: (node: TreeTransferData) => TreeTransferData[] - onExpand?: MaybeArray<(expanded: boolean, node: TreeNode) => void> - onExpandedChange?: MaybeArray<(expendedKeys: any[], expendedNodes: TreeNode[]) => void> -} +export type ProTransferTreeProps = Pick< + TreeProps, + | 'showLine' + | 'childrenKey' + | 'expandIcon' + | 'labelKey' + | 'leafLineIcon' + | 'loadChildren' + | 'onExpand' + | 'onExpandedChange' +> export const proTransferProps = { type: {