chore: review changes

goto · Sep 21, 2023 · fb1a0f3 · fb1a0f3
1 parent 1b2bf1e
commit fb1a0f3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/packages/apsara-ui/src/Listing/Listing.types.tsx b/packages/apsara-ui/src/Listing/Listing.types.tsx
@@ -1,5 +1,8 @@
 import { IVirtualTable } from "../Table/VirtualisedTable";
 import { Column } from "../TableV2/VirtualisedTable";
+
+export type ColumnRenderFunc<T> = (path: string, x: any) => Column<T>[];
+
 export interface ListingProps<T> {
     list?: T[];
     loading?: boolean;
@@ -8,7 +11,7 @@ export interface ListingProps<T> {
     rowKey?: string;
     className?: string;
     tableProps?: {
-        getColumnList?: (path: string, sortedInfo: any) => Column<T>[];
+        getColumnList?: ColumnRenderFunc<T> | undefined;
         selectedRowId?: number;
         scroll?: any;
     } & Omit<IVirtualTable, "columns" | "items">;
@@ -18,9 +21,11 @@ export interface ListingProps<T> {
         searchFields?: string[];
         disabled?: boolean;
     };
-    renderExtraFilters?: React.ReactNode | null;
-    renderHeader?: React.ReactNode | null;
-    renderBody?: React.ReactNode | null;
+    calculateRowHeight?: (index: number, defaultRowHeight: number) => number;
+    calculateColumnWidth?: (index: number, defaultColumnWidth: number) => number;
+    renderExtraFilters?: React.ReactNode;
+    renderHeader?: React.ReactNode;
+    renderBody?: React.ReactNode;
     rowClick?: (props: any) => any;
     sortable?: boolean;
     defaultSearchTerm?: string;

diff --git a/packages/apsara-ui/src/Table/VirtualisedTable.tsx b/packages/apsara-ui/src/Table/VirtualisedTable.tsx
@@ -57,8 +57,8 @@ export interface IVirtualTable extends TableProps<any> {
     };
     loadMore?: () => Promise<void> | null;
     onRowClick?: (event: any, rowIndexData: any) => void;
-    calculateRowHeight?: any;
-    calculateColumnWidth?: any;
+    calculateRowHeight?: (index: number, defaultRowHeight: number) => number;
+    calculateColumnWidth?: (index: number, defaultRowHeight: number) => number;
     alternate?: boolean;
     alternateHover?: boolean;
     className?: string;

diff --git a/packages/apsara-ui/src/TableV2/VirtualisedTable.tsx b/packages/apsara-ui/src/TableV2/VirtualisedTable.tsx
@@ -28,15 +28,17 @@ interface ITableProps {
     loading?: boolean;
 }
 
+type RenderFunction<T, U = T> = (props: { row: { original: U } }) => any;
+
 export type Column<T> = {
-    key: string;
-    title: string;
-    dataIndex: string;
-    sorter?: (a: T, b: T) => number;
+    key?: string | undefined;
+    title?: string;
+    dataIndex?: string;
+    sorter?: (a: any, b: any) => number;
     sortOrder?: any;
     ellipsis?: boolean;
     width?: number;
-    render?: React.ReactNode | null;
+    render?: RenderFunction<T>;
 };
 
 function VirtualisedTable({