refactor: 抽取 prefix 逻辑

antvis · Nov 24, 2023 · dea9605 · dea9605
1 parent 05808f1
commit dea9605
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/packages/s2-core/src/data-set/custom-tree-pivot-data-set.ts b/packages/s2-core/src/data-set/custom-tree-pivot-data-set.ts
@@ -4,6 +4,7 @@ import { i18n } from '../common/i18n';
 import type { Meta, S2DataConfig } from '../common/interface';
 import {
   getDataPath,
+  getDataPathPrefix,
   transformDimensionsValues,
 } from '../utils/dataset/pivot-data-set';
 import { DataHandler } from '../utils/dataset/proxy-handler';
@@ -20,13 +21,15 @@ export class CustomTreePivotDataSet extends PivotDataSet {
       query,
       columns as string[],
     );
+
     const path = getDataPath({
       rowDimensionValues,
       colDimensionValues,
       rowPivotMeta: this.rowPivotMeta,
       colPivotMeta: this.colPivotMeta,
       rowFields: rows,
       colFields: columns as string[],
+      prefix: getDataPathPrefix(rows, columns as string[]),
     });
     const data = get(this.indexesData, path);
     if (data) {

diff --git a/packages/s2-core/src/data-set/interface.ts b/packages/s2-core/src/data-set/interface.ts
@@ -38,6 +38,7 @@ export type DataPathParams = {
     // 完整维度信息：'四川省[&]成都市'
     dimensionPath: string;
   }) => void;
+  prefix?: string;
 };
 
 export interface CellDataParams {

diff --git a/packages/s2-core/src/data-set/pivot-data-set.ts b/packages/s2-core/src/data-set/pivot-data-set.ts
@@ -43,6 +43,7 @@ import {
   deleteMetaById,
   flattenIndexesData,
   getDataPath,
+  getDataPathPrefix,
   getFlattenDimensionValues,
   getSatisfiedPivotMetaValues,
   isMultiValue,
@@ -410,6 +411,7 @@ export class PivotDataSet extends BaseDataSet {
       colPivotMeta: this.colPivotMeta,
       rowFields: rows,
       colFields: columns as string[],
+      prefix: getDataPathPrefix(rows, columns as string[]),
     });
     const data = get(this.indexesData, path);
     if (data) {
@@ -538,6 +540,7 @@ export class PivotDataSet extends BaseDataSet {
       queryType,
     });
 
+    const prefix = getDataPathPrefix(totalRows, columns as string[]);
     const all: Data[] = [];
 
     for (const rowQuery of rowQueries) {
@@ -549,6 +552,7 @@ export class PivotDataSet extends BaseDataSet {
           colPivotMeta: this.colPivotMeta,
           rowFields: totalRows,
           colFields: columns as string[],
+          prefix,
         });
 
         let hadMultiField = false;

diff --git a/packages/s2-core/src/utils/dataset/pivot-data-set.ts b/packages/s2-core/src/utils/dataset/pivot-data-set.ts
@@ -151,6 +151,13 @@ export function getDimensionsWithParentPath(
     ?.filter((item) => item);
 }
 
+export function getDataPathPrefix(rowFields: string[], colFields: string[]) {
+  return rowFields
+    .concat(colFields)
+    .filter((i) => i !== EXTRA_FIELD)
+    .join(ID_SEPARATOR);
+}
+
 /**
  * Transform a single data to path
  * {
@@ -180,15 +187,9 @@ export function getDataPath(params: DataPathParams) {
     colFields,
     rowPivotMeta,
     colPivotMeta,
+    prefix = '',
   } = params;
 
-  const getDimensionPrefix = () => {
-    return rowFields
-      .concat(colFields)
-      .filter((i) => i !== EXTRA_FIELD)
-      .join(ID_SEPARATOR);
-  };
-
   // 根据行、列维度值生成对应的 path 路径，始终将总计小计置于第 0 位，明细数据从第 1 位开始，有两个情况：
   // 如果是汇总格子: path = [0, 0, 0, 0] path 中会存在 0 的值
   // 如果是明细格子: path = [1, 1, 1] 数字均不为 0
@@ -253,7 +254,7 @@ export function getDataPath(params: DataPathParams) {
   const rowPath = getPath(rowFields, rowDimensionValues, rowPivotMeta, false);
   const colPath = getPath(colFields, colDimensionValues, colPivotMeta, true);
 
-  return [getDimensionPrefix(), ...rowPath, ...colPath];
+  return [prefix, ...rowPath, ...colPath];
 }
 interface Param {
   rows: string[];
@@ -305,6 +306,8 @@ export function transformIndexesData(params: Param) {
     ).push(dimensionPath);
   };
 
+  const prefix = getDataPathPrefix(rows, columns as string[]);
+
   data.forEach((item) => {
     // 空数据没有意义，直接跳过
     if (!item || isEmpty(item)) {
@@ -333,6 +336,7 @@ export function transformIndexesData(params: Param) {
           colFields: columns,
           isFirstCreate: true,
           onFirstCreate,
+          prefix,
         });
         paths.push(path);
         set(indexesData, path, item);