fix(layout): 修复存在多列头多数值且数值置于行头时,列总计单元格高度不对 close #1715 #2049 #2051

lijinke666 · 2023-01-13T09:48:37Z

👀 PR includes

🐛 Bugfix

Solve the issue and closes 🤔 多值展示在行时，右侧总计栏下方出现空白区域 #1715 🐛 开启指标行列转换valueInCols: false 后，当有两个指标，且列上有两个维度的时候，开启列总计，列总计行高异常 #2049

📝 Description

🖼️ Screenshot

Before	After

🔗 Related issue link

close #1715
close #2049

🔍 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 · 2023-01-13T09:48:40Z

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

Name	Status	Preview	Updated
antvis-s2	❌ Failed (Inspect)		Jan 13, 2023 at 10:13AM (UTC)

github-actions · 2023-01-13T09:56:30Z

Size Change: -44 B (0%)

Total Size: 435 kB

Filename	Size	Change
`./packages/s2-core/dist/index.min.js`	171 kB	-44 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`	67.4 kB
`./packages/s2-react/dist/style.min.css`	3.43 kB
`./packages/s2-vue/dist/index.min.js`	20.5 kB
`./packages/s2-vue/dist/style.min.css`	1.68 kB

_{compressed-size-action}

github-actions · 2023-01-13T09:57:43Z

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

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

codecov · 2023-01-13T10:48:12Z

Codecov Report

Base: 77.16% // Head: 76.66% // Decreases project coverage by -0.50% ⚠️

Coverage data is based on head (28b0d56) compared to base (a4b14a8).
Patch coverage: 66.14% of modified lines in pull request are covered.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #2051      +/-   ##
==========================================
- Coverage   77.16%   76.66%   -0.51%     
==========================================
  Files         234      240       +6     
  Lines       11518    12230     +712     
  Branches     2449     2610     +161     
==========================================
+ Hits         8888     9376     +488     
- Misses       1258     1362     +104     
- Partials     1372     1492     +120

Impacted Files	Coverage Δ
packages/s2-core/src/cell/merged-cell.ts	`34.78% <ø> (-1.59%)`	⬇️
packages/s2-core/src/common/constant/index.ts	`90.47% <ø> (-0.60%)`	⬇️
packages/s2-core/src/common/icons/gui-icon.ts	`86.66% <ø> (-1.71%)`	⬇️
packages/s2-core/src/data-set/base-data-set.ts	`93.54% <ø> (+25.80%)`	⬆️
packages/s2-core/src/facet/header/row.ts	`85.18% <0.00%> (ø)`
...kages/s2-core/src/interaction/row-column-resize.ts	`86.53% <0.00%> (ø)`
packages/s2-core/src/sheet-type/pivot-sheet.ts	`86.11% <0.00%> (ø)`
packages/s2-core/src/sheet-type/table-sheet.ts	`89.65% <ø> (+1.72%)`	⬆️
packages/s2-core/src/utils/hide-columns.ts	`83.87% <ø> (+0.35%)`	⬆️
packages/s2-core/src/utils/interaction/index.ts	`95.23% <ø> (+0.59%)`	⬆️
... and 165 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

lijinke666 · 2023-01-16T02:24:23Z

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

The release is available on:

Your semantic-release bot 📦🚀

lijinke666 · 2023-01-16T02:27:26Z

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

The release is available on:

Your semantic-release bot 📦🚀

lijinke666 · 2023-02-22T02:57:11Z

🎉 This PR is included in version @antv/s2-v2.0.0-next.5 🎉

The release is available on:

Your semantic-release bot 📦🚀

lijinke666 · 2023-02-22T03:02:56Z

🎉 This PR is included in version @antv/s2-react-v2.0.0-next.4 🎉

The release is available on:

Your semantic-release bot 📦🚀

Co-authored-by: Jinke Li <[email protected]>

fix(layout): 修复存在多列头多数值且数值置于行头时,列总计单元格高度不对 close #1715 #2049

2a3ae39

github-actions bot added the pr(fix) bug fix label Jan 13, 2023

github-actions bot assigned lijinke666 Jan 13, 2023

github-actions bot requested review from lcx-seima, serializedowen, stone-lyl and wjgogogo January 13, 2023 09:48

lijinke666 enabled auto-merge (squash) January 13, 2023 09:48

vercel bot had a problem deploying to Preview January 13, 2023 09:49 Failure

chore: 还原数据集

bd14694

vercel bot had a problem deploying to Preview January 13, 2023 09:54 Failure

github-actions bot added the 🚨 test failed 单元测试挂了 label Jan 13, 2023

test: 修复测试

28b0d56

vercel bot had a problem deploying to Preview January 13, 2023 10:13 Failure

github-actions bot removed the 🚨 test failed 单元测试挂了 label Jan 13, 2023

lcx-seima approved these changes Jan 16, 2023

View reviewed changes

lijinke666 merged commit a415f46 into master Jan 16, 2023

lijinke666 deleted the fix-1715 branch January 16, 2023 02:11

lijinke666 added the released label Jan 16, 2023

lijinke666 added the released on @next label Feb 22, 2023

wjgogogo pushed a commit that referenced this pull request Oct 25, 2023

fix(layout): 修复存在多列头多数值且数值置于行头时,列总计单元格高度不对 close #1715 #2049 (#2051)

435feec

Co-authored-by: Jinke Li <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(layout): 修复存在多列头多数值且数值置于行头时,列总计单元格高度不对 close #1715 #2049 #2051

fix(layout): 修复存在多列头多数值且数值置于行头时,列总计单元格高度不对 close #1715 #2049 #2051

lijinke666 commented Jan 13, 2023

vercel bot commented Jan 13, 2023 •

edited

Loading

github-actions bot commented Jan 13, 2023 •

edited

Loading

github-actions bot commented Jan 13, 2023

codecov bot commented Jan 13, 2023

lijinke666 commented Jan 16, 2023

lijinke666 commented Jan 16, 2023

lijinke666 commented Feb 22, 2023

lijinke666 commented Feb 22, 2023

fix(layout): 修复存在多列头多数值且数值置于行头时,列总计单元格高度不对 close #1715 #2049 #2051

fix(layout): 修复存在多列头多数值且数值置于行头时,列总计单元格高度不对 close #1715 #2049 #2051

Conversation

lijinke666 commented Jan 13, 2023

👀 PR includes

📝 Description

🖼️ Screenshot

🔗 Related issue link

🔍 Self-Check before the merge

vercel bot commented Jan 13, 2023 • edited Loading

github-actions bot commented Jan 13, 2023 • edited Loading

github-actions bot commented Jan 13, 2023

codecov bot commented Jan 13, 2023

Codecov Report

lijinke666 commented Jan 16, 2023

lijinke666 commented Jan 16, 2023

lijinke666 commented Feb 22, 2023

lijinke666 commented Feb 22, 2023

vercel bot commented Jan 13, 2023 •

edited

Loading

github-actions bot commented Jan 13, 2023 •

edited

Loading