Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/report/js/rpt_jspdf.js

@@ -38,6 +38,7 @@ let JpcJsPDFHelper = {
         let me = this;
         let offsetX = 0;
         let offsetY = 0;
+        let floatReg = /^(-?\d+)(\.\d+)?$/;
         let strReplaceReg1 = new RegExp('\n\r', 'gm'),
             strReplaceReg2 = new RegExp('\r\n', 'gm'),
             strReplaceReg3 = new RegExp('\n', 'gm'),
@@ -335,6 +336,15 @@ let JpcJsPDFHelper = {
                 } else {
                     control = cell[JV.PROP_CONTROL];
                 }
+                if (control.ShowZero === "F") {
+                    if (typeof cell[JV.PROP_VALUE] === "string") {
+                        if (floatReg.test(cell[JV.PROP_VALUE]) && parseFloat(cell[JV.PROP_VALUE]) === 0.0) {
+                            values = [""];
+                        }
+                    } else if (parseFloat(cell[JV.PROP_VALUE]) === 0.0) {
+                        values = [""];
+                    }
+                }
 
                 if (font) {
                     doc.setFontSize(1 * font[JV.FONT_PROPS[1]]);