zy-react-library 1.0.99 → 1.0.101

package/components/Signature/index.d.ts

@@ -16,6 +16,8 @@ export interface SignatureProps {
   width?: number;
   /** 签字区域高度，默认为 300 */
   height?: number;
+  /** 回显的签字图片 */
+  url?: string;
 }
 
 /**

package/components/Signature/index.js

@@ -1,6 +1,6 @@
 import { Button, Image, message, Modal } from "antd";
 import dayjs from "dayjs";
-import { useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import SignatureCanvas from "react-signature-canvas";
 import { base642File } from "../../utils";
 
@@ -12,12 +12,16 @@ function Signature(props) {
     onConfirm,
     width = 752,
     height = 300,
+    url = "",
     ...restProps
   } = props;
 
   const [signatureModalOpen, setSignatureModalOpen] = useState(false);
   const signatureCanvas = useRef(null);
   const [base64, setBase64] = useState("");
+  useEffect(() => {
+    setBase64(url);
+  }, [url]);
 
   const onOk = () => {
     if (signatureCanvas.current.isEmpty()) {
@@ -49,7 +53,7 @@ function Signature(props) {
       </div>
       {base64 && (
         <div style={{ border: "1px dashed #d9d9d9", width, height, marginTop: 16 }}>
-          <Image src={base64} />
+          <Image src={base64} style={{ width, height, objectFit: "contain" }} />
         </div>
       )}
       <Modal

package/enum/uploadFile/gwj/index.js

@@ -65,6 +65,8 @@ export const UPLOAD_FILE_TYPE_ENUM = {
   136: 136,
   137: 137,
   138: 138,
+  139: 139,
+  140: 140,
 };
 
 /**
@@ -134,4 +136,6 @@ export const UPLOAD_FILE_PATH_ENUM = {
   136: "accident_incident",
   137: "accident_incident",
   138: "hidden_disposal_plan",
+  139: "safety_environmental_inspection_inspection_signature",
+  140: "safety_environmental_inspection_inspection_situation",
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.0.99",
+  "version": "1.0.101",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",