PullRequest: 239 优化代码并修复422bp到423版本的冲突

Merge branch 'fix/dev-4.2.3-synchronization-422bp-to-423 of [email protected]:oceanbase/oceanbase-developer-center.git into dev-4.2.3 https://code.alipay.com/oceanbase/oceanbase-developer-center/pull_requests/239 Signed-off-by: 晓康 <[email protected]> * fix: synchronization-422bp-to-423 * fix: optimized code
oceanbase · Nov 22, 2023 · 9459b9f · 9459b9f
1 parent 483b9b9
commit 9459b9f
Show file tree

Hide file tree

Showing 11 changed files with 402 additions and 294 deletions.
diff --git a/src/component/CommonTable/index.tsx b/src/component/CommonTable/index.tsx
@@ -189,7 +189,7 @@ const CommonTable: <RecordType extends object = any>(
       (tableProps?.pagination as TablePaginationConfig)?.pageSize ??
       Math.max(
         Math.floor(
-          (tableRef.current.offsetHeight -
+          (tableRef.current?.offsetHeight -
             TOOLBAR_HEIGHT -
             TABLE_HEAD_HEIGHT -
             INFO_BAR_HEIGHT -
@@ -200,7 +200,7 @@ const CommonTable: <RecordType extends object = any>(
         1,
       );
     setPageSize(computedPageSize);
-    setWrapperHeight(tableRef.current.offsetHeight);
+    setWrapperHeight(tableRef.current?.offsetHeight);
   }
 
   function computeTableScrollHeight() {

diff --git a/src/d.ts/database.ts b/src/d.ts/database.ts
@@ -26,6 +26,7 @@ export enum DatabaseSyncStatus {
 
 export interface IDatabase {
   id: number;
+  databaseId?: string;
   name: string;
   project: IProject;
   lockDatabaseUserRequired: boolean;

diff --git a/src/page/Project/Sensitive/SensitiveContext.ts b/src/page/Project/Sensitive/SensitiveContext.ts
@@ -43,6 +43,11 @@ interface ISensitiveContext {
   sensitiveRuleIdMap: {
     [key in any]: string;
   };
+  setSensitiveRuleIdMap: (
+    sensitiveRuleIdMap: {
+      [key in any]: string;
+    },
+  ) => void;
 }
 
 const SensitiveContext = React.createContext<Partial<ISensitiveContext>>({
@@ -58,6 +63,7 @@ const SensitiveContext = React.createContext<Partial<ISensitiveContext>>({
   tables: [],
   sensitiveRules: [],
   sensitiveRuleIdMap: {},
+  setSensitiveRuleIdMap: (sensitiveRuleIdMap = {}) => {},
 });
 
 export default SensitiveContext;