模型切换规范和模版 修改接口

src/model/datamodel.js

@@ -82,6 +82,10 @@ export function* getDraft(payload) {
   return yield call(datamodelerService.draft, payload);
 }
 
+export function* getConsult(payload) {
+  return yield call(datamodelerService.consult, payload);
+}
+
 export function* getSupportedDatatypes() {
   return yield call(datamodelerService.getSupportedDatatypes);
 }

src/service/datamodeler.js

@@ -41,6 +41,11 @@ export function draft(payload) {
   return PostJSON("/datamodeler/easyDataModelerDesign/draft", payload);
 }
 
+//切换模版或者规范时调用
+export function consult(payload) {
+  return PostJSON("/datamodeler/easyDataModelerDesign/consult", payload);
+}
+
 //获取支持的数据类型
 export function getSupportedDatatypes() {
   return GetJSON("/datamodeler/easyDataModelerCURD/getSupportedDatatypes");

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

@@ -62,24 +62,32 @@ const ImportAction = (props) => {
         }   
       },
       callback: data => {
-        if (!modelerData) {
-          setModelerData(data||{});
-          form.setFieldsValue({ 
-            cnName: data.cnName||'',
-            name: data.name||'',
-            remark: data.remark||'',
-            easyDataModelerModelingTemplate: data.easyDataModelerModelingTemplate||''
-          });
-        } else {
-          //切换规则,更新数据表结构
-          setModelerData({...modelerData, easyDataModelerDataModelAttributes: [...data.easyDataModelerDataModelAttributes] })
-        }
+        setModelerData(data||{});
+        form.setFieldsValue({ 
+          cnName: data.cnName||'',
+          name: data.name||'',
+          remark: data.remark||'',
+          easyDataModelerModelingTemplate: data.easyDataModelerModelingTemplate||''
+        });
         onChange && onChange(data||{});
         getSupportedDatatypes();
       }
     })
   }
 
+  const getConsult = (data) => {
+    dispatch({
+      type: 'datamodel.getConsult',
+      payload: {
+        data  
+      },
+      callback: data => {
+        setModelerData({...modelerData, easyDataModelerDataModelAttributes: [...data.easyDataModelerDataModelAttributes] })
+        onChange && onChange(data||{});
+      }
+    })
+  }
+
   const getCurrentDataModel = () => {
     dispatchLatest({
       type: 'datamodel.getDataModel',
@@ -121,14 +129,8 @@ const ImportAction = (props) => {
     setModelerData(newModelerData)
     onChange && onChange(newModelerData);
 
-    (modelerData.easyDataModelerDataModelAttributes||[]).forEach((_attribute, index) => {
-      if (_attribute.name && _attribute.name!=='') {
-        _hints.push(_attribute.cnName);
-      }
-    });
-
     setConstraint(currentConstraint);
-    getDraft(currentConstraint, template, _hints);
+    getConsult(newModelerData);
   }
 
   const onTemplateChange = (value) => {
@@ -150,14 +152,8 @@ const ImportAction = (props) => {
     setModelerData(newModelerData)
     onChange && onChange(newModelerData);
 
-    (modelerData.easyDataModelerDataModelAttributes||[]).forEach((_attribute, index) => {
-      if (_attribute.name && _attribute.name!=='') {
-        _hints.push(_attribute.cnName);
-      }
-    });
-
     setTemplate(currentTemplate);
-    getDraft(constraint, currentTemplate, _hints);
+    getConsult(newModelerData);
   }
 
   const getSupportedDatatypes = () => {