fix: 修复多指标情况下自定义树展示不全的问题

yingying.xwy · yingying.xwy · commit 1f6bf71f87bc · 2022-01-11T13:34:12.000+08:00
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
@@ -1,4 +1,4 @@
-import { get, intersection } from 'lodash';
+import { forEach, get, has, intersection, uniq } from 'lodash';
 import { PivotDataSet } from '@/data-set/pivot-data-set';
 import { CellDataParams, DataType } from '@/data-set/interface';
 import { S2DataConfig } from '@/common/interface';
@@ -32,6 +32,7 @@ export class CustomTreePivotDataSet extends PivotDataSet {
     // 3、values 不需要参与计算，默认就在行头结构中
     dataCfg.fields.rows = [EXTRA_FIELD];
     dataCfg.fields.valueInCols = false;
+    const { data, ...restCfg } = dataCfg;
     const { values } = dataCfg.fields;
     // 将源数据中的value值，映射为 $$extra$$,$$value$$
     // {
@@ -42,16 +43,24 @@ export class CustomTreePivotDataSet extends PivotDataSet {
     //                      $$value$$=11
     // 此时 province, city 均配置在columns里面
     // }
-    dataCfg.data = dataCfg.data.map((data) => {
-      // 正常数据omit后只会唯一存在 value key
-      const keys = Object.keys(data);
-      const valueKey = get(intersection(values, keys), 0);
-      return {
-        ...data,
-        [EXTRA_FIELD]: valueKey,
-        [VALUE_FIELD]: data[valueKey],
-      };
+    const transformedData = [];
+    forEach(data, (dataItem) => {
+      forEach(values, (value) => {
+        if (has(dataItem, value)) {
+          transformedData.push({
+            ...dataItem,
+            [EXTRA_FIELD]: value,
+            [VALUE_FIELD]: dataItem[value],
+          });
+        } else {
+          transformedData.push(dataItem);
+        }
+      });
     });
-    return dataCfg;
+
+    return {
+      data: uniq(transformedData),
+      ...restCfg,
+    };
   }
 }
diff --git a/packages/s2-react/src/hooks/useEvents.ts b/packages/s2-react/src/hooks/useEvents.ts
@@ -98,14 +98,14 @@ export function useEvents(props: BaseSheetComponentProps) {
         },
 
         [S2Event.LAYOUT_ROW_NODE_BORDER_REACHED]: (
-          targetRow: TargetLayoutNode,
+          reachedRow: TargetLayoutNode,
         ) => {
-          props.onRowCellScroll?.(targetRow);
+          props.onRowCellScroll?.(reachedRow);
         },
         [S2Event.LAYOUT_COL_NODE_BORDER_REACHED]: (
-          targetCol: TargetLayoutNode,
+          reachedCol: TargetLayoutNode,
         ) => {
-          props.onColCellScroll?.(targetCol);
+          props.onColCellScroll?.(reachedCol);
         },
         [S2Event.LAYOUT_CELL_SCROLL]: (value: CellScrollPosition) => {
           props.onCellScroll?.(value);
