提交 69af37ec 编写于 作者: V vben

fix(table): fix table typo

上级 86de3104
......@@ -7,6 +7,12 @@
### 🎫 Chores
- 删除菜单背景图
- 更新`ant-design-vue`版本为`beta13`
- 更新`vite`版本为`rc.9`
### 🐛 Bug Fixes
- 修复升级之后 table 类型问题
## 2.0.0-rc.8 (2020-11-2)
......
import type { VNodeChild } from 'vue';
import type { PaginationProps } from './pagination';
import type { FormProps } from '/@/components/Form/index';
import type { IColumnProps, ITableRowSelection } from 'ant-design-vue/lib/table/interface';
import type {
ColumnProps,
TableRowSelection as ITableRowSelection,
} from 'ant-design-vue/lib/table/interface';
import { ComponentType } from './componentType';
import { ColumnProps } from './column';
// import { ColumnProps } from './column';
export declare type SortOrder = 'ascend' | 'descend';
export interface TableCurrentDataSource<T = any> {
currentDataSource: T[];
......@@ -55,8 +58,8 @@ export interface TableCustomRecord<T = any> {
index?: number;
}
export interface SorterResult<T> {
column: ColumnProps<T>;
export interface SorterResult {
column: ColumnProps;
order: SortOrder;
field: string;
columnKey: string;
......@@ -309,7 +312,7 @@ export interface BasicTableProps<T = any> {
* Set props on per header row
* @type Function
*/
customHeaderRow?: (column: IColumnProps, index: number) => object;
customHeaderRow?: (column: ColumnProps, index: number) => object;
/**
* Set props on per row
......@@ -366,8 +369,9 @@ export interface BasicTableProps<T = any> {
onExpandedRowsChange?: (expandedRows: string[] | number[]) => void;
}
export interface BasicColumn extends IColumnProps {
export interface BasicColumn extends ColumnProps {
children?: BasicColumn[];
//
flag?: 'INDEX' | 'DEFAULT' | 'CHECKBOX' | 'RADIO' | 'ACTION';
......
......@@ -80,8 +80,8 @@ export function getMultipleHeaderColumns(): BasicColumn[] {
dataIndex: 'no',
width: 120,
filters: [
{ text: 'Male', value: 'male' },
{ text: 'Female', value: 'female' },
{ text: 'Male', value: 'male', children: [] },
{ text: 'Female', value: 'female', children: [] },
],
},
......@@ -125,8 +125,8 @@ export function getCustomHeaderColumns(): BasicColumn[] {
dataIndex: 'no',
width: 120,
filters: [
{ text: 'Male', value: 'male' },
{ text: 'Female', value: 'female' },
{ text: 'Male', value: 'male', children: [] },
{ text: 'Female', value: 'female', children: [] },
],
},
{
......@@ -190,8 +190,8 @@ export function getMergeHeaderColumns(): BasicColumn[] {
dataIndex: 'no',
colSpan: 0,
filters: [
{ text: 'Male', value: 'male' },
{ text: 'Female', value: 'female' },
{ text: 'Male', value: 'male', children: [] },
{ text: 'Female', value: 'female', children: [] },
],
customRender: renderContent,
},
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册