mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-06-12 20:43:11 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

fix: typescript define (#19780)

Browse Source 
* ColumnGroupType should be antd's

* columns should not be from rc-table
This commit is contained in:
jeessy2 2019-11-19 10:03:03 +08:00 committed by 二货机器人
parent 5d98667687
commit 23f74eccbe
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/table/Table.tsx
View File

@ -56,11 +56,13 @@ export interface TableProps<RecordType>
| 'internalHooks' | 'internalHooks'
| 'internalRefs' | 'internalRefs'
| 'data' | 'data'
| 'columns'
| 'expandIconColumnIndex' | 'expandIconColumnIndex'
| 'scroll' | 'scroll'
> { > {
dropdownPrefixCls?: string; dropdownPrefixCls?: string;
dataSource?: RcTableProps<RecordType>['data']; dataSource?: RcTableProps<RecordType>['data'];
columns?: ColumnsType<RecordType>;
pagination?: false | TablePaginationConfig; pagination?: false | TablePaginationConfig;
loading?: boolean | SpinProps; loading?: boolean | SpinProps;
size?: TableSize; size?: TableSize;

5
components/table/interface.tsx
View File

@ -1,6 +1,5 @@
import { import {
GetRowKey, GetRowKey,
ColumnGroupType,
ColumnType as RcColumnType, ColumnType as RcColumnType,
ExpandableConfig, ExpandableConfig,
} from 'rc-table/lib/interface'; } from 'rc-table/lib/interface';
@ -94,6 +93,10 @@ export interface ColumnType<RecordType> extends RcColumnType<RecordType> {
onFilterDropdownVisibleChange?: (visible: boolean) => void; onFilterDropdownVisibleChange?: (visible: boolean) => void;
} }
export interface ColumnGroupType<RecordType> extends ColumnType<RecordType> {
children: ColumnsType<RecordType>
}
export type ColumnsType<RecordType = unknown> = ( export type ColumnsType<RecordType = unknown> = (
| ColumnGroupType<RecordType> | ColumnGroupType<RecordType>
| ColumnType<RecordType> | ColumnType<RecordType>