bug fix

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

@@ -583,7 +583,7 @@ const EditModel = (props) => {
           onClick={onHistory} 
           ghost 
           permissionKey='历史版本'
-          defaultPermission={branchId?true:undefined}
+          defaultPermission={(branchId||approvalId)?true:undefined}
           permissions={privilege?.optionList?.filter(item => item.enabled)?.map(item => item.name)}
         >
           历史版本
@@ -620,49 +620,6 @@ 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

@@ -47,13 +47,9 @@ const ImportAction = React.forwardRef((props, ref) => {
   useEffect(() =>{
     if ((action||'')==='') return;
 
-    if ((!mountRef.current && action === 'edit' && !permitCheckOut) || action === 'edit-inherited') {
-      return;
-    }
-
-
-    //流程打开模型详情的情况下,id由-1变成-2,会再次触发获取模型详情.这里直接return掉
-    if (approvalId || (!mountRef.current&&action === 'flow')) {
+    if ((!mountRef.current&&action === 'edit'&&!permitCheckOut) 
+      || action==='edit-inherited' 
+      || approvalId) {
       return;
     }
 
@@ -110,38 +106,22 @@ const ImportAction = React.forwardRef((props, ref) => {
 
   useEffect(() => {
     if (approvalModelId) {
-      //把数据表结构中的数据清空,解决性能问题
-      const newModelerData = { ...modelerData, easyDataModelerDataModelAttributes: [] };
-
-      onChange && onChange(newModelerData);
-      setModelerData(newModelerData);
-      modelerDataRef.current = newModelerData;
+      if (action==='edit') {
+        form?.resetFields();
+      }
+  
+      if (action === 'detail'|| action ==='flow') {
+         //把数据表结构中的数据清空,解决性能问题
+          const newModelerData = { ...modelerData, easyDataModelerDataModelAttributes: [] };
+  
+          onChange && onChange(newModelerData);
+          setModelerData(newModelerData);
+          modelerDataRef.current = newModelerData;
+      }
 
-      setLoading(true);
-      dispatch({
-        type: 'datamodel.getAllConstraints',
-        callback: data => {
-          setConstraints(data);
-          dispatch({
-            type: 'datamodel.getDataModelWithRecommendedDefinitionAndTermDiscovery',
-            payload: {
-              id: approvalModelId,
-            },
-            callback: data => {
-              setLoading(false);
-              getExtraData(data);
-            },
-            error: () => {
-              setLoading(false);
-            }
-          })
-        },
-        error: () => {
-          setLoading(false);
-        }
-      })
+      getCurrentDataModel()
     }
-  }, [approvalModelId])
+  }, [approvalModelId, action])
 
   useEffect(() => {
     if (constraint?.name) {
@@ -274,7 +254,8 @@ const ImportAction = React.forwardRef((props, ref) => {
   }
 
   const getCurrentDataModel = () => {
-    if ((modelerId||'') === '') {
+    if ((action!=='flow'&&!modelerId) 
+      || (action === 'flow'&&!approvalModelId)) {
       setLoading(false);
       return;
     }
@@ -289,6 +270,9 @@ const ImportAction = React.forwardRef((props, ref) => {
       type = 'datamodel.modelCopy';
     } else if (action === 'flow') {
       type = 'datamodel.getDataModelWithRecommendedDefinitionAndTermDiscovery';
+      params = {
+        id: approvalModelId,
+      }
     } else if (action === 'detail-version') {
       type = 'datamodel.getDataModelByVersionId';
       params = {