refactor(TreeTable): remove deprecated TableRowSelection props

altence · Dec 5, 2023 · f2daa34 · f2daa34
1 parent 21596fd
commit f2daa34
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 21 deletions.
diff --git a/src/components/tables/TreeTable/TreeTable.tsx b/src/components/tables/TreeTable/TreeTable.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { BaseTable } from '@app/components/common/BaseTable/BaseTable';
-import { Key, DefaultRecordType } from 'rc-table/lib/interface';
+import { TableRowSelection, ColumnsType } from 'antd/es/table/interface';
 import { TreeTableRow, Pagination, getTreeTableData } from 'api/table.api';
 import { useTranslation } from 'react-i18next';
 import { useMounted } from '@app/hooks/useMounted';
@@ -39,19 +39,16 @@ export const TreeTable: React.FC = () => {
     fetch(pagination);
   };
 
-  const rowSelection = {
-    onChange: (selectedRowKeys: Key[], selectedRows: DefaultRecordType[]) => {
-      console.log(selectedRowKeys, selectedRows);
+  const rowSelection: TableRowSelection<TreeTableRow> = {
+    onChange: (selectedRowKeys: React.Key[], selectedRows: TreeTableRow[], info) => {
+      console.log(selectedRowKeys, selectedRows, info);
     },
-    onSelect: (record: DefaultRecordType, selected: boolean, selectedRows: DefaultRecordType[]) => {
+    onSelect: (record: TreeTableRow, selected: boolean, selectedRows: TreeTableRow[]) => {
       console.log(record, selected, selectedRows);
     },
-    onSelectAll: (selected: boolean, selectedRows: DefaultRecordType[]) => {
-      console.log(selected, selectedRows);
-    },
   };
 
-  const columns = [
+  const columns: ColumnsType<TreeTableRow> = [
     {
       title: t('common.name'),
       dataIndex: 'name',
@@ -72,16 +69,14 @@ export const TreeTable: React.FC = () => {
   ];
 
   return (
-    <>
-      <BaseTable
-        columns={columns}
-        dataSource={tableData.data}
-        rowSelection={{ ...rowSelection }}
-        pagination={tableData.pagination}
-        loading={tableData.loading}
-        onChange={handleTableChange}
-        scroll={{ x: 800 }}
-      />
-    </>
+    <BaseTable
+      columns={columns}
+      dataSource={tableData.data}
+      rowSelection={rowSelection}
+      pagination={tableData.pagination}
+      loading={tableData.loading}
+      onChange={handleTableChange}
+      scroll={{ x: 800 }}
+    />
   );
 };
diff --git a/src/components/tables/editableTable/EditableTable.tsx b/src/components/tables/editableTable/EditableTable.tsx
@@ -8,6 +8,7 @@ import { useMounted } from '@app/hooks/useMounted';
 import { BaseForm } from '@app/components/common/forms/BaseForm/BaseForm';
 import { BaseSpace } from '@app/components/common/BaseSpace/BaseSpace';
 import { BasePopconfirm } from '@app/components/common/BasePopconfirm/BasePopconfirm';
+import { ColumnsType } from 'antd/es/table/interface';
 
 const initialPagination: Pagination = {
   current: 1,
@@ -135,7 +136,7 @@ export const EditableTable: React.FC = () => {
     },
   ];
 
-  const mergedColumns = columns.map((col) => {
+  const mergedColumns: ColumnsType<BasicTableRow> = columns.map((col) => {
     if (!col.editable) {
       return col;
     }