模型点击取消 快速点击编辑历史存储形式的bug

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

@@ -34,6 +34,7 @@ const EditModel = (props) => {
   const { action, catalogId, modelerId, hints, roughModelerData, permitCheckOut, editable, stateId, versionId, holder, ddl, readOnly } = actionData;
 
   const [form] = Form.useForm();
+  const importActionRef = useRef(undefined);
 
   useEffect(() => {
     const _action = getQueryParam(Action, props.location.search);
@@ -317,6 +318,11 @@ const EditModel = (props) => {
           readOnly!=='true' && <Space>
               {
                 !modelerData?.inheritedFromEasyDataModelerDataModel && <Button type='primary' onClick={() => {
+                  if (importActionRef.current && importActionRef.current.isLoading()) {
+                    showMessage("warn", '正在加载中,请稍后!');
+                    return;
+                  }
+
                   setActionData({ ...actionData, action: 'edit-inherited' });
                   actionRef.current = 'edit-inherited';
                   setEditInheritedParms({visible: true, modelerData});
@@ -360,6 +366,11 @@ const EditModel = (props) => {
         </Button>
         {
           !modelerData?.inheritedFromEasyDataModelerDataModel && <Button type='primary' onClick={() => {
+              if (importActionRef.current && importActionRef.current.isLoading()) {
+                showMessage("warn", '正在加载中,请稍后!');
+                return;
+              }
+
               setActionData({ ...actionData, action: 'edit-inherited' });
               actionRef.current = 'edit-inherited';
               setEditInheritedParms({visible: true, modelerData});
@@ -387,7 +398,7 @@ const EditModel = (props) => {
         </div>
         <div className='edit-container'>
           <div className='edit-container-card'>
-            <ImportAction hints={hints} onChange={onActionChange} action={action} modelerId={modelerId} catalogId={catalogId} ddl={ddl} form={form} terms={terms} roughModelerData={roughModelerData} permitCheckOut={permitCheckOut} stateId={stateId} versionId={versionId} autoTabKey={autoTabKey} {...props} /> 
+            <ImportAction ref={importActionRef} hints={hints} onChange={onActionChange} action={action} modelerId={modelerId} catalogId={catalogId} ddl={ddl} form={form} terms={terms} roughModelerData={roughModelerData} permitCheckOut={permitCheckOut} stateId={stateId} versionId={versionId} autoTabKey={autoTabKey} {...props} /> 
           </div>
         </div>
         <div className='edit-footer'>

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

-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect, useRef, useImperativeHandle } from 'react';
 import { Spin } from 'antd';
 import LocalStorage from 'local-storage';
 
@@ -10,7 +10,7 @@ import { getQueryParam } from '../../../../util';
 import { Action } from '../../../../util/constant';
 import { dispatch } from '../../../../model'; 
 
-const ImportAction = (props) => {
+const ImportAction = React.forwardRef((props, ref) => {
   const { action, hints, onChange, form, modelerId, terms, ddl, roughModelerData, versionId, permitCheckOut, catalogId } = props;
 
   const [ constraints, setConstraints ] = useState([]);
@@ -27,6 +27,12 @@ const ImportAction = (props) => {
   const mountRef = useRef(true);
   const modelerDataRef = useRef(null);
 
+  useImperativeHandle(ref, () => ({
+    isLoading: () => {
+      return loading;
+    }
+  }), [loading])
+
   useEffect(() =>{
     if ((action||'')==='') return;
 
@@ -573,6 +579,6 @@ const ImportAction = (props) => {
       />
     </Spin>
   );
-};
+});
 
 export default ImportAction;
\ No newline at end of file