签章组件保存的bug

one_stop_public/libs/PictureSignature/PictureSignature.js

@@ -16,6 +16,7 @@ export default function PictureSignature({
                                            disabled,
                                            basicUrl,
                                            onChangeFile,
+                                           imageIndex,
                                            // fileInfo,
                                            ...others
                                          }) {
@@ -78,17 +79,17 @@ export default function PictureSignature({
   const handleClickButton = (clickType) => {
     switch (clickType) {
       case 'startEdit': // 开始签章
-        console.log(imageInfo);
+        // console.log(imageInfo);
         setOpenEdit(true);
         break;
       case 'confirm': // 确定
-        onChangeFile({...fileInfo});
+        onChangeFile({...fileInfo}, imageIndex);
         changeShowModal();
         break;
       case 'save': // 保存签章
         let ratioX = backgroundImageWidth / 1200; // 本来是 1500 的 图片 宽度变成了 1200 高度变成了 1200/1500 * imageInfo.height;
         // let ratioY = 1200 / backgroundImageWidth * imageInfo.height;
-        console.log(ratioX);
+        // console.log(ratioX);
         // return ;
         let signConfig = deepCopy(otherProps.signConfig);
         apiRequest('/ImageLibApi/merge', {
@@ -103,7 +104,7 @@ export default function PictureSignature({
                 g.y = g.y + 20;
                 g.x = g.x + 20;
               }
-              console.log(g);
+              // console.log(g);
               return g;
             }),
           }),
@@ -165,7 +166,7 @@ export default function PictureSignature({
   if (!fileInfo) {
     return null;
   }
-  console.log(imageInfo, fileInfo);
+  // console.log(imageInfo, fileInfo);
   return (
     <div className={styles.outSideDiv}
     >
@@ -183,7 +184,7 @@ export default function PictureSignature({
           destroyOnClose={true}
           maskClosable={false}
           onCancel={changeShowModal}
-          // getContainer={false}
+          getContainer={false}
           className={styles.ModalClass}
           footer={<Footer/>}
           title={'图片签章'}
@@ -254,21 +255,21 @@ export function SignArray(props) {
   const {value, onChange, basicUrl, json,} = props;
   // console.log(props);
   let files = value?.files || [];
-  const onChangeFile = (newFielInfo) => {
-    for (let item of files) {
-      if ((item.path || item.originPath) === newFielInfo.originPath) {
-        item = newFielInfo;
-      }
-    }
+  const onChangeFile = (newFielInfo, imageIndex) => {
+    if(newFielInfo && newFielInfo.path){
+      files[imageIndex] = newFielInfo;
       value.files = files;
-    onChange({files});
+      onChange(value);
+    }
   }
+  // console.log(value, '222222222222222')
   return <div>
     {
-      files.map((g) => {
+      files.map((g, index) => {
         return <PictureSignature json={json}
                                  basicUrl={basicUrl}
                                  fileInfo={g}
+                                 imageIndex={index}
                                  onChangeFile={onChangeFile}
 
         />