code sync

modules/reports/rpt_component/jpc_flow_tab.js

@@ -229,7 +229,10 @@ JpcFlowTabSrv.prototype.createNew = function(){
                     for (let j = 0; j < me.segments[i].length; j++) {
                         //3. start to sum
                         // rowGrandTotal[di] = rowGrandTotal[di] + 1.0 * JpcFieldHelper.getValue(data_fields[di], me.segments[i][j]);
-                        rowGrandTotal[di] = rowGrandTotal[di] + parseFloat(parseFloat(JpcFieldHelper.getValue(data_fields[di], me.segments[i][j])).toFixed(precisionAmt));
+                        let sv = JpcFieldHelper.getValue(data_fields[di], me.segments[i][j]);
+                        if (sv) {
+                            rowGrandTotal[di] = rowGrandTotal[di] + parseFloat(parseFloat(sv).toFixed(precisionAmt));
+                        }
                     }
                 }
                 me.segSumValLst.push(rowGrandTotal);
@@ -966,7 +969,10 @@ JpcFlowTabSrv.prototype.createNew = function(){
                             }
                             // rowGrandTotal[di] = rowGrandTotal[di] + 1.0 * JpcFieldHelper.getValue(page_sum_data_fields[di], contentValuesIdx[rowIdx][2]);
                             if (contentValuesIdx[rowIdx][2] >= 0) {
-                                rowGrandTotal[di] = rowGrandTotal[di] + parseFloat(parseFloat(JpcFieldHelper.getValue(page_sum_data_fields[di], contentValuesIdx[rowIdx][2])).toFixed(precisionAmt));
+                                let psv = JpcFieldHelper.getValue(page_sum_data_fields[di], contentValuesIdx[rowIdx][2]);
+                                if (psv) {
+                                    rowGrandTotal[di] = rowGrandTotal[di] + parseFloat(parseFloat(psv).toFixed(precisionAmt));
+                                }
                             }
                         }
                     }

modules/reports/util/rpt_excel_util.js

@@ -432,9 +432,13 @@ function writeSheet(pageData, sheetData, paperSize, sharedStrList, stylesObj, ap
         return rst;
     };
     let private_getSharedStrIdx = function(val) {
-        let rst = sharedStrList.indexOf(val);
+        let strVal = val;
+        if (val === null) {
+            strVal = "";
+        }
+        let rst = sharedStrList.indexOf(strVal);
         if (rst < 0) {
-            sharedStrList.push(val);
+            sharedStrList.push(strVal);
             rst = sharedStrList.length - 1;
         }
         return rst;