模型重名增加提示

src/service/datamodeler.js

@@ -26,7 +26,7 @@ export function upDownModelCatalog(payload) {
 
 //绑定模型和模型目录
 export function bindCatalogDataModel(payload) {
-  return PostJSON("/datamodeler/easyDataModelerCURD/catalogDataModel", payload);
+  return Post("/datamodeler/easyDataModelerCURD/catalogDataModel", payload);
 }
 
 //读取当前模型目录中的模型
@@ -44,7 +44,7 @@ export function nextState(payload) {
 }
 
 export function recatalogDataModel(payload) {
-  return PostJSON("/datamodeler/easyDataModelerCURD/recatalogDataModel", payload);
+  return Post("/datamodeler/easyDataModelerCURD/recatalogDataModel", payload);
 }
 
 export function modelCopy(payload) {

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

@@ -5,7 +5,7 @@ import LocalStorage from 'local-storage';
 import ImportAction from './ImportAction';
 import CatalogModal from './CatalogModal';
 import { dispatchLatest } from '../../../../model'; 
-import { getQueryParam, showMessage } from '../../../../util';
+import { getQueryParam, showMessage, showNotifaction } from '../../../../util';
 import { Action, CatalogId, ModelerId, Hints, ModelerData, PermitCheckOut, Editable, StateId, VersionId, Holder } from '../../../../util/constant';
 import HistoryAndVersionDrawer from './HistoryAndVersionDrawer';
 
@@ -134,11 +134,16 @@ const EditModel = (props) => {
                   easyDataModelerDataModelIds: data.id||''
                 }
               },
-              callback: () => {
+              callback: message => {
                 setConfirmLoading(false);
                 setTerms([]);
 
-                showMessage("success", '新增模型成功');
+                if ((message||'')!=='' && (message||'')!=='ok') {
+                  showNotifaction('提示', message, 5);
+                } else {
+                  showMessage("success", '新增模型成功');
+                }
+
                 setActionData({ ...actionData, ...{ action: 'detail', modelerId: data.id||'', editable: data?.editable||false, stateId: data?.state?.id||'' } });
 
                 LocalStorage.set('modelChange', !(LocalStorage.get('modelChange')||false));

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

@@ -3,7 +3,7 @@ import { Modal } from "antd";
 
 import { dispatch } from '../../../../model';
 import ModelTree from './ModelTree';
-import { showMessage } from '../../../../util';
+import { showMessage, showNotifaction } from '../../../../util';
 
 const RecatalogModal = (props) => {
   
@@ -30,9 +30,13 @@ const RecatalogModal = (props) => {
           easyDataModelerDataModelIds: ids.join(',')
         },
       },
-      callback: data => {
+      callback: message => {
         setConfirmLoading(false);
 
+        if ((message||'')!=='' && (message||'')!=='ok') {
+          showNotifaction('提示', message, 5);
+        }
+
         reset();
         onCancel && onCancel(true);
       },