模型流程详情

src/service/datamodeler.js

@@ -162,7 +162,7 @@ export function getDataModelLocation(payload) {
 }
 
 export function searchModel(payload) {
-  return GetJSON("/datamodeler/easyDataModelerCURD/searchEasyDataModelerDataModelsByNaming", payload);
+  return GetJSON("/shandatamodeler/easyDataModelerCURD/searchEasyDataModelerDataModelsByNaming", payload);
 }
 
 export function getVersions(payload) {
@@ -461,7 +461,7 @@ export function getSearchProperties() {
 }
 
 export function searchModelBySearchProperties(payload) {
-  return PostJSON("/datamodeler/easyDataModelerCURD/searchEasyDataModelerDataModelsByModelSearchProperties", payload);
+  return PostJSON("/shandatamodeler/easyDataModelerCURD/searchEasyDataModelerDataModelsByModelSearchProperties", payload);
 }
 
 /* compare */

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

@@ -604,6 +604,49 @@ const EditModel = (props) => {
           getApprovalDetail()
         }}
       />
+    } else {
+      actionsBtn = (
+        <Space>
+          <PermissionButton 
+            type='primary' 
+            onClick={onHistory} 
+            ghost
+            permissionKey='历史版本'
+            permissions={modelerData?.optionList?.filter(item => item.enabled)?.map(item => item.name)}
+          >
+          历史版本
+          </PermissionButton>
+          {
+            !isSzseEnv && !modelerData?.inheritedFromEasyDataModelerDataModel && <PermissionButton 
+                type='primary' 
+                onClick={() => {
+                  if (importActionRef.current && importActionRef.current.isLoading()) {
+                    showMessage("warn", '正在加载中,请稍后!');
+                    return;
+                  }
+                  
+                  setEditInheritedParms({visible: true, modelerData});
+                }} 
+                ghost 
+                permissionKey='编辑'
+                permissions={modelerData?.optionList?.filter(item => item.enabled)?.map(item => item.name)}
+              >
+              编辑历史存储形式
+            </PermissionButton>
+          }
+          {
+            !modelerData?.inheritedFromEasyDataModelerDataModel && editable && <PermissionButton 
+              type='primary' 
+              tooltipPlacement='topRight'
+              onClick={edit}  
+              permissionKey='编辑'
+              permissions={modelerData?.optionList?.filter(item => item.enabled)?.map(item => item.name)}
+            >
+            编辑
+            </PermissionButton>
+          }
+        </Space>
+      )
     }
   } else if (action === 'detail-version') {
     actionsBtn = (

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

@@ -49,7 +49,8 @@ const ImportAction = React.forwardRef((props, ref) => {
 
     if ((!mountRef.current&&action === 'edit'&&!permitCheckOut) 
       || action==='edit-inherited' 
-      || approvalId) {
+      || approvalId
+      || (!mountRef.current&&action === 'flow')) {
       return;
     }
 
@@ -254,24 +255,21 @@ const ImportAction = React.forwardRef((props, ref) => {
   }
 
   const getCurrentDataModel = () => {
-    if ((action!=='flow'&&!modelerId) 
-      || (action === 'flow'&&!approvalModelId)) {
-      setLoading(false);
-      return;
+    if (!modelerId && !approvalModelId) {
+      setLoading(false)
+      return 
     }
 
     let type = 'datamodel.getDataModel';
 
-    let params = {
-      id: modelerId||''
-    };
+    let params = { id: modelerId };
 
     if (action === 'add') {
       type = 'datamodel.modelCopy';
     } else if (action === 'flow') {
       type = 'datamodel.getDataModelWithRecommendedDefinitionAndTermDiscovery';
-      params = {
-        id: approvalModelId,
+      if (approvalModelId) {
+        params = { id: approvalModelId }
       }
     } else if (action === 'detail-version') {
       type = 'datamodel.getDataModelByVersionId';