优化

package.json

@@ -31,7 +31,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-to-print": "^3.2.0",
-    "zy-react-library": "^1.0.118"
+    "zy-react-library": "^1.0.119"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^5.4.1",

src/pages/Container/BranchCompany/Average/Confirm/Review/index.js

@@ -211,7 +211,7 @@ function Confirm(props) {
           ]}
         />
       </div>
-      <RejectModal open={rejectModalOpen} onCancel={() => setRejectModalOpen(false)} data={data} />
+      {rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} data={data} />}
     </div>
   );
 }
@@ -236,7 +236,8 @@ const RejectModalComponent = (props) => {
   return (
     <Modal
       title="驳回原因"
-      open={props.open}
+      open
+      maskClosable={false}
       onCancel={props.onCancel}
       onOk={form.submit}
       confirmLoading={props.confirm.confirmLoading}

src/pages/Container/BranchCompany/Average/ConfirmUser/index.js

@@ -77,7 +77,7 @@ function HiddenConfirmUser(props) {
         ]}
         {...tableProps}
       />
-      <AddModal open={addModalOpen} onCancel={() => setAddModalOpen(false)} getData={getData} />
+      {addModalOpen && <AddModal onCancel={() => setAddModalOpen(false)} getData={getData} />}
     </div>
   );
 }
@@ -90,7 +90,6 @@ const AddModalComponent = (props) => {
     if (success) {
       message.success("操作成功");
       props.onCancel();
-      form.resetFields();
       props.getData();
     }
   };
@@ -99,11 +98,9 @@ const AddModalComponent = (props) => {
     <Modal
       title="新增隐患确认人"
       width={800}
-      open={props.open}
-      onCancel={() => {
-        props.onCancel();
-        form.resetFields();
-      }}
+      open
+      maskClosable={false}
+      onCancel={props.onCancel}
       onOk={form.submit}
       loading={props.confirmUser.confirmUserLoading}
     >

src/pages/Container/BranchCompany/Average/Ledger/List/index.js

@@ -244,19 +244,21 @@ function List(props) {
           {...tableProps}
         />
       </Spin>
-      <ExportByColumnModal
-        open={exportByColumnModalOpen}
-        hiddenFindTime={form.getFieldValue("hiddenFindTime")}
-        onCancel={() => setExportByColumnModalOpen(false)}
-      />
-      <PrintModal
-        open={printModalOpen}
-        data={printData}
-        onCancel={() => {
-          setPrintModalOpen(false);
-          setPrintData([]);
-        }}
-      />
+      {exportByColumnModalOpen && (
+        <ExportByColumnModal
+          hiddenFindTime={form.getFieldValue("hiddenFindTime")}
+          onCancel={() => setExportByColumnModalOpen(false)}
+        />
+      )}
+      {printModalOpen && (
+        <PrintModal
+          data={printData}
+          onCancel={() => {
+            setPrintModalOpen(false);
+            setPrintData([]);
+          }}
+        />
+      )}
     </div>
   );
 }
@@ -289,7 +291,8 @@ const ExportByColumnModalComponent = (props) => {
     <Modal
       title="按列导出"
       width={800}
-      open={props.open}
+      open
+      maskClosable={false}
       onCancel={props.onCancel}
       onOk={form.submit}
       loading={loading}
@@ -345,7 +348,8 @@ const PrintModal = (props) => {
       title="打印"
       width={1500}
       okText="打印"
-      open={props.open}
+      open
+      maskClosable={false}
       onCancel={props.onCancel}
       onOk={handlePrint}
     >

src/pages/Container/BranchCompany/Average/Part/index.js

@@ -160,18 +160,19 @@ function Part(props) {
           />
         </div>
       </div>
-      <AddModal
-        open={addModalOpen}
-        id={currentId}
-        parentName={parentName}
-        parentId={parentId}
-        getData={getData}
-        getTreeData={getTreeData}
-        onCancel={() => {
-          setAddModalOpen(false);
-          setCurrentId("");
-        }}
-      />
+      {addModalOpen && (
+        <AddModal
+          id={currentId}
+          parentName={parentName}
+          parentId={parentId}
+          getData={getData}
+          getTreeData={getTreeData}
+          onCancel={() => {
+            setAddModalOpen(false);
+            setCurrentId("");
+          }}
+        />
+      )}
     </div>
   );
 }
@@ -185,8 +186,8 @@ const AddModalComponent = (props) => {
     form.setFieldsValue(data);
   };
   useEffect(() => {
-    props.id && getData();
-  }, [props.id]);
+    getData();
+  }, []);
   const onSubmit = async (values) => {
     const { success } = await props[!props.id ? "partAdd" : "partEdit"]({ ...values, parentId: props.parentId, id: props.id });
     if (success) {
@@ -201,11 +202,9 @@ const AddModalComponent = (props) => {
     <Modal
       title={props.id ? "编辑" : "新增"}
       width={800}
-      open={props.open}
-      onCancel={() => {
-        props.onCancel();
-        form.resetFields();
-      }}
+      open
+      maskClosable={false}
+      onCancel={props.onCancel}
       onOk={form.submit}
       loading={props.part.partLoading}
     >

src/pages/Container/BranchCompany/Average/Postponement/Review/index.js

@@ -39,7 +39,7 @@ function Review(props) {
           <Button key="back" onClick={() => props.history.goBack()}>取消</Button>
         </Space>
       </div>
-      <RejectModal open={rejectModalOpen} onCancel={() => setRejectModalOpen(false)} data={{ id: query.id, hiddenId: query.hiddenId }} />
+      {rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} data={{ id: query.id, hiddenId: query.hiddenId }} />}
     </div>
   );
 }
@@ -63,7 +63,8 @@ const RejectModalComponent = (props) => {
   return (
     <Modal
       title="驳回原因"
-      open={props.open}
+      open
+      maskClosable={false}
       onCancel={props.onCancel}
       onOk={form.submit}
       confirmLoading={props.specialDisposal.specialDisposalLoading}

src/pages/Container/BranchCompany/Average/Rectification/List/index.js

@@ -141,24 +141,26 @@ function List(props) {
         ]}
         {...tableProps}
       />
-      <TemporarySafetyMeasuresModal
-        id={currentId}
-        open={temporarySafetyMeasuresModalOpen}
-        onCancel={() => {
-          setTemporarySafetyMeasuresModalOpen(false);
-          setCurrentId("");
-        }}
-        getData={getData}
-      />
-      <RequestAnExtensionModal
-        id={currentId}
-        open={requestAnExtensionModalOpen}
-        onCancel={() => {
-          setRequestAnExtensionModalOpen(false);
-          setCurrentId("");
-        }}
-        getData={getData}
-      />
+      {temporarySafetyMeasuresModalOpen && (
+        <TemporarySafetyMeasuresModal
+          id={currentId}
+          onCancel={() => {
+            setTemporarySafetyMeasuresModalOpen(false);
+            setCurrentId("");
+          }}
+          getData={getData}
+        />
+      )}
+      {requestAnExtensionModalOpen && (
+        <RequestAnExtensionModal
+          id={currentId}
+          onCancel={() => {
+            setRequestAnExtensionModalOpen(false);
+            setCurrentId("");
+          }}
+          getData={getData}
+        />
+      )}
     </div>
   );
 }
@@ -178,7 +180,8 @@ const TemporarySafetyMeasuresModalComponent = (props) => {
     <Modal
       title="添加临时安全措施"
       width={800}
-      open={props.open}
+      open
+      maskClosable={false}
       onCancel={props.onCancel}
       onOk={form.submit}
       loading={props.rectification.rectificationLoading}
@@ -214,7 +217,8 @@ const RequestAnExtensionModalComponent = (props) => {
     <Modal
       title="申请延期"
       width={800}
-      open={props.open}
+      open
+      maskClosable={false}
       onCancel={props.onCancel}
       onOk={form.submit}
       loading={props.rectification.rectificationLoading || uploadFileLoading}

src/pages/Container/Supervision/Average/Average/HiddenList/index.js

@@ -187,14 +187,15 @@ function HiddenList(props) {
           />
         </Spin>
       </div>
-      <PrintModal
-        open={printModalOpen}
-        data={printData}
-        onCancel={() => {
-          setPrintModalOpen(false);
-          setPrintData([]);
-        }}
-      />
+      {printModalOpen && (
+        <PrintModal
+          data={printData}
+          onCancel={() => {
+            setPrintModalOpen(false);
+            setPrintData([]);
+          }}
+        />
+      )}
     </div>
   );
 }
@@ -221,7 +222,8 @@ const PrintModal = (props) => {
       title="打印"
       width={1500}
       okText="打印"
-      open={props.open}
+      open
+      maskClosable={false}
       onCancel={props.onCancel}
       onOk={handlePrint}
     >