From 452f03b79d281ac8b61977464c2196506c3bfa9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=92=8F=E5=92=8C?= <xueyonghe.xyh@digital-engine.com>
Date: Mon, 25 Sep 2023 10:31:15 +0800
Subject: [PATCH] PullRequest: 192 Fixes oceanbase/odc#376
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge branch 'fix/sprint-4.2.1-bugs-xyh-0925 of git@gitlab.alipay-inc.com:oceanbase/oceanbase-developer-center.git into dev-4.2.1

https://code.alipay.com/oceanbase/oceanbase-developer-center/pull_requests/192


Signed-off-by: 晓康 <xxk268858@oceanbase.com>


* Fixes oceanbase/odc#376

* Fixes oceanbase/odc#376
---
 src/page/Datasource/Recycle/RecycleBinPage/index.tsx   | 5 +++--
 src/page/Datasource/Recycle/index.tsx                  | 2 +-
 src/page/Workspace/components/EditableTable/index.tsx  | 4 +++-
 src/page/Workspace/components/RecycleBinPage/index.tsx | 4 +++-
 4 files changed, 10 insertions(+), 5 deletions(-)

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 <RecycleBinPage simpleHeader datasourceId={parseInt(dataSourceId)} />;
+export default function RecycleBin({ dataSourceId, theme }: IProps) {
+  return <RecycleBinPage simpleHeader datasourceId={parseInt(dataSourceId)} theme={theme} />;
 }
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<IProps> = (props) => {
-  return <RecycleBin dataSourceId={props.id} />;
+  return <RecycleBin dataSourceId={props.id} theme="white" />;
 };
 
 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<R extends RowType<R>, SR> extends PickDataGridProps<R, SR> {
   enableColumnRecord?: boolean;
   gridRef?: React.Ref<DataGridRef>;
   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 (
         <DataGrid
-          theme={settingStore.theme.sheetTheme as any}
+          theme={theme || (settingStore.theme.sheetTheme as any)}
           style={{
             height: minHeight,
           }}
diff --git a/src/page/Workspace/components/RecycleBinPage/index.tsx b/src/page/Workspace/components/RecycleBinPage/index.tsx
index aed731e40..aee81fe52 100644
--- a/src/page/Workspace/components/RecycleBinPage/index.tsx
+++ b/src/page/Workspace/components/RecycleBinPage/index.tsx
@@ -54,6 +54,7 @@ interface IProps {
   datasourceId: number;
   showDatasource?: boolean;
   simpleHeader?: boolean;
+  theme?: 'dark' | 'white';
 }
 
 class RecycleBin extends Component<
@@ -301,7 +302,7 @@ class RecycleBin extends Component<
       recycleConfig,
     } = this.state;
 
-    const { simpleHeader } = this.props;
+    const { simpleHeader, theme } = this.props;
 
     const columns: ColumnsType<IRecycleObject> = [
       {
@@ -568,6 +569,7 @@ class RecycleBin extends Component<
             columns={columnsInRestoreDrawer}
             rowKey="uniqueId"
             rows={selectedObjects as any}
+            theme={theme}
             onRowsChange={this.handleEditPropertyInCell}
           />