refactor: 处理总计小计在 indexData 中的存储位置

packages/s2-core/__tests__/unit/facet/util.ts

@@ -13,6 +13,7 @@ export function getMockPivotMeta() {
   return transformIndexesData({
     rows: fields.rows,
     columns: fields.columns,
+    values: fields.values,
     originData: data,
     indexesData: rawIndexesData,
     totalData,

packages/s2-core/__tests__/unit/utils/dataset/pivot-dataset-spec.ts

@@ -35,13 +35,14 @@ describe('PivotDataSet util test', () => {
   });
 
   test('for transformIndexesData function', () => {
-    const { rows, columns } = dataCfg.fields;
+    const { rows, columns, values } = dataCfg.fields;
     const sortedDimensionValues = {};
     const rowPivotMeta = new Map();
     const colPivotMeta = new Map();
     const result = transformIndexesData({
       rows,
       columns: columns as string[],
+      values,
       originData: dataCfg.data,
       totalData: [],
       indexesData: [],
@@ -105,7 +106,6 @@ describe('PivotDataSet util test', () => {
       rowPivotMeta,
       colPivotMeta,
       isFirstCreate: true,
-      careUndefined: false,
       rowFields: rows,
       colFields: columns,
     });
@@ -124,7 +124,6 @@ describe('PivotDataSet util test', () => {
       rowPivotMeta,
       colPivotMeta,
       isFirstCreate: false,
-      careUndefined: false,
     });
     expect(rowPivotMeta.size).toEqual(0);
     expect(colPivotMeta.size).toEqual(0);
@@ -142,7 +141,6 @@ describe('PivotDataSet util test', () => {
       rowPivotMeta,
       colPivotMeta,
       isFirstCreate: true,
-      careUndefined: false,
     });
     expect(rowPivotMeta.get(rowDimensionValues[0]).childField).toBeUndefined();
     expect(colPivotMeta.get(colDimensionValues[0]).childField).toBeUndefined();
@@ -162,7 +160,6 @@ describe('PivotDataSet util test', () => {
       rowPivotMeta,
       colPivotMeta,
       isFirstCreate: true,
-      careUndefined: false,
       rowFields: rows,
       colFields: columns,
     });

packages/s2-core/src/common/constant/basic.ts

@@ -3,6 +3,7 @@ export const VALUE_FIELD = '$$value$$';
 export const EXTRA_FIELD = '$$extra$$';
 export const EXTRA_COLUMN_FIELD = '$$extra_column$$';
 export const TOTAL_VALUE = '$$total$$';
+export const MULTI_VALUE = '$$multi$$';
 export const SERIES_NUMBER_FIELD = '$$series_number$$';
 
 export const BACK_GROUND_GROUP_CONTAINER_Z_INDEX = 0;

packages/s2-core/src/data-set/custom-tree-pivot-data-set.ts

@@ -13,7 +13,7 @@ import { PivotDataSet } from './pivot-data-set';
 export class CustomTreePivotDataSet extends PivotDataSet {
   getCellData(params: CellDataParams): DataType {
     const { query } = params;
-    const { columns, rows } = this.fields;
+    const { rows, columns } = this.fields;
     const rowDimensionValues = transformDimensionsValues(query, rows);
     // 透视表下columns只支持简单结构
     const colDimensionValues = transformDimensionsValues(
@@ -25,10 +25,6 @@ export class CustomTreePivotDataSet extends PivotDataSet {
       colDimensionValues,
       rowPivotMeta: this.rowPivotMeta,
       colPivotMeta: this.colPivotMeta,
-      isFirstCreate: true,
-      careUndefined: true,
-      rowFields: rows,
-      colFields: columns as string[],
     });
     const data = get(this.indexesData, path);
     if (data) {

packages/s2-core/src/data-set/interface.ts

@@ -25,15 +25,11 @@ export type DataPathParams = {
   isFirstCreate?: boolean;
   // callback when pivot map create node
   onFirstCreate?: (params: {
-    // 是否是行头字段
-    isRow: boolean;
     // 维度 id，如 city
     dimension: string;
     // 维度数组 ['四川省', '成都市']
     dimensionPath: string[];
   }) => void;
-  // use for multiple data queries（path contains undefined）
-  careUndefined?: boolean;
   // use in row tree mode to append fields information
   rowFields?: string[];
   colFields?: string[];

packages/s2-core/src/data-set/pivot-data-set.ts

@@ -40,14 +40,13 @@ import type {
 } from '../common/interface';
 import { Node } from '../facet/layout/node';
 import {
-  filterUndefined,
+  filterTotal,
   flatten as customFlatten,
   flattenDeep as customFlattenDeep,
   getAggregationAndCalcFuncByQuery,
   getFieldKeysByDimensionValues,
   getListBySorted,
   isEveryUndefined,
-  isTotalData,
   splitTotal,
 } from '../utils/data-set-operate';
 import {
@@ -165,7 +164,6 @@ export class PivotDataSet extends BaseDataSet {
       originData,
       totalData,
       indexesData: this.indexesData,
-
       sortedDimensionValues: this.sortedDimensionValues,
       rowPivotMeta: this.rowPivotMeta,
       colPivotMeta: this.colPivotMeta,
@@ -329,7 +327,7 @@ export class PivotDataSet extends BaseDataSet {
         field,
       }),
     );
-    return filterUndefined(
+    return filterTotal(
       uniq(getDimensionsWithoutPathPre([...allCurrentFieldDimensionValues])),
     );
   }
@@ -371,16 +369,16 @@ export class PivotDataSet extends BaseDataSet {
       if (isEmpty(sortedMeta)) {
         return [];
       }
-      return filterUndefined(getListBySorted([...meta.keys()], sortedMeta));
+      return filterTotal(getListBySorted([...meta.keys()], sortedMeta));
     }
 
     if (this.sortedDimensionValues[field]) {
-      return filterUndefined(
+      return filterTotal(
         getDimensionsWithoutPathPre([...this.sortedDimensionValues[field]]),
       );
     }
 
-    return filterUndefined([...meta.keys()]);
+    return filterTotal([...meta.keys()]);
   }
 
   getTotalValue(query: Query, totalStatus?: TotalStatus) {
@@ -429,6 +427,7 @@ export class PivotDataSet extends BaseDataSet {
     if (!isTotals || isDrillDown) {
       rows = Node.getFieldPath(rowNode, isDrillDown) ?? originRows;
     }
+
     const rowDimensionValues = transformDimensionsValues(query, rows);
     const colDimensionValues = transformDimensionsValues(
       query,
@@ -437,8 +436,6 @@ export class PivotDataSet extends BaseDataSet {
     const path = getDataPath({
       rowDimensionValues,
       colDimensionValues,
-      careUndefined:
-        isTotals || isTotalData([].concat(originRows).concat(columns), query),
       rowPivotMeta: this.rowPivotMeta,
       colPivotMeta: this.colPivotMeta,
     });
@@ -447,7 +444,10 @@ export class PivotDataSet extends BaseDataSet {
       // 如果已经有数据则取已有数据
       return DataHandler.createProxyData(data, query[EXTRA_FIELD]);
     }
-    return isTotals ? this.getTotalValue(query, totalStatus) : data;
+
+    if (isTotals) {
+      return this.getTotalValue(query, totalStatus);
+    }
   }
 
   getCustomData = (path: number[]) => {
@@ -630,9 +630,6 @@ export class PivotDataSet extends BaseDataSet {
       const path = getDataPath({
         rowDimensionValues,
         colDimensionValues,
-        careUndefined: true,
-        rowFields: rows,
-        colFields: columns as string[],
         rowPivotMeta: this.rowPivotMeta,
         colPivotMeta: this.colPivotMeta,
       });
@@ -646,7 +643,7 @@ export class PivotDataSet extends BaseDataSet {
     query: Query,
     isTotals?: boolean,
     isRow?: boolean,
-    drillDownFields?: string[],
+    drillDownFields: string[] = [],
     includeTotalData?: boolean,
   ): DataType[] {
     if (isEmpty(query)) {
@@ -672,9 +669,6 @@ export class PivotDataSet extends BaseDataSet {
       const path = getDataPath({
         rowDimensionValues,
         colDimensionValues,
-        careUndefined: true,
-        rowFields: rows,
-        colFields: columns as string[],
         rowPivotMeta: this.rowPivotMeta,
         colPivotMeta: this.colPivotMeta,
       });

packages/s2-core/src/data-set/table-data-set.ts

@@ -171,7 +171,7 @@ export class TableDataSet extends BaseDataSet {
     return rowData[query.col];
   }
 
-  public getMultiData(query: Query, isTotals?: boolean): DataType[] {
+  public getMultiData(): DataType[] {
     return this.displayData;
   }
 

packages/s2-core/src/facet/layout/build-row-tree-hierarchy.ts

@@ -2,7 +2,7 @@ import { isNumber } from 'lodash';
 import { i18n, ID_SEPARATOR, ROOT_ID } from '../../common';
 import type { PivotDataSet } from '../../data-set';
 import type { SpreadSheet } from '../../sheet-type';
-import { filterUndefined, getListBySorted } from '../../utils/data-set-operate';
+import { filterTotal, getListBySorted } from '../../utils/data-set-operate';
 import { generateId } from '../../utils/layout/generate-id';
 import type { FieldValue, TreeHeaderParams } from '../layout/interface';
 import { layoutArrange, layoutHierarchy } from '../layout/layout-hooks';
@@ -53,7 +53,7 @@ export const buildRowTreeHierarchy = (params: TreeHeaderParams) => {
   const sortedDimensionValues =
     (dataSet as PivotDataSet)?.sortedDimensionValues?.[currentField] || [];
 
-  const unsortedDimValues = filterUndefined(Array.from(pivotMeta.keys()));
+  const unsortedDimValues = filterTotal(Array.from(pivotMeta.keys()));
   const dimValues = getListBySorted(
     unsortedDimValues,
     sortedDimensionValues,

packages/s2-core/src/utils/data-set-operate.ts

@@ -1,4 +1,5 @@
-import { every, filter, get, isUndefined, keys, reduce } from 'lodash';
+import { every, get, isUndefined, keys, reduce } from 'lodash';
+import { TOTAL_VALUE } from '../common/constant/basic';
 import type { Data, Fields, Totals, TotalsStatus } from '../common/interface';
 
 export const getListBySorted = (
@@ -27,8 +28,8 @@ export const getListBySorted = (
   });
 };
 
-export const filterUndefined = (values: string[]) => {
-  return filter(values, (t) => !isUndefined(t) && t !== 'undefined');
+export const filterTotal = (values: string[] = []) => {
+  return values.filter((v) => v !== TOTAL_VALUE);
 };
 
 export const flattenDeep = (data: Record<any, any>[] | Record<any, any>) =>
@@ -108,7 +109,7 @@ export const sortByItems = (arr1: string[], arr2: string[]) => {
  * @returns
  */
 export const isTotalData = (ids: string[], data: Data): boolean => {
-  return !every(ids, (id) => data[id]);
+  return !every(ids, (id) => id in data);
 };
 
 /**