确保各种键类和字段一致

src/view/Manage/Model/Component/ImportAction.jsx

@@ -128,7 +128,7 @@ const ImportAction = (props) => {
       },
       callback: data => {
         let newModelerData = {...(data||{})};
-        newModelerData = { ...newModelerData, ...getAllNewKeysAfterTableChange(newModelerData) };
+        newModelerData = { ...newModelerData, ...getConsistentKeys(newModelerData) };
 
         setModelerData(newModelerData);
         modelerDataRef.current = newModelerData;
@@ -193,36 +193,38 @@ const ImportAction = (props) => {
   }
 
   const getExtraData = (data) => {
-    setModelerData(data||{});
-    modelerDataRef.current = data||{};
+    const newModelerData = { ...(data||{}), ...getConsistentKeys(data||{}) };
 
-    setConstraint(data.easyDataModelerModelingConstraint||{});
-    setTemplate(data.easyDataModelerModelingTemplate||{});
-    onChange && onChange(data||{});
+    setModelerData(newModelerData||{});
+    modelerDataRef.current = newModelerData||{};
+
+    setConstraint(newModelerData.easyDataModelerModelingConstraint||{});
+    setTemplate(newModelerData.easyDataModelerModelingTemplate||{});
+    onChange && onChange(newModelerData||{});
     getSupportedDatatypes();
     getSupportedPartitionTypes();
 
-    if (data) {
+    if (newModelerData) {
       form.setFieldsValue({ 
-        cnName: data.cnName||'',
-        name: data.name||'',
-        remark: data.remark||'',
-        easyDataModelerModelingConstraint: data.easyDataModelerModelingConstraint||'',
-        easyDataModelerModelingTemplate: data.easyDataModelerModelingTemplate||'',
-        dataResidence: data.dataResidence||'',
-        tableType: data.tableType||'',
-        dataUpdatingTiming: data.dataUpdatingTiming||'',
-        maintenanceRecords: data.maintenanceRecords||'',
-        dataLoadingStrategy: data.dataLoadingStrategy||'',
-        primaryKeysDescription: data.primaryKeysDescription||'',
-        distributionKeysDescription: data.distributionKeysDescription||'',
-        dataCircumstances: data.dataCircumstances||'',
-        partitionsDescription: data.partitionsDescription||'',
-        semiPrimaryKeysDescription: data.semiPrimaryKeysDescription||'',
+        cnName: newModelerData.cnName||'',
+        name: newModelerData.name||'',
+        remark: newModelerData.remark||'',
+        easyDataModelerModelingConstraint: newModelerData.easyDataModelerModelingConstraint||'',
+        easyDataModelerModelingTemplate: newModelerData.easyDataModelerModelingTemplate||'',
+        dataResidence: newModelerData.dataResidence||'',
+        tableType: newModelerData.tableType||'',
+        dataUpdatingTiming: newModelerData.dataUpdatingTiming||'',
+        maintenanceRecords: newModelerData.maintenanceRecords||'',
+        dataLoadingStrategy: newModelerData.dataLoadingStrategy||'',
+        primaryKeysDescription: newModelerData.primaryKeysDescription||'',
+        distributionKeysDescription: newModelerData.distributionKeysDescription||'',
+        dataCircumstances: newModelerData.dataCircumstances||'',
+        partitionsDescription: newModelerData.partitionsDescription||'',
+        semiPrimaryKeysDescription: newModelerData.semiPrimaryKeysDescription||'',
       });
     }
     
-    validateDataModel(data||{});
+    validateDataModel(newModelerData||{});
   }
 
   const onConstraintChange = (value) => {
@@ -331,7 +333,7 @@ const ImportAction = (props) => {
 
     let newModelerData = {...modelerDataRef.current, ...{easyDataModelerDataModelAttributes: data}};
 
-    newModelerData = { ...newModelerData, ...getAllNewKeysAfterTableChange(newModelerData) };
+    newModelerData = { ...newModelerData, ...getConsistentKeys(newModelerData) };
     
     setModelerData(newModelerData);
     modelerDataRef.current = newModelerData;
@@ -371,7 +373,7 @@ const ImportAction = (props) => {
     }
   }
 
-  const getAllNewKeysAfterTableChange = (newModelerData) => {
+  const getConsistentKeys = (newModelerData) => {
 
     //分布键
     let newDistribution = [];