From 41515fdb7e72cd542a81bd75d887def563093f3e Mon Sep 17 00:00:00 2001 From: goodmice Date: Thu, 6 Oct 2022 20:27:48 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?= =?UTF-8?q?=D0=B0=20=D1=82=D0=B8=D0=BF=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=D0=B0?= =?UTF-8?q?=20Table?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Table/Table.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx index 3b25a0d..36587af 100755 --- a/src/components/Table/Table.tsx +++ b/src/components/Table/Table.tsx @@ -13,7 +13,7 @@ import '@styles/index.css' export type BaseTableColumn = ColumnGroupType | ColumnType export type TableColumns = OmitExtends, TableColumnSettings>[] -export type TableContainer = TableProps & { +export type TableContainer = Omit, 'columns'> & { columns: TableColumns tableName?: string showSettingsChanger?: boolean @@ -45,9 +45,9 @@ const _Table = ({ columns, dataSource, tableName, showSettings }), [settings, columns, onSettingsChanged, showSettingsChanger, tableName]) return ( - columns={newColumns} - dataSource={tryAddKeys(dataSource)} + dataSource={tryAddKeys(dataSource as any)} {...other} /> )