@visactor/vtable 0.11.1-alpha.9 → 0.12.0-alpha.1

package/cjs/dataset/dataset-pivot-table.js

@@ -33,23 +33,16 @@ class DatasetForPivotTable {
         }
         if (records) {
             this.records = records;
-            const t0 = "undefined" != typeof window ? window.performance.now() : 0;
+            "undefined" != typeof window && window.performance.now();
             this.setRecords(records);
-            const t1 = "undefined" != typeof window ? window.performance.now() : 0;
-            console.log("processRecords:", t1 - t0);
-            const t4 = "undefined" != typeof window ? window.performance.now() : 0;
+            "undefined" != typeof window && window.performance.now(), "undefined" != typeof window && window.performance.now();
             this.totalStatistics();
-            const t5 = "undefined" != typeof window ? window.performance.now() : 0;
-            console.log("totalStatistics:", t5 - t4);
-            const t2 = "undefined" != typeof window ? window.performance.now() : 0;
+            "undefined" != typeof window && window.performance.now(), "undefined" != typeof window && window.performance.now();
             this.sortKeys();
-            const t3 = "undefined" != typeof window ? window.performance.now() : 0;
-            console.log("sortKeys:", t3 - t2);
-            const t7 = "undefined" != typeof window ? window.performance.now() : 0;
+            "undefined" != typeof window && window.performance.now(), "undefined" != typeof window && window.performance.now();
             this.rowKeysPath = customRowTree ? this.TreeToArr2(customRowTree) : this.TreeToArr(this.ArrToTree(this.rowKeys, this.rowsIsTotal, (null === (_0 = null === (_z = null == this ? void 0 : this.totals) || void 0 === _z ? void 0 : _z.row) || void 0 === _0 ? void 0 : _0.showGrandTotals) || 0 === this.columns.length, this.rowGrandTotalLabel, this.rowSubTotalLabel)), 
             this.colKeysPath = customColTree ? this.TreeToArr2(customColTree) : this.TreeToArr(this.ArrToTree(this.colKeys, this.colsIsTotal, (null === (_2 = null === (_1 = this.totals) || void 0 === _1 ? void 0 : _1.column) || void 0 === _2 ? void 0 : _2.showGrandTotals) || 0 === this.rows.length, this.colGrandTotalLabel, this.colSubTotalLabel));
-            const t8 = "undefined" != typeof window ? window.performance.now() : 0;
-            console.log("TreeToArr:", t8 - t7);
+            "undefined" != typeof window && window.performance.now();
         }
         delete this.rowFlatKeys, delete this.colFlatKeys;
     }

package/cjs/dataset/dataset.d.ts

@@ -1,17 +1,14 @@
-import type { FilterRules, IDataConfig, SortRule, AggregationRules, SortRules, DerivedFieldRules, Totals, MappingRules, IHeaderTreeDefine, CollectValueBy, CollectedValue, IPagination } from '../ts-types';
+import type { FilterRules, IDataConfig, SortRule, AggregationRules, SortRules, DerivedFieldRules, Totals, MappingRules, IHeaderTreeDefine, CollectValueBy, CollectedValue, IIndicator } from '../ts-types';
 import type { Aggregator } from './statistics-helper';
 import { typeSort } from './statistics-helper';
 export declare class Dataset {
     dataConfig: IDataConfig;
-    pagination: IPagination;
     records: any[] | Record<string, any[]>;
     tree: Record<string, Record<string, Aggregator[]>>;
     private colFlatKeys;
     private rowFlatKeys;
     colKeys: string[][];
     rowKeys: string[][];
-    rowKeysPath: string[][];
-    colKeysPath: string[][];
     rowOrder: string;
     colOrder: string;
     sorted: boolean;
@@ -45,8 +42,12 @@ export declare class Dataset {
     rows: string[];
     columns: string[];
     indicatorKeys: string[];
-    private rowKeysPath_FULL;
-    constructor(dataConfig: IDataConfig, pagination: IPagination, rows: string[], columns: string[], indicatorKeys: string[], records: any[] | Record<string, any[]>, customColTree?: IHeaderTreeDefine[], customRowTree?: IHeaderTreeDefine[], needSplitPositiveAndNegative?: boolean);
+    colHeaderTree: any[];
+    rowHeaderTree: any[];
+    rowHierarchyType: 'grid' | 'tree';
+    indicators: (string | IIndicator)[];
+    indicatorsAsCol: boolean;
+    constructor(dataConfig: IDataConfig, rows: string[], columns: string[], indicatorKeys: string[], indicators: (string | IIndicator)[], indicatorsAsCol: boolean, records: any[] | Record<string, any[]>, rowHierarchyType?: 'grid' | 'tree', customColTree?: IHeaderTreeDefine[], customRowTree?: IHeaderTreeDefine[], needSplitPositiveAndNegative?: boolean);
     registerAggregator(type: string, aggregator: any): void;
     registerAggregators(): void;
     private setRecords;
@@ -57,16 +58,16 @@ export declare class Dataset {
     private processRecord;
     updateSortRules(sortRules: SortRules): void;
     updateFilterRules(filterRules: FilterRules, isResetTree?: boolean): void;
-    updatePagination(pagination: IPagination): void;
     private getAggregatorRule;
     getAggregator(rowKey: string[] | string, colKey: string[] | string, indicator: string): Aggregator;
     sortKeys(): void;
     arrSort(fieldArr: string[], isRow: boolean): (a: string[], b: string[]) => number;
     getSort(sortRule: SortRule, isSortRow: boolean): typeof typeSort;
     totalStatistics(): void;
+    private ArrToTree1;
     private ArrToTree;
     private TreeToArr;
-    private TreeToArr2;
     private dealWithZeroAlign;
     private cacheDeminsionCollectedValues;
+    private _adjustCustomTree;
 }

package/cjs/dataset/dataset.js

@@ -4,21 +4,23 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.Dataset = void 0;
 
-const vutils_1 = require("@visactor/vutils"), util_1 = require("../tools/util"), ts_types_1 = require("../ts-types"), statistics_helper_1 = require("./statistics-helper"), zero_align_1 = require("./util/zero-align");
+const vutils_1 = require("@visactor/vutils"), ts_types_1 = require("../ts-types"), statistics_helper_1 = require("./statistics-helper"), zero_align_1 = require("./util/zero-align");
 
 class Dataset {
-    constructor(dataConfig, pagination, rows, columns, indicatorKeys, records, customColTree, customRowTree, needSplitPositiveAndNegative) {
+    constructor(dataConfig, rows, columns, indicatorKeys, indicators, indicatorsAsCol, records, rowHierarchyType, customColTree, customRowTree, needSplitPositiveAndNegative) {
         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;
         this.tree = {}, this.colFlatKeys = {}, this.rowFlatKeys = {}, this.colKeys = [], 
         this.rowKeys = [], this.rowOrder = "key_a_to_z", this.colOrder = "key_a_to_z", this.sorted = !1, 
         this.indicatorStatistics = [], this.aggregators = {}, this.stringJoinChar = String.fromCharCode(0), 
         this.rowsIsTotal = [], this.colsIsTotal = [], this.collectedValues = {}, this.cacheCollectedValues = {}, 
-        this.registerAggregators(), this.dataConfig = dataConfig, this.sortRules = null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.sortRules, 
+        this.registerAggregators(), this.dataConfig = dataConfig, this.rowHierarchyType = null != rowHierarchyType ? rowHierarchyType : "grid", 
+        this.sortRules = null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.sortRules, 
         this.aggregationRules = null === (_b = this.dataConfig) || void 0 === _b ? void 0 : _b.aggregationRules, 
         this.derivedFieldRules = null === (_c = this.dataConfig) || void 0 === _c ? void 0 : _c.derivedFieldRules, 
         this.mappingRules = null === (_d = this.dataConfig) || void 0 === _d ? void 0 : _d.mappingRules, 
         this.totals = null === (_e = this.dataConfig) || void 0 === _e ? void 0 : _e.totals, 
-        this.rows = rows, this.columns = columns, this.indicatorKeys = indicatorKeys, this.colGrandTotalLabel = null !== (_h = null === (_g = null === (_f = this.totals) || void 0 === _f ? void 0 : _f.column) || void 0 === _g ? void 0 : _g.grandTotalLabel) && void 0 !== _h ? _h : "总计", 
+        this.rows = rows, this.columns = columns, this.indicatorKeys = indicatorKeys, this.indicatorsAsCol = indicatorsAsCol, 
+        this.indicators = indicators, this.colGrandTotalLabel = null !== (_h = null === (_g = null === (_f = this.totals) || void 0 === _f ? void 0 : _f.column) || void 0 === _g ? void 0 : _g.grandTotalLabel) && void 0 !== _h ? _h : "总计", 
         this.colSubTotalLabel = null !== (_l = null === (_k = null === (_j = this.totals) || void 0 === _j ? void 0 : _j.column) || void 0 === _k ? void 0 : _k.subTotalLabel) && void 0 !== _l ? _l : "小计", 
         this.rowGrandTotalLabel = null !== (_p = null === (_o = null === (_m = this.totals) || void 0 === _m ? void 0 : _m.row) || void 0 === _o ? void 0 : _o.grandTotalLabel) && void 0 !== _p ? _p : "总计", 
         this.rowSubTotalLabel = null !== (_s = null === (_r = null === (_q = this.totals) || void 0 === _q ? void 0 : _q.row) || void 0 === _r ? void 0 : _r.subTotalLabel) && void 0 !== _s ? _s : "小计", 
@@ -33,28 +35,23 @@ class Dataset {
             const dimension = this.totals.column.subTotalsDimensions[i], dimensionIndex = this.columns.indexOf(dimension);
             this.colsIsTotal[dimensionIndex] = !0;
         }
-        if (this.rowKeysPath = [], this.rowKeysPath_FULL = [], this.colKeysPath = [], records) {
+        if (records) {
             this.records = records;
-            const t0 = "undefined" != typeof window ? window.performance.now() : 0;
+            "undefined" != typeof window && window.performance.now();
             this.setRecords(), this.processCollectedValuesWithSumBy(), this.processCollectedValuesWithSortBy();
-            const t1 = "undefined" != typeof window ? window.performance.now() : 0;
-            console.log("processRecords:", t1 - t0);
-            const t4 = "undefined" != typeof window ? window.performance.now() : 0;
+            "undefined" != typeof window && window.performance.now(), "undefined" != typeof window && window.performance.now();
             this.totalStatistics();
-            const t5 = "undefined" != typeof window ? window.performance.now() : 0;
-            console.log("totalStatistics:", t5 - t4);
-            const t2 = "undefined" != typeof window ? window.performance.now() : 0;
+            "undefined" != typeof window && window.performance.now(), "undefined" != typeof window && window.performance.now();
             this.sortKeys();
-            const t3 = "undefined" != typeof window ? window.performance.now() : 0;
-            console.log("sortKeys:", t3 - t2);
-            const t7 = "undefined" != typeof window ? window.performance.now() : 0;
-            this.rowKeysPath_FULL = customRowTree ? this.TreeToArr2(customRowTree) : this.TreeToArr(this.ArrToTree(this.rowKeys, this.rowsIsTotal, null === (_1 = null === (_0 = null == this ? void 0 : this.totals) || void 0 === _0 ? void 0 : _0.row) || void 0 === _1 ? void 0 : _1.showGrandTotals, this.rowGrandTotalLabel, this.rowSubTotalLabel)), 
-            this.colKeysPath = customColTree ? this.TreeToArr2(customColTree) : this.TreeToArr(this.ArrToTree(this.colKeys, this.colsIsTotal, null === (_3 = null === (_2 = this.totals) || void 0 === _2 ? void 0 : _2.column) || void 0 === _3 ? void 0 : _3.showGrandTotals, this.colGrandTotalLabel, this.colSubTotalLabel));
-            const t8 = "undefined" != typeof window ? window.performance.now() : 0;
-            console.log("TreeToArr:", t8 - t7), (null === (_4 = this.dataConfig) || void 0 === _4 ? void 0 : _4.isPivotChart) && (this.dealWithZeroAlign(), 
+            "undefined" != typeof window && window.performance.now(), "undefined" != typeof window && window.performance.now();
+            customRowTree ? (indicatorsAsCol || (customRowTree = this._adjustCustomTree(customRowTree)), 
+            this.rowHeaderTree = customRowTree) : "tree" === this.rowHierarchyType ? this.rowHeaderTree = this.ArrToTree1(this.rowKeys, this.rows, indicatorsAsCol ? void 0 : indicators) : this.rowHeaderTree = this.ArrToTree(this.rowKeys, this.rows, indicatorsAsCol ? void 0 : indicators, this.rowsIsTotal, (null === (_1 = null === (_0 = null == this ? void 0 : this.totals) || void 0 === _0 ? void 0 : _0.row) || void 0 === _1 ? void 0 : _1.showGrandTotals) || 0 === this.columns.length, this.rowGrandTotalLabel, this.rowSubTotalLabel), 
+            customColTree ? (indicatorsAsCol && (customColTree = this._adjustCustomTree(customColTree)), 
+            this.colHeaderTree = customColTree) : this.colHeaderTree = this.ArrToTree(this.colKeys, this.columns, indicatorsAsCol ? indicators : void 0, this.colsIsTotal, null === (_3 = null === (_2 = this.totals) || void 0 === _2 ? void 0 : _2.column) || void 0 === _3 ? void 0 : _3.showGrandTotals, this.colGrandTotalLabel, this.colSubTotalLabel);
+            "undefined" != typeof window && window.performance.now();
+            (null === (_4 = this.dataConfig) || void 0 === _4 ? void 0 : _4.isPivotChart) && (this.dealWithZeroAlign(), 
             this.cacheDeminsionCollectedValues());
         }
-        this.updatePagination(pagination);
     }
     registerAggregator(type, aggregator) {
         this.aggregators[type] = aggregator;
@@ -179,9 +176,7 @@ class Dataset {
         }
     }
     updateSortRules(sortRules) {
-        var _a, _b, _c, _d;
-        this.sorted = !1, this.sortRules = sortRules, this.sortKeys(), this.rowKeysPath_FULL = this.TreeToArr(this.ArrToTree(this.rowKeys, this.rowsIsTotal, (null === (_b = null === (_a = null == this ? void 0 : this.totals) || void 0 === _a ? void 0 : _a.row) || void 0 === _b ? void 0 : _b.showGrandTotals) || 0 === this.columns.length, this.rowGrandTotalLabel, this.rowSubTotalLabel)), 
-        this.colKeysPath = this.TreeToArr(this.ArrToTree(this.colKeys, this.colsIsTotal, (null === (_d = null === (_c = this.totals) || void 0 === _c ? void 0 : _c.column) || void 0 === _d ? void 0 : _d.showGrandTotals) || 0 === this.rows.length, this.colGrandTotalLabel, this.colSubTotalLabel));
+        this.sorted = !1, this.sortRules = sortRules, this.sortKeys();
     }
     updateFilterRules(filterRules, isResetTree = !1) {
         var _a;
@@ -189,16 +184,6 @@ class Dataset {
         this.collectedValues = {}, this.processRecords(), this.processCollectedValuesWithSumBy(), 
         this.processCollectedValuesWithSortBy(), (null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.isPivotChart) && this.dealWithZeroAlign();
     }
-    updatePagination(pagination) {
-        var _a, _b, _c, _d;
-        if (this.pagination = pagination, (0, util_1.isValid)(null === (_a = this.pagination) || void 0 === _a ? void 0 : _a.perPageCount) && (0, 
-        util_1.isValid)(null === (_b = this.pagination) || void 0 === _b ? void 0 : _b.currentPage)) {
-            this.pagination.perPageCount = Math.ceil(this.pagination.perPageCount / this.indicatorKeys.length) * this.indicatorKeys.length;
-            const {perPageCount: perPageCount, currentPage: currentPage} = this.pagination, startIndex = Math.ceil(perPageCount * (currentPage || 0) / this.indicatorKeys.length), endIndex = startIndex + Math.ceil(perPageCount / this.indicatorKeys.length);
-            this.rowKeysPath = null === (_c = this.rowKeysPath_FULL) || void 0 === _c ? void 0 : _c.slice(startIndex, endIndex);
-        } else this.rowKeysPath = this.rowKeysPath_FULL;
-        this.pagination && (this.pagination.totalCount = null === (_d = this.rowKeysPath_FULL) || void 0 === _d ? void 0 : _d.length);
-    }
     getAggregatorRule(indicatorKey) {
         var _a;
         return null === (_a = this.aggregationRules) || void 0 === _a ? void 0 : _a.find(((value, index) => indicatorKey === value.indicatorKey));
@@ -321,7 +306,7 @@ class Dataset {
                     const dimension = that.totals.column.subTotalsDimensions[i], dimensionIndex = that.columns.indexOf(dimension);
                     if (dimensionIndex >= 0) {
                         const colTotalKey = colKey.slice(0, dimensionIndex + 1);
-                        colTotalKey.push(null !== (_f = null === (_e = null === (_d = that.totals) || void 0 === _d ? void 0 : _d.column) || void 0 === _e ? void 0 : _e.subTotalLabel) && void 0 !== _f ? _f : "小计");
+                        "grid" === this.rowHierarchyType && colTotalKey.push(null !== (_f = null === (_e = null === (_d = that.totals) || void 0 === _d ? void 0 : _d.column) || void 0 === _e ? void 0 : _e.subTotalLabel) && void 0 !== _f ? _f : "小计");
                         const flatColTotalKey = colTotalKey.join(this.stringJoinChar);
                         this.tree[flatRowKey][flatColTotalKey] || (this.tree[flatRowKey][flatColTotalKey] = []);
                         for (let i = 0; i < this.indicatorKeys.length; i++) {
@@ -353,7 +338,7 @@ class Dataset {
                         const dimension = that.totals.row.subTotalsDimensions[i], dimensionIndex = that.rows.indexOf(dimension);
                         if (dimensionIndex >= 0) {
                             const rowTotalKey = rowKey.slice(0, dimensionIndex + 1);
-                            rowTotalKey.push(null !== (_f = null === (_e = null === (_d = that.totals) || void 0 === _d ? void 0 : _d.row) || void 0 === _e ? void 0 : _e.subTotalLabel) && void 0 !== _f ? _f : "小计");
+                            "grid" === this.rowHierarchyType && rowTotalKey.push(null !== (_f = null === (_e = null === (_d = that.totals) || void 0 === _d ? void 0 : _d.row) || void 0 === _e ? void 0 : _e.subTotalLabel) && void 0 !== _f ? _f : "小计");
                             const flatRowTotalKey = rowTotalKey.join(this.stringJoinChar);
                             if (this.tree[flatRowTotalKey] || (this.tree[flatRowTotalKey] = {}, rowTotalKeys.push(flatRowTotalKey)), 
                             !this.tree[flatRowTotalKey][flatColKey]) {
@@ -389,9 +374,35 @@ class Dataset {
             }));
         }
     }
-    ArrToTree(arr, subTotalFlags, isGrandTotal, grandTotalLabel, subTotalLabel) {
+    ArrToTree1(arr, rows, indicators) {
         const result = [], concatStr = this.stringJoinChar, map = new Map;
-        if (arr.forEach((item => function(list) {
+        return arr.forEach((item => function(list) {
+            const path = [];
+            let node;
+            list.forEach(((value, index) => {
+                path.push(value);
+                const flatKey = path.join(concatStr);
+                let item = map.get(flatKey);
+                item || (item = {
+                    value: value,
+                    dimensionKey: rows[index],
+                    children: index === list.length - 1 && (null == indicators ? void 0 : indicators.length) >= 1 ? null == indicators ? void 0 : indicators.map((indicator => "string" == typeof indicator ? {
+                        indicatorKey: indicator,
+                        value: indicator
+                    } : {
+                        indicatorKey: indicator.indicatorKey,
+                        value: indicator.title
+                    })) : []
+                }, map.set(flatKey, item), node ? node.children.push(item) : result.push(item)), 
+                node = item;
+            }));
+        }(item))), result;
+    }
+    ArrToTree(arr, rows, indicators, subTotalFlags, isGrandTotal, grandTotalLabel, subTotalLabel) {
+        var _a;
+        let result = [];
+        const concatStr = this.stringJoinChar, map = new Map;
+        if ((null == arr ? void 0 : arr.length) ? arr.forEach((item => function(list) {
             const path = [];
             let node;
             list.forEach(((value, index) => {
@@ -400,14 +411,28 @@ class Dataset {
                 let item = map.get(flatKey);
                 if (!item) {
                     if (item = {
-                        id: flatKey,
-                        children: []
+                        value: value,
+                        dimensionKey: rows[index],
+                        children: index === list.length - 1 && (null == indicators ? void 0 : indicators.length) >= 1 ? null == indicators ? void 0 : indicators.map((indicator => "string" == typeof indicator ? {
+                            indicatorKey: indicator,
+                            value: indicator
+                        } : {
+                            indicatorKey: indicator.indicatorKey,
+                            value: indicator.title
+                        })) : []
                     }, subTotalFlags[index]) {
                         let curChild = item.children;
                         for (let i = index; i < list.length - 1; i++) {
                             const totalChild = {
-                                id: `${flatKey}${concatStr}${subTotalLabel}`,
-                                children: []
+                                value: subTotalLabel,
+                                dimensionKey: rows[index + 1],
+                                children: index + 1 === list.length - 1 && (null == indicators ? void 0 : indicators.length) >= 1 ? null == indicators ? void 0 : indicators.map((indicator => "string" == typeof indicator ? {
+                                    indicatorKey: indicator,
+                                    value: indicator
+                                } : {
+                                    indicatorKey: indicator.indicatorKey,
+                                    value: indicator.title
+                                })) : []
                             };
                             curChild.push(totalChild), curChild = totalChild.children;
                         }
@@ -416,19 +441,25 @@ class Dataset {
                 }
                 node = item;
             }));
-        }(item))), isGrandTotal) {
+        }(item))) : indicators && (result = null == indicators ? void 0 : indicators.map((indicator => {
+            var _a;
+            return {
+                indicatorKey: indicator.indicatorKey,
+                value: null !== (_a = indicator.title) && void 0 !== _a ? _a : indicator.indicatorKey
+            };
+        }))), isGrandTotal && (null == arr ? void 0 : arr.length)) {
             const node = {
-                id: grandTotalLabel,
-                children: []
+                value: grandTotalLabel,
+                dimensionKey: rows[0],
+                rowSpan: subTotalFlags.length,
+                children: 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 : []
             };
-            let curChild = node.children;
-            for (let i = 1; i < subTotalFlags.length; i++) {
-                const totalChild = {
-                    id: grandTotalLabel,
-                    children: []
-                };
-                curChild.push(totalChild), curChild = totalChild.children;
-            }
             result.push(node);
         }
         return result;
@@ -441,15 +472,6 @@ class Dataset {
         }
         return tree.forEach((treeNode => getPath(treeNode, []))), result;
     }
-    TreeToArr2(tree) {
-        const result = [];
-        function getPath(node, arr) {
-            var _a, _b;
-            arr.push(arr.length > 0 ? [ arr[arr.length - 1], node.value ].join(String.fromCharCode(0)) : node.value), 
-            (null === (_a = node.children) || void 0 === _a ? void 0 : _a.length) > 0 && !node.children[0].indicatorKey ? null === (_b = node.children) || void 0 === _b || _b.forEach((childItem => getPath(childItem, [ ...arr ]))) : result.push(arr);
-        }
-        return tree.forEach((treeNode => getPath(treeNode, []))), result;
-    }
     dealWithZeroAlign() {
         const indicatorsToAlign = [];
         for (let i = 0; i < this.aggregationRules.length; i++) {
@@ -491,6 +513,28 @@ class Dataset {
     cacheDeminsionCollectedValues() {
         for (const key in this.collectValuesBy) "xField" !== this.collectValuesBy[key].type && "yField" !== this.collectValuesBy[key].type || (this.dataConfig.dimensionSortArray ? this.cacheCollectedValues[key] = arraySortByAnotherArray(this.collectedValues[key], this.dataConfig.dimensionSortArray) : this.cacheCollectedValues[key] = this.collectedValues[key]);
     }
+    _adjustCustomTree(customTree) {
+        var _a;
+        const checkNode = (nodes, isHasIndicator) => {
+            nodes.forEach((node => {
+                var _a, _b;
+                node.indicatorKey || isHasIndicator || (null === (_a = node.children) || void 0 === _a ? void 0 : _a.length) ? node.children && checkNode(node.children, isHasIndicator || !!node.indicatorKey) : node.children = null === (_b = this.indicators) || void 0 === _b ? void 0 : _b.map((indicator => {
+                    var _a;
+                    return {
+                        indicatorKey: indicator.indicatorKey,
+                        value: null !== (_a = indicator.title) && void 0 !== _a ? _a : indicator.indicatorKey
+                    };
+                }));
+            }));
+        };
+        return (null == customTree ? void 0 : customTree.length) ? checkNode(customTree, !1) : customTree = null === (_a = this.indicators) || void 0 === _a ? void 0 : _a.map((indicator => {
+            var _a;
+            return {
+                indicatorKey: indicator.indicatorKey,
+                value: null !== (_a = indicator.title) && void 0 !== _a ? _a : indicator.indicatorKey
+            };
+        })), customTree;
+    }
 }
 
 function arraySortByAnotherArray(array, sortArray) {