现有模型新增模型

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

@@ -21,7 +21,7 @@ const ImportAction = (props) => {
 
   useEffect(() =>{
  
-    if ((action||'')==='' || (action==='add'&&(hints||[]).length===0&&(ddl||'').length===0)) return;
+    if ((action||'')==='' || (action==='add'&&(hints||[]).length===0&&(ddl||'').length===0)&&(modelerId||'')==='') return;
 
     //初始化form状态
     if (action==='add'||action==='edit') {
@@ -48,6 +48,8 @@ const ImportAction = (props) => {
             getDraft((data.constraints||[]).length>0?data.constraints[0]:{}, {} ,hints);
           } else if ((ddl||'').length>0) {
             getDraftUsingDDL((data.constraints||[]).length>0?data.constraints[0]:{}, {} ,ddl);
+          } else if ((modelerId||'')!=='') {
+            getCurrentDataModel();
           }
         } else if(action === 'edit' || action === 'detail') {
           getCurrentDataModel();
@@ -141,13 +143,19 @@ const ImportAction = (props) => {
       },
       callback: data => {
         setLoading(false);
+
+        //以现有模版新增时
+        if (action === 'add') {
+          data.id = null;
+        }
+
         setModelerData(data||{});
         setConstraint(data.easyDataModelerModelingConstraint||{});
         setTemplate(data.easyDataModelerModelingTemplate||{});
         onChange && onChange(data||{});
         getSupportedDatatypes();
 
-        if (action === 'edit') {
+        if ((action==='add'&&(modelerId||''!=='')) || action==='edit') {
           form.setFieldsValue({ 
             cnName: data.cnName||'',
             name: data.name||'',

src/view/Manage/Model/index.jsx

@@ -195,6 +195,26 @@ class Model extends React.Component {
     
   }
 
+  onImportModelBtnClick = () => {
+    const { catalogId, importModalAction, selectModelerIds } = this.state;
+    if (!catalogId || catalogId==='') {
+      showMessage('info', '请先选择目录');
+      return;
+    }
+
+    if ((selectModelerIds||[]).length === 0) {
+      showMessage('info', '请先选择一个模型');
+      return;
+    }
+
+    if ((selectModelerIds||[]).length > 1) {
+      showMessage('info', '只能选择一个模型');
+      return;
+    }
+
+    window.open(`/data-govern/data-model-action?${Action}=add&${CatalogId}=${catalogId}&${ModelerId}=${selectModelerIds[0]}`);
+  }
+
   onImportDDLBtnClick = () => {
     const { catalogId } = this.state;
     if (!catalogId || catalogId==='') {
@@ -297,7 +317,7 @@ class Model extends React.Component {
     this.setState({ importModalVisible: false }, () => {
       if ((hints||[]).length > 0) {
         setTimeout(() => {
-          window.open(`/data-govern/data-model-action?${Action}=${importModalAction}&${CatalogId}=${catalogId}&${ModelerId}=${modelerId}&${Hints}=${(hints||[]).join(',')}`);
+          window.open(`/data-govern/data-model-action?${Action}=${importModalAction}&${CatalogId}=${catalogId}&${Hints}=${(hints||[]).join(',')}`);
         }, 1000);
       }
     });
@@ -356,6 +376,8 @@ class Model extends React.Component {
               <Button type="primary" onClick={this.onImportExcelBtnClick}>Excel导入</Button>
               <Button type="primary" onClick={this.onImportExcelCopyBtnClick}>Excel复制粘贴</Button>
               <Button type="primary" onClick={this.onImportWordBtnClick}>Word导入</Button>
+              <Button type="primary" onClick={this.onImportModelBtnClick}>现有模型</Button>
+
               {/* <Button type="primary" onClick={this.onImportDDLBtnClick}>DDL导入</Button> */}
             </Space>  
             <Space>