@visactor/vtable 0.9.2-alpha.3 → 0.9.2

package/cjs/dataset/dataset.js

@@ -4,41 +4,35 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.Dataset = void 0;
 
-const vutils_1 = require("@visactor/vutils"), util_1 = require("../tools/util"), ts_types_1 = require("../ts-types"), statistics_helper_1 = require("./statistics-helper"), zero_align_1 = require("./util/zero-align");
+const ts_types_1 = require("../ts-types");
 
 class Dataset {
-    constructor(dataConfig, rows, columns, indicatorKeys, records, customColTree, customRowTree) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
+    constructor(dataConfig, rows, columns, indicators, records) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
         this.tree = {}, this.colFlatKeys = {}, this.rowFlatKeys = {}, this.colKeys = [], 
         this.rowKeys = [], this.rowOrder = "key_a_to_z", this.colOrder = "key_a_to_z", this.sorted = !1, 
         this.indicatorStatistics = [], this.aggregators = {}, this.stringJoinChar = String.fromCharCode(0), 
-        this.rowsIsTotal = [], this.colsIsTotal = [], this.collectedValues = {}, this.registerAggregators(), 
-        this.dataConfig = dataConfig, this.sortRules = null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.sortRules, 
-        this.aggregationRules = null === (_b = this.dataConfig) || void 0 === _b ? void 0 : _b.aggregationRules, 
-        this.derivedFieldRules = null === (_c = this.dataConfig) || void 0 === _c ? void 0 : _c.derivedFieldRules, 
-        this.mappingRules = null === (_d = this.dataConfig) || void 0 === _d ? void 0 : _d.mappingRules, 
-        this.totals = null === (_e = this.dataConfig) || void 0 === _e ? void 0 : _e.totals, 
-        this.rows = rows, this.columns = columns, this.indicatorKeys = indicatorKeys, this.colGrandTotalLabel = null !== (_h = null === (_g = null === (_f = this.totals) || void 0 === _f ? void 0 : _f.column) || void 0 === _g ? void 0 : _g.grandTotalLabel) && void 0 !== _h ? _h : "总计", 
-        this.colSubTotalLabel = null !== (_l = null === (_k = null === (_j = this.totals) || void 0 === _j ? void 0 : _j.column) || void 0 === _k ? void 0 : _k.subTotalLabel) && void 0 !== _l ? _l : "小计", 
-        this.rowGrandTotalLabel = null !== (_p = null === (_o = null === (_m = this.totals) || void 0 === _m ? void 0 : _m.row) || void 0 === _o ? void 0 : _o.grandTotalLabel) && void 0 !== _p ? _p : "总计", 
-        this.rowSubTotalLabel = null !== (_s = null === (_r = null === (_q = this.totals) || void 0 === _q ? void 0 : _q.row) || void 0 === _r ? void 0 : _r.subTotalLabel) && void 0 !== _s ? _s : "小计", 
-        this.collectValuesBy = null !== (_u = null === (_t = this.dataConfig) || void 0 === _t ? void 0 : _t.collectValuesBy) && void 0 !== _u ? _u : {
-            230417170554008: {
-                by: [ "230417171050031", "230417171050028" ]
-            }
-        }, this.rowsIsTotal = new Array(this.rows.length).fill(!1), this.colsIsTotal = new Array(this.columns.length).fill(!1);
-        for (let i = 0, len = null === (_x = null === (_w = null === (_v = this.totals) || void 0 === _v ? void 0 : _v.row) || void 0 === _w ? void 0 : _w.subTotalsDimensions) || void 0 === _x ? void 0 : _x.length; i < len; i++) {
+        this.rowsIsTotal = [], this.colsIsTotal = [], this.registerAggregators(), this.dataConfig = dataConfig, 
+        this.sortRules = this.dataConfig.sortRules, this.aggregationRules = this.dataConfig.aggregationRules, 
+        this.derivedFieldRules = this.dataConfig.derivedFieldRules, this.mappingRules = this.dataConfig.mappingRules, 
+        this.totals = dataConfig.totals, this.rows = rows, this.columns = columns, this.indicators = indicators, 
+        this.colGrandTotalLabel = null !== (_c = null === (_b = null === (_a = this.totals) || void 0 === _a ? void 0 : _a.column) || void 0 === _b ? void 0 : _b.grandTotalLabel) && void 0 !== _c ? _c : "总计", 
+        this.colSubTotalLabel = null !== (_f = null === (_e = null === (_d = this.totals) || void 0 === _d ? void 0 : _d.column) || void 0 === _e ? void 0 : _e.subTotalLabel) && void 0 !== _f ? _f : "小计", 
+        this.rowGrandTotalLabel = null !== (_j = null === (_h = null === (_g = this.totals) || void 0 === _g ? void 0 : _g.row) || void 0 === _h ? void 0 : _h.grandTotalLabel) && void 0 !== _j ? _j : "总计", 
+        this.rowSubTotalLabel = null !== (_m = null === (_l = null === (_k = this.totals) || void 0 === _k ? void 0 : _k.row) || void 0 === _l ? void 0 : _l.subTotalLabel) && void 0 !== _m ? _m : "小计", 
+        this.rowsIsTotal = new Array(this.rows.length).fill(!1), this.colsIsTotal = new Array(this.columns.length).fill(!1);
+        for (let i = 0, len = null === (_q = null === (_p = null === (_o = this.totals) || void 0 === _o ? void 0 : _o.row) || void 0 === _p ? void 0 : _p.subTotalsDimensions) || void 0 === _q ? void 0 : _q.length; i < len; i++) {
             const dimension = this.totals.row.subTotalsDimensions[i], dimensionIndex = this.rows.indexOf(dimension);
             this.rowsIsTotal[dimensionIndex] = !0;
         }
-        for (let i = 0, len = null === (_0 = null === (_z = null === (_y = this.totals) || void 0 === _y ? void 0 : _y.column) || void 0 === _z ? void 0 : _z.subTotalsDimensions) || void 0 === _0 ? void 0 : _0.length; i < len; i++) {
+        for (let i = 0, len = null === (_t = null === (_s = null === (_r = this.totals) || void 0 === _r ? void 0 : _r.column) || void 0 === _s ? void 0 : _s.subTotalsDimensions) || void 0 === _t ? void 0 : _t.length; i < len; i++) {
             const dimension = this.totals.column.subTotalsDimensions[i], dimensionIndex = this.columns.indexOf(dimension);
             this.colsIsTotal[dimensionIndex] = !0;
         }
         if (records) {
             this.records = records;
             const t0 = "undefined" != typeof window ? window.performance.now() : 0;
-            this.setRecords(records), this.processCollectedValuesWithSumBy();
+            this.setRecords(records);
             const t1 = "undefined" != typeof window ? window.performance.now() : 0;
             console.log("processRecords:", t1 - t0);
             const t4 = "undefined" != typeof window ? window.performance.now() : 0;
@@ -50,56 +44,36 @@ class Dataset {
             const t3 = "undefined" != typeof window ? window.performance.now() : 0;
             console.log("sortKeys:", t3 - t2);
             const t7 = "undefined" != typeof window ? window.performance.now() : 0;
-            this.rowKeysPath = customRowTree ? this.TreeToArr2(customRowTree) : this.TreeToArr(this.ArrToTree(this.rowKeys, this.rowsIsTotal, (null === (_2 = null === (_1 = null == this ? void 0 : this.totals) || void 0 === _1 ? void 0 : _1.row) || void 0 === _2 ? void 0 : _2.showGrandTotals) || 0 === this.columns.length, this.rowGrandTotalLabel, this.rowSubTotalLabel)), 
-            this.colKeysPath = customColTree ? this.TreeToArr2(customColTree) : this.TreeToArr(this.ArrToTree(this.colKeys, this.colsIsTotal, (null === (_4 = null === (_3 = this.totals) || void 0 === _3 ? void 0 : _3.column) || void 0 === _4 ? void 0 : _4.showGrandTotals) || 0 === this.rows.length, this.colGrandTotalLabel, this.colSubTotalLabel));
+            this.rowKeysPath = this.TreeToArr(this.ArrToTree(this.rowKeys, this.rowsIsTotal, (null === (_v = null === (_u = null == this ? void 0 : this.totals) || void 0 === _u ? void 0 : _u.row) || void 0 === _v ? void 0 : _v.showGrandTotals) || 0 === this.columns.length, this.rowGrandTotalLabel, this.rowSubTotalLabel)), 
+            this.colKeysPath = this.TreeToArr(this.ArrToTree(this.colKeys, this.colsIsTotal, (null === (_x = null === (_w = this.totals) || void 0 === _w ? void 0 : _w.column) || void 0 === _x ? void 0 : _x.showGrandTotals) || 0 === this.rows.length, this.colGrandTotalLabel, this.colSubTotalLabel));
             const t8 = "undefined" != typeof window ? window.performance.now() : 0;
-            console.log("TreeToArr:", t8 - t7), this.dataConfig.isPivotChart && this.dealWithZeroAlign();
+            console.log("TreeToArr:", t8 - t7);
         }
+        delete this.rowFlatKeys, delete this.colFlatKeys;
     }
     registerAggregator(type, aggregator) {
         this.aggregators[type] = aggregator;
     }
     registerAggregators() {
-        this.registerAggregator(ts_types_1.AggregationType.RECORD, statistics_helper_1.RecordAggregator), 
-        this.registerAggregator(ts_types_1.AggregationType.SUM, statistics_helper_1.SumAggregator), 
-        this.registerAggregator(ts_types_1.AggregationType.COUNT, statistics_helper_1.CountAggregator), 
-        this.registerAggregator(ts_types_1.AggregationType.MAX, statistics_helper_1.MaxAggregator), 
-        this.registerAggregator(ts_types_1.AggregationType.MIN, statistics_helper_1.MinAggregator), 
-        this.registerAggregator(ts_types_1.AggregationType.AVG, statistics_helper_1.AvgAggregator);
+        this.registerAggregator(ts_types_1.AggregationType.SUM, SumAggregator), this.registerAggregator(ts_types_1.AggregationType.COUNT, CountAggregator), 
+        this.registerAggregator(ts_types_1.AggregationType.MAX, MaxAggregator), this.registerAggregator(ts_types_1.AggregationType.MIN, MinAggregator), 
+        this.registerAggregator(ts_types_1.AggregationType.AVG, AvgAggregator);
     }
     setRecords(records) {
         this.processRecords();
     }
-    processCollectedValuesWithSumBy() {
-        var _a;
-        for (const field in this.collectedValues) if (null === (_a = this.collectValuesBy[field]) || void 0 === _a ? void 0 : _a.sumBy) for (const byKeys in this.collectedValues[field]) {
-            const max = Object.values(this.collectedValues[field][byKeys]).reduce(((acc, cur) => cur.value() > acc ? cur.value() : acc), Number.MIN_SAFE_INTEGER), min = Object.values(this.collectedValues[field][byKeys]).reduce(((acc, cur) => cur.value() < acc ? cur.value() : acc), Number.MAX_SAFE_INTEGER);
-            this.collectedValues[field][byKeys] = {}, this.collectedValues[field][byKeys].max = max, 
-            this.collectedValues[field][byKeys].min = min;
-        }
-    }
     processRecords() {
-        var _a, _b;
-        let isNeedFilter = !1;
-        (null === (_b = null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.filterRules) || void 0 === _b ? void 0 : _b.length) >= 1 && (isNeedFilter = !0);
         for (let i = 0, len = this.records.length; i < len; i++) {
             const record = this.records[i];
-            isNeedFilter && !this.filterRecord(record) || this.processRecord(record);
+            this.filterRecord(record) && this.processRecord(record);
         }
-        this.rowFlatKeys = {}, this.colFlatKeys = {};
     }
     filterRecord(record) {
         var _a, _b;
         let isReserved = !0;
-        for (let i = 0; i < this.dataConfig.filterRules.length; i++) {
-            const filterRule = null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.filterRules[i];
-            if (filterRule.filterKey) {
-                const filterValue = record[filterRule.filterKey];
-                if (-1 === filterRule.filteredValues.indexOf(filterValue)) {
-                    isReserved = !1;
-                    break;
-                }
-            } else if (!(null === (_b = filterRule.filterFunc) || void 0 === _b ? void 0 : _b.call(filterRule, record))) {
+        for (let i = 0; i < (null === (_a = this.dataConfig.filterRules) || void 0 === _a ? void 0 : _a.length); i++) {
+            const filterRule = this.dataConfig.filterRules[i];
+            if (!(null === (_b = filterRule.filterFunc) || void 0 === _b ? void 0 : _b.call(filterRule, record))) {
                 isReserved = !1;
                 break;
             }
@@ -107,7 +81,7 @@ class Dataset {
         return isReserved;
     }
     processRecord(record) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         null === (_a = this.derivedFieldRules) || void 0 === _a || _a.forEach(((derivedFieldRule, i) => {
             record[derivedFieldRule.fieldName] = derivedFieldRule.derivedFunc(record);
         }));
@@ -120,48 +94,30 @@ class Dataset {
             const colAttr = this.columns[n];
             colKey.push(record[colAttr]);
         }
-        for (const field in this.collectValuesBy) if (record[field]) {
-            this.collectedValues[field] || (this.collectedValues[field] = {});
-            const collectKeys = this.collectValuesBy[field].by.map((byField => record[byField])).join(this.stringJoinChar);
-            if (this.collectedValues[field][collectKeys] || (this.collectValuesBy[field].sumBy ? this.collectedValues[field][collectKeys] = {} : this.collectValuesBy[field].range ? this.collectedValues[field][collectKeys] = {
-                min: Number.MAX_SAFE_INTEGER,
-                max: Number.MIN_SAFE_INTEGER
-            } : this.collectedValues[field][collectKeys] = new Set), this.collectValuesBy[field].sumBy) {
-                const sumByKeys = this.collectValuesBy[field].sumBy.map((byField => record[byField])).join(this.stringJoinChar);
-                this.collectedValues[field][collectKeys][sumByKeys] || (this.collectedValues[field][collectKeys][sumByKeys] = new this.aggregators[ts_types_1.AggregationType.SUM](field)), 
-                this.collectedValues[field][collectKeys][sumByKeys].push(record);
-            } else if (this.collectValuesBy[field].range) {
-                const fieldRange = this.collectedValues[field][collectKeys];
-                fieldRange.max = Math.max(record[field], fieldRange.max), fieldRange.min = Math.min(record[field], fieldRange.min);
-            } else {
-                this.collectedValues[field][collectKeys].add(record[field]);
-            }
-        }
         const flatRowKey = rowKey.join(this.stringJoinChar), flatColKey = colKey.join(this.stringJoinChar);
         if (0 !== rowKey.length && (this.rowFlatKeys[flatRowKey] || (this.rowKeys.push(rowKey), 
         this.rowFlatKeys[flatRowKey] = 1)), 0 !== colKey.length && (this.colFlatKeys[flatColKey] || (this.colKeys.push(colKey), 
         this.colFlatKeys[flatColKey] = 1)), 0 !== colKey.length || 0 !== rowKey.length) {
             this.tree[flatRowKey] || (this.tree[flatRowKey] = {}), (null === (_b = this.tree[flatRowKey]) || void 0 === _b ? void 0 : _b[flatColKey]) || (this.tree[flatRowKey][flatColKey] = []);
-            for (let i = 0; i < this.indicatorKeys.length; i++) {
-                const aggRule = this.getAggregatorRule(this.indicatorKeys[i]);
-                if ((null === (_d = null === (_c = this.tree[flatRowKey]) || void 0 === _c ? void 0 : _c[flatColKey]) || void 0 === _d ? void 0 : _d[i]) || (this.tree[flatRowKey][flatColKey][i] = new this.aggregators[null !== (_e = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _e ? _e : ts_types_1.AggregationType.SUM](null !== (_f = null == aggRule ? void 0 : aggRule.field) && void 0 !== _f ? _f : this.indicatorKeys[i], null == aggRule ? void 0 : aggRule.formatFun)), 
-                null == aggRule ? void 0 : aggRule.field) if ("string" == typeof (null == aggRule ? void 0 : aggRule.field)) (0, 
-                util_1.isValid)(record[null == aggRule ? void 0 : aggRule.field]) && (null === (_h = null === (_g = this.tree[flatRowKey]) || void 0 === _g ? void 0 : _g[flatColKey]) || void 0 === _h || _h[i].push(record)); else {
-                    (null == aggRule ? void 0 : aggRule.field.find((field => record[field]))) && (null === (_k = null === (_j = this.tree[flatRowKey]) || void 0 === _j ? void 0 : _j[flatColKey]) || void 0 === _k || _k[i].push(record));
-                } else (0, util_1.isValid)(record[this.indicatorKeys[i]]) && (null === (_m = null === (_l = this.tree[flatRowKey]) || void 0 === _l ? void 0 : _l[flatColKey]) || void 0 === _m || _m[i].push(record));
+            for (let i = 0; i < this.indicators.length; i++) {
+                if (!(null === (_d = null === (_c = this.tree[flatRowKey]) || void 0 === _c ? void 0 : _c[flatColKey]) || void 0 === _d ? void 0 : _d[i])) {
+                    const aggRule = this.getAggregatorRule(this.indicators[i]);
+                    this.tree[flatRowKey][flatColKey][i] = new this.aggregators[null !== (_e = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _e ? _e : ts_types_1.AggregationType.SUM](null !== (_f = null == aggRule ? void 0 : aggRule.field) && void 0 !== _f ? _f : this.indicators[i], null == aggRule ? void 0 : aggRule.formatFun);
+                }
+                null === (_h = null === (_g = this.tree[flatRowKey]) || void 0 === _g ? void 0 : _g[flatColKey]) || void 0 === _h || _h[i].push(record);
             }
         }
-        if (this.mappingRules) for (let i = 0; i < this.indicatorKeys.length; i++) {
+        if (this.mappingRules) for (let i = 0; i < this.indicators.length; i++) {
             if (!this.indicatorStatistics[i]) {
-                const aggRule = this.getAggregatorRule(this.indicatorKeys[i]);
+                const aggRule = this.getAggregatorRule(this.indicators[i]);
                 this.indicatorStatistics[i] = {
-                    max: new this.aggregators[ts_types_1.AggregationType.MAX](this.indicatorKeys[i]),
-                    min: new this.aggregators[ts_types_1.AggregationType.MIN](this.indicatorKeys[i]),
-                    total: new this.aggregators[null !== (_o = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _o ? _o : ts_types_1.AggregationType.SUM](null !== (_p = null == aggRule ? void 0 : aggRule.field) && void 0 !== _p ? _p : this.indicatorKeys[i], null == aggRule ? void 0 : aggRule.formatFun)
+                    max: new this.aggregators[ts_types_1.AggregationType.MAX](this.indicators[i]),
+                    min: new this.aggregators[ts_types_1.AggregationType.MIN](this.indicators[i]),
+                    total: new this.aggregators[null !== (_j = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _j ? _j : ts_types_1.AggregationType.SUM](null !== (_k = null == aggRule ? void 0 : aggRule.field) && void 0 !== _k ? _k : this.indicators[i], null == aggRule ? void 0 : aggRule.formatFun)
                 };
             }
-            this.indicatorStatistics[i].max.push(null === (_r = null === (_q = this.tree[flatRowKey]) || void 0 === _q ? void 0 : _q[flatColKey]) || void 0 === _r ? void 0 : _r[i].value()), 
-            this.indicatorStatistics[i].min.push(null === (_t = null === (_s = this.tree[flatRowKey]) || void 0 === _s ? void 0 : _s[flatColKey]) || void 0 === _t ? void 0 : _t[i].value()), 
+            this.indicatorStatistics[i].max.push(null === (_m = null === (_l = this.tree[flatRowKey]) || void 0 === _l ? void 0 : _l[flatColKey]) || void 0 === _m ? void 0 : _m[i].value()), 
+            this.indicatorStatistics[i].min.push(null === (_p = null === (_o = this.tree[flatRowKey]) || void 0 === _o ? void 0 : _o[flatColKey]) || void 0 === _p ? void 0 : _p[i].value()), 
             this.indicatorStatistics[i].total.push(record);
         }
     }
@@ -170,17 +126,13 @@ class Dataset {
         this.sorted = !1, this.sortRules = sortRules, this.sortKeys(), this.rowKeysPath = this.TreeToArr(this.ArrToTree(this.rowKeys, this.rowsIsTotal, (null === (_b = null === (_a = null == this ? void 0 : this.totals) || void 0 === _a ? void 0 : _a.row) || void 0 === _b ? void 0 : _b.showGrandTotals) || 0 === this.columns.length, this.rowGrandTotalLabel, this.rowSubTotalLabel)), 
         this.colKeysPath = this.TreeToArr(this.ArrToTree(this.colKeys, this.colsIsTotal, (null === (_d = null === (_c = this.totals) || void 0 === _c ? void 0 : _c.column) || void 0 === _d ? void 0 : _d.showGrandTotals) || 0 === this.rows.length, this.colGrandTotalLabel, this.colSubTotalLabel));
     }
-    updateFilterRules(filterRules, isResetTree = !1) {
-        if (this.filterRules = filterRules, isResetTree) this.tree = {}; else for (const treeRowKey in this.tree) for (const treeColKey in this.tree[treeRowKey]) for (let i = 0; i < this.tree[treeRowKey][treeColKey].length; i++) this.tree[treeRowKey][treeColKey][i].reset();
-        this.collectedValues = {}, this.processRecords(), this.processCollectedValuesWithSumBy();
-    }
     getAggregatorRule(indicatorKey) {
         var _a;
         return null === (_a = this.aggregationRules) || void 0 === _a ? void 0 : _a.find(((value, index) => indicatorKey === value.indicatorKey));
     }
     getAggregator(rowKey = [], colKey = [], indicator) {
         var _a, _b;
-        const indicatorIndex = this.indicatorKeys.indexOf(indicator);
+        const indicatorIndex = this.indicators.indexOf(indicator);
         let agg, flatRowKey, flatColKey;
         return flatRowKey = "string" == typeof rowKey ? rowKey : rowKey.join(this.stringJoinChar), 
         flatColKey = "string" == typeof colKey ? colKey : colKey.join(this.stringJoinChar), 
@@ -189,8 +141,7 @@ class Dataset {
             className: "",
             push() {},
             value: () => null,
-            formatValue: () => "",
-            reset() {}
+            formatValue: () => ""
         };
     }
     sortKeys() {
@@ -203,13 +154,13 @@ class Dataset {
             switch (this.rowOrder) {
               case "value_a_to_z":
                 this.rowKeys.sort((function(a, b) {
-                    return (0, statistics_helper_1.naturalSort)(getValue(a, []), getValue(b, []));
+                    return naturalSort(getValue(a, []), getValue(b, []));
                 }));
                 break;
 
               case "value_z_to_a":
                 this.rowKeys.sort((function(a, b) {
-                    return -(0, statistics_helper_1.naturalSort)(getValue(a, []), getValue(b, []));
+                    return -naturalSort(getValue(a, []), getValue(b, []));
                 }));
                 break;
 
@@ -219,13 +170,13 @@ class Dataset {
             switch (this.colOrder) {
               case "value_a_to_z":
                 this.colKeys.sort((function(a, b) {
-                    return (0, statistics_helper_1.naturalSort)(getValue([], a), getValue([], b));
+                    return naturalSort(getValue([], a), getValue([], b));
                 }));
                 break;
 
               case "value_z_to_a":
                 this.colKeys.sort((function(a, b) {
-                    return -(0, statistics_helper_1.naturalSort)(getValue([], a), getValue([], b));
+                    return -naturalSort(getValue([], a), getValue([], b));
                 }));
                 break;
 
@@ -252,7 +203,7 @@ class Dataset {
                 isHasSortRule || results.push({
                     field: field,
                     fieldIndex: l,
-                    func: statistics_helper_1.naturalSort
+                    func: naturalSort
                 });
             }
             return results;
@@ -281,9 +232,8 @@ class Dataset {
                 colKey.length < that.columns.length && colKey[colKey.length - 1] !== that.colSubTotalLabel && colKey[colKey.length - 1] !== that.colGrandTotalLabel && colKey.push(that.colSubTotalLabel), 
                 that.getAggregator(rowKey, colKey, sortRule.sortByIndicator).value();
             };
-            return isSortRow ? (0, statistics_helper_1.naturalSort)(getValue(a, sortRule.query), getValue(b, sortRule.query)) : (0, 
-            statistics_helper_1.naturalSort)(getValue(sortRule.query, a), getValue(sortRule.query, b));
-        } : sortRule.sortBy ? (0, statistics_helper_1.sortBy)(sortRule.sortBy) : sortRule.sortType ? statistics_helper_1.typeSort : sortRule.sortFunc ? sortRule.sortFunc : statistics_helper_1.naturalSort;
+            return isSortRow ? naturalSort(getValue(a, sortRule.query), getValue(b, sortRule.query)) : naturalSort(getValue(sortRule.query, a), getValue(sortRule.query, b));
+        } : sortRule.sortBy ? sortBy(sortRule.sortBy) : sortRule.sortType ? typeSort : sortRule.sortFunc ? sortRule.sortFunc : naturalSort;
     }
     totalStatistics() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
@@ -299,10 +249,10 @@ class Dataset {
                         colTotalKey.push(null !== (_f = null === (_e = null === (_d = that.totals) || void 0 === _d ? void 0 : _d.column) || void 0 === _e ? void 0 : _e.subTotalLabel) && void 0 !== _f ? _f : "小计");
                         const flatColTotalKey = colTotalKey.join(this.stringJoinChar);
                         this.tree[flatRowKey][flatColTotalKey] || (this.tree[flatRowKey][flatColTotalKey] = []);
-                        for (let i = 0; i < this.indicatorKeys.length; i++) {
+                        for (let i = 0; i < this.indicators.length; i++) {
                             if (!this.tree[flatRowKey][flatColTotalKey][i]) {
-                                const aggRule = this.getAggregatorRule(this.indicatorKeys[i]);
-                                this.tree[flatRowKey][flatColTotalKey][i] = new this.aggregators[null !== (_g = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _g ? _g : ts_types_1.AggregationType.SUM](null !== (_h = null == aggRule ? void 0 : aggRule.field) && void 0 !== _h ? _h : this.indicatorKeys[i], null == aggRule ? void 0 : aggRule.formatFun);
+                                const aggRule = this.getAggregatorRule(this.indicators[i]);
+                                this.tree[flatRowKey][flatColTotalKey][i] = new this.aggregators[null !== (_g = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _g ? _g : ts_types_1.AggregationType.SUM](null !== (_h = null == aggRule ? void 0 : aggRule.field) && void 0 !== _h ? _h : this.indicators[i], null == aggRule ? void 0 : aggRule.formatFun);
                             }
                             this.tree[flatRowKey][flatColTotalKey][i].push(null === (_k = null === (_j = that.tree[flatRowKey]) || void 0 === _j ? void 0 : _j[flatColKey]) || void 0 === _k ? void 0 : _k[i]);
                         }
@@ -311,10 +261,10 @@ class Dataset {
                 if ((null === (_m = null === (_l = that.totals) || void 0 === _l ? void 0 : _l.column) || void 0 === _m ? void 0 : _m.showGrandTotals) || 0 === this.rows.length) {
                     const flatColTotalKey = that.colGrandTotalLabel;
                     this.tree[flatRowKey][flatColTotalKey] || (this.tree[flatRowKey][flatColTotalKey] = []);
-                    for (let i = 0; i < this.indicatorKeys.length; i++) {
+                    for (let i = 0; i < this.indicators.length; i++) {
                         if (!this.tree[flatRowKey][flatColTotalKey][i]) {
-                            const aggRule = this.getAggregatorRule(this.indicatorKeys[i]);
-                            this.tree[flatRowKey][flatColTotalKey][i] = new this.aggregators[null !== (_o = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _o ? _o : ts_types_1.AggregationType.SUM](null !== (_p = null == aggRule ? void 0 : aggRule.field) && void 0 !== _p ? _p : this.indicatorKeys[i], null == aggRule ? void 0 : aggRule.formatFun);
+                            const aggRule = this.getAggregatorRule(this.indicators[i]);
+                            this.tree[flatRowKey][flatColTotalKey][i] = new this.aggregators[null !== (_o = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _o ? _o : ts_types_1.AggregationType.SUM](null !== (_p = null == aggRule ? void 0 : aggRule.field) && void 0 !== _p ? _p : this.indicators[i], null == aggRule ? void 0 : aggRule.formatFun);
                         }
                         this.tree[flatRowKey][flatColTotalKey][i].push(null === (_r = null === (_q = that.tree[flatRowKey]) || void 0 === _q ? void 0 : _q[flatColKey]) || void 0 === _r ? void 0 : _r[i]);
                     }
@@ -333,29 +283,29 @@ class Dataset {
                             if (this.tree[flatRowTotalKey] || (this.tree[flatRowTotalKey] = {}, rowTotalKeys.push(flatRowTotalKey)), 
                             !this.tree[flatRowTotalKey][flatColKey]) {
                                 this.tree[flatRowTotalKey][flatColKey] = [];
-                                for (let i = 0; i < this.indicatorKeys.length; i++) {
+                                for (let i = 0; i < this.indicators.length; i++) {
                                     if (!this.tree[flatRowTotalKey][flatColKey][i]) {
-                                        const aggRule = this.getAggregatorRule(this.indicatorKeys[i]);
-                                        this.tree[flatRowTotalKey][flatColKey][i] = new this.aggregators[null !== (_g = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _g ? _g : ts_types_1.AggregationType.SUM](null !== (_h = null == aggRule ? void 0 : aggRule.field) && void 0 !== _h ? _h : this.indicatorKeys[i], null == aggRule ? void 0 : aggRule.formatFun);
+                                        const aggRule = this.getAggregatorRule(this.indicators[i]);
+                                        this.tree[flatRowTotalKey][flatColKey][i] = new this.aggregators[null !== (_g = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _g ? _g : ts_types_1.AggregationType.SUM](null !== (_h = null == aggRule ? void 0 : aggRule.field) && void 0 !== _h ? _h : this.indicators[i], null == aggRule ? void 0 : aggRule.formatFun);
                                     }
                                     this.tree[flatRowTotalKey][flatColKey][i].push(null === (_k = null === (_j = that.tree[flatRowKey]) || void 0 === _j ? void 0 : _j[flatColKey]) || void 0 === _k ? void 0 : _k[i]);
                                 }
                             }
                         }
-                    }
-                    if ((null === (_m = null === (_l = that.totals) || void 0 === _l ? void 0 : _l.row) || void 0 === _m ? void 0 : _m.showGrandTotals) || 0 === this.columns.length) {
-                        const flatRowTotalKey = that.rowGrandTotalLabel;
-                        this.tree[flatRowTotalKey] || (this.tree[flatRowTotalKey] = {}, rowTotalKeys.push(flatRowTotalKey)), 
-                        this.tree[flatRowTotalKey][flatColKey] || (this.tree[flatRowTotalKey][flatColKey] = []);
-                        for (let i = 0; i < this.indicatorKeys.length; i++) {
-                            if (!this.tree[flatRowTotalKey][flatColKey][i]) {
-                                const aggRule = this.getAggregatorRule(this.indicatorKeys[i]);
-                                this.tree[flatRowTotalKey][flatColKey][i] = new this.aggregators[null !== (_o = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _o ? _o : ts_types_1.AggregationType.SUM](null !== (_p = null == aggRule ? void 0 : aggRule.field) && void 0 !== _p ? _p : this.indicatorKeys[i], null == aggRule ? void 0 : aggRule.formatFun);
+                        if ((null === (_m = null === (_l = that.totals) || void 0 === _l ? void 0 : _l.row) || void 0 === _m ? void 0 : _m.showGrandTotals) || 0 === this.columns.length) {
+                            const flatRowTotalKey = that.rowGrandTotalLabel;
+                            this.tree[flatRowTotalKey] || (this.tree[flatRowTotalKey] = {}, rowTotalKeys.push(flatRowTotalKey)), 
+                            this.tree[flatRowTotalKey][flatColKey] || (this.tree[flatRowTotalKey][flatColKey] = []);
+                            for (let i = 0; i < this.indicators.length; i++) {
+                                if (!this.tree[flatRowTotalKey][flatColKey][i]) {
+                                    const aggRule = this.getAggregatorRule(this.indicators[i]);
+                                    this.tree[flatRowTotalKey][flatColKey][i] = new this.aggregators[null !== (_o = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _o ? _o : ts_types_1.AggregationType.SUM](null !== (_p = null == aggRule ? void 0 : aggRule.field) && void 0 !== _p ? _p : this.indicators[i], null == aggRule ? void 0 : aggRule.formatFun);
+                                }
+                                this.tree[flatRowTotalKey][flatColKey][i].push(null === (_r = null === (_q = that.tree[flatRowKey]) || void 0 === _q ? void 0 : _q[flatColKey]) || void 0 === _r ? void 0 : _r[i]);
                             }
-                            this.tree[flatRowTotalKey][flatColKey][i].push(null === (_r = null === (_q = that.tree[flatRowKey]) || void 0 === _q ? void 0 : _q[flatColKey]) || void 0 === _r ? void 0 : _r[i]);
                         }
+                        colCompute(flatRowKey, flatColKey);
                     }
-                    colCompute(flatRowKey, flatColKey);
                 }));
             })), rowTotalKeys.forEach((flatRowKey => {
                 Object.keys(that.tree[flatRowKey]).forEach((flatColKey => {
@@ -376,33 +326,33 @@ class Dataset {
                 if (!item) {
                     if (item = {
                         id: flatKey,
-                        children: []
+                        child: []
                     }, subTotalFlags[index]) {
-                        let curChild = item.children;
+                        let curChild = item.child;
                         for (let i = index; i < list.length - 1; i++) {
                             const totalChild = {
                                 id: `${flatKey}${concatStr}${subTotalLabel}`,
-                                children: []
+                                child: []
                             };
-                            curChild.push(totalChild), curChild = totalChild.children;
+                            curChild.push(totalChild), curChild = totalChild.child;
                         }
                     }
-                    map.set(flatKey, item), node ? subTotalFlags[index - 1] ? node.children.splice(node.children.length - 1, 0, item) : node.children.push(item) : result.push(item);
+                    map.set(flatKey, item), node ? subTotalFlags[index - 1] ? node.child.splice(node.child.length - 1, 0, item) : node.child.push(item) : result.push(item);
                 }
                 node = item;
             }));
         }(item))), isGrandTotal) {
             const node = {
                 id: grandTotalLabel,
-                children: []
+                child: []
             };
-            let curChild = node.children;
+            let curChild = node.child;
             for (let i = 1; i < subTotalFlags.length; i++) {
                 const totalChild = {
                     id: grandTotalLabel,
-                    children: []
+                    child: []
                 };
-                curChild.push(totalChild), curChild = totalChild.children;
+                curChild.push(totalChild), curChild = totalChild.child;
             }
             result.push(node);
         }
@@ -412,51 +362,129 @@ class Dataset {
         const result = [];
         function getPath(node, arr) {
             var _a;
-            arr.push(node.id), node.children.length > 0 ? null === (_a = node.children) || void 0 === _a || _a.forEach((childItem => getPath(childItem, [ ...arr ]))) : result.push(arr);
+            arr.push(node.id), node.child.length > 0 ? null === (_a = node.child) || void 0 === _a || _a.forEach((childItem => getPath(childItem, [ ...arr ]))) : result.push(arr);
         }
         return tree.forEach((treeNode => getPath(treeNode, []))), result;
     }
-    TreeToArr2(tree) {
-        const result = [];
-        function getPath(node, arr) {
-            var _a, _b;
-            arr.push(arr.length > 0 ? [ arr[arr.length - 1], node.value ].join(String.fromCharCode(0)) : node.value), 
-            (null === (_a = node.children) || void 0 === _a ? void 0 : _a.length) > 0 && !node.children[0].indicatorKey ? null === (_b = node.children) || void 0 === _b || _b.forEach((childItem => getPath(childItem, [ ...arr ]))) : result.push(arr);
-        }
-        return tree.forEach((treeNode => getPath(treeNode, []))), result;
+}
+
+exports.Dataset = Dataset;
+
+class Aggregator {
+    constructor(dimension, formatFun, isRecord) {
+        this.className = "Aggregator", this.isRecord = !0, this.records = [], this.field = dimension, 
+        this.formatFun = formatFun, this.isRecord = null != isRecord ? isRecord : this.isRecord;
     }
-    dealWithZeroAlign() {
-        const indicatorsToAlign = [];
-        for (let i = 0; i < this.aggregationRules.length; i++) {
-            const rule = this.aggregationRules[i];
-            (0, vutils_1.isArray)(rule.field) && 2 === rule.field.length && indicatorsToAlign.push(rule.field);
-        }
-        indicatorsToAlign.forEach((indicatorToAlign => {
-            const indicator1 = indicatorToAlign[0], indicator2 = indicatorToAlign[1], collectedValue1 = this.collectedValues[indicator1], collectedValue2 = this.collectedValues[indicator2];
-            this.collectedValues[indicator1 + "_align"] = {}, this.collectedValues[indicator2 + "_align"] = {};
-            for (const key in collectedValue1) {
-                const range1 = collectedValue1[key], range2 = collectedValue2[key], newRanges = (0, 
-                zero_align_1.getNewRangeToAlign)(range1, range2);
-                if (newRanges) {
-                    const {range1: newRange1, range2: newRange2} = newRanges;
-                    this.collectedValues[indicator1 + "_align"][key] = {
-                        min: newRange1[0],
-                        max: newRange1[1]
-                    }, this.collectedValues[indicator2 + "_align"][key] = {
-                        min: newRange2[0],
-                        max: newRange2[1]
-                    };
-                } else this.collectedValues[indicator1 + "_align"][key] = {
-                    min: range1.min,
-                    max: range1.max
-                }, this.collectedValues[indicator2 + "_align"][key] = {
-                    min: range2.min,
-                    max: range2.max
-                };
-            }
-        }));
+    formatValue() {
+        return this._formatedValue || (this.formatFun ? this._formatedValue = this.formatFun(this.value()) : this._formatedValue = this.value()), 
+        this._formatedValue;
     }
 }
 
-exports.Dataset = Dataset;
+class SumAggregator extends Aggregator {
+    constructor() {
+        super(...arguments), this.type = ts_types_1.AggregationType.SUM, this.sum = 0;
+    }
+    push(record) {
+        this.isRecord && ("Aggregator" === record.className ? this.records.push(...record.records) : this.records.push(record)), 
+        "Aggregator" === record.className ? this.sum += record.value() : isNaN(parseFloat(record[this.field])) || (this.sum += parseFloat(record[this.field]));
+    }
+    value() {
+        return this.sum;
+    }
+}
+
+class CountAggregator extends Aggregator {
+    constructor() {
+        super(...arguments), this.type = ts_types_1.AggregationType.COUNT, this.count = 0;
+    }
+    push(record) {
+        this.isRecord && ("Aggregator" === record.className ? this.records.push(...record.records) : this.records.push(record)), 
+        "Aggregator" === record.className ? this.count += record.value() : this.count++;
+    }
+    value() {
+        return this.count;
+    }
+}
+
+class AvgAggregator extends Aggregator {
+    constructor() {
+        super(...arguments), this.type = ts_types_1.AggregationType.AVG, this.sum = 0, this.count = 0;
+    }
+    push(record) {
+        this.isRecord && ("Aggregator" === record.className ? this.records.push(...record.records) : this.records.push(record)), 
+        "Aggregator" === record.className && record.type === ts_types_1.AggregationType.AVG ? (this.sum += record.sum, 
+        this.count += record.count) : isNaN(parseFloat(record[this.field])) || (this.sum += parseFloat(record[this.field]), 
+        this.count++);
+    }
+    value() {
+        return this.sum / this.count;
+    }
+}
+
+class MaxAggregator extends Aggregator {
+    constructor() {
+        super(...arguments), this.type = ts_types_1.AggregationType.MAX, this.max = Number.MIN_SAFE_INTEGER, 
+        this.isRecord = !1;
+    }
+    push(record) {
+        this.isRecord && ("Aggregator" === record.className ? this.records.push(...record.records) : this.records.push(record)), 
+        "number" == typeof record ? this.max = record > this.max ? record : this.max : "number" == typeof record[this.field] ? this.max = record[this.field] > this.max ? record[this.field] : this.max : isNaN(record[this.field]) || (this.max = parseFloat(record[this.field]) > this.max ? parseFloat(record[this.field]) : this.max);
+    }
+    value() {
+        return this.max;
+    }
+}
+
+class MinAggregator extends Aggregator {
+    constructor() {
+        super(...arguments), this.type = ts_types_1.AggregationType.MIN, this.min = Number.MAX_SAFE_INTEGER, 
+        this.isRecord = !1;
+    }
+    push(record) {
+        this.isRecord && ("Aggregator" === record.className ? this.records.push(...record.records) : this.records.push(record)), 
+        "number" == typeof record ? this.min = record < this.min ? record : this.min : "number" == typeof record[this.field] && (this.min = record[this.field] < this.min ? record[this.field] : this.min);
+    }
+    value() {
+        return this.min;
+    }
+}
+
+function indicatorSort(a, b) {
+    return a && b ? a.toString().localeCompare(b.toString(), "zh") : a ? 1 : -1;
+}
+
+function typeSort(a, b) {
+    return a && b ? a.toString().localeCompare(b.toString(), "zh") : a ? 1 : -1;
+}
+
+function naturalSort(as, bs) {
+    const rx = /(\d+)|(\D+)/g, rd = /\d/, rz = /^0/;
+    let a, a1, b, b1, nas = 0, nbs = 0;
+    if (null !== bs && null === as) return -1;
+    if (null !== as && null === bs) return 1;
+    if ("number" == typeof as && isNaN(as)) return -1;
+    if ("number" == typeof bs && isNaN(bs)) return 1;
+    if (nas = +as, nbs = +bs, nas < nbs) return -1;
+    if (nas > nbs) return 1;
+    if ("number" == typeof as && "number" != typeof bs) return -1;
+    if ("number" == typeof bs && "number" != typeof as) return 1;
+    if ("number" == typeof as && "number" == typeof bs) return 0;
+    if (isNaN(nbs) && !isNaN(nas)) return -1;
+    if (isNaN(nas) && !isNaN(nbs)) return 1;
+    if (a = String(as), b = String(bs), a === b) return 0;
+    if (!rd.test(a) || !rd.test(b)) return a > b ? 1 : -1;
+    for (a = a.match(rx), b = b.match(rx); a.length && b.length; ) if (a1 = a.shift(), 
+    b1 = b.shift(), a1 !== b1) return rd.test(a1) && rd.test(b1) ? a1.replace(rz, ".0") - b1.replace(rz, ".0") : a1 > b1 ? 1 : -1;
+    return a.length - b.length;
+}
+
+function sortBy(order) {
+    let x;
+    const mapping = {}, lowercase_mapping = {};
+    for (let i = 0; i < order.length; i++) x = order[i], mapping[x] = i, "string" == typeof x && (lowercase_mapping[x.toLowerCase()] = i);
+    return function(a, b) {
+        return null !== mapping[a] && void 0 !== mapping[a] && null !== mapping[b] && void 0 !== mapping[b] ? mapping[a] - mapping[b] : null !== mapping[a] && void 0 !== mapping[a] ? -1 : null !== mapping[b] && void 0 !== mapping[b] ? 1 : null !== lowercase_mapping[a] && void 0 !== mapping[a] && null !== lowercase_mapping[b] && void 0 !== mapping[b] ? lowercase_mapping[a] - lowercase_mapping[b] : null === lowercase_mapping[a] || void 0 === mapping[a] || null === lowercase_mapping[b] || void 0 === mapping[b] ? 0 : null !== lowercase_mapping[a] && void 0 !== mapping[a] ? -1 : null !== lowercase_mapping[b] && void 0 !== mapping[b] ? 1 : naturalSort(a, b);
+    };
+}
 //# sourceMappingURL=dataset.js.map