@visactor/vtable 1.26.6 → 1.26.8

package/cjs/dataset/dataset.js

@@ -12,9 +12,11 @@ class Dataset {
         this.tree = {}, this.changedTree = {}, this.colFlatKeys = {}, this.rowFlatKeys = {}, 
         this.colKeys = [], this.rowKeys = [], this.colKeys_normal = [], this.rowKeys_normal = [], 
         this.rowOrder = "key_a_to_z", this.colOrder = "key_a_to_z", this.sorted = !1, this.indicatorStatistics = [], 
-        this.stringJoinChar = String.fromCharCode(0), this.rowsIsTotal = [], this.colsIsTotal = [], 
-        this.collectedValues = {}, this.cacheCollectedValues = {}, this.totalRecordsTree = {}, 
-        this.registerAggregators(), this.dataConfig = dataConfig, this.filterRules = null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.filterRules, 
+        this.stringJoinChar = String.fromCharCode(0), this.groupedGrandTotalKey = String.fromCharCode(1) + "vtable_grouped_grand_total", 
+        this.groupedGrandTotalSubtotalKey = String.fromCharCode(1) + "vtable_grouped_grand_total_subtotal", 
+        this.rowsIsTotal = [], this.colsIsTotal = [], this.collectedValues = {}, this.cacheCollectedValues = {}, 
+        this.totalRecordsTree = {}, this.registerAggregators(), this.dataConfig = dataConfig, 
+        this.filterRules = null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.filterRules, 
         this.rowHierarchyType = null != rowHierarchyType ? rowHierarchyType : "grid", this.columnHierarchyType = null != columnHierarchyType ? columnHierarchyType : "grid", 
         this.sortRules = null === (_b = this.dataConfig) || void 0 === _b ? void 0 : _b.sortRules, 
         this.aggregationRules = null === (_c = this.dataConfig) || void 0 === _c ? void 0 : _c.aggregationRules, 
@@ -51,7 +53,7 @@ class Dataset {
         this.setRecords(records);
     }
     setRecords(records) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+        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, _5, _6;
         if (this.records = records, this.collectedValues = {}, this.cacheCollectedValues = {}, 
         this.totalRecordsTree = {}, this.tree = {}, this.colFlatKeys = {}, this.rowFlatKeys = {}, 
         this.colKeys = [], this.rowKeys = [], this.rowsHasValue = [], this.columnsHasValue = [], 
@@ -67,10 +69,10 @@ class Dataset {
             "undefined" != typeof window && window.performance.now();
             this.sortKeys();
             "undefined" != typeof window && window.performance.now(), "undefined" != typeof window && window.performance.now();
-            this.customRowTree ? this.rowHeaderTree = this.customRowTree : "tree" === this.rowHierarchyType ? this.rowHeaderTree = this.ArrToTree1(this.rowKeys, this.rows.filter(((key, index) => this.rowsHasValue[index])), this.indicatorsAsCol ? void 0 : this.indicators, (null === (_b = null === (_a = this.totals) || void 0 === _a ? void 0 : _a.row) || void 0 === _b ? void 0 : _b.showGrandTotals) || !this.indicatorsAsCol && 0 === this.columns.length || this.indicatorsAsCol && 0 === this.rows.length, this.rowGrandTotalLabel, null !== (_e = null === (_d = null === (_c = this.totals) || void 0 === _c ? void 0 : _c.row) || void 0 === _d ? void 0 : _d.showGrandTotalsOnTop) && void 0 !== _e && _e) : this.rowHeaderTree = this.ArrToTree(this.rowKeys, this.rows.filter(((key, index) => this.rowsHasValue[index])), this.indicatorsAsCol ? void 0 : this.indicators, this.rowsIsTotal, (null === (_g = null === (_f = this.totals) || void 0 === _f ? void 0 : _f.row) || void 0 === _g ? void 0 : _g.showGrandTotals) || this.indicatorsAsCol && 0 === this.rows.length, this.rowGrandTotalLabel, this.rowSubTotalLabel, null !== (_k = null === (_j = null === (_h = this.totals) || void 0 === _h ? void 0 : _h.row) || void 0 === _j ? void 0 : _j.showGrandTotalsOnTop) && void 0 !== _k && _k, null !== (_o = null === (_m = null === (_l = this.totals) || void 0 === _l ? void 0 : _l.row) || void 0 === _m ? void 0 : _m.showSubTotalsOnTop) && void 0 !== _o && _o), 
-            this.customColTree ? this.colHeaderTree = this.customColTree : this.colHeaderTree = this.ArrToTree(this.colKeys, this.columns.filter(((key, index) => this.columnsHasValue[index])), this.indicatorsAsCol ? this.indicators : void 0, this.colsIsTotal, (null === (_q = null === (_p = this.totals) || void 0 === _p ? void 0 : _p.column) || void 0 === _q ? void 0 : _q.showGrandTotals) || !this.indicatorsAsCol && 0 === this.columns.length, this.colGrandTotalLabel, this.colSubTotalLabel, null !== (_t = null === (_s = null === (_r = this.totals) || void 0 === _r ? void 0 : _r.column) || void 0 === _s ? void 0 : _s.showGrandTotalsOnLeft) && void 0 !== _t && _t, null !== (_w = null === (_v = null === (_u = this.totals) || void 0 === _u ? void 0 : _u.column) || void 0 === _v ? void 0 : _v.showSubTotalsOnLeft) && void 0 !== _w && _w);
+            this.customRowTree ? this.rowHeaderTree = this.customRowTree : "tree" === this.rowHierarchyType ? this.rowHeaderTree = this.ArrToTree1(this.rowKeys, this.rows.filter(((key, index) => this.rowsHasValue[index])), this.indicatorsAsCol ? void 0 : this.indicators, (null === (_b = null === (_a = this.totals) || void 0 === _a ? void 0 : _a.row) || void 0 === _b ? void 0 : _b.showGrandTotals) || !this.indicatorsAsCol && 0 === this.columns.length || this.indicatorsAsCol && 0 === this.rows.length, this.rowGrandTotalLabel, null !== (_e = null === (_d = null === (_c = this.totals) || void 0 === _c ? void 0 : _c.row) || void 0 === _d ? void 0 : _d.showGrandTotalsOnTop) && void 0 !== _e && _e, null === (_g = null === (_f = this.totals) || void 0 === _f ? void 0 : _f.row) || void 0 === _g ? void 0 : _g.grandTotalDimensions, this.rowSubTotalLabel, null !== (_k = null === (_j = null === (_h = this.totals) || void 0 === _h ? void 0 : _h.row) || void 0 === _j ? void 0 : _j.showSubTotalsOnTop) && void 0 !== _k && _k, this.rows) : this.rowHeaderTree = this.ArrToTree(this.rowKeys, this.rows.filter(((key, index) => this.rowsHasValue[index])), this.indicatorsAsCol ? void 0 : this.indicators, this.rowsIsTotal, (null === (_m = null === (_l = this.totals) || void 0 === _l ? void 0 : _l.row) || void 0 === _m ? void 0 : _m.showGrandTotals) || this.indicatorsAsCol && 0 === this.rows.length, this.rowGrandTotalLabel, this.rowSubTotalLabel, null !== (_q = null === (_p = null === (_o = this.totals) || void 0 === _o ? void 0 : _o.row) || void 0 === _p ? void 0 : _p.showGrandTotalsOnTop) && void 0 !== _q && _q, null !== (_t = null === (_s = null === (_r = this.totals) || void 0 === _r ? void 0 : _r.row) || void 0 === _s ? void 0 : _s.showSubTotalsOnTop) && void 0 !== _t && _t, null === (_v = null === (_u = this.totals) || void 0 === _u ? void 0 : _u.row) || void 0 === _v ? void 0 : _v.grandTotalDimensions, !0, this.rows), 
+            this.customColTree ? this.colHeaderTree = this.customColTree : this.colHeaderTree = this.ArrToTree(this.colKeys, this.columns.filter(((key, index) => this.columnsHasValue[index])), this.indicatorsAsCol ? this.indicators : void 0, this.colsIsTotal, (null === (_x = null === (_w = this.totals) || void 0 === _w ? void 0 : _w.column) || void 0 === _x ? void 0 : _x.showGrandTotals) || !this.indicatorsAsCol && 0 === this.columns.length, this.colGrandTotalLabel, this.colSubTotalLabel, null !== (_0 = null === (_z = null === (_y = this.totals) || void 0 === _y ? void 0 : _y.column) || void 0 === _z ? void 0 : _z.showGrandTotalsOnLeft) && void 0 !== _0 && _0, null !== (_3 = null === (_2 = null === (_1 = this.totals) || void 0 === _1 ? void 0 : _1.column) || void 0 === _2 ? void 0 : _2.showSubTotalsOnLeft) && void 0 !== _3 && _3, null === (_5 = null === (_4 = this.totals) || void 0 === _4 ? void 0 : _4.column) || void 0 === _5 ? void 0 : _5.grandTotalDimensions, !1, this.columns);
             "undefined" != typeof window && window.performance.now();
-            (null === (_x = this.dataConfig) || void 0 === _x ? void 0 : _x.isPivotChart) && this.cacheDeminsionCollectedValues();
+            (null === (_6 = this.dataConfig) || void 0 === _6 ? void 0 : _6.isPivotChart) && this.cacheDeminsionCollectedValues();
         }
     }
     registerAggregator(type, aggregator) {
@@ -126,7 +128,10 @@ class Dataset {
     processRecords() {
         var _a, _b;
         let isNeedFilter = !1;
-        if ((null !== (_b = null === (_a = this.filterRules) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0) >= 1 && (isNeedFilter = !0), 
+        (null !== (_b = null === (_a = this.filterRules) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0) >= 1 && (isNeedFilter = !0);
+        const records = (Array.isArray(this.records) ? this.records : Object.values(this.records).flat()).filter((record => !isNeedFilter || this.filterRecord(record)));
+        if (this.rowsHasValue = this.rows.map((row => records.some((record => record && row in record)))), 
+        this.columnsHasValue = this.columns.map((column => records.some((record => record && column in record)))), 
         Array.isArray(this.records)) {
             this.filteredRecords || (this.filteredRecords = []);
             for (let i = 0, len = this.records.length; i < len; i++) {
@@ -162,53 +167,72 @@ class Dataset {
         }
         return isReserved;
     }
+    collectValue(field, collectKeys, record) {
+        var _a;
+        if (this.collectedValues[field] || (this.collectedValues[field] = {}), 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] = []), this.collectValuesBy[field].sumBy) {
+            const sumByKeys = null === (_a = this.collectValuesBy[field].sumBy) || void 0 === _a ? void 0 : _a.map((byField => record[byField])).join(this.stringJoinChar);
+            this.collectedValues[field][collectKeys][sumByKeys] || (this.collectedValues[field][collectKeys][sumByKeys] = new aggregation_1.registeredAggregators[ts_types_1.AggregationType.SUM]({
+                key: field,
+                field: field,
+                isRecord: void 0,
+                needSplitPositiveAndNegative: this.needSplitPositiveAndNegative
+            })), this.collectedValues[field][collectKeys][sumByKeys].push(record);
+        } else if (this.collectValuesBy[field].range) {
+            const fieldRange = this.collectedValues[field][collectKeys];
+            let max = Math.max(record[field], fieldRange.max), min = Math.min(record[field], fieldRange.min);
+            if (this.collectValuesBy[field].considerFields) for (const considerField of this.collectValuesBy[field].considerFields) record[considerField] && ("number" == typeof record[considerField] ? (max = Math.max(record[considerField], max), 
+            min = Math.min(record[considerField], min)) : Array.isArray(record[considerField]) && (max = Math.max(...record[considerField], max), 
+            min = Math.min(...record[considerField], min)));
+            isNaN(max) || (fieldRange.max = max, fieldRange.min = min);
+        } else {
+            const fieldValues = this.collectedValues[field][collectKeys];
+            -1 === fieldValues.indexOf(record[field]) && fieldValues.push(record[field]);
+        }
+    }
+    getGroupedCollectedValueKeys(by, record) {
+        var _a, _b, _c;
+        if (!(null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.isPivotChart)) return [];
+        const keys = new Set;
+        return [ {
+            dimensions: this.rows,
+            totals: null === (_b = this.totals) || void 0 === _b ? void 0 : _b.row
+        }, {
+            dimensions: this.columns,
+            totals: null === (_c = this.totals) || void 0 === _c ? void 0 : _c.column
+        } ].forEach((({dimensions: dimensions, totals: totals}) => {
+            if (!(null == totals ? void 0 : totals.showGrandTotals)) return;
+            const dimensionIndexes = this.getGrandTotalDimensionIndexes(dimensions, totals.grandTotalDimensions);
+            dimensionIndexes.length && dimensionIndexes.every((index => -1 !== by.indexOf(dimensions[index]))) && (keys.add((0, 
+            join_1.join)([ this.groupedGrandTotalKey, ...dimensionIndexes.map((index => record[dimensions[index]])) ], this.stringJoinChar)), 
+            keys.add((0, join_1.join)([ this.groupedGrandTotalKey, this.groupedGrandTotalSubtotalKey ], this.stringJoinChar)));
+        })), Array.from(keys);
+    }
     processRecord(record, assignedIndicatorKey) {
-        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, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41;
+        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, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52;
         null === (_a = this.derivedFieldRules) || void 0 === _a || _a.forEach(((derivedFieldRule, i) => {
             derivedFieldRule.fieldName && derivedFieldRule.derivedFunc && (record[derivedFieldRule.fieldName] = derivedFieldRule.derivedFunc(record));
         }));
-        for (const field in this.collectValuesBy) if ((0, vutils_1.isValid)(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] = []), this.collectValuesBy[field].sumBy) {
-                const sumByKeys = null === (_b = this.collectValuesBy[field].sumBy) || void 0 === _b ? void 0 : _b.map((byField => record[byField])).join(this.stringJoinChar);
-                this.collectedValues[field][collectKeys][sumByKeys] || (this.collectedValues[field][collectKeys][sumByKeys] = new aggregation_1.registeredAggregators[ts_types_1.AggregationType.SUM]({
-                    key: field,
-                    field: field,
-                    isRecord: void 0,
-                    needSplitPositiveAndNegative: this.needSplitPositiveAndNegative
-                })), this.collectedValues[field][collectKeys][sumByKeys].push(record);
-            } else if (this.collectValuesBy[field].range) {
-                const fieldRange = this.collectedValues[field][collectKeys];
-                let max = Math.max(record[field], fieldRange.max), min = Math.min(record[field], fieldRange.min);
-                if (this.collectValuesBy[field].considerFields) for (const considerField of this.collectValuesBy[field].considerFields) record[considerField] && ("number" == typeof record[considerField] ? (max = Math.max(record[considerField], max), 
-                min = Math.min(record[considerField], min)) : Array.isArray(record[considerField]) && (max = Math.max(...record[considerField], max), 
-                min = Math.min(...record[considerField], min)));
-                isNaN(max) || (fieldRange.max = max, fieldRange.min = min);
-            } else {
-                const fieldRange = this.collectedValues[field][collectKeys];
-                -1 === fieldRange.indexOf(record[field]) && fieldRange.push(record[field]);
-            }
-        }
         let isToTalRecord = !1;
         const colKeys = [], rowKeys = [];
-        if (!this.parseCustomTreeToMatchRecords || (null === (_c = this.dataConfig) || void 0 === _c ? void 0 : _c.isPivotChart) || !(null === (_d = this.customRowTree) || void 0 === _d ? void 0 : _d.length) || assignedIndicatorKey || this.hasExtensionRowTree) {
+        if (!this.parseCustomTreeToMatchRecords || (null === (_b = this.dataConfig) || void 0 === _b ? void 0 : _b.isPivotChart) || !(null === (_c = this.customRowTree) || void 0 === _c ? void 0 : _c.length) || assignedIndicatorKey || this.hasExtensionRowTree) {
             const rowKey = [];
             rowKeys.push({
                 rowKey: rowKey,
                 indicatorKey: assignedIndicatorKey
             });
-            for (let l = 0, len1 = this.rows.length; l < len1; l++) {
+            const customGroupedGrandTotalKey = (null === (_f = null === (_e = null === (_d = this.dataConfig) || void 0 === _d ? void 0 : _d.totals) || void 0 === _e ? void 0 : _e.row) || void 0 === _f ? void 0 : _f.showGrandTotals) && this.rowsHasValue[0] ? this.getCustomGroupedGrandTotalKey(record, this.rows, null === (_j = null === (_h = null === (_g = this.dataConfig) || void 0 === _g ? void 0 : _g.totals) || void 0 === _h ? void 0 : _h.row) || void 0 === _j ? void 0 : _j.grandTotalDimensions) : void 0;
+            if (customGroupedGrandTotalKey) rowKey.push(...customGroupedGrandTotalKey), isToTalRecord = !0; else for (let l = 0, len1 = this.rows.length; l < len1; l++) {
                 const rowAttr = this.rows[l];
                 if (rowAttr in record) this.rowsHasValue[l] = !0, rowKey.push(record[rowAttr]); else if (rowAttr !== global_1.IndicatorDimensionKeyPlaceholder) {
-                    if ((null === (_g = null === (_f = null === (_e = this.dataConfig) || void 0 === _e ? void 0 : _e.totals) || void 0 === _f ? void 0 : _f.row) || void 0 === _g ? void 0 : _g.showGrandTotals) && 0 === l && !this.rows.find((rk => rk in record))) {
-                        rowKey.push(this.rowGrandTotalLabel), isToTalRecord = !0;
+                    if ((null === (_m = null === (_l = null === (_k = this.dataConfig) || void 0 === _k ? void 0 : _k.totals) || void 0 === _l ? void 0 : _l.row) || void 0 === _m ? void 0 : _m.showGrandTotals) && 0 === l && !this.rows.find((rk => rk in record))) {
+                        this.getGrandTotalDimensionIndexes(this.rows, this.dataConfig.totals.row.grandTotalDimensions).length ? rowKey.push(this.groupedGrandTotalKey, this.groupedGrandTotalSubtotalKey) : rowKey.push(this.rowGrandTotalLabel), 
+                        isToTalRecord = !0;
                         break;
                     }
-                    if ((null === (_k = null === (_j = null === (_h = this.dataConfig) || void 0 === _h ? void 0 : _h.totals) || void 0 === _j ? void 0 : _j.row) || void 0 === _k ? void 0 : _k.subTotalsDimensions) && (null === (_o = null === (_m = null === (_l = this.dataConfig) || void 0 === _l ? void 0 : _l.totals) || void 0 === _m ? void 0 : _m.row) || void 0 === _o ? void 0 : _o.subTotalsDimensions.indexOf(this.rows[l - 1])) >= 0) {
+                    if ((null === (_q = null === (_p = null === (_o = this.dataConfig) || void 0 === _o ? void 0 : _o.totals) || void 0 === _p ? void 0 : _p.row) || void 0 === _q ? void 0 : _q.subTotalsDimensions) && (null === (_t = null === (_s = null === (_r = this.dataConfig) || void 0 === _r ? void 0 : _r.totals) || void 0 === _s ? void 0 : _s.row) || void 0 === _t ? void 0 : _t.subTotalsDimensions.indexOf(this.rows[l - 1])) >= 0) {
                         "tree" !== this.rowHierarchyType && rowKey.push(this.rowSubTotalLabel), isToTalRecord = !0;
                         break;
                     }
@@ -226,20 +250,22 @@ class Dataset {
                 });
             }
         }
-        if (!this.parseCustomTreeToMatchRecords || (null === (_p = this.dataConfig) || void 0 === _p ? void 0 : _p.isPivotChart) || !(null === (_q = this.customColTree) || void 0 === _q ? void 0 : _q.length) || assignedIndicatorKey || this.hasExtensionRowTree) {
+        if (!this.parseCustomTreeToMatchRecords || (null === (_u = this.dataConfig) || void 0 === _u ? void 0 : _u.isPivotChart) || !(null === (_v = this.customColTree) || void 0 === _v ? void 0 : _v.length) || assignedIndicatorKey || this.hasExtensionRowTree) {
             const colKey = [];
             colKeys.push({
                 colKey: colKey,
                 indicatorKey: assignedIndicatorKey
             });
-            for (let n = 0, len2 = this.columns.length; n < len2; n++) {
+            const customGroupedGrandTotalKey = (null === (_y = null === (_x = null === (_w = this.dataConfig) || void 0 === _w ? void 0 : _w.totals) || void 0 === _x ? void 0 : _x.column) || void 0 === _y ? void 0 : _y.showGrandTotals) && this.columnsHasValue[0] ? this.getCustomGroupedGrandTotalKey(record, this.columns, null === (_1 = null === (_0 = null === (_z = this.dataConfig) || void 0 === _z ? void 0 : _z.totals) || void 0 === _0 ? void 0 : _0.column) || void 0 === _1 ? void 0 : _1.grandTotalDimensions) : void 0;
+            if (customGroupedGrandTotalKey) colKey.push(...customGroupedGrandTotalKey), isToTalRecord = !0; else for (let n = 0, len2 = this.columns.length; n < len2; n++) {
                 const colAttr = this.columns[n];
                 if (colAttr in record) this.columnsHasValue[n] = !0, colKey.push(record[colAttr]); else if (colAttr !== global_1.IndicatorDimensionKeyPlaceholder) {
-                    if ((null === (_t = null === (_s = null === (_r = this.dataConfig) || void 0 === _r ? void 0 : _r.totals) || void 0 === _s ? void 0 : _s.column) || void 0 === _t ? void 0 : _t.showGrandTotals) && 0 === n && !this.columns.find((ck => ck in record))) {
-                        colKey.push(this.colGrandTotalLabel), isToTalRecord = !0;
+                    if ((null === (_4 = null === (_3 = null === (_2 = this.dataConfig) || void 0 === _2 ? void 0 : _2.totals) || void 0 === _3 ? void 0 : _3.column) || void 0 === _4 ? void 0 : _4.showGrandTotals) && 0 === n && !this.columns.find((ck => ck in record))) {
+                        this.getGrandTotalDimensionIndexes(this.columns, this.dataConfig.totals.column.grandTotalDimensions).length ? colKey.push(this.groupedGrandTotalKey, this.groupedGrandTotalSubtotalKey) : colKey.push(this.colGrandTotalLabel), 
+                        isToTalRecord = !0;
                         break;
                     }
-                    if ((null === (_w = null === (_v = null === (_u = this.dataConfig) || void 0 === _u ? void 0 : _u.totals) || void 0 === _v ? void 0 : _v.column) || void 0 === _w ? void 0 : _w.subTotalsDimensions) && (null === (_z = null === (_y = null === (_x = this.dataConfig) || void 0 === _x ? void 0 : _x.totals) || void 0 === _y ? void 0 : _y.column) || void 0 === _z ? void 0 : _z.subTotalsDimensions.indexOf(this.columns[n - 1])) >= 0) {
+                    if ((null === (_7 = null === (_6 = null === (_5 = this.dataConfig) || void 0 === _5 ? void 0 : _5.totals) || void 0 === _6 ? void 0 : _6.column) || void 0 === _7 ? void 0 : _7.subTotalsDimensions) && (null === (_10 = null === (_9 = null === (_8 = this.dataConfig) || void 0 === _8 ? void 0 : _8.totals) || void 0 === _9 ? void 0 : _9.column) || void 0 === _10 ? void 0 : _10.subTotalsDimensions.indexOf(this.columns[n - 1])) >= 0) {
                         colKey.push(this.colSubTotalLabel), isToTalRecord = !0;
                         break;
                     }
@@ -257,6 +283,12 @@ class Dataset {
                 });
             }
         }
+        if (!isToTalRecord) for (const field in this.collectValuesBy) if ((0, vutils_1.isValid)(record[field])) {
+            const collectKeys = this.collectValuesBy[field].by.map((byField => record[byField])).join(this.stringJoinChar);
+            this.collectValue(field, collectKeys, record), this.getGroupedCollectedValueKeys(this.collectValuesBy[field].by, record).forEach((groupedCollectKeys => {
+                this.collectValue(field, groupedCollectKeys, record);
+            }));
+        }
         for (let row_i = 0; row_i < rowKeys.length; row_i++) {
             const rowKey = rowKeys[row_i].rowKey;
             let assignedIndicatorKey_value;
@@ -270,55 +302,55 @@ class Dataset {
                     this.totalRecordsTree[flatRowKey] || (this.totalRecordsTree[flatRowKey] = {}), this.totalRecordsTree[flatRowKey][flatColKey] || (this.totalRecordsTree[flatRowKey][flatColKey] = []);
                     const toComputeIndicatorKeys = this.indicatorKeysIncludeCalculatedFieldDependIndicatorKeys;
                     for (let i = 0; i < toComputeIndicatorKeys.length; i++) if (this.calculatedFiledKeys.indexOf(toComputeIndicatorKeys[i]) >= 0) {
-                        const calculatedFieldRule = null === (_0 = this.calculatedFieldRules) || void 0 === _0 ? void 0 : _0.find((rule => rule.key === toComputeIndicatorKeys[i]));
-                        (null === (_2 = null === (_1 = this.totalRecordsTree[flatRowKey]) || void 0 === _1 ? void 0 : _1[flatColKey]) || void 0 === _2 ? void 0 : _2[i]) || (this.totalRecordsTree[flatRowKey][flatColKey][i] = new aggregation_1.registeredAggregators[ts_types_1.AggregationType.RECALCULATE]({
+                        const calculatedFieldRule = null === (_11 = this.calculatedFieldRules) || void 0 === _11 ? void 0 : _11.find((rule => rule.key === toComputeIndicatorKeys[i]));
+                        (null === (_13 = null === (_12 = this.totalRecordsTree[flatRowKey]) || void 0 === _12 ? void 0 : _12[flatColKey]) || void 0 === _13 ? void 0 : _13[i]) || (this.totalRecordsTree[flatRowKey][flatColKey][i] = new aggregation_1.registeredAggregators[ts_types_1.AggregationType.RECALCULATE]({
                             key: toComputeIndicatorKeys[i],
                             field: toComputeIndicatorKeys[i],
                             isRecord: !0,
-                            formatFun: null === (_4 = null === (_3 = this.indicators) || void 0 === _3 ? void 0 : _3.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _4 ? void 0 : _4.format,
+                            formatFun: null === (_15 = null === (_14 = this.indicators) || void 0 === _14 ? void 0 : _14.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _15 ? void 0 : _15.format,
                             calculateFun: null == calculatedFieldRule ? void 0 : calculatedFieldRule.calculateFun,
                             dependAggregators: this.totalRecordsTree[flatRowKey][flatColKey],
                             dependIndicatorKeys: null == calculatedFieldRule ? void 0 : calculatedFieldRule.dependIndicatorKeys
-                        })), toComputeIndicatorKeys[i] in record && (null === (_6 = null === (_5 = this.totalRecordsTree[flatRowKey]) || void 0 === _5 ? void 0 : _5[flatColKey]) || void 0 === _6 || _6[i].push(record));
+                        })), toComputeIndicatorKeys[i] in record && (null === (_17 = null === (_16 = this.totalRecordsTree[flatRowKey]) || void 0 === _16 ? void 0 : _16[flatColKey]) || void 0 === _17 || _17[i].push(record));
                     } else {
                         const aggRule = this.getAggregatorRule(toComputeIndicatorKeys[i]);
-                        (null === (_8 = null === (_7 = this.totalRecordsTree[flatRowKey]) || void 0 === _7 ? void 0 : _7[flatColKey]) || void 0 === _8 ? void 0 : _8[i]) || (this.totalRecordsTree[flatRowKey][flatColKey][i] = new aggregation_1.registeredAggregators[null !== (_9 = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _9 ? _9 : ts_types_1.AggregationType.SUM]({
+                        (null === (_19 = null === (_18 = this.totalRecordsTree[flatRowKey]) || void 0 === _18 ? void 0 : _18[flatColKey]) || void 0 === _19 ? void 0 : _19[i]) || (this.totalRecordsTree[flatRowKey][flatColKey][i] = new aggregation_1.registeredAggregators[null !== (_20 = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _20 ? _20 : ts_types_1.AggregationType.SUM]({
                             key: toComputeIndicatorKeys[i],
-                            field: null !== (_10 = null == aggRule ? void 0 : aggRule.field) && void 0 !== _10 ? _10 : toComputeIndicatorKeys[i],
+                            field: null !== (_21 = null == aggRule ? void 0 : aggRule.field) && void 0 !== _21 ? _21 : toComputeIndicatorKeys[i],
                             aggregationFun: null == aggRule ? void 0 : aggRule.aggregationFun,
-                            formatFun: null !== (_11 = null == aggRule ? void 0 : aggRule.formatFun) && void 0 !== _11 ? _11 : null === (_13 = null === (_12 = this.indicators) || void 0 === _12 ? void 0 : _12.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _13 ? void 0 : _13.format
-                        })), toComputeIndicatorKeys[i] in record && (null === (_15 = null === (_14 = this.totalRecordsTree[flatRowKey]) || void 0 === _14 ? void 0 : _14[flatColKey]) || void 0 === _15 || _15[i].push(record));
+                            formatFun: null !== (_22 = null == aggRule ? void 0 : aggRule.formatFun) && void 0 !== _22 ? _22 : null === (_24 = null === (_23 = this.indicators) || void 0 === _23 ? void 0 : _23.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _24 ? void 0 : _24.format
+                        })), toComputeIndicatorKeys[i] in record && (null === (_26 = null === (_25 = this.totalRecordsTree[flatRowKey]) || void 0 === _25 ? void 0 : _25[flatColKey]) || void 0 === _26 || _26[i].push(record));
                     }
                     return;
                 }
                 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)), this.tree[flatRowKey] || (this.tree[flatRowKey] = {}), 
-                (null === (_16 = this.tree[flatRowKey]) || void 0 === _16 ? void 0 : _16[flatColKey]) || (this.tree[flatRowKey][flatColKey] = []);
+                (null === (_27 = this.tree[flatRowKey]) || void 0 === _27 ? void 0 : _27[flatColKey]) || (this.tree[flatRowKey][flatColKey] = []);
                 const toComputeIndicatorKeys = this.indicatorKeysIncludeCalculatedFieldDependIndicatorKeys;
                 for (let i = 0; i < toComputeIndicatorKeys.length; i++) if (this.calculatedFiledKeys.indexOf(toComputeIndicatorKeys[i]) >= 0) {
-                    const calculatedFieldRule = null === (_17 = this.calculatedFieldRules) || void 0 === _17 ? void 0 : _17.find((rule => rule.key === toComputeIndicatorKeys[i]));
-                    (null === (_19 = null === (_18 = this.tree[flatRowKey]) || void 0 === _18 ? void 0 : _18[flatColKey]) || void 0 === _19 ? void 0 : _19[i]) || (this.tree[flatRowKey][flatColKey][i] = new aggregation_1.registeredAggregators[ts_types_1.AggregationType.RECALCULATE]({
+                    const calculatedFieldRule = null === (_28 = this.calculatedFieldRules) || void 0 === _28 ? void 0 : _28.find((rule => rule.key === toComputeIndicatorKeys[i]));
+                    (null === (_30 = null === (_29 = this.tree[flatRowKey]) || void 0 === _29 ? void 0 : _29[flatColKey]) || void 0 === _30 ? void 0 : _30[i]) || (this.tree[flatRowKey][flatColKey][i] = new aggregation_1.registeredAggregators[ts_types_1.AggregationType.RECALCULATE]({
                         key: toComputeIndicatorKeys[i],
                         field: toComputeIndicatorKeys[i],
                         isRecord: !0,
-                        formatFun: null === (_21 = null === (_20 = this.indicators) || void 0 === _20 ? void 0 : _20.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _21 ? void 0 : _21.format,
+                        formatFun: null === (_32 = null === (_31 = this.indicators) || void 0 === _31 ? void 0 : _31.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _32 ? void 0 : _32.format,
                         calculateFun: null == calculatedFieldRule ? void 0 : calculatedFieldRule.calculateFun,
                         dependAggregators: this.tree[flatRowKey][flatColKey],
                         dependIndicatorKeys: null == calculatedFieldRule ? void 0 : calculatedFieldRule.dependIndicatorKeys
-                    })), null === (_23 = null === (_22 = this.tree[flatRowKey]) || void 0 === _22 ? void 0 : _22[flatColKey]) || void 0 === _23 || _23[i].push(record);
+                    })), null === (_34 = null === (_33 = this.tree[flatRowKey]) || void 0 === _33 ? void 0 : _33[flatColKey]) || void 0 === _34 || _34[i].push(record);
                 } else {
                     const aggRule = this.getAggregatorRule(toComputeIndicatorKeys[i]);
                     let needAddToAggregator = !1;
                     if (assignedIndicatorKey_value) assignedIndicatorKey === assignedIndicatorKey_value ? toComputeIndicatorKeys[i] === assignedIndicatorKey_value && (needAddToAggregator = !0) : toComputeIndicatorKeys[i] === assignedIndicatorKey_value && toComputeIndicatorKeys[i] in record && (needAddToAggregator = !0); else if (null == aggRule ? void 0 : aggRule.field) if ("string" == typeof (null == aggRule ? void 0 : aggRule.field)) (null == aggRule ? void 0 : aggRule.field) in record && (needAddToAggregator = !0); else {
                         (null == aggRule ? void 0 : aggRule.field.find((field => field in record))) && (needAddToAggregator = !0);
                     } else toComputeIndicatorKeys[i] in record && (needAddToAggregator = !0);
-                    !(null === (_25 = null === (_24 = this.tree[flatRowKey]) || void 0 === _24 ? void 0 : _24[flatColKey]) || void 0 === _25 ? void 0 : _25[i]) && needAddToAggregator && (this.tree[flatRowKey][flatColKey][i] = new aggregation_1.registeredAggregators[null !== (_26 = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _26 ? _26 : ts_types_1.AggregationType.SUM]({
+                    !(null === (_36 = null === (_35 = this.tree[flatRowKey]) || void 0 === _35 ? void 0 : _35[flatColKey]) || void 0 === _36 ? void 0 : _36[i]) && needAddToAggregator && (this.tree[flatRowKey][flatColKey][i] = new aggregation_1.registeredAggregators[null !== (_37 = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _37 ? _37 : ts_types_1.AggregationType.SUM]({
                         key: toComputeIndicatorKeys[i],
-                        field: null !== (_27 = null == aggRule ? void 0 : aggRule.field) && void 0 !== _27 ? _27 : toComputeIndicatorKeys[i],
+                        field: null !== (_38 = null == aggRule ? void 0 : aggRule.field) && void 0 !== _38 ? _38 : toComputeIndicatorKeys[i],
                         aggregationFun: null == aggRule ? void 0 : aggRule.aggregationFun,
-                        formatFun: null !== (_28 = null == aggRule ? void 0 : aggRule.formatFun) && void 0 !== _28 ? _28 : null === (_30 = null === (_29 = this.indicators) || void 0 === _29 ? void 0 : _29.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _30 ? void 0 : _30.format
-                    })), needAddToAggregator && (null === (_32 = null === (_31 = this.tree[flatRowKey]) || void 0 === _31 ? void 0 : _31[flatColKey]) || void 0 === _32 || _32[i].push(record));
+                        formatFun: null !== (_39 = null == aggRule ? void 0 : aggRule.formatFun) && void 0 !== _39 ? _39 : null === (_41 = null === (_40 = this.indicators) || void 0 === _40 ? void 0 : _40.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _41 ? void 0 : _41.format
+                    })), needAddToAggregator && (null === (_43 = null === (_42 = this.tree[flatRowKey]) || void 0 === _42 ? void 0 : _42[flatColKey]) || void 0 === _43 || _43[i].push(record));
                 }
                 if (this.mappingRules) for (let i = 0; i < this.indicatorKeys.length; i++) {
                     if (!this.indicatorStatistics[i]) {
@@ -332,25 +364,25 @@ class Dataset {
                                 key: this.indicatorKeys[i],
                                 field: this.indicatorKeys[i]
                             }),
-                            total: new aggregation_1.registeredAggregators[null !== (_33 = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _33 ? _33 : ts_types_1.AggregationType.SUM]({
+                            total: new aggregation_1.registeredAggregators[null !== (_44 = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _44 ? _44 : ts_types_1.AggregationType.SUM]({
                                 key: this.indicatorKeys[i],
-                                field: null !== (_34 = null == aggRule ? void 0 : aggRule.field) && void 0 !== _34 ? _34 : this.indicatorKeys[i],
+                                field: null !== (_45 = null == aggRule ? void 0 : aggRule.field) && void 0 !== _45 ? _45 : this.indicatorKeys[i],
                                 aggregationFun: null == aggRule ? void 0 : aggRule.aggregationFun,
-                                formatFun: null !== (_35 = null == aggRule ? void 0 : aggRule.formatFun) && void 0 !== _35 ? _35 : null === (_37 = null === (_36 = this.indicators) || void 0 === _36 ? void 0 : _36.find((indicator => "string" != typeof indicator && indicator.indicatorKey === this.indicatorKeys[i]))) || void 0 === _37 ? void 0 : _37.format
+                                formatFun: null !== (_46 = null == aggRule ? void 0 : aggRule.formatFun) && void 0 !== _46 ? _46 : null === (_48 = null === (_47 = this.indicators) || void 0 === _47 ? void 0 : _47.find((indicator => "string" != typeof indicator && indicator.indicatorKey === this.indicatorKeys[i]))) || void 0 === _48 ? void 0 : _48.format
                             })
                         };
                     }
-                    this.indicatorStatistics[i].max.push(null === (_39 = null === (_38 = this.tree[flatRowKey]) || void 0 === _38 ? void 0 : _38[flatColKey]) || void 0 === _39 ? void 0 : _39[i].value()), 
-                    this.indicatorStatistics[i].min.push(null === (_41 = null === (_40 = this.tree[flatRowKey]) || void 0 === _40 ? void 0 : _40[flatColKey]) || void 0 === _41 ? void 0 : _41[i].value()), 
+                    this.indicatorStatistics[i].max.push(null === (_50 = null === (_49 = this.tree[flatRowKey]) || void 0 === _49 ? void 0 : _49[flatColKey]) || void 0 === _50 ? void 0 : _50[i].value()), 
+                    this.indicatorStatistics[i].min.push(null === (_52 = null === (_51 = this.tree[flatRowKey]) || void 0 === _51 ? void 0 : _51[flatColKey]) || void 0 === _52 ? void 0 : _52[i].value()), 
                     this.indicatorStatistics[i].total.push(record);
                 }
             }
         }
     }
     updateSortRules(sortRules) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
-        this.sorted = !1, this.sortRules = sortRules, this.sortKeys(), this.customRowTree || ("tree" === this.rowHierarchyType ? this.rowHeaderTree = this.ArrToTree1(this.rowKeys, this.rows.filter(((key, index) => this.rowsHasValue[index])), this.indicatorsAsCol ? void 0 : this.indicators, (null === (_b = null === (_a = this.totals) || void 0 === _a ? void 0 : _a.row) || void 0 === _b ? void 0 : _b.showGrandTotals) || !this.indicatorsAsCol && 0 === this.columns.length || this.indicatorsAsCol && 0 === this.rows.length, this.rowGrandTotalLabel, null !== (_e = null === (_d = null === (_c = this.totals) || void 0 === _c ? void 0 : _c.row) || void 0 === _d ? void 0 : _d.showGrandTotalsOnTop) && void 0 !== _e && _e) : this.rowHeaderTree = this.ArrToTree(this.rowKeys, this.rows.filter(((key, index) => this.rowsHasValue[index])), this.indicatorsAsCol ? void 0 : this.indicators, this.rowsIsTotal, (null === (_g = null === (_f = this.totals) || void 0 === _f ? void 0 : _f.row) || void 0 === _g ? void 0 : _g.showGrandTotals) || this.indicatorsAsCol && 0 === this.rows.length, this.rowGrandTotalLabel, this.rowSubTotalLabel, null !== (_k = null === (_j = null === (_h = this.totals) || void 0 === _h ? void 0 : _h.row) || void 0 === _j ? void 0 : _j.showGrandTotalsOnTop) && void 0 !== _k && _k, null !== (_o = null === (_m = null === (_l = this.totals) || void 0 === _l ? void 0 : _l.row) || void 0 === _m ? void 0 : _m.showSubTotalsOnTop) && void 0 !== _o && _o)), 
-        this.customColTree || (this.colHeaderTree = this.ArrToTree(this.colKeys, this.columns.filter(((key, index) => this.columnsHasValue[index])), this.indicatorsAsCol ? this.indicators : void 0, this.colsIsTotal, (null === (_q = null === (_p = this.totals) || void 0 === _p ? void 0 : _p.column) || void 0 === _q ? void 0 : _q.showGrandTotals) || !this.indicatorsAsCol && 0 === this.columns.length, this.colGrandTotalLabel, this.colSubTotalLabel, null !== (_t = null === (_s = null === (_r = this.totals) || void 0 === _r ? void 0 : _r.column) || void 0 === _s ? void 0 : _s.showGrandTotalsOnLeft) && void 0 !== _t && _t, null !== (_w = null === (_v = null === (_u = this.totals) || void 0 === _u ? void 0 : _u.column) || void 0 === _v ? void 0 : _v.showSubTotalsOnLeft) && void 0 !== _w && _w));
+        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, _5;
+        this.sorted = !1, this.sortRules = sortRules, this.sortKeys(), this.customRowTree || ("tree" === this.rowHierarchyType ? this.rowHeaderTree = this.ArrToTree1(this.rowKeys, this.rows.filter(((key, index) => this.rowsHasValue[index])), this.indicatorsAsCol ? void 0 : this.indicators, (null === (_b = null === (_a = this.totals) || void 0 === _a ? void 0 : _a.row) || void 0 === _b ? void 0 : _b.showGrandTotals) || !this.indicatorsAsCol && 0 === this.columns.length || this.indicatorsAsCol && 0 === this.rows.length, this.rowGrandTotalLabel, null !== (_e = null === (_d = null === (_c = this.totals) || void 0 === _c ? void 0 : _c.row) || void 0 === _d ? void 0 : _d.showGrandTotalsOnTop) && void 0 !== _e && _e, null === (_g = null === (_f = this.totals) || void 0 === _f ? void 0 : _f.row) || void 0 === _g ? void 0 : _g.grandTotalDimensions, this.rowSubTotalLabel, null !== (_k = null === (_j = null === (_h = this.totals) || void 0 === _h ? void 0 : _h.row) || void 0 === _j ? void 0 : _j.showSubTotalsOnTop) && void 0 !== _k && _k, this.rows) : this.rowHeaderTree = this.ArrToTree(this.rowKeys, this.rows.filter(((key, index) => this.rowsHasValue[index])), this.indicatorsAsCol ? void 0 : this.indicators, this.rowsIsTotal, (null === (_m = null === (_l = this.totals) || void 0 === _l ? void 0 : _l.row) || void 0 === _m ? void 0 : _m.showGrandTotals) || this.indicatorsAsCol && 0 === this.rows.length, this.rowGrandTotalLabel, this.rowSubTotalLabel, null !== (_q = null === (_p = null === (_o = this.totals) || void 0 === _o ? void 0 : _o.row) || void 0 === _p ? void 0 : _p.showGrandTotalsOnTop) && void 0 !== _q && _q, null !== (_t = null === (_s = null === (_r = this.totals) || void 0 === _r ? void 0 : _r.row) || void 0 === _s ? void 0 : _s.showSubTotalsOnTop) && void 0 !== _t && _t, null === (_v = null === (_u = this.totals) || void 0 === _u ? void 0 : _u.row) || void 0 === _v ? void 0 : _v.grandTotalDimensions, !0, this.rows)), 
+        this.customColTree || (this.colHeaderTree = this.ArrToTree(this.colKeys, this.columns.filter(((key, index) => this.columnsHasValue[index])), this.indicatorsAsCol ? this.indicators : void 0, this.colsIsTotal, (null === (_x = null === (_w = this.totals) || void 0 === _w ? void 0 : _w.column) || void 0 === _x ? void 0 : _x.showGrandTotals) || !this.indicatorsAsCol && 0 === this.columns.length, this.colGrandTotalLabel, this.colSubTotalLabel, null !== (_0 = null === (_z = null === (_y = this.totals) || void 0 === _y ? void 0 : _y.column) || void 0 === _z ? void 0 : _z.showGrandTotalsOnLeft) && void 0 !== _0 && _0, null !== (_3 = null === (_2 = null === (_1 = this.totals) || void 0 === _1 ? void 0 : _1.column) || void 0 === _2 ? void 0 : _2.showSubTotalsOnLeft) && void 0 !== _3 && _3, null === (_5 = null === (_4 = this.totals) || void 0 === _4 ? void 0 : _4.column) || void 0 === _5 ? void 0 : _5.grandTotalDimensions, !1, this.columns));
     }
     updateFilterRules(filterRules, isResetTree = !1) {
         var _a, _b;
@@ -364,7 +396,7 @@ class Dataset {
         return null === (_a = this.aggregationRules) || void 0 === _a ? void 0 : _a.find(((value, index) => indicatorKey === value.indicatorKey));
     }
     getAggregator(rowKey = [], colKey = [], indicator, considerChangedValue = !0, indicatorPosition) {
-        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, _q, _r, _s, _t, _u, _v, _w, _x, _y;
         const indicatorIndex = this.indicatorKeys.indexOf(indicator);
         let rowDimensionKey, colDimensionKey, flatRowKey, flatColKey;
         if ("row" === (null == indicatorPosition ? void 0 : indicatorPosition.position)) rowDimensionKey = rowKey.length >= 2 ? this.rows[rowKey.length - 2] : void 0; else {
@@ -375,15 +407,24 @@ class Dataset {
             const colIndex = colKey.length - 1;
             colDimensionKey = colIndex >= 0 && colIndex < this.columns.length ? this.columns[colIndex] : void 0;
         }
-        "string" == typeof rowKey ? flatRowKey = rowKey : (indicatorPosition && "row" !== indicatorPosition.position || rowKey.map(((key, i) => {
+        if ("string" == typeof rowKey ? flatRowKey = rowKey : (indicatorPosition && "row" !== indicatorPosition.position || rowKey.map(((key, i) => {
             key !== indicator || (0, vutils_1.isValid)(null == indicatorPosition ? void 0 : indicatorPosition.index) && i !== indicatorPosition.index || rowKey.splice(i, 1);
-        })), rowKey.length < this.rows.length && "grid-tree" === this.rowHierarchyType && (rowKey[0] === this.rowGrandTotalLabel || ((null === (_b = null === (_a = this.totals) || void 0 === _a ? void 0 : _a.row) || void 0 === _b ? void 0 : _b.subTotalsDimensions) && (null === (_e = null === (_d = null === (_c = this.totals) || void 0 === _c ? void 0 : _c.row) || void 0 === _d ? void 0 : _d.subTotalsDimensions) || void 0 === _e ? void 0 : _e.length) >= 1 && this.totals.row.subTotalsDimensions.find((dimension => dimension === rowDimensionKey)) || (null === (_g = null === (_f = this.totals) || void 0 === _f ? void 0 : _f.row) || void 0 === _g ? void 0 : _g.showSubTotalsOnTreeNode)) && rowKey[rowKey.length - 1] !== this.rowSubTotalLabel && rowKey.push(this.rowSubTotalLabel)), 
+        })), rowKey.length < this.rows.length && "grid-tree" === this.rowHierarchyType && (rowKey[0] === this.rowGrandTotalLabel || rowKey[0] === this.groupedGrandTotalKey || ((null === (_b = null === (_a = this.totals) || void 0 === _a ? void 0 : _a.row) || void 0 === _b ? void 0 : _b.subTotalsDimensions) && (null === (_e = null === (_d = null === (_c = this.totals) || void 0 === _c ? void 0 : _c.row) || void 0 === _d ? void 0 : _d.subTotalsDimensions) || void 0 === _e ? void 0 : _e.length) >= 1 && this.totals.row.subTotalsDimensions.find((dimension => dimension === rowDimensionKey)) || (null === (_g = null === (_f = this.totals) || void 0 === _f ? void 0 : _f.row) || void 0 === _g ? void 0 : _g.showSubTotalsOnTreeNode)) && rowKey[rowKey.length - 1] !== this.rowSubTotalLabel && rowKey.push(this.rowSubTotalLabel)), 
         flatRowKey = (0, join_1.join)(rowKey, this.stringJoinChar)), "string" == typeof colKey ? flatColKey = colKey : (indicatorPosition && "col" !== indicatorPosition.position || colKey.map(((key, i) => {
             key !== indicator || (0, vutils_1.isValid)(null == indicatorPosition ? void 0 : indicatorPosition.index) && i !== indicatorPosition.index || colKey.splice(i, 1);
-        })), colKey.length < this.columns.length && "grid-tree" === this.columnHierarchyType && (colKey[0] === this.colGrandTotalLabel || ((null === (_j = null === (_h = this.totals) || void 0 === _h ? void 0 : _h.column) || void 0 === _j ? void 0 : _j.subTotalsDimensions) && (null === (_m = null === (_l = null === (_k = this.totals) || void 0 === _k ? void 0 : _k.column) || void 0 === _l ? void 0 : _l.subTotalsDimensions) || void 0 === _m ? void 0 : _m.length) >= 1 && this.totals.column.subTotalsDimensions.find((dimension => dimension === colDimensionKey)) || (null === (_p = null === (_o = this.totals) || void 0 === _o ? void 0 : _o.column) || void 0 === _p ? void 0 : _p.showSubTotalsOnTreeNode)) && colKey[colKey.length - 1] !== this.colSubTotalLabel && colKey.push(this.colSubTotalLabel)), 
-        flatColKey = (0, join_1.join)(colKey, this.stringJoinChar));
-        const agg = null === (_r = null === (_q = this.tree[flatRowKey]) || void 0 === _q ? void 0 : _q[flatColKey]) || void 0 === _r ? void 0 : _r[indicatorIndex];
-        if (considerChangedValue && (0, vutils_1.isValid)(null === (_t = null === (_s = this.changedTree[flatRowKey]) || void 0 === _s ? void 0 : _s[flatColKey]) || void 0 === _t ? void 0 : _t[indicatorIndex])) {
+        })), colKey.length < this.columns.length && "grid-tree" === this.columnHierarchyType && (colKey[0] === this.colGrandTotalLabel || colKey[0] === this.groupedGrandTotalKey || ((null === (_j = null === (_h = this.totals) || void 0 === _h ? void 0 : _h.column) || void 0 === _j ? void 0 : _j.subTotalsDimensions) && (null === (_m = null === (_l = null === (_k = this.totals) || void 0 === _k ? void 0 : _k.column) || void 0 === _l ? void 0 : _l.subTotalsDimensions) || void 0 === _m ? void 0 : _m.length) >= 1 && this.totals.column.subTotalsDimensions.find((dimension => dimension === colDimensionKey)) || (null === (_p = null === (_o = this.totals) || void 0 === _o ? void 0 : _o.column) || void 0 === _p ? void 0 : _p.showSubTotalsOnTreeNode)) && colKey[colKey.length - 1] !== this.colSubTotalLabel && colKey.push(this.colSubTotalLabel)), 
+        flatColKey = (0, join_1.join)(colKey, this.stringJoinChar)), Array.isArray(rowKey) && rowKey[0] === this.rowGrandTotalLabel && !this.tree[flatRowKey] && this.getGrandTotalDimensionIndexes(this.rows.filter(((_, index) => this.rowsHasValue[index])), null === (_r = null === (_q = this.totals) || void 0 === _q ? void 0 : _q.row) || void 0 === _r ? void 0 : _r.grandTotalDimensions, this.rows).length) {
+            const internalRowKey = rowKey.slice();
+            internalRowKey[0] = this.groupedGrandTotalKey, 2 === internalRowKey.length && internalRowKey[1] === this.rowSubTotalLabel && (internalRowKey[1] = this.groupedGrandTotalSubtotalKey), 
+            flatRowKey = (0, join_1.join)(internalRowKey, this.stringJoinChar);
+        }
+        if (Array.isArray(colKey) && colKey[0] === this.colGrandTotalLabel && !(null === (_s = this.tree[flatRowKey]) || void 0 === _s ? void 0 : _s[flatColKey]) && this.getGrandTotalDimensionIndexes(this.columns.filter(((_, index) => this.columnsHasValue[index])), null === (_u = null === (_t = this.totals) || void 0 === _t ? void 0 : _t.column) || void 0 === _u ? void 0 : _u.grandTotalDimensions, this.columns).length) {
+            const internalColKey = colKey.slice();
+            internalColKey[0] = this.groupedGrandTotalKey, 2 === internalColKey.length && internalColKey[1] === this.colSubTotalLabel && (internalColKey[1] = this.groupedGrandTotalSubtotalKey), 
+            flatColKey = (0, join_1.join)(internalColKey, this.stringJoinChar);
+        }
+        const agg = null === (_w = null === (_v = this.tree[flatRowKey]) || void 0 === _v ? void 0 : _v[flatColKey]) || void 0 === _w ? void 0 : _w[indicatorIndex];
+        if (considerChangedValue && (0, vutils_1.isValid)(null === (_y = null === (_x = this.changedTree[flatRowKey]) || void 0 === _x ? void 0 : _x[flatColKey]) || void 0 === _y ? void 0 : _y[indicatorIndex])) {
             const changeValue = this.changedTree[flatRowKey][flatColKey][indicatorIndex];
             return agg ? {
                 value: () => changeValue,
@@ -427,7 +468,7 @@ class Dataset {
             this.colKeys.sort(sortfun);
         }
     }
-    arrSort(fieldArr, isRow) {
+    arrSort(fieldArr, isRow, pathPrefix) {
         let field;
         const that = this, sortersArr = function(_this) {
             const results = [];
@@ -451,9 +492,10 @@ class Dataset {
                 if (sorter = sortersArr[i], null === (_a = sorter.sortRule) || void 0 === _a ? void 0 : _a.sortByIndicator) {
                     let aChanged = a, bChanged = b;
                     sorter.fieldIndex < fieldArr.length - 1 && (aChanged = a.slice(0, sorter.fieldIndex + 1), 
-                    "grid" === that.rowHierarchyType && isRow ? aChanged.push(that.rowSubTotalLabel) : isRow || aChanged.push(that.colSubTotalLabel), 
-                    bChanged = b.slice(0, sorter.fieldIndex + 1), "grid" === that.rowHierarchyType && isRow ? bChanged.push(that.rowSubTotalLabel) : isRow || bChanged.push(that.colSubTotalLabel)), 
-                    comparison = sorter.func(aChanged, bChanged, null === (_b = sorter.sortRule) || void 0 === _b ? void 0 : _b.sortType);
+                    !(null == pathPrefix ? void 0 : pathPrefix.length) && "grid" === that.rowHierarchyType && isRow ? aChanged.push(that.rowSubTotalLabel) : (null == pathPrefix ? void 0 : pathPrefix.length) || isRow || aChanged.push(that.colSubTotalLabel), 
+                    bChanged = b.slice(0, sorter.fieldIndex + 1), !(null == pathPrefix ? void 0 : pathPrefix.length) && "grid" === that.rowHierarchyType && isRow ? bChanged.push(that.rowSubTotalLabel) : (null == pathPrefix ? void 0 : pathPrefix.length) || isRow || bChanged.push(that.colSubTotalLabel)), 
+                    (null == pathPrefix ? void 0 : pathPrefix.length) && (aChanged = [ ...pathPrefix, ...aChanged ], 
+                    bChanged = [ ...pathPrefix, ...bChanged ]), comparison = sorter.func(aChanged, bChanged, null === (_b = sorter.sortRule) || void 0 === _b ? void 0 : _b.sortType);
                 } else comparison = null === (_c = sorter.func) || void 0 === _c ? void 0 : _c.call(sorter, a[sorter.fieldIndex], b[sorter.fieldIndex], null === (_d = sorter.sortRule) || void 0 === _d ? void 0 : _d.sortType);
                 if (0 !== comparison) return comparison;
             }
@@ -464,8 +506,8 @@ class Dataset {
         const that = this;
         return sortRule.sortByIndicator ? (a, b, sortType) => {
             const getValue = function(rowKey, colKey) {
-                return "grid" === that.rowHierarchyType && rowKey.length < that.rows.length && rowKey[rowKey.length - 1] !== that.rowSubTotalLabel && rowKey[rowKey.length - 1] !== that.rowGrandTotalLabel && rowKey.push(that.rowSubTotalLabel), 
-                colKey.length < that.columns.length && colKey[colKey.length - 1] !== that.colSubTotalLabel && colKey[colKey.length - 1] !== that.colGrandTotalLabel && colKey.push(that.colSubTotalLabel), 
+                return "grid" === that.rowHierarchyType && rowKey.length < that.rows.length && rowKey[rowKey.length - 1] !== that.rowSubTotalLabel && rowKey[rowKey.length - 1] !== that.rowGrandTotalLabel && rowKey[0] !== that.groupedGrandTotalKey && rowKey.push(that.rowSubTotalLabel), 
+                colKey.length < that.columns.length && colKey[colKey.length - 1] !== that.colSubTotalLabel && colKey[colKey.length - 1] !== that.colGrandTotalLabel && colKey[0] !== that.groupedGrandTotalKey && colKey.push(that.colSubTotalLabel), 
                 that.getAggregator(rowKey, colKey, sortRule.sortByIndicator).value();
             };
             return isSortRow ? sortRule.sortFunc ? sortRule.sortFunc(getValue(a, sortRule.query), getValue(b, sortRule.query), a, b, sortType) : (0, 
@@ -476,7 +518,7 @@ class Dataset {
     totalStatistics() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
         const that = this, colCompute = (flatRowKey, flatColKey) => {
-            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, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32;
+            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, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34;
             if (null === (_b = null === (_a = this.totalRecordsTree) || void 0 === _a ? void 0 : _a[flatRowKey]) || void 0 === _b ? void 0 : _b[flatColKey]) return this.tree[flatRowKey] || (this.tree[flatRowKey] = {}), 
             void (this.tree[flatRowKey][flatColKey] = null === (_d = null === (_c = this.totalRecordsTree) || void 0 === _c ? void 0 : _c[flatRowKey]) || void 0 === _d ? void 0 : _d[flatColKey]);
             const colKey = flatColKey.split(this.stringJoinChar);
@@ -518,32 +560,38 @@ class Dataset {
                     }
                 }
             }
-            if ((null === (_14 = null === (_13 = that.totals) || void 0 === _13 ? void 0 : _13.column) || void 0 === _14 ? void 0 : _14.showGrandTotals) || 0 === this.rows.length) {
-                const flatColTotalKey = that.colGrandTotalLabel;
-                if (null === (_16 = null === (_15 = this.totalRecordsTree) || void 0 === _15 ? void 0 : _15[flatRowKey]) || void 0 === _16 ? void 0 : _16[flatColTotalKey]) return void (this.tree[flatRowKey][flatColTotalKey] = null === (_18 = null === (_17 = this.totalRecordsTree) || void 0 === _17 ? void 0 : _17[flatRowKey]) || void 0 === _18 ? void 0 : _18[flatColTotalKey]);
-                this.tree[flatRowKey][flatColTotalKey] || (this.tree[flatRowKey][flatColTotalKey] = []);
-                const toComputeIndicatorKeys = this.indicatorKeysIncludeCalculatedFieldDependIndicatorKeys;
-                for (let i = 0; i < toComputeIndicatorKeys.length; i++) if (this.calculatedFiledKeys.indexOf(toComputeIndicatorKeys[i]) >= 0) {
-                    const calculatedFieldRule = null === (_19 = this.calculatedFieldRules) || void 0 === _19 ? void 0 : _19.find((rule => rule.key === toComputeIndicatorKeys[i]));
-                    (null === (_21 = null === (_20 = this.tree[flatRowKey]) || void 0 === _20 ? void 0 : _20[flatColTotalKey]) || void 0 === _21 ? void 0 : _21[i]) || (this.tree[flatRowKey][flatColTotalKey][i] = new aggregation_1.registeredAggregators[ts_types_1.AggregationType.RECALCULATE]({
-                        key: toComputeIndicatorKeys[i],
-                        field: toComputeIndicatorKeys[i],
-                        isRecord: !0,
-                        formatFun: null === (_23 = null === (_22 = this.indicators) || void 0 === _22 ? void 0 : _22.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _23 ? void 0 : _23.format,
-                        calculateFun: null == calculatedFieldRule ? void 0 : calculatedFieldRule.calculateFun,
-                        dependAggregators: this.tree[flatRowKey][flatColTotalKey],
-                        dependIndicatorKeys: null == calculatedFieldRule ? void 0 : calculatedFieldRule.dependIndicatorKeys
-                    })), flatColTotalKey !== flatColKey && this.tree[flatRowKey][flatColTotalKey][i].push(null === (_25 = null === (_24 = that.tree[flatRowKey]) || void 0 === _24 ? void 0 : _24[flatColKey]) || void 0 === _25 ? void 0 : _25[i]);
-                } else {
-                    if (!this.tree[flatRowKey][flatColTotalKey][i]) {
-                        const aggRule = this.getAggregatorRule(toComputeIndicatorKeys[i]);
-                        this.tree[flatRowKey][flatColTotalKey][i] = new aggregation_1.registeredAggregators[null !== (_26 = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _26 ? _26 : ts_types_1.AggregationType.SUM]({
+            if (((null === (_14 = null === (_13 = that.totals) || void 0 === _13 ? void 0 : _13.column) || void 0 === _14 ? void 0 : _14.showGrandTotals) || 0 === this.rows.length) && colKey[0] !== this.groupedGrandTotalKey) {
+                const flatColTotalKeys = this.getGrandTotalKeys(colKey, that.columns.filter(((_, index) => that.columnsHasValue[index])), null === (_16 = null === (_15 = that.totals) || void 0 === _15 ? void 0 : _15.column) || void 0 === _16 ? void 0 : _16.grandTotalDimensions, that.colGrandTotalLabel, that.columns);
+                for (const flatColTotalKey of flatColTotalKeys) {
+                    if (null === (_18 = null === (_17 = this.totalRecordsTree) || void 0 === _17 ? void 0 : _17[flatRowKey]) || void 0 === _18 ? void 0 : _18[flatColTotalKey]) {
+                        this.tree[flatRowKey][flatColTotalKey] = null === (_20 = null === (_19 = this.totalRecordsTree) || void 0 === _19 ? void 0 : _19[flatRowKey]) || void 0 === _20 ? void 0 : _20[flatColTotalKey];
+                        continue;
+                    }
+                    this.tree[flatRowKey][flatColTotalKey] || (this.tree[flatRowKey][flatColTotalKey] = []);
+                    const toComputeIndicatorKeys = this.indicatorKeysIncludeCalculatedFieldDependIndicatorKeys;
+                    for (let i = 0; i < toComputeIndicatorKeys.length; i++) if (this.calculatedFiledKeys.indexOf(toComputeIndicatorKeys[i]) >= 0) {
+                        const calculatedFieldRule = null === (_21 = this.calculatedFieldRules) || void 0 === _21 ? void 0 : _21.find((rule => rule.key === toComputeIndicatorKeys[i]));
+                        (null === (_23 = null === (_22 = this.tree[flatRowKey]) || void 0 === _22 ? void 0 : _22[flatColTotalKey]) || void 0 === _23 ? void 0 : _23[i]) || (this.tree[flatRowKey][flatColTotalKey][i] = new aggregation_1.registeredAggregators[ts_types_1.AggregationType.RECALCULATE]({
                             key: toComputeIndicatorKeys[i],
-                            field: null !== (_27 = null == aggRule ? void 0 : aggRule.field) && void 0 !== _27 ? _27 : toComputeIndicatorKeys[i],
-                            formatFun: null !== (_28 = null == aggRule ? void 0 : aggRule.formatFun) && void 0 !== _28 ? _28 : null === (_30 = null === (_29 = this.indicators) || void 0 === _29 ? void 0 : _29.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _30 ? void 0 : _30.format
-                        });
+                            field: toComputeIndicatorKeys[i],
+                            isRecord: !0,
+                            formatFun: null === (_25 = null === (_24 = this.indicators) || void 0 === _24 ? void 0 : _24.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _25 ? void 0 : _25.format,
+                            calculateFun: null == calculatedFieldRule ? void 0 : calculatedFieldRule.calculateFun,
+                            dependAggregators: this.tree[flatRowKey][flatColTotalKey],
+                            dependIndicatorKeys: null == calculatedFieldRule ? void 0 : calculatedFieldRule.dependIndicatorKeys
+                        })), flatColTotalKey !== flatColKey && this.tree[flatRowKey][flatColTotalKey][i].push(null === (_27 = null === (_26 = that.tree[flatRowKey]) || void 0 === _26 ? void 0 : _26[flatColKey]) || void 0 === _27 ? void 0 : _27[i]);
+                    } else {
+                        if (!this.tree[flatRowKey][flatColTotalKey][i]) {
+                            const aggRule = this.getAggregatorRule(toComputeIndicatorKeys[i]);
+                            this.tree[flatRowKey][flatColTotalKey][i] = new aggregation_1.registeredAggregators[null !== (_28 = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _28 ? _28 : ts_types_1.AggregationType.SUM]({
+                                key: toComputeIndicatorKeys[i],
+                                field: null !== (_29 = null == aggRule ? void 0 : aggRule.field) && void 0 !== _29 ? _29 : toComputeIndicatorKeys[i],
+                                aggregationFun: null == aggRule ? void 0 : aggRule.aggregationFun,
+                                formatFun: null !== (_30 = null == aggRule ? void 0 : aggRule.formatFun) && void 0 !== _30 ? _30 : null === (_32 = null === (_31 = this.indicators) || void 0 === _31 ? void 0 : _31.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _32 ? void 0 : _32.format
+                            }), this.tree[flatRowKey][flatColTotalKey][i] instanceof aggregation_1.CustomAggregator && flatColTotalKey.startsWith(this.groupedGrandTotalKey) && (this.tree[flatRowKey][flatColTotalKey][i].recalculateFromChildren = !0);
+                        }
+                        flatColTotalKey !== flatColKey && this.tree[flatRowKey][flatColTotalKey][i].push(null === (_34 = null === (_33 = that.tree[flatRowKey]) || void 0 === _33 ? void 0 : _33[flatColKey]) || void 0 === _34 ? void 0 : _34[i]);
                     }
-                    flatColTotalKey !== flatColKey && this.tree[flatRowKey][flatColTotalKey][i].push(null === (_32 = null === (_31 = that.tree[flatRowKey]) || void 0 === _31 ? void 0 : _31[flatColKey]) || void 0 === _32 ? void 0 : _32[i]);
                 }
             }
         };
@@ -552,7 +600,7 @@ class Dataset {
             Object.keys(that.tree).forEach((flatRowKey => {
                 const rowKey = flatRowKey.split(this.stringJoinChar);
                 Object.keys(that.tree[flatRowKey]).forEach((flatColKey => {
-                    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, _5, _6, _7, _8, _9, _10, _11, _12;
+                    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, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14;
                     if ((null === (_b = null === (_a = that.totals) || void 0 === _a ? void 0 : _a.row) || void 0 === _b ? void 0 : _b.subTotalsDimensions) && (null === (_e = null === (_d = null === (_c = that.totals) || void 0 === _c ? void 0 : _c.row) || void 0 === _d ? void 0 : _d.subTotalsDimensions) || void 0 === _e ? void 0 : _e.length) > 0 && (!1 !== (null === (_g = null === (_f = that.totals) || void 0 === _f ? void 0 : _f.row) || void 0 === _g ? void 0 : _g.showSubTotals) || (null === (_j = null === (_h = that.totals) || void 0 === _h ? void 0 : _h.row) || void 0 === _j ? void 0 : _j.showSubTotalsOnTreeNode)) || (null === (_l = null === (_k = that.totals) || void 0 === _k ? void 0 : _k.row) || void 0 === _l ? void 0 : _l.showSubTotalsOnTreeNode) && that.rows.length > 0) {
                         let rowSubTotalDimensions = (null === (_o = null === (_m = that.totals) || void 0 === _m ? void 0 : _m.row) || void 0 === _o ? void 0 : _o.subTotalsDimensions) || [];
                         (null === (_q = null === (_p = that.totals) || void 0 === _p ? void 0 : _p.row) || void 0 === _q ? void 0 : _q.showSubTotalsOnTreeNode) && 0 === rowSubTotalDimensions.length && (rowSubTotalDimensions = that.rows.map((row => row)));
@@ -590,32 +638,35 @@ class Dataset {
                             }
                         }
                     }
-                    if ((null === (_2 = null === (_1 = that.totals) || void 0 === _1 ? void 0 : _1.row) || void 0 === _2 ? void 0 : _2.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] = []);
-                        const toComputeIndicatorKeys = this.indicatorKeysIncludeCalculatedFieldDependIndicatorKeys;
-                        for (let i = 0; i < toComputeIndicatorKeys.length; i++) {
-                            if (!this.tree[flatRowTotalKey][flatColKey][i]) if (this.calculatedFiledKeys.indexOf(toComputeIndicatorKeys[i]) >= 0) {
-                                const calculatedFieldRule = null === (_3 = this.calculatedFieldRules) || void 0 === _3 ? void 0 : _3.find((rule => rule.key === toComputeIndicatorKeys[i]));
-                                this.tree[flatRowTotalKey][flatColKey][i] = new aggregation_1.registeredAggregators[ts_types_1.AggregationType.RECALCULATE]({
-                                    key: toComputeIndicatorKeys[i],
-                                    field: toComputeIndicatorKeys[i],
-                                    isRecord: !0,
-                                    formatFun: null === (_5 = null === (_4 = this.indicators) || void 0 === _4 ? void 0 : _4.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _5 ? void 0 : _5.format,
-                                    calculateFun: null == calculatedFieldRule ? void 0 : calculatedFieldRule.calculateFun,
-                                    dependAggregators: this.tree[flatRowTotalKey][flatColKey],
-                                    dependIndicatorKeys: null == calculatedFieldRule ? void 0 : calculatedFieldRule.dependIndicatorKeys
-                                });
-                            } else {
-                                const aggRule = this.getAggregatorRule(toComputeIndicatorKeys[i]);
-                                this.tree[flatRowTotalKey][flatColKey][i] = new aggregation_1.registeredAggregators[null !== (_6 = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _6 ? _6 : ts_types_1.AggregationType.SUM]({
-                                    key: toComputeIndicatorKeys[i],
-                                    field: null !== (_7 = null == aggRule ? void 0 : aggRule.field) && void 0 !== _7 ? _7 : toComputeIndicatorKeys[i],
-                                    formatFun: null !== (_8 = null == aggRule ? void 0 : aggRule.formatFun) && void 0 !== _8 ? _8 : null === (_10 = null === (_9 = this.indicators) || void 0 === _9 ? void 0 : _9.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _10 ? void 0 : _10.format
-                                });
+                    if (((null === (_2 = null === (_1 = that.totals) || void 0 === _1 ? void 0 : _1.row) || void 0 === _2 ? void 0 : _2.showGrandTotals) || 0 === this.columns.length) && rowKey[0] !== this.groupedGrandTotalKey) {
+                        const flatRowTotalKeys = this.getGrandTotalKeys(rowKey, that.rows.filter(((_, index) => that.rowsHasValue[index])), null === (_4 = null === (_3 = that.totals) || void 0 === _3 ? void 0 : _3.row) || void 0 === _4 ? void 0 : _4.grandTotalDimensions, that.rowGrandTotalLabel, that.rows);
+                        for (const flatRowTotalKey of flatRowTotalKeys) {
+                            this.tree[flatRowTotalKey] || (this.tree[flatRowTotalKey] = {}, rowTotalKeys.push(flatRowTotalKey)), 
+                            this.tree[flatRowTotalKey][flatColKey] || (this.tree[flatRowTotalKey][flatColKey] = []);
+                            const toComputeIndicatorKeys = this.indicatorKeysIncludeCalculatedFieldDependIndicatorKeys;
+                            for (let i = 0; i < toComputeIndicatorKeys.length; i++) {
+                                if (!this.tree[flatRowTotalKey][flatColKey][i]) if (this.calculatedFiledKeys.indexOf(toComputeIndicatorKeys[i]) >= 0) {
+                                    const calculatedFieldRule = null === (_5 = this.calculatedFieldRules) || void 0 === _5 ? void 0 : _5.find((rule => rule.key === toComputeIndicatorKeys[i]));
+                                    this.tree[flatRowTotalKey][flatColKey][i] = new aggregation_1.registeredAggregators[ts_types_1.AggregationType.RECALCULATE]({
+                                        key: toComputeIndicatorKeys[i],
+                                        field: toComputeIndicatorKeys[i],
+                                        isRecord: !0,
+                                        formatFun: null === (_7 = null === (_6 = this.indicators) || void 0 === _6 ? void 0 : _6.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _7 ? void 0 : _7.format,
+                                        calculateFun: null == calculatedFieldRule ? void 0 : calculatedFieldRule.calculateFun,
+                                        dependAggregators: this.tree[flatRowTotalKey][flatColKey],
+                                        dependIndicatorKeys: null == calculatedFieldRule ? void 0 : calculatedFieldRule.dependIndicatorKeys
+                                    });
+                                } else {
+                                    const aggRule = this.getAggregatorRule(toComputeIndicatorKeys[i]);
+                                    this.tree[flatRowTotalKey][flatColKey][i] = new aggregation_1.registeredAggregators[null !== (_8 = null == aggRule ? void 0 : aggRule.aggregationType) && void 0 !== _8 ? _8 : ts_types_1.AggregationType.SUM]({
+                                        key: toComputeIndicatorKeys[i],
+                                        field: null !== (_9 = null == aggRule ? void 0 : aggRule.field) && void 0 !== _9 ? _9 : toComputeIndicatorKeys[i],
+                                        aggregationFun: null == aggRule ? void 0 : aggRule.aggregationFun,
+                                        formatFun: null !== (_10 = null == aggRule ? void 0 : aggRule.formatFun) && void 0 !== _10 ? _10 : null === (_12 = null === (_11 = this.indicators) || void 0 === _11 ? void 0 : _11.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _12 ? void 0 : _12.format
+                                    }), this.tree[flatRowTotalKey][flatColKey][i] instanceof aggregation_1.CustomAggregator && flatRowTotalKey.startsWith(this.groupedGrandTotalKey) && (this.tree[flatRowTotalKey][flatColKey][i].recalculateFromChildren = !0);
+                                }
+                                flatRowTotalKey !== flatRowKey && this.tree[flatRowTotalKey][flatColKey][i].push(null === (_14 = null === (_13 = that.tree[flatRowKey]) || void 0 === _13 ? void 0 : _13[flatColKey]) || void 0 === _14 ? void 0 : _14[i]);
                             }
-                            flatRowTotalKey !== flatRowKey && this.tree[flatRowTotalKey][flatColKey][i].push(null === (_12 = null === (_11 = that.tree[flatRowKey]) || void 0 === _11 ? void 0 : _11[flatColKey]) || void 0 === _12 ? void 0 : _12[i]);
                         }
                     }
                     colCompute(flatRowKey, flatColKey);
@@ -628,7 +679,37 @@ class Dataset {
         }
         for (const flatRowKey in that.totalRecordsTree) for (const flatColKey in that.totalRecordsTree[flatRowKey]) colCompute(flatRowKey, flatColKey);
     }
-    ArrToTree1(arr, rows, indicators, isGrandTotal, grandTotalLabel, showGrandTotalsOnTop) {
+    getGrandTotalDimensionIndexes(dimensions, grandTotalDimensions, configuredDimensions = dimensions) {
+        return (null == grandTotalDimensions ? void 0 : grandTotalDimensions.length) ? grandTotalDimensions.map((dimension => ({
+            configuredIndex: configuredDimensions.indexOf(dimension),
+            activeIndex: dimensions.indexOf(dimension)
+        }))).filter((({configuredIndex: configuredIndex, activeIndex: activeIndex}, position, indexes) => configuredIndex > 0 && activeIndex >= 0 && indexes.findIndex((item => item.activeIndex === activeIndex)) === position)).map((({activeIndex: activeIndex}) => activeIndex)).sort(((a, b) => a - b)) : [];
+    }
+    getCustomGroupedGrandTotalKey(record, dimensions, grandTotalDimensions) {
+        const dimensionIndexes = this.getGrandTotalDimensionIndexes(dimensions, grandTotalDimensions);
+        if (!dimensionIndexes.length || dimensions.some(((dimension, index) => -1 === dimensionIndexes.indexOf(index) && dimension in record))) return;
+        const prefixIndexes = [];
+        for (const index of dimensionIndexes) {
+            if (!(dimensions[index] in record)) break;
+            prefixIndexes.push(index);
+        }
+        return prefixIndexes.length && !dimensionIndexes.slice(prefixIndexes.length).some((index => dimensions[index] in record)) ? [ this.groupedGrandTotalKey, ...prefixIndexes.map((index => record[dimensions[index]])) ] : void 0;
+    }
+    getGroupedGrandTotalPaths(keys, dimensions, grandTotalDimensions, isRow = !0, configuredDimensions = dimensions) {
+        const dimensionIndexes = this.getGrandTotalDimensionIndexes(dimensions, grandTotalDimensions, configuredDimensions), groupedPaths = new Map;
+        return keys.forEach((key => {
+            const path = dimensionIndexes.map((index => key[index]));
+            groupedPaths.set((0, join_1.join)(path, this.stringJoinChar), path);
+        })), Array.from(groupedPaths.values()).sort(this.arrSort(dimensionIndexes.map((index => dimensions[index])), isRow, [ this.groupedGrandTotalKey ]));
+    }
+    getGrandTotalKeys(dimensionKey, dimensions, grandTotalDimensions, grandTotalLabel, configuredDimensions = dimensions) {
+        const dimensionIndexes = this.getGrandTotalDimensionIndexes(dimensions, grandTotalDimensions, configuredDimensions);
+        if (!dimensionIndexes.length) return [ grandTotalLabel ];
+        const groupedKey = [ this.groupedGrandTotalKey, ...dimensionIndexes.map((dimensionIndex => dimensionKey[dimensionIndex])) ];
+        return [ ...groupedKey.slice(1).map(((_, index) => (0, join_1.join)(groupedKey.slice(0, index + 2), this.stringJoinChar))), (0, 
+        join_1.join)([ this.groupedGrandTotalKey, this.groupedGrandTotalSubtotalKey ], this.stringJoinChar) ];
+    }
+    ArrToTree1(arr, rows, indicators, isGrandTotal, grandTotalLabel, showGrandTotalsOnTop, grandTotalDimensions, subTotalLabel, showSubTotalsOnTop, configuredRows = rows) {
         const result = [], concatStr = this.stringJoinChar, map = new Map;
         function addList(list, isGrandTotal) {
             const path = [];
@@ -652,10 +733,55 @@ class Dataset {
                 node = item;
             }));
         }
-        return arr.forEach((item => addList(item, !1))), isGrandTotal && addList([ grandTotalLabel ], isGrandTotal), 
-        result;
+        const createIndicatorChildren = () => {
+            var _a;
+            return null !== (_a = null == indicators ? void 0 : indicators.map((indicator => "string" == typeof indicator ? {
+                indicatorKey: indicator,
+                value: indicator
+            } : {
+                indicatorKey: indicator.indicatorKey,
+                value: indicator.title
+            }))) && void 0 !== _a ? _a : [];
+        };
+        if (arr.forEach((item => addList(item, !1))), isGrandTotal) {
+            const grandTotalDimensionIndexes = this.getGrandTotalDimensionIndexes(rows, grandTotalDimensions, configuredRows);
+            if (grandTotalDimensionIndexes.length) {
+                const grandTotalNode = {
+                    value: grandTotalLabel,
+                    dataValue: this.groupedGrandTotalKey,
+                    dimensionKey: rows[0],
+                    children: [],
+                    role: "grand-total"
+                }, grandTotalMap = new Map;
+                this.getGroupedGrandTotalPaths(arr, rows, grandTotalDimensions, !0, configuredRows).forEach((list => {
+                    let parent = grandTotalNode;
+                    const path = [ this.groupedGrandTotalKey ];
+                    grandTotalDimensionIndexes.forEach(((dimensionIndex, index) => {
+                        const value = list[index];
+                        path.push(value);
+                        const flatKey = (0, join_1.join)(path, concatStr);
+                        let item = grandTotalMap.get(flatKey);
+                        item || (item = {
+                            value: value,
+                            dataValue: value,
+                            dimensionKey: rows[dimensionIndex],
+                            children: index === grandTotalDimensionIndexes.length - 1 ? createIndicatorChildren() : []
+                        }, grandTotalMap.set(flatKey, item), parent.children.push(item)), parent = item;
+                    }));
+                }));
+                const totalChild = {
+                    value: subTotalLabel,
+                    dataValue: this.groupedGrandTotalSubtotalKey,
+                    dimensionKey: rows[grandTotalDimensionIndexes[0]],
+                    children: createIndicatorChildren()
+                };
+                showSubTotalsOnTop ? grandTotalNode.children.unshift(totalChild) : grandTotalNode.children.push(totalChild), 
+                showGrandTotalsOnTop ? result.unshift(grandTotalNode) : result.push(grandTotalNode);
+            } else addList([ grandTotalLabel ], isGrandTotal);
+        }
+        return result;
     }
-    ArrToTree(arr, rows, indicators, subTotalFlags, isGrandTotal, grandTotalLabel, subTotalLabel, showGrandTotalsOnTop, showSubTotalsOnTop) {
+    ArrToTree(arr, rows, indicators, subTotalFlags, isGrandTotal, grandTotalLabel, subTotalLabel, showGrandTotalsOnTop, showSubTotalsOnTop, grandTotalDimensions, isRow, configuredRows = rows) {
         var _a;
         let result = [];
         const concatStr = this.stringJoinChar, map = new Map;
@@ -709,19 +835,56 @@ class Dataset {
                 value: null !== (_a = indicator.title) && void 0 !== _a ? _a : indicator.indicatorKey
             };
         }))), isGrandTotal && (null == arr ? void 0 : arr.length)) {
-            const node = {
-                value: grandTotalLabel,
-                dimensionKey: rows[0],
-                levelSpan: subTotalFlags.length,
-                children: null !== (_a = null == indicators ? void 0 : indicators.map((indicator => "string" == typeof indicator ? {
+            const grandTotalDimensionIndexes = this.getGrandTotalDimensionIndexes(rows, grandTotalDimensions, configuredRows), createIndicatorChildren = () => {
+                var _a;
+                return null !== (_a = null == indicators ? void 0 : indicators.map((indicator => "string" == typeof indicator ? {
                     indicatorKey: indicator,
                     value: indicator
                 } : {
                     indicatorKey: indicator.indicatorKey,
                     value: indicator.title
-                }))) && void 0 !== _a ? _a : [],
+                }))) && void 0 !== _a ? _a : [];
+            }, node = {
+                value: grandTotalLabel,
+                dataValue: grandTotalDimensionIndexes.length ? this.groupedGrandTotalKey : void 0,
+                dimensionKey: rows[0],
+                levelSpan: Math.max(1, null !== (_a = grandTotalDimensionIndexes[0]) && void 0 !== _a ? _a : subTotalFlags.length),
+                children: [],
                 role: "grand-total"
             };
+            if (grandTotalDimensionIndexes.length) {
+                const grandTotalMap = new Map;
+                this.getGroupedGrandTotalPaths(arr, rows, grandTotalDimensions, isRow, configuredRows).forEach((list => {
+                    let parent = node;
+                    const path = [ this.groupedGrandTotalKey ];
+                    grandTotalDimensionIndexes.forEach(((dimensionIndex, index) => {
+                        var _a;
+                        const value = list[index];
+                        path.push(value);
+                        const flatKey = (0, join_1.join)(path, concatStr);
+                        let item = grandTotalMap.get(flatKey);
+                        if (!item) {
+                            const nextDimensionIndex = null !== (_a = grandTotalDimensionIndexes[index + 1]) && void 0 !== _a ? _a : rows.length;
+                            item = {
+                                value: value,
+                                dataValue: value,
+                                dimensionKey: rows[dimensionIndex],
+                                levelSpan: nextDimensionIndex - dimensionIndex,
+                                children: index === grandTotalDimensionIndexes.length - 1 ? createIndicatorChildren() : []
+                            }, grandTotalMap.set(flatKey, item), parent.children.push(item);
+                        }
+                        parent = item;
+                    }));
+                }));
+                const totalChild = {
+                    value: subTotalLabel,
+                    dataValue: this.groupedGrandTotalSubtotalKey,
+                    dimensionKey: rows[grandTotalDimensionIndexes[0]],
+                    levelSpan: rows.length - grandTotalDimensionIndexes[0],
+                    children: createIndicatorChildren()
+                };
+                showSubTotalsOnTop ? node.children.unshift(totalChild) : node.children.push(totalChild);
+            } else node.children = createIndicatorChildren();
             showGrandTotalsOnTop ? result.unshift(node) : result.push(node);
         }
         return result;
@@ -743,10 +906,10 @@ class Dataset {
         }
         "string" == typeof rowKey ? flatRowKey = rowKey : (indicatorPosition && "row" !== indicatorPosition.position || rowKey.map(((key, i) => {
             key !== indicator || (0, vutils_1.isValid)(null == indicatorPosition ? void 0 : indicatorPosition.index) && i !== indicatorPosition.index || rowKey.splice(i, 1);
-        })), rowKey.length < this.rows.length && "grid-tree" === this.rowHierarchyType && (rowKey[0] === this.rowGrandTotalLabel || ((null === (_b = null === (_a = this.totals) || void 0 === _a ? void 0 : _a.row) || void 0 === _b ? void 0 : _b.subTotalsDimensions) && (null === (_e = null === (_d = null === (_c = this.totals) || void 0 === _c ? void 0 : _c.row) || void 0 === _d ? void 0 : _d.subTotalsDimensions) || void 0 === _e ? void 0 : _e.length) >= 1 && this.totals.row.subTotalsDimensions.find((dimension => dimension === rowDimensionKey)) || (null === (_g = null === (_f = this.totals) || void 0 === _f ? void 0 : _f.row) || void 0 === _g ? void 0 : _g.showSubTotalsOnTreeNode)) && rowKey[rowKey.length - 1] !== this.rowSubTotalLabel && rowKey.push(this.rowSubTotalLabel)), 
+        })), rowKey.length < this.rows.length && "grid-tree" === this.rowHierarchyType && (rowKey[0] === this.rowGrandTotalLabel || rowKey[0] === this.groupedGrandTotalKey || ((null === (_b = null === (_a = this.totals) || void 0 === _a ? void 0 : _a.row) || void 0 === _b ? void 0 : _b.subTotalsDimensions) && (null === (_e = null === (_d = null === (_c = this.totals) || void 0 === _c ? void 0 : _c.row) || void 0 === _d ? void 0 : _d.subTotalsDimensions) || void 0 === _e ? void 0 : _e.length) >= 1 && this.totals.row.subTotalsDimensions.find((dimension => dimension === rowDimensionKey)) || (null === (_g = null === (_f = this.totals) || void 0 === _f ? void 0 : _f.row) || void 0 === _g ? void 0 : _g.showSubTotalsOnTreeNode)) && rowKey[rowKey.length - 1] !== this.rowSubTotalLabel && rowKey.push(this.rowSubTotalLabel)), 
         flatRowKey = (0, join_1.join)(rowKey, this.stringJoinChar)), "string" == typeof colKey ? flatColKey = colKey : (indicatorPosition && "col" !== indicatorPosition.position || colKey.map(((key, i) => {
             key !== indicator || (0, vutils_1.isValid)(null == indicatorPosition ? void 0 : indicatorPosition.index) && i !== indicatorPosition.index || colKey.splice(i, 1);
-        })), colKey.length < this.columns.length && "grid-tree" === this.columnHierarchyType && (colKey[0] === this.colGrandTotalLabel || ((null === (_j = null === (_h = this.totals) || void 0 === _h ? void 0 : _h.column) || void 0 === _j ? void 0 : _j.subTotalsDimensions) && (null === (_m = null === (_l = null === (_k = this.totals) || void 0 === _k ? void 0 : _k.column) || void 0 === _l ? void 0 : _l.subTotalsDimensions) || void 0 === _m ? void 0 : _m.length) >= 1 && this.totals.column.subTotalsDimensions.find((dimension => dimension === colDimensionKey)) || (null === (_p = null === (_o = this.totals) || void 0 === _o ? void 0 : _o.column) || void 0 === _p ? void 0 : _p.showSubTotalsOnTreeNode)) && colKey[colKey.length - 1] !== this.colSubTotalLabel && colKey.push(this.colSubTotalLabel)), 
+        })), colKey.length < this.columns.length && "grid-tree" === this.columnHierarchyType && (colKey[0] === this.colGrandTotalLabel || colKey[0] === this.groupedGrandTotalKey || ((null === (_j = null === (_h = this.totals) || void 0 === _h ? void 0 : _h.column) || void 0 === _j ? void 0 : _j.subTotalsDimensions) && (null === (_m = null === (_l = null === (_k = this.totals) || void 0 === _k ? void 0 : _k.column) || void 0 === _l ? void 0 : _l.subTotalsDimensions) || void 0 === _m ? void 0 : _m.length) >= 1 && this.totals.column.subTotalsDimensions.find((dimension => dimension === colDimensionKey)) || (null === (_p = null === (_o = this.totals) || void 0 === _o ? void 0 : _o.column) || void 0 === _p ? void 0 : _p.showSubTotalsOnTreeNode)) && colKey[colKey.length - 1] !== this.colSubTotalLabel && colKey.push(this.colSubTotalLabel)), 
         flatColKey = (0, join_1.join)(colKey, this.stringJoinChar)), "string" == typeof newValue && (isNaN(parseFloat(newValue)) || (newValue = parseFloat(newValue))), 
         (null === (_q = this.changedTree[flatRowKey]) || void 0 === _q ? void 0 : _q[flatColKey]) ? this.changedTree[flatRowKey][flatColKey][indicatorIndex] = newValue : this.changedTree[flatRowKey] ? (this.changedTree[flatRowKey][flatColKey] = [], 
         this.changedTree[flatRowKey][flatColKey][indicatorIndex] = newValue) : (this.changedTree[flatRowKey] = {}, 
@@ -764,60 +927,54 @@ class Dataset {
         }
     }
     recalculateTotals(rowKey = [], colKey = [], indicator, newCellAggregator) {
-        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, _5, _6, _7, _8, _9, _10, _11;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         if (!this.totals || 0 === Object.keys(this.tree).length || !((null === (_a = this.totals.row) || void 0 === _a ? void 0 : _a.showGrandTotals) || (null === (_b = this.totals.row) || void 0 === _b ? void 0 : _b.subTotalsDimensions) && this.totals.row.subTotalsDimensions.length > 0 && !1 !== this.totals.row.showSubTotals) && !((null === (_c = this.totals.column) || void 0 === _c ? void 0 : _c.showGrandTotals) || (null === (_d = this.totals.column) || void 0 === _d ? void 0 : _d.subTotalsDimensions) && this.totals.column.subTotalsDimensions.length > 0 && !1 !== this.totals.column.showSubTotals)) return;
-        const flatRowKey = Array.isArray(rowKey) ? rowKey.join(this.stringJoinChar) : rowKey, flatColKey = Array.isArray(colKey) ? colKey.join(this.stringJoinChar) : colKey, indicatorIndex = this.indicatorKeysIncludeCalculatedFieldDependIndicatorKeys.indexOf(indicator), aggregatorsToReset = new Set, subTotalAggregators = new Set, rowKeyParts = flatRowKey.split(this.stringJoinChar), colKeyParts = flatColKey.split(this.stringJoinChar), addAggregatorToResetSet = (agg, rowKey, colKey) => {
+        const flatRowKey = Array.isArray(rowKey) ? (0, join_1.join)(rowKey, this.stringJoinChar) : rowKey, flatColKey = Array.isArray(colKey) ? (0, 
+        join_1.join)(colKey, this.stringJoinChar) : colKey, indicatorIndex = this.indicatorKeysIncludeCalculatedFieldDependIndicatorKeys.indexOf(indicator), aggregatorsToReset = new Set, subTotalAggregators = new Set, rowKeyParts = Array.isArray(rowKey) ? rowKey.slice() : rowKey.split(this.stringJoinChar), colKeyParts = Array.isArray(colKey) ? colKey.slice() : colKey.split(this.stringJoinChar), addAggregatorToResetSet = (agg, rowKey, colKey) => {
             !agg || rowKey === flatRowKey && colKey === flatColKey || (aggregatorsToReset.add(agg), 
             rowKey !== flatRowKey && colKey !== flatColKey || subTotalAggregators.add(agg));
-        };
+        }, rowAggregateKeys = [], colAggregateKeys = [];
         if ((null === (_f = null === (_e = this.totals) || void 0 === _e ? void 0 : _e.row) || void 0 === _f ? void 0 : _f.subTotalsDimensions) && !1 !== this.totals.row.showSubTotals) for (let i = 0; i < this.totals.row.subTotalsDimensions.length; i++) {
             const dimension = this.totals.row.subTotalsDimensions[i], dimensionIndex = this.rows.indexOf(dimension);
             if (dimensionIndex >= 0 && dimensionIndex < rowKeyParts.length) {
                 const rowSubTotalKeyParts = rowKeyParts.slice(0, dimensionIndex + 1);
                 "tree" !== this.rowHierarchyType && rowSubTotalKeyParts.push(this.rowSubTotalLabel);
                 const flatRowSubTotalKey = rowSubTotalKeyParts.join(this.stringJoinChar);
-                if ((null === (_h = null === (_g = this.tree[flatRowSubTotalKey]) || void 0 === _g ? void 0 : _g[flatColKey]) || void 0 === _h ? void 0 : _h[indicatorIndex]) && addAggregatorToResetSet(this.tree[flatRowSubTotalKey][flatColKey][indicatorIndex], flatRowSubTotalKey, flatColKey), 
-                (null === (_k = null === (_j = this.totals) || void 0 === _j ? void 0 : _j.column) || void 0 === _k ? void 0 : _k.subTotalsDimensions) && !1 !== this.totals.column.showSubTotals) for (let j = 0; j < this.totals.column.subTotalsDimensions.length; j++) {
-                    const colDimension = this.totals.column.subTotalsDimensions[j], colDimensionIndex = this.columns.indexOf(colDimension);
-                    if (colDimensionIndex >= 0 && colDimensionIndex < colKeyParts.length) {
-                        const colSubTotalKeyParts = colKeyParts.slice(0, colDimensionIndex + 1);
-                        colSubTotalKeyParts.push(this.colSubTotalLabel);
-                        const flatColSubTotalKey = colSubTotalKeyParts.join(this.stringJoinChar);
-                        (null === (_m = null === (_l = this.tree[flatRowSubTotalKey]) || void 0 === _l ? void 0 : _l[flatColSubTotalKey]) || void 0 === _m ? void 0 : _m[indicatorIndex]) && addAggregatorToResetSet(this.tree[flatRowSubTotalKey][flatColSubTotalKey][indicatorIndex], flatRowSubTotalKey, flatColSubTotalKey);
-                    }
-                }
-                (null === (_p = null === (_o = this.totals) || void 0 === _o ? void 0 : _o.column) || void 0 === _p ? void 0 : _p.showGrandTotals) && (null === (_r = null === (_q = this.tree[flatRowSubTotalKey]) || void 0 === _q ? void 0 : _q[this.colGrandTotalLabel]) || void 0 === _r ? void 0 : _r[indicatorIndex]) && addAggregatorToResetSet(this.tree[flatRowSubTotalKey][this.colGrandTotalLabel][indicatorIndex], flatRowSubTotalKey, this.colGrandTotalLabel);
+                -1 === rowAggregateKeys.indexOf(flatRowSubTotalKey) && rowAggregateKeys.push(flatRowSubTotalKey);
             }
         }
-        if (null === (_t = null === (_s = this.totals) || void 0 === _s ? void 0 : _s.row) || void 0 === _t ? void 0 : _t.showGrandTotals) {
-            if (null === (_v = null === (_u = this.tree[this.rowGrandTotalLabel]) || void 0 === _u ? void 0 : _u[flatColKey]) || void 0 === _v ? void 0 : _v[indicatorIndex]) {
-                if (addAggregatorToResetSet(this.tree[this.rowGrandTotalLabel][flatColKey][indicatorIndex], this.rowGrandTotalLabel, flatColKey), 
-                (null === (_x = null === (_w = this.totals) || void 0 === _w ? void 0 : _w.column) || void 0 === _x ? void 0 : _x.subTotalsDimensions) && !1 !== this.totals.column.showSubTotals) for (let j = 0; j < this.totals.column.subTotalsDimensions.length; j++) {
-                    const colDimension = this.totals.column.subTotalsDimensions[j], colDimensionIndex = this.columns.indexOf(colDimension);
-                    if (colDimensionIndex >= 0 && colDimensionIndex < colKeyParts.length) {
-                        const colSubTotalKeyParts = colKeyParts.slice(0, colDimensionIndex + 1);
-                        colSubTotalKeyParts.push(this.colSubTotalLabel);
-                        const flatColSubTotalKey = colSubTotalKeyParts.join(this.stringJoinChar);
-                        (null === (_z = null === (_y = this.tree[this.rowGrandTotalLabel]) || void 0 === _y ? void 0 : _y[flatColSubTotalKey]) || void 0 === _z ? void 0 : _z[indicatorIndex]) && addAggregatorToResetSet(this.tree[this.rowGrandTotalLabel][flatColSubTotalKey][indicatorIndex], this.rowGrandTotalLabel, flatColSubTotalKey);
-                    }
-                }
-                (null === (_1 = null === (_0 = this.totals) || void 0 === _0 ? void 0 : _0.column) || void 0 === _1 ? void 0 : _1.showGrandTotals) && (null === (_3 = null === (_2 = this.tree[this.rowGrandTotalLabel]) || void 0 === _2 ? void 0 : _2[this.colGrandTotalLabel]) || void 0 === _3 ? void 0 : _3[indicatorIndex]) && addAggregatorToResetSet(this.tree[this.rowGrandTotalLabel][this.colGrandTotalLabel][indicatorIndex], this.rowGrandTotalLabel, this.colGrandTotalLabel);
-            }
-            if ((null === (_5 = null === (_4 = this.totals) || void 0 === _4 ? void 0 : _4.column) || void 0 === _5 ? void 0 : _5.subTotalsDimensions) && !1 !== this.totals.column.showSubTotals) for (let j = 0; j < this.totals.column.subTotalsDimensions.length; j++) {
-                const colDimension = this.totals.column.subTotalsDimensions[j], colDimensionIndex = this.columns.indexOf(colDimension);
-                if (colDimensionIndex >= 0 && colDimensionIndex < colKeyParts.length) {
-                    const colSubTotalKeyParts = colKeyParts.slice(0, colDimensionIndex + 1);
-                    colSubTotalKeyParts.push(this.colSubTotalLabel);
-                    const flatColSubTotalKey = colSubTotalKeyParts.join(this.stringJoinChar);
-                    (null === (_7 = null === (_6 = this.tree[flatRowKey]) || void 0 === _6 ? void 0 : _6[flatColSubTotalKey]) || void 0 === _7 ? void 0 : _7[indicatorIndex]) && addAggregatorToResetSet(this.tree[flatRowKey][flatColSubTotalKey][indicatorIndex], flatRowKey, flatColSubTotalKey);
-                }
+        if (null === (_h = null === (_g = this.totals) || void 0 === _g ? void 0 : _g.row) || void 0 === _h ? void 0 : _h.showGrandTotals) {
+            const rowGrandTotalKeys = this.getGrandTotalKeys(rowKeyParts, this.rows.filter(((_, index) => this.rowsHasValue[index])), this.totals.row.grandTotalDimensions, this.rowGrandTotalLabel, this.rows);
+            for (const rowGrandTotalKey of rowGrandTotalKeys) -1 === rowAggregateKeys.indexOf(rowGrandTotalKey) && rowAggregateKeys.push(rowGrandTotalKey);
+        }
+        if ((null === (_k = null === (_j = this.totals) || void 0 === _j ? void 0 : _j.column) || void 0 === _k ? void 0 : _k.subTotalsDimensions) && !1 !== this.totals.column.showSubTotals) for (let j = 0; j < this.totals.column.subTotalsDimensions.length; j++) {
+            const colDimension = this.totals.column.subTotalsDimensions[j], colDimensionIndex = this.columns.indexOf(colDimension);
+            if (colDimensionIndex >= 0 && colDimensionIndex < colKeyParts.length) {
+                const colSubTotalKeyParts = colKeyParts.slice(0, colDimensionIndex + 1);
+                colSubTotalKeyParts.push(this.colSubTotalLabel);
+                const flatColSubTotalKey = colSubTotalKeyParts.join(this.stringJoinChar);
+                -1 === colAggregateKeys.indexOf(flatColSubTotalKey) && colAggregateKeys.push(flatColSubTotalKey);
             }
-            (null === (_9 = null === (_8 = this.totals) || void 0 === _8 ? void 0 : _8.column) || void 0 === _9 ? void 0 : _9.showGrandTotals) && (null === (_11 = null === (_10 = this.tree[flatRowKey]) || void 0 === _10 ? void 0 : _10[this.colGrandTotalLabel]) || void 0 === _11 ? void 0 : _11[indicatorIndex]) && addAggregatorToResetSet(this.tree[flatRowKey][this.colGrandTotalLabel][indicatorIndex], flatRowKey, this.colGrandTotalLabel), 
-            aggregatorsToReset.forEach((agg => {
-                newCellAggregator && subTotalAggregators.has(agg) && agg.push(newCellAggregator), 
-                agg.recalculate();
-            }));
         }
+        if (null === (_m = null === (_l = this.totals) || void 0 === _l ? void 0 : _l.column) || void 0 === _m ? void 0 : _m.showGrandTotals) {
+            const colGrandTotalKeys = this.getGrandTotalKeys(colKeyParts, this.columns.filter(((_, index) => this.columnsHasValue[index])), this.totals.column.grandTotalDimensions, this.colGrandTotalLabel, this.columns);
+            for (const colGrandTotalKey of colGrandTotalKeys) -1 === colAggregateKeys.indexOf(colGrandTotalKey) && colAggregateKeys.push(colGrandTotalKey);
+        }
+        rowAggregateKeys.forEach((rowAggregateKey => {
+            var _a, _b;
+            addAggregatorToResetSet(null === (_b = null === (_a = this.tree[rowAggregateKey]) || void 0 === _a ? void 0 : _a[flatColKey]) || void 0 === _b ? void 0 : _b[indicatorIndex], rowAggregateKey, flatColKey);
+        })), colAggregateKeys.forEach((colAggregateKey => {
+            var _a, _b;
+            addAggregatorToResetSet(null === (_b = null === (_a = this.tree[flatRowKey]) || void 0 === _a ? void 0 : _a[colAggregateKey]) || void 0 === _b ? void 0 : _b[indicatorIndex], flatRowKey, colAggregateKey);
+        })), rowAggregateKeys.forEach((rowAggregateKey => {
+            colAggregateKeys.forEach((colAggregateKey => {
+                var _a, _b;
+                addAggregatorToResetSet(null === (_b = null === (_a = this.tree[rowAggregateKey]) || void 0 === _a ? void 0 : _a[colAggregateKey]) || void 0 === _b ? void 0 : _b[indicatorIndex], rowAggregateKey, colAggregateKey);
+            }));
+        })), aggregatorsToReset.forEach((agg => {
+            newCellAggregator && subTotalAggregators.has(agg) && agg.push(newCellAggregator), 
+            agg.recalculate();
+        }));
     }
     changeRecordFieldValue(fieldName, oldValue, value) {
         var _a;