Skip to content
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.

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

fix: the order of multiple selection of cells is wrong #857

Merged
merged 7 commits into from
Dec 3, 2021

Conversation

stone-lyl
Copy link
Member

👀 PR includes

✨ Feature

  • New feature

🎨 Enhance

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

🐛 Bugfix

  • Solve the issue and close #0

🔧 Chore

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

📝 Description

  1. 调整 COL_ROW_MULTI_SELECTION 为CELL_MULTI_SELECTION。
  2. 调整失效文档
  3. 选择多个单元格时,未使用第一个被点击单元格的信息作为合并单元的信息作为展示。
  4. 调整命名

🖼️ Screenshot

Before After
单元格合并选择第一个失效 单元格合并选择第一个修复

🔗 Related issue link

🔍 Self Check before Merge

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

@github-actions
Copy link
Contributor

github-actions bot commented Dec 2, 2021

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

@github-actions
Copy link
Contributor

github-actions bot commented Dec 2, 2021

Size Change: +33 B (0%)

Total Size: 185 kB

Filename Size Change
./packages/s2-core/dist/index.min.js 113 kB +33 B (0%)
ℹ️ View Unchanged
Filename Size
./packages/s2-core/dist/style.min.css 356 B
./packages/s2-react/dist/index.min.js 68.5 kB
./packages/s2-react/dist/style.min.css 3.1 kB

compressed-size-action

@github-actions
Copy link
Contributor

github-actions bot commented Dec 2, 2021

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

Hello, @stone-lyl CI run failed, please click the [Details] button try to fixed it.

@github-actions github-actions bot added the 🚨 test failed 单元测试挂了 label Dec 2, 2021
@stone-lyl stone-lyl changed the title Feat merge cell fix: the order of multiple selection of cells is wrong Dec 3, 2021
@github-actions github-actions bot added the pr(fix) bug fix label Dec 3, 2021
@github-actions github-actions bot removed the 🚨 test failed 单元测试挂了 label Dec 3, 2021
@codecov
Copy link

codecov bot commented Dec 3, 2021

Codecov Report

Merging #857 (f03573c) into master (025ec55) will increase coverage by 0.58%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #857      +/-   ##
==========================================
+ Coverage   71.13%   71.71%   +0.58%     
==========================================
  Files         168      168              
  Lines       11654    12183     +529     
  Branches     2729     2942     +213     
==========================================
+ Hits         8290     8737     +447     
- Misses       2220     2258      +38     
- Partials     1144     1188      +44     
Impacted Files Coverage Δ
packages/s2-core/src/facet/base-facet.ts 66.80% <ø> (ø)
packages/s2-core/src/utils/interaction/index.ts 93.87% <ø> (ø)
.../s2-core/src/utils/interaction/state-controller.ts 76.92% <ø> (ø)
packages/s2-core/src/cell/merged-cell.ts 29.24% <100.00%> (ø)
...ackages/s2-core/src/common/constant/interaction.ts 100.00% <100.00%> (ø)
...re/src/interaction/base-interaction/click/index.ts 100.00% <100.00%> (ø)
...action/base-interaction/click/merged-cell-click.ts 73.84% <100.00%> (ø)
packages/s2-core/src/interaction/root.ts 85.02% <100.00%> (+0.27%) ⬆️
...ckages/s2-core/src/utils/interaction/merge-cell.ts 70.62% <100.00%> (ø)
packages/s2-core/src/cell/corner-cell.ts 70.61% <0.00%> (-0.11%) ⬇️
... and 15 more

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 025ec55...f03573c. Read the comment docs.

@lijinke666 lijinke666 merged commit 63d1fcb into master Dec 3, 2021
@lijinke666 lijinke666 deleted the feat-merge-cell branch December 3, 2021 08:00
@github-actions
Copy link
Contributor

github-actions bot commented Dec 6, 2021

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

The release is available on:

Your semantic-release bot 📦🚀

wjgogogo pushed a commit that referenced this pull request Oct 25, 2023
* fix: the order of multiple selection of cells is wrong

* chore: rename merge cells to merge cell

* docs: update merge-cell.zh.md content, no longer rely on React

* docs: keep the document style consistent

* chore: delete merge-cell-spec.ts

* chore: tweak CELL_MULTI_SELECTION to DATA_CELL_MULTI_SELECTION

* fix: fix unit test, remove undefined in array
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants