支持hive

src/model/datamodel.js

@@ -443,3 +443,13 @@ export function* getSearchProperties() {
 export function* searchModelBySearchProperties(payload) {
   return yield call(datamodelerService.searchModelBySearchProperties, payload)
 }
+
+//zcx hive
+export function* getDbTypes() {
+  return yield call(datamodelerService.getDbTypes)
+}
+
+//zcx hive
+export function* getHiveStoredTypes() {
+  return yield call(datamodelerService.getHiveStoredTypes)
+}
\ No newline at end of file

src/service/datamodeler.js

@@ -399,3 +399,13 @@ export function getSearchProperties() {
 export function searchModelBySearchProperties(payload) {
   return PostJSON("/datamodeler/easyDataModelerCURD/searchEasyDataModelerDataModelsByModelSearchProperties", payload);
 }
+
+//zcx hive
+export function getDbTypes() {
+  return GetJSON("/datamodeler/easyDataModelerCURD/getDbTypes")
+}
+
+//zcx hive
+export function getHiveStoredTypes() {
+  return GetJSON("/datamodeler/easyDataModelerCURD/getHiveStoredTypes")
+}
\ No newline at end of file

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

@@ -500,15 +500,9 @@ const ImportAction = React.forwardRef((props, ref) => {
   const getConsistentKeys = (newModelerData) => {
 
     //分布键
-    let newDistribution = [];
+    let newDistribution = {...newModelerData.distributionKey};
 
-    (newModelerData.easyDataModelerDistributionKey||[]).forEach((item, index) => {
-      const _index = (newModelerData.easyDataModelerDataModelAttributes||[]).findIndex(_item => item.iid === _item.iid);
-
-      if (_index !== -1) {
-        newDistribution.push({...newModelerData.easyDataModelerDataModelAttributes[_index]});
-      } 
-    })
+    newDistribution.keys = (newDistribution.keys??[]).filter(item => (newModelerData.easyDataModelerDataModelAttributes??[]).findIndex(_item => item.iid === _item.iid) !== -1)
 
      //主键
      let newPrimary = [];
@@ -573,7 +567,7 @@ const ImportAction = React.forwardRef((props, ref) => {
 
     newEasyDataModelerIndices = newEasyDataModelerIndices.filter(item => (item.indexedEasyDataModelAttributes||[]).length > 0);
 
-    return { partition: newPartition, easyDataModelerDistributionKey: newDistribution, easyDataModelerPrimaryKey: newPrimary, easyDataModelerIndices: newEasyDataModelerIndices, easyDataModelerSemiPrimaryKey: newSemiPrimary};
+    return { partition: newPartition, distributionKey: newDistribution, easyDataModelerPrimaryKey: newPrimary, easyDataModelerIndices: newEasyDataModelerIndices, easyDataModelerSemiPrimaryKey: newSemiPrimary};
   }
 
   return (