From 7d26ed0e19bf952e7c037b21bfd687759b46e851 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 25 六月 2024 19:21:33 +0800
Subject: [PATCH] 菜单更新
---
src/components/Table/src/types/table.ts | 79 +++++++++++++++++++++++++++++----------
1 files changed, 59 insertions(+), 20 deletions(-)
diff --git a/src/components/Table/src/types/table.ts b/src/components/Table/src/types/table.ts
index 6276daf..653b736 100644
--- a/src/components/Table/src/types/table.ts
+++ b/src/components/Table/src/types/table.ts
@@ -1,12 +1,19 @@
import type { VNodeChild } from 'vue';
import type { PaginationProps } from './pagination';
-import type { FormProps } from '/@/components/Form';
-import type { TableRowSelection as ITableRowSelection } from 'ant-design-vue/lib/table/interface';
+import type { FormProps } from '@/components/Form';
+import type {
+ TableRowSelection as ITableRowSelection,
+ Key,
+} from 'ant-design-vue/lib/table/interface';
+
import type { ColumnProps } from 'ant-design-vue/lib/table';
import { ComponentType } from './componentType';
-import { VueNode } from '/@/utils/propTypes';
-import { RoleEnum } from '/@/enums/roleEnum';
+import { VueNode } from '@/utils/propTypes';
+import { RoleEnum } from '@/enums/roleEnum';
+import { FixedType } from 'ant-design-vue/es/vc-table/interface';
+
+import AntDesignVueTable from 'ant-design-vue/es/table';
export declare type SortOrder = 'ascend' | 'descend';
@@ -17,9 +24,12 @@
export interface TableRowSelection<T = any> extends ITableRowSelection {
/**
* Callback executed when selected rows change
- * @type Function
+ * @param selectedRowKeys 宸查�夌殑 keyValues
+ * @param selectedRows 宸查�夌殑 records
+ * @param isClickCustomRow 鏄惁鏄偣鍑昏瑙﹀彂锛堝弽涔嬶紝灏辨槸鐐瑰嚮checkbox/radiobox锛�
+ * @returns void
*/
- onChange?: (selectedRowKeys: string[] | number[], selectedRows: T[]) => any;
+ onChange?: (selectedRowKeys: Key[], selectedRows: T[], isClickCustomRow?: boolean) => void;
/**
* Callback executed when select/deselect one row
@@ -37,7 +47,7 @@
* Callback executed when row selection is inverted
* @type Function
*/
- onSelectInvert?: (selectedRows: string[] | number[]) => any;
+ onSelectInvert?: (selectedRows: Key[]) => any;
}
export interface TableCustomRecord<T> {
@@ -83,30 +93,32 @@
export type SizeType = 'default' | 'middle' | 'small' | 'large';
export interface TableActionType {
- reload: (opt?: FetchParams) => Promise<void>;
+ reload: (opt?: FetchParams) => Promise<Recordable<any>[] | undefined>;
setSelectedRows: (rows: Recordable[]) => void;
getSelectRows: <T = Recordable>() => T[];
clearSelectedRowKeys: () => void;
expandAll: () => void;
- expandRows: (keys: string[] | number[]) => void;
collapseAll: () => void;
+ expandRows: (keyValues: Key[]) => void;
+ collapseRows: (keyValues: Key[]) => void;
scrollTo: (pos: string) => void; // pos: id | "top" | "bottom"
- getSelectRowKeys: () => string[];
- deleteSelectRowByKey: (key: string) => void;
+ getSelectRowKeys: () => Key[];
+ deleteSelectRowByKey: (keyValue: Key) => void;
setPagination: (info: Partial<PaginationProps>) => void;
setTableData: <T = Recordable>(values: T[]) => void;
- updateTableDataRecord: (rowKey: string | number, record: Recordable) => Recordable | void;
- deleteTableDataRecord: (rowKey: string | number | string[] | number[]) => void;
+ updateTableDataRecord: (keyValue: Key, record: Recordable) => Recordable | void;
+ deleteTableDataRecord: (keyValues: Key | Key[]) => void;
insertTableDataRecord: (record: Recordable | Recordable[], index?: number) => Recordable[] | void;
- findTableDataRecord: (rowKey: string | number) => Recordable | void;
+ findTableDataRecord: (keyValue: Key) => Recordable | void;
getColumns: (opt?: GetColumnsParams) => BasicColumn[];
setColumns: (columns: BasicColumn[] | string[]) => void;
getDataSource: <T = Recordable>() => T[];
getRawDataSource: <T = Recordable>() => T;
+ getSearchInfo: <T = Recordable>() => T;
setLoading: (loading: boolean) => void;
setProps: (props: Partial<BasicTableProps>) => void;
redoHeight: () => void;
- setSelectedRowKeys: (rowKeys: string[] | number[]) => void;
+ setSelectedRowKeys: (keyValues: Key[]) => void;
getPaginationRef: () => PaginationProps | boolean;
getSize: () => SizeType;
getRowSelection: () => TableRowSelection<Recordable>;
@@ -134,6 +146,7 @@
redo?: boolean;
size?: boolean;
setting?: boolean;
+ settingCache?: boolean;
fullScreen?: boolean;
}
@@ -141,6 +154,7 @@
// 鐐瑰嚮琛岄�変腑
clickToRowSelect?: boolean;
isTreeTable?: boolean;
+ accordion?: boolean; // isTreeTable 鎴� expandRowByClick 鏃舵敮鎸�
// 鑷畾涔夋帓搴忔柟娉�
sortFn?: (sortInfo: SorterResult) => any;
// 鎺掑簭鏂规硶
@@ -203,7 +217,7 @@
// 鍦ㄥ垎椤垫敼鍙樼殑鏃跺�欐竻绌洪�夐」
clearSelectOnPageChange?: boolean;
//
- rowKey?: string | ((record: Recordable) => string);
+ rowKey?: InstanceType<typeof AntDesignVueTable>['$props']['rowKey'];
// 鏁版嵁
dataSource?: Recordable[];
// 鏍囬鍙充晶鎻愮ず
@@ -306,12 +320,18 @@
rowSelection?: TableRowSelection;
/**
+ * Show table selection bar锛堟樉绀哄閫夌姸鎬佹爮锛�
+ * @type boolean
+ */
+ showSelectionBar?: boolean;
+
+ /**
* Set horizontal or vertical scrolling, can also be used to specify the width and height of the scroll area.
* It is recommended to set a number for x, if you want to set it to true,
* you need to add style .ant-table td { white-space: nowrap; }.
* @type object
*/
- scroll?: { x?: number | string | true; y?: number | string };
+ scroll?: InstanceType<typeof AntDesignVueTable>['$props']['scroll'];
/**
* Whether to show table header
@@ -378,7 +398,7 @@
beforeEditSubmit?: (data: {
record: Recordable;
index: number;
- key: string | number;
+ key: Key;
value: any;
}) => Promise<any>;
@@ -397,7 +417,7 @@
* @param expanded
* @param record
*/
- onExpand?: (expande: boolean, record: T) => void;
+ onExpand?: (expanded: boolean, record: T) => void;
/**
* Callback executed when the expanded rows change
@@ -430,11 +450,13 @@
slots?: Recordable;
+ // 鑷畾涔塰eader娓叉煋
+ customHeaderRender?: (column: BasicColumn) => string | VNodeChild | JSX.Element;
// Whether to hide the column by default, it can be displayed in the column configuration
defaultHidden?: boolean;
// Help text for table column header
- helpMessage?: string | string[];
+ helpMessage?: string | string[] | VNodeChild | JSX.Element;
format?: CellFormat;
@@ -464,6 +486,7 @@
record: Recordable;
column: BasicColumn;
index: number;
+ currentValue: string | number | boolean | Recordable;
}) => VNodeChild | JSX.Element;
// 鍔ㄦ�� Disabled
editDynamicDisabled?: boolean | ((record: Recordable) => boolean);
@@ -478,3 +501,19 @@
export interface InnerHandlers {
onColumnsChange: (data: ColumnChangeParam[]) => void;
}
+
+export interface InnerMethods {
+ clearSelectedRowKeys: TableActionType['clearSelectedRowKeys'];
+ getSelectRowKeys: TableActionType['getSelectRowKeys'];
+}
+
+export interface ColumnOptionsType {
+ value: string;
+ label: string;
+ //
+ column: {
+ defaultHidden?: boolean;
+ };
+ //
+ fixed?: FixedType;
+}
--
Gitblit v1.9.3