fix: 修复隐藏列总计时行总计也被隐藏问题

[wuhaiyang]

👀 PR includes

✨ Feature

• New feature

🎨 Enhance

• Code style optimization
• Refactoring
• Change the UI
• Improve the performance
• Type optimization

🐛 Bugfix

• 修复隐藏列总计时行总计也被隐藏问题

🔧 Chore

• Test case
• Docs / demos update
• CI / workflow
• Release version
• Other ()

📝 Description

• 解决：目前仅支持隐藏列头部分，行总计和列总计ID 一致时也会被隐藏问题
• 其他说明：行头、列头实际场景不会出现同样的维度

🖼️ Screenshot

Before	After

🔗 Related issue link

🔍 Self-Check before the merge

• Add or update relevant docs.
• Add or update relevant demos.
• Add or update test case.
• Add or update relevant TypeScript definitions.

[vercel]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
antvis-s2	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Nov 17, 2023 4:21am

[github-actions]

Size Change: +67 B (0%)

Total Size: 439 kB

Filename	Size	Change
./packages/s2-core/dist/index.min.js	174 kB	+67 B (0%)

ℹ️ View Unchanged

Filename	Size
./packages/s2-core/dist/style.min.css	389 B
./packages/s2-core/node_modules/@testing-library/dom/dist/@testing-library/dom.cjs.js	21.7 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/@testing-library/dom.esm.js	21.2 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/@testing-library/dom.umd.js	60.3 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/@testing-library/dom.umd.min.js	33.9 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/config.js	1.16 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/DOMElementFilter.js	1.87 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/event-map.js	1.18 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/events.js	1.55 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/get-node-text.js	300 B
./packages/s2-core/node_modules/@testing-library/dom/dist/get-queries-for-element.js	738 B
./packages/s2-core/node_modules/@testing-library/dom/dist/get-user-code-frame.js	810 B
./packages/s2-core/node_modules/@testing-library/dom/dist/helpers.js	1.07 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/index.js	1.14 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/label-helpers.js	1.05 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/matches.js	1.14 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/pretty-dom.js	1.47 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/all-utils.js	337 B
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/alt-text.js	573 B
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/display-value.js	713 B
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/index.js	418 B
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/label-text.js	1.8 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/placeholder-text.js	491 B
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/role.js	2.67 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/test-id.js	498 B
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/text.js	958 B
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/title.js	718 B
./packages/s2-core/node_modules/@testing-library/dom/dist/query-helpers.js	1.81 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/role-helpers.js	2.82 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/screen.js	1.51 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/suggestions.js	1.5 kB
./packages/s2-core/node_modules/@testing-library/dom/dist/wait-for-element-to-be-removed.js	748 B
./packages/s2-core/node_modules/@testing-library/dom/dist/wait-for.js	2.38 kB
./packages/s2-react/dist/index.min.js	68 kB
./packages/s2-react/dist/style.min.css	3.42 kB
./packages/s2-vue/dist/index.min.js	20.5 kB
./packages/s2-vue/dist/style.min.css	1.68 kB

_{compressed-size-action}

[lijinke666]

需要补充一个单测 (隐藏列总计后, 行总计应该还存在), 参考

S2/packages/s2-core/__tests__/spreadsheet/hidden-columns-spec.ts

Lines 536 to 556 in 708fde4

	// https://github.com/antvis/S2/issues/1721
	test('should hide grand totals node', () => {
	const nodeId = 'root[&]总计[&]sub_type';
	sheet.setDataCfg({
	...mockDataConfig,
	fields: {
	rows: ['province', 'city'],
	columns: ['type'],
	values: ['sub_type', 'number'],
	valueInCols: true,
	},
	});
	sheet.render();
	sheet.interaction.hideColumns([nodeId]);
	const leafNodes = sheet.getColumnLeafNodes();
	expect(leafNodes.some((node) => node.id === nodeId)).toBeFalsy();
	expect(leafNodes).toHaveLength(5);
	});

[codecov]

Codecov Report

Attention: 100 lines in your changes are missing coverage. Please review.

Comparison is base (1adc25d) 76.48% compared to head (dcd0487) 76.74%.
Report is 90 commits behind head on master.

Files	Patch %	Lines
packages/s2-core/src/data-set/pivot-data-set.ts	72.85%	2 Missing and 17 partials ⚠️
packages/s2-core/src/facet/pivot-facet.ts	81.63%	1 Missing and 8 partials ⚠️
packages/s2-core/src/utils/text.ts	50.00%	7 Missing ⚠️
...mponents/sheets/editable-sheet/edit-cell/index.tsx	50.00%	5 Missing and 1 partial ⚠️
...s/s2-core/src/facet/layout/build-gird-hierarchy.ts	85.29%	1 Missing and 4 partials ⚠️
packages/s2-core/src/facet/layout/layout-hooks.ts	0.00%	3 Missing and 1 partial ⚠️
...act/src/components/sheets/editable-sheet/index.tsx	33.33%	3 Missing and 1 partial ⚠️
packages/s2-core/src/facet/base-facet.ts	85.71%	0 Missing and 3 partials ⚠️
...nteraction/brush-selection/base-brush-selection.ts	70.00%	2 Missing and 1 partial ⚠️
packages/s2-core/src/utils/export/copy.ts	85.00%	0 Missing and 3 partials ⚠️
... and 25 more

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #2417      +/-   ##
==========================================
+ Coverage   76.48%   76.74%   +0.26%     
==========================================
  Files         240      241       +1     
  Lines       12312    12602     +290     
  Branches     2630     2708      +78     
==========================================
+ Hits         9417     9672     +255     
+ Misses       1377     1350      -27     
- Partials     1518     1580      +62     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[github-actions]

你好 @wuhaiyang，感谢你的贡献, 为了让代码更健壮, 请补充相应单元测试, 如果有 API 改动, 请修改 相应的文档

Hello, @wuhaiyang, Thanks for your contribution. In order to make the code more robust, please add the corresponding unit tests, and update the docs if there are API changes.

[wuhaiyang]

已补充

[github-actions]

你好, @wuhaiyang CI 执行失败, 请点击 [Details] 按钮查看, 并根据日志修复。

Hello, @wuhaiyang CI run failed, please click the [Details] button for detailed log information and fix it.

[lijinke666]

🎉 This PR is included in version @antv/s2-v1.53.0-alpha.1 🎉

The release is available on:

• npm package (@alpha dist-tag)
• GitHub release

Your semantic-release bot 📦🚀

[lijinke666]

🎉 This PR is included in version @antv/s2-v1.52.1 🎉

The release is available on:

• npm package (@latest dist-tag)
• GitHub release

Your semantic-release bot 📦🚀