Tony Kang před 2 roky
rodič
revize
a6079c6db4
1 změnil soubory, kde provedl 2 přidání a 48 odebrání
  1. 2 48
      app/public/report/js/rpt_jspdf.js

+ 2 - 48
app/public/report/js/rpt_jspdf.js

@@ -203,55 +203,9 @@ const JpcJsPDFHelper = {
             }
         }
 
-        function private_getProperSignatureArea(cell, control) {
-            // 约定默认长宽比例是2:1,图片分辨率是600*300
-            const rst = [0, 0, 0, 0]; // left, top, right, bottom
-            if (cell && cell[JV.PROP_AREA]) {
-                if (cell.hasOwnProperty('isOrgShow') && cell.isOrgShow) {
-                    rst[JV.IDX_LEFT] = cell[JV.PROP_AREA][JV.PROP_LEFT];
-                    rst[JV.IDX_TOP] = cell[JV.PROP_AREA][JV.PROP_TOP];
-                    rst[JV.IDX_RIGHT] = cell[JV.PROP_AREA][JV.PROP_RIGHT];
-                    rst[JV.IDX_BOTTOM] = cell[JV.PROP_AREA][JV.PROP_BOTTOM];
-                } else {
-                    let width = cell[JV.PROP_AREA][JV.PROP_RIGHT] - cell[JV.PROP_AREA][JV.PROP_LEFT],
-                        height = cell[JV.PROP_AREA][JV.PROP_BOTTOM] - cell[JV.PROP_AREA][JV.PROP_TOP];
-                    if (width > height * 2) {
-                        width = height * 2;
-                    } else {
-                        height = width / 2;
-                    }
-                    switch (control[JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_HORIZON]]) {
-                        case 'left':
-                            rst[0] = cell[JV.PROP_AREA][JV.PROP_LEFT];
-                            rst[1] = cell[JV.PROP_AREA][JV.PROP_TOP];
-                            rst[2] = rst[0] + width;
-                            rst[3] = rst[1] + height;
-                            break;
-                        case 'right':
-                            rst[2] = cell[JV.PROP_AREA][JV.PROP_RIGHT];
-                            rst[3] = cell[JV.PROP_AREA][JV.PROP_BOTTOM];
-                            rst[0] = rst[2] - width;
-                            rst[1] = rst[3] - height;
-                            break;
-                        default:
-                            //center
-                            rst[0] = (cell[JV.PROP_AREA][JV.PROP_LEFT] + cell[JV.PROP_AREA][JV.PROP_RIGHT] - width) / 2;
-                            rst[1] = cell[JV.PROP_AREA][JV.PROP_TOP];
-                            rst[2] = rst[0] + width;
-                            rst[3] = rst[1] + height;
-                            break;
-                    }
-                }
-            }
-            rst[0] = rst[0] + offsetX;
-            rst[2] = rst[2] + offsetX;
-            rst[1] = rst[1] + offsetY;
-            rst[3] = rst[3] + offsetY;
-            return rst;
-        }
-
         function private_drawImage(doc, ctx, cell, control, imageData, orgSize = false, offsetArea) {
-            let area = private_getProperSignatureArea(cell, control);
+            // let area = private_getProperSignatureArea(cell, control);
+            let area = getProperSignatureArea(cell, control, offsetX, offsetY, JV);
             if (orgSize) {
                 area[0] = cell[JV.PROP_AREA][JV.PROP_LEFT] + offsetX; // Left
                 area[1] = cell[JV.PROP_AREA][JV.PROP_TOP] + offsetX; // Top