Merge branch 'dev-4.2.2' of code.alipay.com:oceanbase/oceanbase-devel…

…oper-center into dev-4.2.2
oceanbase · Oct 25, 2023 · e4804be · e4804be
2 parents 0ac657a + 47e8f30
commit e4804be
Show file tree

Hide file tree

Showing 5 changed files with 617 additions and 489 deletions.
diff --git a/src/common/network/sensitiveColumn.ts b/src/common/network/sensitiveColumn.ts
@@ -90,7 +90,7 @@ export async function listColumns(projectId: number, database: number[]) {
       },
     },
   );
-  return result?.data;
+  return result?.data || [];
 }
 
 export enum ScannResultType {

diff --git a/src/component/Task/ImportTask/CreateModal/index.tsx b/src/component/Task/ImportTask/CreateModal/index.tsx
@@ -517,12 +517,14 @@ class CreateModal extends React.Component<IProps, IState> {
                 formData={formData}
                 projectId={projectId}
                 onFormValueChange={(values) => {
-                  this.setState({
-                    isFormChanged: true,
-                    formData: {
-                      ...this.state.formData,
-                      ...values,
-                    },
+                  this.setState((state) => {
+                    return {
+                      isFormChanged: true,
+                      formData: {
+                        ...state.formData,
+                        ...values,
+                      },
+                    };
                   });
                 }}
                 ref={this._formRef}
-Original file line number
+Diff line change
@@ Expand Up @@
           },
         },
       );
-      return result?.data;
+      return result?.data || [];
     }
     export enum ScannResultType {
@@ Expand Down @@