刷新

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

@@ -85,8 +85,7 @@ const FC = (props) => {
         callback: data => {
           setConfirmLoading(false);
           reset();
-          window.location?.reload?.();
-          onCancel?.();
+          onCancel?.(true);
         }, 
         error: () => {
           setConfirmLoading(false);

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

@@ -290,7 +290,7 @@ const EditModel = (props) => {
         </Button>
       </Space>
     )
-  } else if (action === 'detail') {
+  } else if (action === 'detail' || action === 'edit-inherited') {
 
     let editTip = '';
     if (!editable && stateId !== '4') {
@@ -310,6 +310,8 @@ const EditModel = (props) => {
           readOnly!=='true' && <Space>
               {
                 !modelerData?.inheritedFromEasyDataModelerDataModel && <Button type='primary' onClick={() => {
+                  setActionData({ ...actionData, action: 'edit-inherited' });
+                  actionRef.current = 'edit-inherited';
                   setEditInheritedParms({visible: true, modelerData})
                 }} danger >
                 编辑历史存储形式
@@ -324,7 +326,7 @@ const EditModel = (props) => {
         }
       </Space>
     );
-  } else if (action === 'edit' || action === 'edit-inherite') {
+  } else if (action === 'edit') {
     actionsBtn = (
       <Space>
         <Button onClick={cancelEdit} >
@@ -387,8 +389,12 @@ const EditModel = (props) => {
         <EditInherited
           visible={editInheritedParam.visible}
           modelerData={editInheritedParam.modelerData}
-          onCancel={() => {
+          onCancel={(refresh = false) => {
             setEditInheritedParms({visible: false, modelerData: undefined});
+            if (refresh) {
+              setActionData({ ...actionData, action: 'detail' });
+              actionRef.current = 'detail';
+            }
           }}
         />
       </div>

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

@@ -30,10 +30,11 @@ const ImportAction = (props) => {
   useEffect(() =>{
     if ((action||'')==='') return;
 
-    if (!mountRef.current && action === 'edit' && !permitCheckOut) {
+    if ((!mountRef.current && action === 'edit' && !permitCheckOut) || action === 'edit-inherited') {
       return;
     }
 
+
     //流程打开模型详情的情况下,id由-1变成-2,会再次触发获取模型详情.这里直接return掉
     if (!mountRef.current && action === 'flow') {
       return;