code sync + 一些代码优化

app/public/report/js/rpt_jsexcel.js

@@ -427,6 +427,17 @@ function writeSheets(pageData, paperSize, sharedStrList, stylesObj, isSinglePage
     return rst;
 }
 
+function getAndSetProperSignatureArea(cell, cellControl) {
+    const area = getProperSignatureArea(cell, cellControl, 0, 0, JV);
+    if (!!cell.isStamp) {
+        area[JV.IDX_LEFT] = cell[JV.PROP_AREA][JV.PROP_LEFT];
+        area[JV.IDX_TOP] = cell[JV.PROP_AREA][JV.PROP_TOP];
+        area[JV.IDX_RIGHT] = cell[JV.PROP_AREA][JV.PROP_RIGHT];
+        area[JV.IDX_BOTTOM] = cell[JV.PROP_AREA][JV.PROP_BOTTOM];
+    }
+    return area;
+}
+
 function preAnalyzePos(pageData, sheetData, xPos, yPos, yMultiPos) {
     let cell;
     let pos;
@@ -471,14 +482,7 @@ function preAnalyzePos(pageData, sheetData, xPos, yPos, yMultiPos) {
             } else {
                 cellControl = cell[JV.PROP_CONTROL];
             }
-            const area = getProperSignatureArea(cell, cellControl, 0, 0, JV);
-            if (!!cell.isStamp) {
-            // if (cell.signature_name.indexOf(JV.SIGNATURE_NAME_DUMMY) >= 0) {
-                area[JV.IDX_LEFT] = cell[JV.PROP_AREA][JV.PROP_LEFT];
-                area[JV.IDX_TOP] = cell[JV.PROP_AREA][JV.PROP_TOP];
-                area[JV.IDX_RIGHT] = cell[JV.PROP_AREA][JV.PROP_RIGHT];
-                area[JV.IDX_BOTTOM] = cell[JV.PROP_AREA][JV.PROP_BOTTOM];
-            }
+            const area = getAndSetProperSignatureArea(cell, cellControl);
             private_set_cell_pos2(area, theXPos, theYPos);
         }
         for (let i = 0; i < theShtData[JV.PROP_SIGNATURE_DATE_CELLS].length; i++) {
@@ -498,14 +502,7 @@ function preAnalyzePos(pageData, sheetData, xPos, yPos, yMultiPos) {
             } else {
                 cellControl = cell[JV.PROP_CONTROL];
             }
-            const area = getProperSignatureArea(cell, cellControl, 0, 0, JV);
-            if (!!cell.isStamp) {
-            // if (cell.signature_name.indexOf(JV.SIGNATURE_NAME_DUMMY) >= 0) {
-                area[JV.IDX_LEFT] = cell[JV.PROP_AREA][JV.PROP_LEFT];
-                area[JV.IDX_TOP] = cell[JV.PROP_AREA][JV.PROP_TOP];
-                area[JV.IDX_RIGHT] = cell[JV.PROP_AREA][JV.PROP_RIGHT];
-                area[JV.IDX_BOTTOM] = cell[JV.PROP_AREA][JV.PROP_BOTTOM];
-            }
+            const area = getAndSetProperSignatureArea(cell, cellControl);
             private_set_cell_pos2(area, theXPos, theYPos);
         }
     };
@@ -1065,14 +1062,7 @@ function writeDrawing(pageData, sheetData, subSignKeyArr, sheetIdx) {
         } else {
             cellControl = signCell[JV.PROP_CONTROL];
         }
-        const area = getProperSignatureArea(signCell, cellControl, 0, 0, JV);
-        if (!!signCell.isStamp) {
-        // if (signCell.signature_name.indexOf(JV.SIGNATURE_NAME_DUMMY) >= 0) {
-            area[JV.IDX_LEFT] = signCell[JV.PROP_AREA][JV.PROP_LEFT];
-            area[JV.IDX_TOP] = signCell[JV.PROP_AREA][JV.PROP_TOP];
-            area[JV.IDX_RIGHT] = signCell[JV.PROP_AREA][JV.PROP_RIGHT];
-            area[JV.IDX_BOTTOM] = signCell[JV.PROP_AREA][JV.PROP_BOTTOM];
-        }
+        const area = getAndSetProperSignatureArea(signCell, cellControl);
 
         // 1. from
         // let colIdx = xPos.indexOf(signCell[JV.PROP_AREA][JV.PROP_LEFT]);