code sync

modules/reports/util/rpt_excel_util.js

@@ -691,7 +691,7 @@ function writeSheet(pageData, sheetData, paperSize, sharedStrList, stylesObj){
                     if (private_chkIfNeedCacheCell(cell)) {
                         for (let xi = idxL; xi < idxR; xi++) {
                             for (let yj = idxT; yj < idxB; yj++) {
-                                cacheBorderCell[private_getCellIdxStr(xi - 1) + yj + offsetY] = cell;
+                                cacheBorderCell[private_getCellIdxStr(xi - 1) + (yj + offsetY)] = cell;
                             }
                         }
                     }
@@ -711,7 +711,7 @@ function writeSheet(pageData, sheetData, paperSize, sharedStrList, stylesObj){
         }
     };
     let private_setSheetData = function(){
-        //remark: 1 excel height = 0.3612 mm
+        //remark: 1 excel unit height = 0.3612 mm
         rst.push('<sheetData>');
         let spanX = xPos.length - 2, cellIdx = 0, h = 0
             ;
@@ -780,7 +780,7 @@ function writeSheet(pageData, sheetData, paperSize, sharedStrList, stylesObj){
             //4. maybe need to dispose the memory
             //...
         };
-        private_cacheMergeBandBorderIdxs();
+        //private_cacheMergeBandBorderIdxs();
         if (sheetData) {
             //current sheet data
             currentPageMergePos = sheetData[JV.PAGE_SPECIAL_MERGE_POS];