Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

modules/reports/rpt_component/helper/jpc_helper_field.js

@@ -71,11 +71,11 @@ let JpcFieldHelper = {
     },
     decorateValue: function (cell, controls) {
         if (controls) {
-            let val = cell[JV.PROP_VALUE];
-            let showZero = controls[cell[JV.PROP_CONTROL]][JV.PROP_SHOW_ZERO];
-            if (showZero && showZero === 'F' ) {
-                if (0.0 === 1.0 * (0 + val)) {
-                    cell[JV.PROP_VALUE] = "";
+            const showZero = controls[cell[JV.PROP_CONTROL]][JV.PROP_SHOW_ZERO];
+            if (showZero && showZero === 'F') {
+                const val = parseFloat(cell[JV.PROP_VALUE]);
+                if (val === 0) {
+                    cell[JV.PROP_VALUE] = '';
                 }
             }
         }

web/building_saas/report/js/rpt_jspdf.js

@@ -127,7 +127,7 @@ let JpcJsPDFHelper = {
         }
 
         function private_drawCellText(doc, ctx, cell, fonts, controls) {
-            if (cell[JV.PROP_VALUE]) {
+            if (cell[JV.PROP_VALUE] !== undefined && cell[JV.PROP_VALUE] !== null) {
                 let values = ("" + cell[JV.PROP_VALUE]).split('|');
                 // let font = fonts[cell[JV.PROP_FONT]];
                 let font = null;

web/building_saas/report/js/rpt_print.js

@@ -189,7 +189,7 @@ function buildText(destRst, cell, font, control, offsetX, offsetY, adjustY, canv
         text_anchor = "start"
     ;
     let value = cell[JV.PROP_VALUE];
-    if (!(value)) {
+    if (value === undefined || value === null) {
         value = "";
     }
     let values = null;