code sync

app/public/report/js/jpc_output.js

@@ -450,12 +450,12 @@ let JpcCanvasOutput = {
                 };
             } else if (cell.path) {
                 const img = new Image();
-                img.src = cell.path;
-                // if (cell.path.indexOf(OSS_PATH) < 0) {
-                //     img.src = OSS_PATH + cell.path;
-                // } else {
-                //     img.src = cell.path;
-                // }
+                // img.src = cell.path;
+                if (cell.path.indexOf(OSS_PATH) < 0 && cell.path[0] !== '/') {
+                    img.src = OSS_PATH + cell.path;
+                } else {
+                    img.src = cell.path;
+                }
                 img.crossOrigin = 'anonymous';
                 img.onload = function() {
                     private_drawImage(cell, control, img, (!!cell.isStamp));

app/public/report/js/rpt_signature.js

@@ -666,9 +666,11 @@ let rptSignatureHelper = {
             if (page.signature_cells) {
                 const adHocScells = [];
                 for (const sCell of page.signature_cells) {
-                    sCell.path = null;
-                    sCell.pre_path = null;
-                    sCell.pic = null;
+                    if (sCell.signature_name.indexOf(JV.SIGNATURE_NAME_DUMMY) < 0) {
+                        sCell.path = null;
+                        sCell.pre_path = null;
+                        sCell.pic = null;
+                    }
                     for (const role_rel of currRoleRelList) {
                         if (role_rel.signature_name === sCell.signature_name) {
                             // 处理签章
@@ -1073,9 +1075,21 @@ function _resetStampArea(ctrl, stampCell, roleRelItem) {
         pTop = stampCell.orgArea.Top;
     if (roleRelItem.stampFeature !== 'not found!') {
         let std_stamp_size_width = STD_STAMP_SIZE_WIDTH, std_stamp_size_height = STD_STAMP_SIZE_HEIGHT;
+        let widthRate = 1, heightRate = 1;
         if (roleRelItem.stampFeature) {
             std_stamp_size_width = parseFloat(roleRelItem.stampFeature.ImageWidth.value);
             std_stamp_size_height = parseFloat(roleRelItem.stampFeature.ImageHeight.value);
+            if (roleRelItem.stampFeature.ImageWidth.value !== roleRelItem.stampFeature.ImageHeight.value) {
+                //设置比例
+                if (roleRelItem.stampFeature.ImageWidth.value > roleRelItem.stampFeature.ImageHeight.value) {
+                    heightRate = roleRelItem.stampFeature.ImageHeight.value / roleRelItem.stampFeature.ImageWidth.value;
+                } else {
+                    widthRate = roleRelItem.stampFeature.ImageWidth.value / roleRelItem.stampFeature.ImageHeight.value;
+                }
+            }
+            if (std_stamp_size_width > STD_STAMP_SIZE_WIDTH || std_stamp_size_height > STD_STAMP_SIZE_HEIGHT) {
+                //
+            }
             std_stamp_size_width = Math.min(std_stamp_size_width, STD_STAMP_SIZE_WIDTH);
             std_stamp_size_height = Math.min(std_stamp_size_height, STD_STAMP_SIZE_HEIGHT);
         }