交叉表合计容错处理

app/reports/rpt_component/jpc_cross_tab.js

@@ -253,7 +253,11 @@ JpcCrossTabSrv.prototype.createNew = function() {
                         rowGrandTotal.push(0.0);
                         for (let k = 0; k < me.sortedRowSequence[i][j].length; k++) {
                             // 3. start to sum
-                            rowGrandTotal[di] = rowGrandTotal[di] + 1.0 * JpcFieldHelper.getValue(data_fields[di], me.sortedRowSequence[i][j][k]);
+                            let vTtl = parseFloat(JpcFieldHelper.getValue(data_fields[di], me.sortedRowSequence[i][j][k]));
+                            if (isNaN(vTtl)) {
+                                vTtl = 0;
+                            }
+                            rowGrandTotal[di] = rowGrandTotal[di] + 1.0 * vTtl;
                         }
                     }
                     me.col_sum_fields_value_total[i].push(rowGrandTotal);
@@ -731,6 +735,8 @@ JpcCrossTabSrv.prototype.createNew = function() {
                             JpcFieldHelper.resetFormat(tab_fields[tfIdx], map_data_field, customizeCfg);
                         }
                     }
+                    // console.log('当前页:' + page);
+                    // console.log(me.dispSumValueLst_Col[page - 1][i]);
                     if (me.dispSumValueLst_Col[page - 1][i] !== null) {
                         for (let j = 0; j < me.dispSumValueLst_Col[page - 1][i].length; j++) {
                             const tab_field = tab_fields[j];

package-lock.json

@@ -2382,6 +2382,11 @@
       "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
       "dev": true
     },
+    "charenc": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npm.taobao.org/charenc/download/charenc-0.0.2.tgz",
+      "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
+    },
     "chokidar": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
@@ -2592,6 +2597,79 @@
         "is-generator": "1.0.3"
       }
     },
+    "co-wechat": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npm.taobao.org/co-wechat/download/co-wechat-2.4.0.tgz",
+      "integrity": "sha1-9py+iTCGzjxLvhTMPDdTq31jk4U=",
+      "requires": {
+        "ejs": "2.5.7",
+        "raw-body": "2.3.2",
+        "wechat-crypto": "0.0.2",
+        "xml2js": "0.4.4"
+      },
+      "dependencies": {
+        "sax": {
+          "version": "0.6.1",
+          "resolved": "http://registry.npm.taobao.org/sax/download/sax-0.6.1.tgz",
+          "integrity": "sha1-VjsZx8HeiS4Jv8Ty/DDjwn8JUrk="
+        },
+        "xml2js": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npm.taobao.org/xml2js/download/xml2js-0.4.4.tgz?cache=0&sync_timestamp=1584990425260&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxml2js%2Fdownload%2Fxml2js-0.4.4.tgz",
+          "integrity": "sha1-MREBAAMAiuGSQOuhdJe1fHKcVV0=",
+          "requires": {
+            "sax": "0.6.1",
+            "xmlbuilder": "11.0.1"
+          }
+        }
+      }
+    },
+    "co-wechat-api": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npm.taobao.org/co-wechat-api/download/co-wechat-api-3.10.0.tgz",
+      "integrity": "sha1-jMNobzDPb4W6g/zMv1Wtp40kPj8=",
+      "requires": {
+        "formstream": "1.1.0",
+        "httpx": "2.2.4",
+        "json-bigint": "0.3.1"
+      },
+      "dependencies": {
+        "bignumber.js": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npm.taobao.org/bignumber.js/download/bignumber.js-9.0.0.tgz",
+          "integrity": "sha1-gFiA+Eoym16sbny2+CdLbYK98HU="
+        },
+        "json-bigint": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npm.taobao.org/json-bigint/download/json-bigint-0.3.1.tgz",
+          "integrity": "sha1-DBcp1nn1gNVQiZ1qIibCKFZK/mA=",
+          "requires": {
+            "bignumber.js": "9.0.0"
+          }
+        }
+      }
+    },
+    "co-wechat-oauth": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npm.taobao.org/co-wechat-oauth/download/co-wechat-oauth-2.0.1.tgz",
+      "integrity": "sha1-n/pS3fuTWdAwAYiBw/jWIQSKKVQ=",
+      "requires": {
+        "httpx": "2.2.4"
+      }
+    },
+    "co-wechat-payment": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npm.taobao.org/co-wechat-payment/download/co-wechat-payment-0.2.0.tgz",
+      "integrity": "sha1-6V2uUqYEPHDZADDbHzPQFg0hEkA=",
+      "requires": {
+        "md5": "2.2.1",
+        "sha1": "1.1.1",
+        "thunkify": "2.1.2",
+        "underscore": "1.10.2",
+        "urllib": "2.25.4",
+        "xml2js": "0.4.23"
+      }
+    },
     "co-wrap-all": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/co-wrap-all/-/co-wrap-all-1.0.0.tgz",
@@ -2990,6 +3068,11 @@
         }
       }
     },
+    "crypt": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npm.taobao.org/crypt/download/crypt-0.0.2.tgz",
+      "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
+    },
     "csrf": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz",
@@ -4469,6 +4552,18 @@
         "wt": "1.1.1"
       }
     },
+    "egg-wechat-all": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npm.taobao.org/egg-wechat-all/download/egg-wechat-all-0.1.4.tgz",
+      "integrity": "sha1-K3qvOqyYtHpQUctg0S4VSrQAUfw=",
+      "requires": {
+        "co-wechat": "2.4.0",
+        "co-wechat-api": "3.10.0",
+        "co-wechat-oauth": "2.0.1",
+        "co-wechat-payment": "0.2.0",
+        "egg-redis": "1.0.2"
+      }
+    },
     "ejs": {
       "version": "2.5.7",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz",
@@ -9314,6 +9409,16 @@
         }
       }
     },
+    "md5": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npm.taobao.org/md5/download/md5-2.2.1.tgz",
+      "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=",
+      "requires": {
+        "charenc": "0.0.2",
+        "crypt": "0.0.2",
+        "is-buffer": "1.1.6"
+      }
+    },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -12657,6 +12762,15 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
       "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
     },
+    "sha1": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npm.taobao.org/sha1/download/sha1-1.1.1.tgz",
+      "integrity": "sha1-rdqnqTFo85PxnrKxUJFhjicA+Eg=",
+      "requires": {
+        "charenc": "0.0.2",
+        "crypt": "0.0.2"
+      }
+    },
     "shallow-copy": {
       "version": "0.0.1",
       "resolved": "https://registry.npm.taobao.org/shallow-copy/download/shallow-copy-0.0.1.tgz",
@@ -13792,6 +13906,11 @@
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
       "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo="
     },
+    "underscore": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npm.taobao.org/underscore/download/underscore-1.10.2.tgz?cache=0&sync_timestamp=1585603748606&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funderscore%2Fdownload%2Funderscore-1.10.2.tgz",
+      "integrity": "sha1-c9aqNmjzGI5K2w8ZQ70Sz9fvqq8="
+    },
     "undertaker": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.0.tgz",
@@ -14200,6 +14319,11 @@
         }
       }
     },
+    "wechat-crypto": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npm.taobao.org/wechat-crypto/download/wechat-crypto-0.0.2.tgz",
+      "integrity": "sha1-pVRD7AgQ9MGZKik6J4YIOXAMY2k="
+    },
     "whatwg-fetch": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz",