feat: 合并 master 到 next #2493

wjgogogo · 2023-12-26T07:11:08Z

👀 PR includes

✨ Feature

New feature

🎨 Enhance

🐛 Bugfix

Solve the issue and close #0

🔧 Chore

📝 Description

🖼️ 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.

fix: 移除空控制符 Co-authored-by: 沫君 <[email protected]>

* fix: 系统拦截快捷键后多选交互异常 * test: 增加测试用例 --------- Co-authored-by: 沫君 <[email protected]>

Co-authored-by: 沫君 <[email protected]>

* feat: 当用户还未配置行列头和数值时，不渲染 * feat: 当用户还未配置行列头和数值时，不渲染表格框架 * test: 添加行列头和数值为空时，不渲染表格框架的单测 --------- Co-authored-by: zishang <[email protected]>

* fix(core): only do compatibility of shit + scroll on Windows * fix(core): only do compatibility of shit + scroll on Windows - add test case --------- Co-authored-by: stone <[email protected]>

…urrounded by square brackets (#2212) Co-authored-by: Jinke Li <[email protected]>

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

* feat: 当用户还未配置行列头和数值时，不渲染 * feat: 当用户还未配置行列头和数值时，不渲染表格框架 * feat: 当 dataCfg 配置为空时，不展示空框架，兼容趋势分析表 * test: 添加当 dataCfg 配置为空时，不展示空框架，兼容趋势分析表单测 * test: 添加趋势分析表中自定义 cornerExtraFieldText 相关单测 --------- Co-authored-by: zishang <[email protected]>

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

* fix: 修复树状模式下，总计小计格式化问题 * fix: 修改 active border 绘制顺序 * test: 单测修复

…cell clicked (#2211) Co-authored-by: Jinke Li <[email protected]> Co-authored-by: 刘嘉一 <[email protected]>

Co-authored-by: 卿珂 <[email protected]>

* feat: trigger hover after scroll * chore: rename property and add note * test: should trigger mousemove after scroll * chore: ci pass * feat: add option to control hover after scroll * test: set hover after scroll option to true * docs: hover after scroll - description in interaction chapter - one demo * chore: config button in react playground * chore: update screenshot link --------- Co-authored-by: 刘嘉一 <[email protected]>

* fix(react): correct `showPagination` type * docs: correct `showPagination` type * chore: correct `showPagination` type - update `showPagination` type in react playground - update correct callback in s2 site demo --------- Co-authored-by: 刘嘉一 <[email protected]>

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

Co-authored-by: 卿珂 <[email protected]>

…chore-merge-master-12-19

codecov · 2024-01-18T07:21:48Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (ecdc9c8) 75.77% compared to head (49f47cd) 78.29%.
Report is 226 commits behind head on next.

Additional details and impacted files

@@            Coverage Diff             @@
##             next    #2493      +/-   ##
==========================================
+ Coverage   75.77%   78.29%   +2.52%     
==========================================
  Files         257      275      +18     
  Lines       11994    12464     +470     
  Branches     2464     2550      +86     
==========================================
+ Hits         9088     9759     +671     
+ Misses       1398     1141     -257     
- Partials     1508     1564      +56

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

lijinke666 · 2024-01-26T06:19:40Z

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

The release is available on:

Your semantic-release bot 📦🚀

lijinke666 · 2024-01-26T06:21:43Z

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

The release is available on:

Your semantic-release bot 📦🚀

lijinke666 · 2024-02-05T05:02:41Z

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

The release is available on:

Your semantic-release bot 📦🚀

lijinke666 · 2024-02-05T05:05:16Z

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

The release is available on:

Your semantic-release bot 📦🚀

lijinke666 · 2024-02-05T05:07:39Z

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

The release is available on:

Your semantic-release bot 📦🚀

lijinke666 and others added 30 commits May 4, 2023 09:34

chore: 🤖 更新 changelog 文件 (#2186)

1734416

fix: 复制时移除空控制符 (#2204)

ce9dcab

fix: 移除空控制符 Co-authored-by: 沫君 <[email protected]>

fix: 系统拦截快捷键后多选交互异常 (#2191)

6a8b85a

* fix: 系统拦截快捷键后多选交互异常 * test: 增加测试用例 --------- Co-authored-by: 沫君 <[email protected]>

fix: 修复 meta name 同名时，hoverFocus 出错的问题 (#2187)

a2d7a81

docs: 更新自定义datacell示例 (#2208)

c878b66

Co-authored-by: 沫君 <[email protected]>

fix: 修复总计小计被意外 format 的问题 (#2209)

6e98291

fix(core): only do compatibility of shift + scroll on Windows (#2206)

740462f

* fix(core): only do compatibility of shit + scroll on Windows * fix(core): only do compatibility of shit + scroll on Windows - add test case --------- Co-authored-by: stone <[email protected]>

chore: 🤖 更新 changelog 文件 (#2213)

8b97fe6

fix(core): can not set field height or width when the field name is s…

83b8e4d

…urrounded by square brackets (#2212) Co-authored-by: Jinke Li <[email protected]>

fix: 明细表存在横向滚动条时多列头文本不居中 close #2199 (#2200)

c15f8c8

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

fix(core): can reset tooltip.renderTooltip in setOptions (#2210)

8b26d9c

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

fix: 修复树状模式下，总计小计格式化问题 (#2219)

d3cdca0

* fix: 修复树状模式下，总计小计格式化问题 * fix: 修改 active border 绘制顺序 * test: 单测修复

fix: 修复 dataCell linkField 不能点击的问题 (#2227)

71410e2

chore: 🤖 更新 changelog 文件 (#2221)

2c72c81

chore: 🤖 更新 changelog 文件 (#2228)

2b2502a

fix(core): highlight the column header cell and row header when data …

b2ac77c

…cell clicked (#2211) Co-authored-by: Jinke Li <[email protected]> Co-authored-by: 刘嘉一 <[email protected]>

docs: type InteractionStateTheme (#2234)

cc34ae9

fix(interaction): 修复列头隐藏后展开 icon 显示异常 close #2194 (#2224)

d23b8f2

Co-authored-by: 卿珂 <[email protected]>

feat: support separate config of hoverHighlight (#2226)

de86300

chore: 🤖 更新 changelog 文件 (#2245)

8df8e05

docs: update DATA_CELL_SELECT_MOVE event (#2248)

1479134

fix: 交叉表圈选表头复制内容不正确 (#2254)

a4021cb

fix(core): 使用客户端的位置来计算调整大小的偏移量 (#2273)

ae9f4ec

fix(core): 删除范围选择中的错误拦截器 (#2263)

589ebb5

fix(core): 悬停角头单元格后显示图标 (#2261)

2d85d57

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

docs: 更新 FAQ 和文档示例 (#2276)

4e89b06

Co-authored-by: 卿珂 <[email protected]>

test: 修复剩余单测

0f2fb4e

vercel bot deployed to Preview January 17, 2024 08:50 View deployment

fix: 修复明细表序号列对齐

2fd7202

vercel bot deployed to Preview January 17, 2024 09:13 View deployment

lijinke666 added 2 commits January 17, 2024 17:37

fix: 修复所有类型问题

007d1ee

Merge branch 'chore-merge-master-12-19' of github.com:antvis/S2 into …

5636b3b

…chore-merge-master-12-19

vercel bot deployed to Preview January 17, 2024 09:42 View deployment

test: 修复 s2-react 下所有单测

c0503df

vercel bot deployed to Preview January 18, 2024 07:14 View deployment

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

fix: 修复组件层问题

49f47cd

vercel bot deployed to Preview January 18, 2024 07:52 View deployment

wjgogogo force-pushed the chore-merge-master-12-19 branch from ed29e0c to 49f47cd Compare January 18, 2024 07:53

vercel bot deployed to Preview January 18, 2024 07:56 View deployment

lijinke666 added 2 commits January 18, 2024 18:08

fix(table-sheet): 修复明细表配置自定义行高后展示异常 close #2501 (#2521)

47a34d4

fix: 增加树状模式自定义宽度的容错 (#2519)

552cecd

lijinke666 merged commit 6da530d into next Jan 18, 2024
5 of 9 checks passed

lijinke666 deleted the chore-merge-master-12-19 branch January 18, 2024 10:15

github-actions bot removed the 🚨 lint failed 静态检查失败 label Jan 18, 2024

vercel bot deployed to Preview January 18, 2024 10:17 View deployment

github-actions bot added 🚨 lint failed 静态检查失败 🚨 test failed 单元测试挂了 labels Jan 18, 2024

lijinke666 added the released label Jan 26, 2024

lijinke666 added the released on @next label Feb 5, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: 合并 master 到 next #2493

feat: 合并 master 到 next #2493

wjgogogo commented Dec 26, 2023

codecov bot commented Jan 18, 2024 •

edited

Loading

lijinke666 commented Jan 26, 2024

lijinke666 commented Jan 26, 2024

lijinke666 commented Feb 5, 2024

lijinke666 commented Feb 5, 2024

lijinke666 commented Feb 5, 2024

feat: 合并 master 到 next #2493

feat: 合并 master 到 next #2493

Conversation

wjgogogo commented Dec 26, 2023

👀 PR includes

📝 Description

🖼️ Screenshot

🔗 Related issue link

🔍 Self-Check before the merge

codecov bot commented Jan 18, 2024 • edited Loading

Codecov Report

lijinke666 commented Jan 26, 2024

lijinke666 commented Jan 26, 2024

lijinke666 commented Feb 5, 2024

lijinke666 commented Feb 5, 2024

lijinke666 commented Feb 5, 2024

codecov bot commented Jan 18, 2024 •

edited

Loading