签章组件完善

one_stop_public/libs/PictureSignature/PictureSignature.js

@@ -20,7 +20,8 @@ export default function PictureSignature({
                                            ...others
                                          }) {
   let imageRef = useRef();
-  const [fileInfo, setFileInfo] = useState(others?.fileInfo);
+  // const [fileInfo, setFileInfo] = useState(others?.fileInfo);
+  const [fileInfo, setFileInfo] = useState(fakeFileInfo);
   const [openEdit, setOpenEdit] = useState(false);
   const [showModal, setShowModal] = useState(false);
   const [otherProps, setOtherProps] = useState({});
@@ -71,7 +72,12 @@ export default function PictureSignature({
         apiRequest('/ImageLibApi/merge', {
           background: fileInfo?.path,
           content: JSON.stringify({
-            objs: otherProps.signConfig,
+            objs: otherProps.signConfig.map((g) => {
+              if(g.type === 'text'){
+                g.y = g.y + g.fontSize;
+              }
+              return g;
+            }),
           }),
         }).then((res) => {
           if (res && res.path) {

one_stop_public/libs/PictureSignature/ShowItem.js

@@ -13,6 +13,7 @@ const ShowItem = ({ basicUrl, type, x, y, ...otherInfo }) => {
             cursor: 'pointer',
             width: otherInfo.w,
             height: otherInfo.h,
+            zIndex: otherInfo.index || 1,
           }}
         />
       );
@@ -28,6 +29,7 @@ const ShowItem = ({ basicUrl, type, x, y, ...otherInfo }) => {
             fontFamily: otherInfo?.fontFamily ? otherInfo.fontFamily : undefined,
             fontWeight: otherInfo?.fontStyle ? otherInfo.fontStyle : undefined,
             color: otherInfo?.color ? otherInfo.color : undefined,
+            zIndex: otherInfo.index || 1,
           }}
         >
           {otherInfo.word}

one_stop_public/libs/PictureSignature/styles.less

@@ -42,6 +42,7 @@
   border: 1px solid red;
   p{
     margin-bottom: 0;
+    user-select: none;
   }
 }
 .modalParentDiv{