fix: 修复隐藏列总计时行总计也被隐藏问题 (#2417)

* fix: 修复隐藏列总计时行总计也被隐藏了 * fix: add fix bug comment * fix: add test case * fix: optimize test case --------- Co-authored-by: wuding.why <[email protected]>
antvis · Nov 17, 2023 · 3b771c0 · 3b771c0 · vercel · Nov 17, 2023
1 parent ed79621
commit 3b771c0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/packages/s2-core/__tests__/spreadsheet/hidden-columns-spec.ts b/packages/s2-core/__tests__/spreadsheet/hidden-columns-spec.ts
@@ -554,6 +554,26 @@ describe('SpreadSheet Hidden Columns Tests', () => {
         expect(leafNodes.some((node) => node.id === nodeId)).toBeFalsy();
         expect(leafNodes).toHaveLength(5);
       });
+
+      test.each(['grid', 'tree'])(
+        'hiding the column totals should not hide the row totals for %s mode',
+        (hierarchyType: 'grid' | 'tree') => {
+          sheet.setOptions({ hierarchyType });
+          sheet.render();
+          const nodeId = 'root[&]总计';
+          const preRowNodes = sheet.facet.layoutResult.rowNodes;
+          const preColumnNodes = sheet.facet.layoutResult.colNodes;
+          sheet.interaction.hideColumns([nodeId]);
+
+          expect(sheet.facet.layoutResult.rowNodes[0].id).toBe(nodeId);
+          expect(sheet.facet.layoutResult.rowNodes.length).toBe(
+            preRowNodes.length,
+          );
+          expect(sheet.facet.layoutResult.colNodes.length).toBe(
+            preColumnNodes.length - 1,
+          );
+        },
+      );
     });
   });
 });
diff --git a/packages/s2-core/src/facet/layout/layout-hooks.ts b/packages/s2-core/src/facet/layout/layout-hooks.ts
@@ -43,7 +43,11 @@ export const layoutHierarchy = (
   const hiddenColumnNode =
     facetCfg.spreadsheet?.facet?.getHiddenColumnsInfo(currentNode);
 
-  if (hiddenColumnNode) {
+  if (
+    hiddenColumnNode &&
+    // fix: Only hiding the column headers is supported to prevent the row subtotals from being hidden when the IDs of the row totals and column totals are the same.
+    facetCfg.columns.find((field) => field === currentNode.field)
+  ) {
     return false;
   }