@visactor/vtable 1.7.2 → 1.7.4

package/es/data/CachedDataSource.js

@@ -64,7 +64,8 @@ export class CachedDataSource extends DataSource {
                 dimension: "",
                 aggregationFun: (values, records, field) => {
                     const groupMap = new Map, groupResult = [];
-                    for (let i = 0; i < records.length; i++) dealWithGroup(records[i], groupResult, groupMap, groupByKeys, 0);
+                    for (let i = 0; i < records.length; i++) dealWithGroup(records[i], groupResult, groupMap, groupByKeys, 0), 
+                    records[i].vtableOriginIndex = i;
                     return groupResult;
                 }
             }), this.fieldAggregators.push(this.groupAggregator);
@@ -119,15 +120,18 @@ function dealWithGroup(record, children, map, groupByKeys, level) {
     const groupByKey = groupByKeys[level];
     if (!isValid(groupByKey)) return void children.push(record);
     const value = record[groupByKey];
-    if (void 0 !== value) if (map.has(value)) {
-        const index = map.get(value);
-        dealWithGroup(record, children[index].children, children[index].map, groupByKeys, level + 1);
-    } else map.set(value, children.length), children.push({
-        vtableMerge: !0,
-        vtableMergeName: value,
-        children: [],
-        map: new Map
-    }), dealWithGroup(record, children[children.length - 1].children, children[children.length - 1].map, groupByKeys, level + 1);
+    if (void 0 !== value) {
+        if (map.has(value)) {
+            const index = map.get(value);
+            return dealWithGroup(record, children[index].children, children[index].map, groupByKeys, level + 1);
+        }
+        return map.set(value, children.length), children.push({
+            vtableMerge: !0,
+            vtableMergeName: value,
+            children: [],
+            map: new Map
+        }), dealWithGroup(record, children[children.length - 1].children, children[children.length - 1].map, groupByKeys, level + 1);
+    }
 }
 
 function syncGroupCollapseState(oldSource, newSource, oldGroupMap, newGroupMap) {

package/es/data/CachedDataSource.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/CachedDataSource.ts"],"names":[],"mappings":"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","file":"CachedDataSource.js","sourcesContent":["import { isArray, isValid } from '@visactor/vutils';\nimport {\n  AggregationType,\n  HierarchyState,\n  type FieldData,\n  type FieldDef,\n  type IListTableDataConfig,\n  type IPagination,\n  type MaybePromise,\n  type MaybePromiseOrUndefined\n} from '../ts-types';\nimport type { BaseTableAPI } from '../ts-types/base-table';\nimport type { ColumnData } from '../ts-types/list-table/layout-map/api';\nimport type { DataSourceParam } from './DataSource';\nimport { DataSource } from './DataSource';\n\n/** @private */\nfunction _setFieldCache(\n  fCache: { [index: number]: Map<FieldDef, any> },\n  index: number,\n  field: FieldDef,\n\n  value: any\n): void {\n  const recCache = fCache[index] || (fCache[index] = new Map());\n  recCache.set(field, value);\n}\n/**\n * table data source for caching Promise data\n *\n * @classdesc VTable.data.CachedDataSource\n * @memberof VTable.data\n */\nexport class CachedDataSource extends DataSource {\n  /**\n   * record cache 当用户定义的CachedDataSource.get为promise的时候 可以用rCache缓存已获取数据条目\n   */\n  private _recordCache: any[];\n  /**\n   * field cache 当用户定义field为promise的时候 可以用fCache缓存已获取值\n   */\n  private _fieldCache: { [index: number]: Map<FieldDef, any> };\n\n  groupAggregator: any;\n\n  static get EVENT_TYPE(): typeof DataSource.EVENT_TYPE {\n    return DataSource.EVENT_TYPE;\n  }\n  static ofArray(\n    array: any[],\n    dataConfig?: IListTableDataConfig,\n    pagination?: IPagination,\n    columnObjs?: ColumnData[],\n    rowHierarchyType?: 'grid' | 'tree',\n    hierarchyExpandLevel?: number\n  ): CachedDataSource {\n    return new CachedDataSource(\n      {\n        get: (index: number): any => {\n          // if (Array.isArray(index)) {\n          //   return getValueFromDeepArray(array, index);\n          // }\n          return array[index];\n        },\n        length: array.length,\n        records: array\n      },\n      dataConfig,\n      pagination,\n      columnObjs,\n      rowHierarchyType,\n      hierarchyExpandLevel\n    );\n  }\n\n  // _originalRecords: any[];\n  constructor(\n    opt?: DataSourceParam,\n    dataConfig?: IListTableDataConfig,\n    pagination?: IPagination,\n    columnObjs?: ColumnData[],\n    rowHierarchyType?: 'grid' | 'tree',\n    hierarchyExpandLevel?: number\n  ) {\n    if (isArray(dataConfig?.groupByRules)) {\n      rowHierarchyType = 'tree';\n    }\n    super(opt, dataConfig, pagination, columnObjs, rowHierarchyType, hierarchyExpandLevel);\n    this._recordCache = [];\n    this._fieldCache = {};\n  }\n  protected getOriginalRecord(index: number): MaybePromiseOrUndefined {\n    if (this._recordCache && this._recordCache[index]) {\n      return this._recordCache[index];\n    }\n    return super.getOriginalRecord(index);\n  }\n  protected getRawRecord(index: number): MaybePromiseOrUndefined {\n    if (this.beforeChangedRecordsMap?.[index as number]) {\n      return this.beforeChangedRecordsMap[index as number];\n    }\n    if (this._recordCache && this._recordCache[index]) {\n      return this._recordCache[index];\n    }\n    return super.getRawRecord(index);\n  }\n  protected getOriginalField<F extends FieldDef>(\n    index: number,\n    field: F,\n    col?: number,\n    row?: number,\n    table?: BaseTableAPI\n  ): FieldData {\n    const rowCache = this._fieldCache && this._fieldCache[index];\n    if (rowCache) {\n      const cache = rowCache.get(field);\n      if (cache) {\n        return cache;\n      }\n    }\n    return super.getOriginalField(index, field, col, row, table);\n  }\n\n  clearCache(): void {\n    if (this._recordCache) {\n      this._recordCache = [];\n    }\n    if (this._fieldCache) {\n      this._fieldCache = {};\n    }\n  }\n\n  protected fieldPromiseCallBack<F extends FieldDef>(index: number, field: F, value: MaybePromiseOrUndefined): void {\n    _setFieldCache(this._fieldCache, index, field, value);\n  }\n  protected recordPromiseCallBack(index: number, record: MaybePromiseOrUndefined): void {\n    this._recordCache[index] = record;\n  }\n  get records(): any[] {\n    return Array.isArray(this._recordCache) && this._recordCache.length > 0 ? this._recordCache : super.records;\n  }\n\n  release(): void {\n    super.release?.();\n    this._recordCache = null;\n    this._fieldCache = null;\n  }\n\n  _generateFieldAggragations() {\n    super._generateFieldAggragations();\n    // groupby aggragations\n    if (isArray(this.dataConfig?.groupByRules)) {\n      // const groupByKey = this.dataConfig.groupByRules[0];\n      const groupByKeys = this.dataConfig.groupByRules;\n      this.groupAggregator = new this.registedAggregators[AggregationType.CUSTOM]({\n        dimension: '',\n        aggregationFun: (values: any, records: any, field: any) => {\n          const groupMap = new Map();\n          const groupResult = [] as any[];\n          for (let i = 0; i < records.length; i++) {\n            dealWithGroup(records[i], groupResult, groupMap, groupByKeys, 0);\n          }\n          return groupResult;\n        }\n      });\n      this.fieldAggregators.push(this.groupAggregator);\n    }\n  }\n\n  processRecords(records: any[]) {\n    const result = super.processRecords(records);\n    const groupResult = this.groupAggregator?.value();\n    if (groupResult) {\n      // this._originalRecords = result;\n      return groupResult;\n    }\n    return result;\n  }\n\n  getGroupLength() {\n    return this.dataConfig?.groupByRules?.length ?? 0;\n  }\n\n  updateGroup() {\n    this.clearCache();\n\n    const oldSource = this.source;\n    (this as any)._source = this.processRecords(this.dataSourceObj?.records ?? this.dataSourceObj);\n    if (oldSource) {\n      syncGroupCollapseState(oldSource, this.source);\n    }\n\n    // syncGroupCollapseState(this.source, newSource.source);\n    this.sourceLength = this.source?.length || 0;\n    this.sortedIndexMap.clear();\n    this.currentIndexedData = Array.from({ length: this.sourceLength }, (_, i) => i);\n    if (!this.userPagination) {\n      this.pagination.perPageCount = this.sourceLength;\n      this.pagination.totalCount = this.sourceLength;\n    }\n\n    this.initTreeHierarchyState();\n    this.updatePagerData();\n  }\n\n  addRecordsForGroup(recordArr: any) {\n    if (!isArray(recordArr) || recordArr.length === 0) {\n      return;\n    }\n    this.dataSourceObj.records.push(...recordArr);\n\n    this.updateGroup();\n  }\n\n  deleteRecordsForGroup(recordIndexs: number[]) {\n    if (!isArray(recordIndexs) || recordIndexs.length === 0) {\n      return;\n    }\n    const recordIndexsMaxToMin = recordIndexs.sort((a, b) => b - a);\n    for (let index = 0; index < recordIndexsMaxToMin.length; index++) {\n      const recordIndex = recordIndexsMaxToMin[index];\n      if (recordIndex >= this.sourceLength || recordIndex < 0) {\n        continue;\n      }\n      delete this.beforeChangedRecordsMap[recordIndex];\n      this.dataSourceObj.records.splice(recordIndex, 1);\n      this.sourceLength -= 1;\n    }\n\n    this.updateGroup();\n  }\n\n  updateRecordsForGroup(records: any[], recordIndexs: number[]) {\n    // const realDeletedRecordIndexs: number[] = [];\n    for (let index = 0; index < recordIndexs.length; index++) {\n      const recordIndex = recordIndexs[index];\n      if (recordIndex >= this.sourceLength || recordIndex < 0) {\n        continue;\n      }\n      delete this.beforeChangedRecordsMap[recordIndex];\n      // realDeletedRecordIndexs.push(recordIndex);\n      this.dataSourceObj.records[recordIndex] = records[index];\n    }\n\n    this.updateGroup();\n  }\n}\n\nfunction dealWithGroup(record: any, children: any[], map: Map<number, any>, groupByKeys: string[], level: number) {\n  const groupByKey = groupByKeys[level];\n  if (!isValid(groupByKey)) {\n    children.push(record);\n    return;\n  }\n  const value = record[groupByKey];\n  if (value !== undefined) {\n    if (map.has(value)) {\n      const index = map.get(value);\n      // children[index].children.push(record);\n      dealWithGroup(record, children[index].children, children[index].map, groupByKeys, level + 1);\n    } else {\n      map.set(value, children.length);\n      children.push({\n        vtableMerge: true,\n        vtableMergeName: value,\n        children: [] as any,\n        map: new Map()\n      });\n      dealWithGroup(\n        record,\n        children[children.length - 1].children,\n        children[children.length - 1].map,\n        groupByKeys,\n        level + 1\n      );\n    }\n  }\n}\n\nfunction syncGroupCollapseState(\n  oldSource: any,\n  newSource: any,\n  oldGroupMap?: Map<string, number>,\n  newGroupMap?: Map<string, number>\n) {\n  if (!oldGroupMap) {\n    oldGroupMap = new Map();\n    for (let i = 0; i < oldSource.length; i++) {\n      const record = oldSource[i];\n      if (record.vtableMerge) {\n        oldGroupMap.set(record.vtableMergeName, i);\n      }\n    }\n  }\n\n  if (!newGroupMap) {\n    newGroupMap = new Map();\n    for (let i = 0; i < newSource.length; i++) {\n      const record = newSource[i];\n      if (record.vtableMerge) {\n        newGroupMap.set(record.vtableMergeName, i);\n      }\n    }\n  }\n\n  for (let i = 0; i < oldSource.length; i++) {\n    const oldRecord = oldSource[i];\n    const newRecord = newSource[newGroupMap.get(oldRecord.vtableMergeName)];\n    if (isValid(newRecord)) {\n      newRecord.hierarchyState = oldSource[i].hierarchyState;\n    }\n    if (\n      isArray(oldRecord.children) &&\n      isArray(newRecord.children) &&\n      oldRecord.map.size !== 0 &&\n      newRecord.map.size !== 0\n    ) {\n      syncGroupCollapseState(oldRecord.children, newRecord.children, oldRecord.map, newRecord.map);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/data/CachedDataSource.ts"],"names":[],"mappings":"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","file":"CachedDataSource.js","sourcesContent":["import { isArray, isValid } from '@visactor/vutils';\nimport {\n  AggregationType,\n  HierarchyState,\n  type FieldData,\n  type FieldDef,\n  type IListTableDataConfig,\n  type IPagination,\n  type MaybePromise,\n  type MaybePromiseOrUndefined\n} from '../ts-types';\nimport type { BaseTableAPI } from '../ts-types/base-table';\nimport type { ColumnData } from '../ts-types/list-table/layout-map/api';\nimport type { DataSourceParam } from './DataSource';\nimport { DataSource } from './DataSource';\n\n/** @private */\nfunction _setFieldCache(\n  fCache: { [index: number]: Map<FieldDef, any> },\n  index: number,\n  field: FieldDef,\n\n  value: any\n): void {\n  const recCache = fCache[index] || (fCache[index] = new Map());\n  recCache.set(field, value);\n}\n/**\n * table data source for caching Promise data\n *\n * @classdesc VTable.data.CachedDataSource\n * @memberof VTable.data\n */\nexport class CachedDataSource extends DataSource {\n  /**\n   * record cache 当用户定义的CachedDataSource.get为promise的时候 可以用rCache缓存已获取数据条目\n   */\n  private _recordCache: any[];\n  /**\n   * field cache 当用户定义field为promise的时候 可以用fCache缓存已获取值\n   */\n  private _fieldCache: { [index: number]: Map<FieldDef, any> };\n\n  groupAggregator: any;\n\n  static get EVENT_TYPE(): typeof DataSource.EVENT_TYPE {\n    return DataSource.EVENT_TYPE;\n  }\n  static ofArray(\n    array: any[],\n    dataConfig?: IListTableDataConfig,\n    pagination?: IPagination,\n    columnObjs?: ColumnData[],\n    rowHierarchyType?: 'grid' | 'tree',\n    hierarchyExpandLevel?: number\n  ): CachedDataSource {\n    return new CachedDataSource(\n      {\n        get: (index: number): any => {\n          // if (Array.isArray(index)) {\n          //   return getValueFromDeepArray(array, index);\n          // }\n          return array[index];\n        },\n        length: array.length,\n        records: array\n      },\n      dataConfig,\n      pagination,\n      columnObjs,\n      rowHierarchyType,\n      hierarchyExpandLevel\n    );\n  }\n\n  // _originalRecords: any[];\n  constructor(\n    opt?: DataSourceParam,\n    dataConfig?: IListTableDataConfig,\n    pagination?: IPagination,\n    columnObjs?: ColumnData[],\n    rowHierarchyType?: 'grid' | 'tree',\n    hierarchyExpandLevel?: number\n  ) {\n    if (isArray(dataConfig?.groupByRules)) {\n      rowHierarchyType = 'tree';\n    }\n    super(opt, dataConfig, pagination, columnObjs, rowHierarchyType, hierarchyExpandLevel);\n    this._recordCache = [];\n    this._fieldCache = {};\n  }\n  protected getOriginalRecord(index: number): MaybePromiseOrUndefined {\n    if (this._recordCache && this._recordCache[index]) {\n      return this._recordCache[index];\n    }\n    return super.getOriginalRecord(index);\n  }\n  protected getRawRecord(index: number): MaybePromiseOrUndefined {\n    if (this.beforeChangedRecordsMap?.[index as number]) {\n      return this.beforeChangedRecordsMap[index as number];\n    }\n    if (this._recordCache && this._recordCache[index]) {\n      return this._recordCache[index];\n    }\n    return super.getRawRecord(index);\n  }\n  protected getOriginalField<F extends FieldDef>(\n    index: number,\n    field: F,\n    col?: number,\n    row?: number,\n    table?: BaseTableAPI\n  ): FieldData {\n    const rowCache = this._fieldCache && this._fieldCache[index];\n    if (rowCache) {\n      const cache = rowCache.get(field);\n      if (cache) {\n        return cache;\n      }\n    }\n    return super.getOriginalField(index, field, col, row, table);\n  }\n\n  clearCache(): void {\n    if (this._recordCache) {\n      this._recordCache = [];\n    }\n    if (this._fieldCache) {\n      this._fieldCache = {};\n    }\n  }\n\n  protected fieldPromiseCallBack<F extends FieldDef>(index: number, field: F, value: MaybePromiseOrUndefined): void {\n    _setFieldCache(this._fieldCache, index, field, value);\n  }\n  protected recordPromiseCallBack(index: number, record: MaybePromiseOrUndefined): void {\n    this._recordCache[index] = record;\n  }\n  get records(): any[] {\n    return Array.isArray(this._recordCache) && this._recordCache.length > 0 ? this._recordCache : super.records;\n  }\n\n  release(): void {\n    super.release?.();\n    this._recordCache = null;\n    this._fieldCache = null;\n  }\n\n  _generateFieldAggragations() {\n    super._generateFieldAggragations();\n    // groupby aggragations\n    if (isArray(this.dataConfig?.groupByRules)) {\n      // const groupByKey = this.dataConfig.groupByRules[0];\n      const groupByKeys = this.dataConfig.groupByRules;\n      this.groupAggregator = new this.registedAggregators[AggregationType.CUSTOM]({\n        dimension: '',\n        aggregationFun: (values: any, records: any, field: any) => {\n          const groupMap = new Map();\n          const groupResult = [] as any[];\n          for (let i = 0; i < records.length; i++) {\n            dealWithGroup(records[i], groupResult, groupMap, groupByKeys, 0);\n            records[i].vtableOriginIndex = i;\n          }\n          return groupResult;\n        }\n      });\n      this.fieldAggregators.push(this.groupAggregator);\n    }\n  }\n\n  processRecords(records: any[]) {\n    const result = super.processRecords(records);\n    const groupResult = this.groupAggregator?.value();\n    if (groupResult) {\n      // this._originalRecords = result;\n      return groupResult;\n    }\n    return result;\n  }\n\n  getGroupLength() {\n    return this.dataConfig?.groupByRules?.length ?? 0;\n  }\n\n  updateGroup() {\n    this.clearCache();\n\n    const oldSource = this.source;\n    (this as any)._source = this.processRecords(this.dataSourceObj?.records ?? this.dataSourceObj);\n    if (oldSource) {\n      syncGroupCollapseState(oldSource, this.source);\n    }\n\n    // syncGroupCollapseState(this.source, newSource.source);\n    this.sourceLength = this.source?.length || 0;\n    this.sortedIndexMap.clear();\n    this.currentIndexedData = Array.from({ length: this.sourceLength }, (_, i) => i);\n    if (!this.userPagination) {\n      this.pagination.perPageCount = this.sourceLength;\n      this.pagination.totalCount = this.sourceLength;\n    }\n\n    this.initTreeHierarchyState();\n    this.updatePagerData();\n  }\n\n  addRecordsForGroup(recordArr: any) {\n    if (!isArray(recordArr) || recordArr.length === 0) {\n      return;\n    }\n    this.dataSourceObj.records.push(...recordArr);\n\n    this.updateGroup();\n  }\n\n  deleteRecordsForGroup(recordIndexs: number[]) {\n    if (!isArray(recordIndexs) || recordIndexs.length === 0) {\n      return;\n    }\n    const recordIndexsMaxToMin = recordIndexs.sort((a, b) => b - a);\n    for (let index = 0; index < recordIndexsMaxToMin.length; index++) {\n      const recordIndex = recordIndexsMaxToMin[index];\n      if (recordIndex >= this.sourceLength || recordIndex < 0) {\n        continue;\n      }\n      delete this.beforeChangedRecordsMap[recordIndex];\n      this.dataSourceObj.records.splice(recordIndex, 1);\n      this.sourceLength -= 1;\n    }\n\n    this.updateGroup();\n  }\n\n  updateRecordsForGroup(records: any[], recordIndexs: number[]) {\n    // const realDeletedRecordIndexs: number[] = [];\n    for (let index = 0; index < recordIndexs.length; index++) {\n      const recordIndex = recordIndexs[index];\n      if (recordIndex >= this.sourceLength || recordIndex < 0) {\n        continue;\n      }\n      delete this.beforeChangedRecordsMap[recordIndex];\n      // realDeletedRecordIndexs.push(recordIndex);\n      this.dataSourceObj.records[recordIndex] = records[index];\n    }\n\n    this.updateGroup();\n  }\n}\n\nfunction dealWithGroup(record: any, children: any[], map: Map<number, any>, groupByKeys: string[], level: number): any {\n  const groupByKey = groupByKeys[level];\n  if (!isValid(groupByKey)) {\n    children.push(record);\n    return;\n  }\n  const value = record[groupByKey];\n  if (value !== undefined) {\n    if (map.has(value)) {\n      const index = map.get(value);\n      // children[index].children.push(record);\n      return dealWithGroup(record, children[index].children, children[index].map, groupByKeys, level + 1);\n    }\n    map.set(value, children.length);\n    children.push({\n      vtableMerge: true,\n      vtableMergeName: value,\n      children: [] as any,\n      map: new Map()\n    });\n    return dealWithGroup(\n      record,\n      children[children.length - 1].children,\n      children[children.length - 1].map,\n      groupByKeys,\n      level + 1\n    );\n  }\n}\n\nfunction syncGroupCollapseState(\n  oldSource: any,\n  newSource: any,\n  oldGroupMap?: Map<string, number>,\n  newGroupMap?: Map<string, number>\n) {\n  if (!oldGroupMap) {\n    oldGroupMap = new Map();\n    for (let i = 0; i < oldSource.length; i++) {\n      const record = oldSource[i];\n      if (record.vtableMerge) {\n        oldGroupMap.set(record.vtableMergeName, i);\n      }\n    }\n  }\n\n  if (!newGroupMap) {\n    newGroupMap = new Map();\n    for (let i = 0; i < newSource.length; i++) {\n      const record = newSource[i];\n      if (record.vtableMerge) {\n        newGroupMap.set(record.vtableMergeName, i);\n      }\n    }\n  }\n\n  for (let i = 0; i < oldSource.length; i++) {\n    const oldRecord = oldSource[i];\n    const newRecord = newSource[newGroupMap.get(oldRecord.vtableMergeName)];\n    if (isValid(newRecord)) {\n      newRecord.hierarchyState = oldSource[i].hierarchyState;\n    }\n    if (\n      isArray(oldRecord.children) &&\n      isArray(newRecord.children) &&\n      oldRecord.map.size !== 0 &&\n      newRecord.map.size !== 0\n    ) {\n      syncGroupCollapseState(oldRecord.children, newRecord.children, oldRecord.map, newRecord.map);\n    }\n  }\n}\n"]}

package/es/dataset/dataset-pivot-table.d.ts

@@ -1,6 +1,6 @@
 import type { FilterRules, IPivotTableDataConfig, SortRule, AggregationRules, SortRules, DerivedFieldRules, Totals, MappingRules, IHeaderTreeDefine } from '../ts-types';
+import { SortType } from '../ts-types';
 import type { Aggregator } from './statistics-helper';
-import { typeSort } from './statistics-helper';
 export declare class DatasetForPivotTable {
     dataConfig: IPivotTableDataConfig;
     records: any[];
@@ -52,7 +52,7 @@ export declare class DatasetForPivotTable {
     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;
+    getSort(sortRule: SortRule, isSortRow: boolean): (a: any, b: any, sortType: SortType) => number;
     totalStatistics(): void;
     private ArrToTree;
     private TreeToArr;

package/es/dataset/dataset.d.ts

@@ -1,6 +1,5 @@
-import type { FilterRules, IPivotTableDataConfig, SortRule, AggregationRules, SortRules, DerivedFieldRules, Totals, MappingRules, IHeaderTreeDefine, CollectValueBy, CollectedValue, IIndicator, IPivotChartDataConfig, CalculateddFieldRules } from '../ts-types';
+import type { FilterRules, IPivotTableDataConfig, SortRule, AggregationRules, SortRules, DerivedFieldRules, Totals, MappingRules, IHeaderTreeDefine, CollectValueBy, CollectedValue, IIndicator, IPivotChartDataConfig, CalculateddFieldRules, SortType } from '../ts-types';
 import type { Aggregator, IAggregator } from './statistics-helper';
-import { typeSort } from './statistics-helper';
 export declare class Dataset {
     dataConfig?: IPivotTableDataConfig | IPivotChartDataConfig;
     records?: any[] | Record<string, any[]>;
@@ -10,6 +9,8 @@ export declare class Dataset {
     private rowFlatKeys;
     colKeys: string[][];
     rowKeys: string[][];
+    colKeys_normal: string[][];
+    rowKeys_normal: string[][];
     rowOrder: string;
     colOrder: string;
     sorted: boolean;
@@ -84,8 +85,8 @@ export declare class Dataset {
         index?: number;
     }): IAggregator;
     sortKeys(): void;
-    arrSort(fieldArr: string[], isRow: boolean): (a: string[], b: string[]) => number;
-    getSort(sortRule: SortRule, isSortRow: boolean): typeof typeSort;
+    arrSort(fieldArr: string[], isRow: boolean): (a: string[], b: string[]) => any;
+    getSort(sortRule: SortRule, isSortRow: boolean): (a: string[], b: string[], sortType?: SortType) => number;
     totalStatistics(): void;
     private ArrToTree1;
     private ArrToTree;

package/es/dataset/dataset.js

@@ -1,6 +1,6 @@
 import { isValid } from "@visactor/vutils";
 
-import { AggregationType, SortType } from "../ts-types";
+import { AggregationType } from "../ts-types";
 
 import { AvgAggregator, CountAggregator, MaxAggregator, MinAggregator, NoneAggregator, RecalculateAggregator, RecordAggregator, SumAggregator, naturalSort, sortBy, typeSort } from "./statistics-helper";
 
@@ -10,38 +10,40 @@ import { join } from "../tools/join";
 
 export class Dataset {
     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, _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;
         this.tree = {}, this.changedTree = {}, 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.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.aggregators = {}, this.stringJoinChar = String.fromCharCode(0), this.rowsIsTotal = [], 
+        this.colsIsTotal = [], this.collectedValues = {}, this.cacheCollectedValues = {}, 
         this.totalRecordsTree = {}, 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.calculatedFieldRules = null === (_e = this.dataConfig) || void 0 === _e ? void 0 : _e.calculatedFieldRules, 
-        this.calculatedFiledKeys = null !== (_g = null === (_f = this.calculatedFieldRules) || void 0 === _f ? void 0 : _f.map((rule => rule.key))) && void 0 !== _g ? _g : [], 
-        this.calculatedFieldDependIndicatorKeys = null !== (_j = null === (_h = this.calculatedFieldRules) || void 0 === _h ? void 0 : _h.reduce(((arr, rule) => {
+        this.filterRules = null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.filterRules, 
+        this.rowHierarchyType = null != rowHierarchyType ? rowHierarchyType : "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, 
+        this.derivedFieldRules = null === (_d = this.dataConfig) || void 0 === _d ? void 0 : _d.derivedFieldRules, 
+        this.mappingRules = null === (_e = this.dataConfig) || void 0 === _e ? void 0 : _e.mappingRules, 
+        this.calculatedFieldRules = null === (_f = this.dataConfig) || void 0 === _f ? void 0 : _f.calculatedFieldRules, 
+        this.calculatedFiledKeys = null !== (_h = null === (_g = this.calculatedFieldRules) || void 0 === _g ? void 0 : _g.map((rule => rule.key))) && void 0 !== _h ? _h : [], 
+        this.calculatedFieldDependIndicatorKeys = null !== (_k = null === (_j = this.calculatedFieldRules) || void 0 === _j ? void 0 : _j.reduce(((arr, rule) => {
             for (let i = 0; i < rule.dependIndicatorKeys.length; i++) -1 === arr.indexOf(rule.dependIndicatorKeys[i]) && arr.push(rule.dependIndicatorKeys[i]);
             return arr;
-        }), [])) && void 0 !== _j ? _j : [], this.totals = null === (_k = this.dataConfig) || void 0 === _k ? void 0 : _k.totals, 
+        }), [])) && void 0 !== _k ? _k : [], this.totals = null === (_l = this.dataConfig) || void 0 === _l ? void 0 : _l.totals, 
         this.rows = rows, this.columns = columns, this.indicatorKeys = indicatorKeys, this.indicatorKeysIncludeCalculatedFieldDependIndicatorKeys = [ ...indicatorKeys ];
         for (let m = 0; m < this.calculatedFieldDependIndicatorKeys.length; m++) -1 === this.indicatorKeysIncludeCalculatedFieldDependIndicatorKeys.indexOf(this.calculatedFieldDependIndicatorKeys[m]) && this.indicatorKeysIncludeCalculatedFieldDependIndicatorKeys.push(this.calculatedFieldDependIndicatorKeys[m]);
         if (this.indicatorsAsCol = indicatorsAsCol, this.indicators = indicators, this.customColTree = customColTree, 
-        this.customRowTree = customRowTree, this.colGrandTotalLabel = null !== (_o = null === (_m = null === (_l = this.totals) || void 0 === _l ? void 0 : _l.column) || void 0 === _m ? void 0 : _m.grandTotalLabel) && void 0 !== _o ? _o : "总计", 
-        this.colSubTotalLabel = null !== (_r = null === (_q = null === (_p = this.totals) || void 0 === _p ? void 0 : _p.column) || void 0 === _q ? void 0 : _q.subTotalLabel) && void 0 !== _r ? _r : "小计", 
-        this.rowGrandTotalLabel = null !== (_u = null === (_t = null === (_s = this.totals) || void 0 === _s ? void 0 : _s.row) || void 0 === _t ? void 0 : _t.grandTotalLabel) && void 0 !== _u ? _u : "总计", 
-        this.rowSubTotalLabel = null !== (_x = null === (_w = null === (_v = this.totals) || void 0 === _v ? void 0 : _v.row) || void 0 === _w ? void 0 : _w.subTotalLabel) && void 0 !== _x ? _x : "小计", 
-        this.collectValuesBy = null === (_y = this.dataConfig) || void 0 === _y ? void 0 : _y.collectValuesBy, 
+        this.customRowTree = customRowTree, this.colGrandTotalLabel = null !== (_p = null === (_o = null === (_m = this.totals) || void 0 === _m ? void 0 : _m.column) || void 0 === _o ? void 0 : _o.grandTotalLabel) && void 0 !== _p ? _p : "总计", 
+        this.colSubTotalLabel = null !== (_s = null === (_r = null === (_q = this.totals) || void 0 === _q ? void 0 : _q.column) || void 0 === _r ? void 0 : _r.subTotalLabel) && void 0 !== _s ? _s : "小计", 
+        this.rowGrandTotalLabel = null !== (_v = null === (_u = null === (_t = this.totals) || void 0 === _t ? void 0 : _t.row) || void 0 === _u ? void 0 : _u.grandTotalLabel) && void 0 !== _v ? _v : "总计", 
+        this.rowSubTotalLabel = null !== (_y = null === (_x = null === (_w = this.totals) || void 0 === _w ? void 0 : _w.row) || void 0 === _x ? void 0 : _x.subTotalLabel) && void 0 !== _y ? _y : "小计", 
+        this.collectValuesBy = null === (_z = this.dataConfig) || void 0 === _z ? void 0 : _z.collectValuesBy, 
         this.needSplitPositiveAndNegative = null != needSplitPositiveAndNegative && needSplitPositiveAndNegative, 
-        this.rowsIsTotal = new Array(null !== (_0 = null === (_z = this.rows) || void 0 === _z ? void 0 : _z.length) && void 0 !== _0 ? _0 : 0).fill(!1), 
-        this.colsIsTotal = new Array(null !== (_2 = null === (_1 = this.columns) || void 0 === _1 ? void 0 : _1.length) && void 0 !== _2 ? _2 : 0).fill(!1), 
-        (null === (_3 = this.totals) || void 0 === _3 ? void 0 : _3.row) && !1 !== this.totals.row.showSubTotals && this.totals.row.subTotalsDimensions) for (let i = 0, len = null !== (_7 = null === (_6 = null === (_5 = null === (_4 = this.totals) || void 0 === _4 ? void 0 : _4.row) || void 0 === _5 ? void 0 : _5.subTotalsDimensions) || void 0 === _6 ? void 0 : _6.length) && void 0 !== _7 ? _7 : 0; i < len; i++) {
+        this.rowsIsTotal = new Array(null !== (_1 = null === (_0 = this.rows) || void 0 === _0 ? void 0 : _0.length) && void 0 !== _1 ? _1 : 0).fill(!1), 
+        this.colsIsTotal = new Array(null !== (_3 = null === (_2 = this.columns) || void 0 === _2 ? void 0 : _2.length) && void 0 !== _3 ? _3 : 0).fill(!1), 
+        (null === (_4 = this.totals) || void 0 === _4 ? void 0 : _4.row) && !1 !== this.totals.row.showSubTotals && this.totals.row.subTotalsDimensions) for (let i = 0, len = null !== (_8 = null === (_7 = null === (_6 = null === (_5 = this.totals) || void 0 === _5 ? void 0 : _5.row) || void 0 === _6 ? void 0 : _6.subTotalsDimensions) || void 0 === _7 ? void 0 : _7.length) && void 0 !== _8 ? _8 : 0; i < len; i++) {
             const dimension = this.totals.row.subTotalsDimensions[i], dimensionIndex = this.rows.indexOf(dimension);
             this.rowsIsTotal[dimensionIndex] = !0;
         }
-        if ((null === (_8 = this.totals) || void 0 === _8 ? void 0 : _8.column) && !1 !== this.totals.column.showSubTotals && this.totals.column.subTotalsDimensions) for (let i = 0, len = null !== (_12 = null === (_11 = null === (_10 = null === (_9 = this.totals) || void 0 === _9 ? void 0 : _9.column) || void 0 === _10 ? void 0 : _10.subTotalsDimensions) || void 0 === _11 ? void 0 : _11.length) && void 0 !== _12 ? _12 : 0; i < len; i++) {
+        if ((null === (_9 = this.totals) || void 0 === _9 ? void 0 : _9.column) && !1 !== this.totals.column.showSubTotals && this.totals.column.subTotalsDimensions) for (let i = 0, len = null !== (_13 = null === (_12 = null === (_11 = null === (_10 = this.totals) || void 0 === _10 ? void 0 : _10.column) || void 0 === _11 ? void 0 : _11.subTotalsDimensions) || void 0 === _12 ? void 0 : _12.length) && void 0 !== _13 ? _13 : 0; i < len; i++) {
             const dimension = this.totals.column.subTotalsDimensions[i], dimensionIndex = this.columns.indexOf(dimension);
             this.colsIsTotal[dimensionIndex] = !0;
         }
@@ -59,7 +61,9 @@ export class Dataset {
             this.processCollectedValuesWithSortBy();
             "undefined" != typeof window && window.performance.now(), "undefined" != typeof window && window.performance.now();
             this.totalStatistics();
-            "undefined" != typeof window && window.performance.now(), "undefined" != typeof window && window.performance.now();
+            "undefined" != typeof window && window.performance.now();
+            this.rowKeys_normal = this.rowKeys.slice(), this.colKeys_normal = this.colKeys.slice();
+            "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) : this.rowHeaderTree = this.ArrToTree(this.rowKeys, this.rows.filter(((key, index) => this.rowsHasValue[index])), this.indicatorsAsCol ? void 0 : this.indicators, this.rowsIsTotal, (null === (_d = null === (_c = this.totals) || void 0 === _c ? void 0 : _c.row) || void 0 === _d ? void 0 : _d.showGrandTotals) || this.indicatorsAsCol && 0 === this.rows.length, this.rowGrandTotalLabel, this.rowSubTotalLabel, null !== (_g = null === (_f = null === (_e = this.totals) || void 0 === _e ? void 0 : _e.row) || void 0 === _f ? void 0 : _f.showGrandTotalsOnTop) && void 0 !== _g && _g, 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), 
@@ -110,9 +114,9 @@ export class Dataset {
         }
     }
     processRecords() {
-        var _a, _b, _c;
+        var _a, _b;
         let isNeedFilter = !1;
-        if ((null !== (_c = null === (_b = null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.filterRules) || void 0 === _b ? void 0 : _b.length) && void 0 !== _c ? _c : 0) >= 1 && (isNeedFilter = !0), 
+        if ((null !== (_b = null === (_a = this.filterRules) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0) >= 1 && (isNeedFilter = !0), 
         Array.isArray(this.records)) for (let i = 0, len = this.records.length; i < len; i++) {
             const record = this.records[i];
             isNeedFilter && !this.filterRecord(record) || this.processRecord(record);
@@ -123,17 +127,17 @@ export class Dataset {
         this.rowFlatKeys = {}, this.colFlatKeys = {};
     }
     filterRecord(record) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         let isReserved = !0;
-        if (null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.filterRules) for (let i = 0; i < this.dataConfig.filterRules.length; i++) {
-            const filterRule = null === (_b = this.dataConfig) || void 0 === _b ? void 0 : _b.filterRules[i];
+        if (this.filterRules) for (let i = 0; i < this.filterRules.length; i++) {
+            const filterRule = this.filterRules[i];
             if (filterRule.filterKey) {
                 const filterValue = record[filterRule.filterKey];
-                if (-1 === (null === (_c = filterRule.filteredValues) || void 0 === _c ? void 0 : _c.indexOf(filterValue))) {
+                if (-1 === (null === (_a = filterRule.filteredValues) || void 0 === _a ? void 0 : _a.indexOf(filterValue))) {
                     isReserved = !1;
                     break;
                 }
-            } else if (!(null === (_d = filterRule.filterFunc) || void 0 === _d ? void 0 : _d.call(filterRule, record))) {
+            } else if (!(null === (_b = filterRule.filterFunc) || void 0 === _b ? void 0 : _b.call(filterRule, record))) {
                 isReserved = !1;
                 break;
             }
@@ -281,7 +285,7 @@ export class Dataset {
         var _a;
         if (this.filterRules = filterRules, isResetTree) this.tree = {}; else for (const treeRowKey in this.tree) for (const treeColKey in this.tree[treeRowKey]) for (let i = 0; i < this.tree[treeRowKey][treeColKey].length; i++) this.tree[treeRowKey][treeColKey][i].reset();
         this.collectedValues = {}, this.processRecords(), this.processCollectedValuesWithSumBy(), 
-        this.processCollectedValuesWithSortBy(), (null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.isPivotChart) && this.cacheDeminsionCollectedValues();
+        this.processCollectedValuesWithSortBy(), this.totalStatistics(), (null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.isPivotChart) && this.cacheDeminsionCollectedValues();
     }
     getAggregatorRule(indicatorKey) {
         var _a;
@@ -329,45 +333,11 @@ export class Dataset {
         };
     }
     sortKeys() {
-        const that = this;
+        this.colKeys = this.colKeys_normal.slice(), this.rowKeys = this.rowKeys_normal.slice();
         if (!this.sorted) {
-            this.sorted = !0;
-            const getValue = function(rowKey, colKey) {
-                return that.getAggregator(rowKey, colKey, "").value();
-            };
-            switch (this.rowOrder) {
-              case "value_a_to_z":
-                this.rowKeys.sort((function(a, b) {
-                    return naturalSort(getValue(a, []), getValue(b, []));
-                }));
-                break;
-
-              case "value_z_to_a":
-                this.rowKeys.sort((function(a, b) {
-                    return -naturalSort(getValue(a, []), getValue(b, []));
-                }));
-                break;
-
-              default:
-                this.rowKeys.sort(this.arrSort(this.rows, !0));
-            }
-            switch (this.colOrder) {
-              case "value_a_to_z":
-                this.colKeys.sort((function(a, b) {
-                    return naturalSort(getValue([], a), getValue([], b));
-                }));
-                break;
-
-              case "value_z_to_a":
-                this.colKeys.sort((function(a, b) {
-                    return -naturalSort(getValue([], a), getValue([], b));
-                }));
-                break;
-
-              default:
-                const sortfun = this.arrSort(this.columns, !1);
-                this.colKeys.sort(sortfun);
-            }
+            this.sorted = !0, this.rowKeys.sort(this.arrSort(this.rows, !0));
+            const sortfun = this.arrSort(this.columns, !1);
+            this.colKeys.sort(sortfun);
         }
     }
     arrSort(fieldArr, isRow) {
@@ -388,30 +358,31 @@ export class Dataset {
             return results;
         }.call(this);
         return function(a, b) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             let comparison, sorter;
             for (let i = 0; i < sortersArr.length; i++) {
                 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), 
-                    aChanged.push(isRow ? that.rowSubTotalLabel : that.colSubTotalLabel), bChanged = b.slice(0, sorter.fieldIndex + 1), 
-                    bChanged.push(isRow ? that.rowSubTotalLabel : that.colSubTotalLabel)), comparison = sorter.func(aChanged, bChanged);
-                } else comparison = null === (_b = sorter.func) || void 0 === _b ? void 0 : _b.call(sorter, a[sorter.fieldIndex], b[sorter.fieldIndex]);
-                if (0 !== comparison) return comparison * ((null === (_c = sorter.sortRule) || void 0 === _c ? void 0 : _c.sortType) === SortType.DESC ? -1 : 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);
+                } 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;
             }
             return 0;
         };
     }
     getSort(sortRule, isSortRow) {
         const that = this;
-        return sortRule.sortByIndicator ? (a, b) => {
+        return sortRule.sortByIndicator ? (a, b, sortType) => {
             const getValue = function(rowKey, colKey) {
-                return rowKey.length < that.rows.length && rowKey[rowKey.length - 1] !== that.rowSubTotalLabel && rowKey[rowKey.length - 1] !== that.rowGrandTotalLabel && rowKey.push(that.rowSubTotalLabel), 
+                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), 
                 that.getAggregator(rowKey, colKey, sortRule.sortByIndicator).value();
             };
-            return isSortRow ? naturalSort(getValue(a, sortRule.query), getValue(b, sortRule.query)) : naturalSort(getValue(sortRule.query, a), getValue(sortRule.query, b));
-        } : sortRule.sortBy ? sortBy(sortRule.sortBy) : sortRule.sortType ? typeSort : sortRule.sortFunc ? sortRule.sortFunc : naturalSort;
+            return isSortRow ? naturalSort(getValue(a, sortRule.query), getValue(b, sortRule.query), sortType) : naturalSort(getValue(sortRule.query, a), getValue(sortRule.query, b), sortType);
+        } : sortRule.sortBy ? sortBy(sortRule.sortBy) : sortRule.sortFunc ? sortRule.sortFunc : sortRule.sortType ? typeSort : naturalSort;
     }
     totalStatistics() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
@@ -440,7 +411,7 @@ export class Dataset {
                                 calculateFun: null == calculatedFieldRule ? void 0 : calculatedFieldRule.calculateFun,
                                 dependAggregators: this.tree[flatRowKey][flatColTotalKey],
                                 dependIndicatorKeys: null == calculatedFieldRule ? void 0 : calculatedFieldRule.dependIndicatorKeys
-                            })), this.tree[flatRowKey][flatColTotalKey][i].push(null === (_y = null === (_x = that.tree[flatRowKey]) || void 0 === _x ? void 0 : _x[flatColKey]) || void 0 === _y ? void 0 : _y[i]);
+                            })), flatColTotalKey !== flatColKey && this.tree[flatRowKey][flatColTotalKey][i].push(null === (_y = null === (_x = that.tree[flatRowKey]) || void 0 === _x ? void 0 : _x[flatColKey]) || void 0 === _y ? void 0 : _y[i]);
                         } else {
                             if (!this.tree[flatRowKey][flatColTotalKey][i]) {
                                 const aggRule = this.getAggregatorRule(toComputeIndicatorKeys[i]);
@@ -450,7 +421,7 @@ export class Dataset {
                                     formatFun: null !== (_1 = null == aggRule ? void 0 : aggRule.formatFun) && void 0 !== _1 ? _1 : null === (_3 = null === (_2 = this.indicators) || void 0 === _2 ? void 0 : _2.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _3 ? void 0 : _3.format
                                 });
                             }
-                            this.tree[flatRowKey][flatColTotalKey][i].push(null === (_5 = null === (_4 = that.tree[flatRowKey]) || void 0 === _4 ? void 0 : _4[flatColKey]) || void 0 === _5 ? void 0 : _5[i]);
+                            flatColTotalKey !== flatColKey && this.tree[flatRowKey][flatColTotalKey][i].push(null === (_5 = null === (_4 = that.tree[flatRowKey]) || void 0 === _4 ? void 0 : _4[flatColKey]) || void 0 === _5 ? void 0 : _5[i]);
                         }
                     }
                 }
@@ -469,7 +440,7 @@ export class Dataset {
                             calculateFun: null == calculatedFieldRule ? void 0 : calculatedFieldRule.calculateFun,
                             dependAggregators: this.tree[flatRowKey][flatColTotalKey],
                             dependIndicatorKeys: null == calculatedFieldRule ? void 0 : calculatedFieldRule.dependIndicatorKeys
-                        })), this.tree[flatRowKey][flatColTotalKey][i].push(null === (_18 = null === (_17 = that.tree[flatRowKey]) || void 0 === _17 ? void 0 : _17[flatColKey]) || void 0 === _18 ? void 0 : _18[i]);
+                        })), flatColTotalKey !== flatColKey && this.tree[flatRowKey][flatColTotalKey][i].push(null === (_18 = null === (_17 = that.tree[flatRowKey]) || void 0 === _17 ? void 0 : _17[flatColKey]) || void 0 === _18 ? void 0 : _18[i]);
                     } else {
                         if (!this.tree[flatRowKey][flatColTotalKey][i]) {
                             const aggRule = this.getAggregatorRule(toComputeIndicatorKeys[i]);
@@ -479,7 +450,7 @@ export class Dataset {
                                 formatFun: null !== (_21 = null == aggRule ? void 0 : aggRule.formatFun) && void 0 !== _21 ? _21 : 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
                             });
                         }
-                        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]);
+                        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]);
                     }
                 }
             };
@@ -516,7 +487,7 @@ export class Dataset {
                                         formatFun: null !== (_p = null == aggRule ? void 0 : aggRule.formatFun) && void 0 !== _p ? _p : null === (_r = null === (_q = this.indicators) || void 0 === _q ? void 0 : _q.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _r ? void 0 : _r.format
                                     });
                                 }
-                                this.tree[flatRowTotalKey][flatColKey][i].push(null === (_t = null === (_s = that.tree[flatRowKey]) || void 0 === _s ? void 0 : _s[flatColKey]) || void 0 === _t ? void 0 : _t[i]);
+                                flatRowTotalKey !== flatRowKey && this.tree[flatRowTotalKey][flatColKey][i].push(null === (_t = null === (_s = that.tree[flatRowKey]) || void 0 === _s ? void 0 : _s[flatColKey]) || void 0 === _t ? void 0 : _t[i]);
                             }
                         }
                     }
@@ -545,7 +516,7 @@ export class Dataset {
                                     formatFun: null !== (_1 = null == aggRule ? void 0 : aggRule.formatFun) && void 0 !== _1 ? _1 : null === (_3 = null === (_2 = this.indicators) || void 0 === _2 ? void 0 : _2.find((indicator => "string" != typeof indicator && indicator.indicatorKey === toComputeIndicatorKeys[i]))) || void 0 === _3 ? void 0 : _3.format
                                 });
                             }
-                            this.tree[flatRowTotalKey][flatColKey][i].push(null === (_5 = null === (_4 = that.tree[flatRowKey]) || void 0 === _4 ? void 0 : _4[flatColKey]) || void 0 === _5 ? void 0 : _5[i]);
+                            flatRowTotalKey !== flatRowKey && this.tree[flatRowTotalKey][flatColKey][i].push(null === (_5 = null === (_4 = that.tree[flatRowKey]) || void 0 === _4 ? void 0 : _4[flatColKey]) || void 0 === _5 ? void 0 : _5[i]);
                         }
                     }
                     colCompute(flatRowKey, flatColKey);