Skip to content

fix: 明细表锁行/列时分割线阴影显隐逻辑 #1123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Feb 23, 2022
Merged

fix: 明细表锁行/列时分割线阴影显隐逻辑 #1123

merged 2 commits into from
Feb 23, 2022

Conversation

lcx-seima
Copy link
Contributor

👀 PR includes

📝 Description

修复明细表阴影逻辑，与交叉表一致 #898 遵循 ant-design 阴影逻辑。并将单次 render 分割线，改为滚动后 render，便于重绘。

🖼️ Screenshot

{
  frozenRowCount: 1,
  frozenTrailingRowCount: 1,
  frozenColCount: 1,
  frozenTrailingColCount: 1,
}
Before After
CleanShot 2022-02-22 at 21 11 51 CleanShot 2022-02-22 at 21 09 48

🔍 Self Check before Merge

  • Add or update relevant Docs.
  • Add or update relevant Demos.
  • Add or update relevant TypeScript definitions.

@codecov
Copy link

codecov bot commented Feb 22, 2022 •
edited
Loading

Codecov Report

Merging #1123 (7a06e35) into master (f088a7b) will increase coverage by 0.04%.
The diff coverage is 94.44%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1123      +/-   ##
==========================================
+ Coverage   72.01%   72.05%   +0.04%     
==========================================
  Files         178      178              
  Lines       13131    13155      +24     
  Branches     3095     3099       +4     
==========================================
+ Hits         9456     9479      +23     
- Misses       2404     2407       +3     
+ Partials     1271     1269       -2
Impacted Files Coverage Δ
packages/s2-core/src/facet/table-facet.ts 82.03% <94.11%> (-0.31%) ⬇️
packages/s2-core/src/common/constant/basic.ts 100.00% <100.00%> (ø)
packages/s2-core/src/facet/base-facet.ts 70.45% <0.00%> (+0.18%) ⬆️
packages/s2-core/src/sheet-type/pivot-sheet.ts 81.32% <0.00%> (+2.27%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f088a7b...7a06e35. Read the comment docs.

@github-actions
Copy link
Contributor

github-actions bot commented Feb 22, 2022 •
edited
Loading

🎊 PR Preview has been successfully built and deployed to https://s2-preview-pr-1123.surge.sh

@github-actions github-actions bot added the pr(fix) bug fix label Feb 22, 2022
@github-actions
Copy link
Contributor

Size Change: +270 B (0%)

Total Size: 193 kB

Filename Size Change
./packages/s2-core/dist/index.min.js 120 kB -45 B (0%)
./packages/s2-react/dist/index.min.js 70 kB +315 B (0%)
ℹ️ View Unchanged
Filename Size
./packages/s2-core/dist/style.min.css 362 B
./packages/s2-react/dist/style.min.css 3.1 kB

compressed-size-action

wjgogogo
wjgogogo reviewed Feb 23, 2022
View reviewed changes
@wjgogogo wjgogogo merged commit 16895de into master Feb 23, 2022
@wjgogogo wjgogogo deleted the fix/table-split-line branch February 23, 2022 06:04
@lijinke666
Copy link
Member

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

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wjgogogo wjgogogo wjgogogo approved these changes

@zxc0328 zxc0328 Awaiting requested review from zxc0328

@lijinke666 lijinke666 Awaiting requested review from lijinke666

@qubaomingg qubaomingg Awaiting requested review from qubaomingg

@stone-lyl stone-lyl Awaiting requested review from stone-lyl

@xingwanying xingwanying Awaiting requested review from xingwanying

@yangzhanmei yangzhanmei Awaiting requested review from yangzhanmei

@YardWill YardWill Awaiting requested review from YardWill

Assignees

@lcx-seima lcx-seima

Labels
pr(fix) bug fix released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

🐛明细表在列冻结的情况下，即使表格没有出现滚动，也会有分割线
3 participants
@lcx-seima @lijinke666 @wjgogogo