diff --git a/src/page/Datasource/Recycle/RecycleBinPage/index.tsx b/src/page/Datasource/Recycle/RecycleBinPage/index.tsx index 7ba0cf974..ba2ec1009 100644 --- a/src/page/Datasource/Recycle/RecycleBinPage/index.tsx +++ b/src/page/Datasource/Recycle/RecycleBinPage/index.tsx @@ -18,8 +18,9 @@ import RecycleBinPage from '@/page/Workspace/components/RecycleBinPage'; interface IProps { dataSourceId: string; + theme?: 'dark' | 'white'; } -export default function RecycleBin({ dataSourceId }: IProps) { - return ; +export default function RecycleBin({ dataSourceId, theme }: IProps) { + return ; } diff --git a/src/page/Datasource/Recycle/index.tsx b/src/page/Datasource/Recycle/index.tsx index c65470a89..64ffd5881 100644 --- a/src/page/Datasource/Recycle/index.tsx +++ b/src/page/Datasource/Recycle/index.tsx @@ -22,7 +22,7 @@ interface IProps { datasource: IDatasource; } const Recycle: React.FC = (props) => { - return ; + return ; }; export default Recycle; diff --git a/src/page/Workspace/components/EditableTable/index.tsx b/src/page/Workspace/components/EditableTable/index.tsx index dc7c74d22..ca004da1a 100644 --- a/src/page/Workspace/components/EditableTable/index.tsx +++ b/src/page/Workspace/components/EditableTable/index.tsx @@ -74,6 +74,7 @@ interface IProps, SR> extends PickDataGridProps { enableColumnRecord?: boolean; gridRef?: React.Ref; bordered?: boolean; + theme?: 'dark' | 'white'; onScroll?: (rowVisibleStartIdx: number, rowVisibleEndIdx: number) => void; getNewRowData?: () => R; /** @@ -104,6 +105,7 @@ export default inject('settingStore')( enableFrozenRow, searchKey, settingStore, + theme, getNewRowData, onRowsChange, onScroll, @@ -280,7 +282,7 @@ export default inject('settingStore')( return ( = [ { @@ -568,6 +569,7 @@ class RecycleBin extends Component< columns={columnsInRestoreDrawer} rowKey="uniqueId" rows={selectedObjects as any} + theme={theme} onRowsChange={this.handleEditPropertyInCell} />