fix: 修复维度字段中包含 [&] 分隔符导致的获取数据不正确的问题

antvis · Dec 20, 2023 · a9f907e · a9f907e
1 parent 918e52e
commit a9f907e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/packages/s2-core/src/data-set/interface.ts b/packages/s2-core/src/data-set/interface.ts
@@ -1,5 +1,5 @@
 import type { QueryDataType } from '../common/constant/query';
-import type { Data, SortParam } from '../common/interface';
+import type { SortParam } from '../common/interface';
 import type { Node } from '../facet/layout/node';
 import type { BaseDataSet } from './base-data-set';
 
@@ -11,6 +11,8 @@ export type Query = Record<string, any>;
 export type PivotMetaValue = {
   // 当前维度结合父级维度生成的完整 id 信息
   id: string;
+  // 当前维度结合父级维度生成的完整 dimensions 信息，主要是预防 field 数据本身出现 [&] 导致维度信息识别不正确
+  dimensions: string[];
   // 当前维度
   value: string;
   level: number;

diff --git a/packages/s2-core/src/utils/dataset/pivot-data-set.ts b/packages/s2-core/src/utils/dataset/pivot-data-set.ts
@@ -214,11 +214,10 @@ export function getDataPath(params: DataPathParams) {
       const value = dimensionValues[i];
 
       if (isFirstCreate && currentMeta && !currentMeta?.has(value)) {
-        const id = dimensionValues
+        const currentDimensions = dimensionValues
           .slice(0, i + 1)
-          .map((it) => String(it))
-          .join(ID_SEPARATOR);
-
+          .map((it) => String(it));
+        const id = currentDimensions.join(ID_SEPARATOR);
         const isTotal = value === TOTAL_VALUE;
 
         let level;
@@ -232,6 +231,7 @@ export function getDataPath(params: DataPathParams) {
 
         currentMeta.set(value, {
           id,
+          dimensions: currentDimensions,
           value,
           level,
           children: new Map(),
@@ -536,7 +536,7 @@ export function flattenDimensionValues(params: {
     sortedDimensionValues,
   });
 
-  return metaValues.map((v) => v.id.split(ID_SEPARATOR));
+  return metaValues.map((v) => v.dimensions);
 }
 
 export function getFlattenDimensionValues(