Merge pull request #4765 from VisActor/refactor/dimension-null-empty-distinction

Refactor/dimension null empty distinction

Author: fangsmile

common/changes/@visactor/vtable/fix-dimension-null-empty-distinction_2025-11-29-08-16.json

@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: distinguish null and empty string values in row/column dimensions\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "gongshiwei@kkgroup.cn"
+}

packages/vtable/src/dataset/dataset.ts

@@ -803,8 +803,9 @@ export class Dataset {
         if (this.indicatorsAsCol) {
           assignedIndicatorKey_value = colKeys[col_j].indicatorKey;
         }
-        const flatRowKey = rowKey.join(this.stringJoinChar);
-        const flatColKey = colKey.join(this.stringJoinChar);
+        // 原生的数组join方法会将null转换为空字符串
+        const flatRowKey = join(rowKey, this.stringJoinChar);
+        const flatColKey = join(colKey, this.stringJoinChar);
 
         //#region 收集用户传入的汇总数据到totalRecordsTree
         //该条数据为汇总数据

packages/vtable/src/layout/pivot-header-layout.ts

@@ -2344,8 +2344,12 @@ export class PivotHeaderLayoutMap implements LayoutMapAPI {
         } = {};
         rowHeaderPath.dimensionKey = rowHeader.dimensionKey;
         rowHeaderPath.indicatorKey = rowHeader.indicatorKey;
+        // 如果value为null且没有indicatorKey时保持value为null（区分null和空字符串，防止单元格数据匹配不对）
         rowHeaderPath.value =
-          rowHeader.value ?? this.getIndicatorInfoByIndicatorKey(rowHeader.indicatorKey)?.title ?? '';
+          rowHeader.value ??
+          (rowHeader.indicatorKey
+            ? this.getIndicatorInfoByIndicatorKey(rowHeader.indicatorKey)?.title ?? ''
+            : rowHeader.value);
         rowHeaderPath.virtual = rowHeader.virtual;
         rowHeaderPath.role = rowHeader.role;
         headerPaths.rowHeaderPaths!.push(rowHeaderPath);