chore: 合并master 到 next 分支 #2036

stone-lyl · 2023-01-09T06:55:19Z

👀 PR includes

✨ Feature

New feature

🎨 Enhance

🐛 Bugfix

Solve the issue and close #0

🔧 Chore

📝 Description

chore : 合并 master 到 next 分支 #2036
还有一个问题，能否开发其他方式的 merge ，不然代码都是一个人写的了

🖼️ 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: 修复 enableCopy 和 hideMeasureColumn 都开启为 true 时，复制报错问题 * test: 添加单测 Co-authored-by: zishang <[email protected]>

Co-authored-by: 杨骥 <[email protected]>

* feat: 树状结构下复制，非叶子节点也需要被复制到 * fix: 修复存在空数据时复制错误的问题 * test: 添加树状结构下复制的单测 * chore: 删除无用代码 * chore: 删除无用代码 Co-authored-by: zishang <[email protected]>

* fix: 适配链接跳转的判断方式 * fix: 增加点击链接返回参数 id * test: 完善链接跳转测试 * fix: 透传整个cellData * docs: 补充链接跳转文档 * test: 修复链接跳转单测 * test: 修复链接跳转单测 Co-authored-by: gaofuhong.gfh <[email protected]>

* feat: 增加 linkFields 参数传入类型 * docs: 补充 linkFields 文档 * docs: 补充 linkFields 文档 * fix: 抽取判断是否需要添加链接为公共方法 * fix: 修改公共方法名 Co-authored-by: gaofuhong.gfh <[email protected]>

* feat: 优化智能反色需求 * feat: 优化智能反色需求 Co-authored-by: zishang <[email protected]>

feat: 官网自定义目录树链接跳转 demo Co-authored-by: gaofuhong.gfh <[email protected]>

* feat: 添加字段标记中，定制柱状图的长度的功能 * chore: 添加字段标记中，定制柱状图的长度的demo * test: 添加字段标记中，定制柱状图的长度的单测 Co-authored-by: zishang <[email protected]>

* fix: 明细表紧凑模式宽度计算错误 * test: 补充紧凑模式测试用例 * test: table-facet测试异常 Co-authored-by: 沫君 <[email protected]>

* fix: 明细表linkField失效 * test: 补充测试用例 Co-authored-by: 沫君 <[email protected]>

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

* fix: 列头label存在数组，层级补齐错误当headers存在数组，但不是每一列都存在数组时，仅需要对header[0]为数组的项进行补齐（当列各层级都是string类型时会补齐过多的空格） * test: 添加单测

* feat: upgrade selectedCellHighlight option & 修复 selectedCellHighlight 单元格因滚动状态失效的问题 * feat: selectedCellHighlight option 复制功能 * fix: selectedCellHighlight 为 false 的情况 * fix: 修复单测报错 * feat: 补充单测 * feat: selectedCellHighlight 配置项补充文档 * refactor: 调整 BaseDataSet.getRowData 为抽象方法 * refactor: remove unused code * refactor: 调整 selectedCellHighlight option 实现逻辑 * feat: 修改文档 & react playground * refactor: 调整 selectedCellHighlight option 复制实现 * feat: 调整单测 * fix: type error * refactor: selectedCellHighlight option 调整数据单元格点击事件 headerCells 存储逻辑 * feat: selectedCellHighlight option 统一刷选的交互 & afterSelectDataCells 函数提取 * refactor: remove duplicate constant * refactor: selectedCellHighlight option selectedCellHighlightAdaptor 调整为 getSelectedCellHighlight * fix: lint error * fix: unit test Co-authored-by: 嘤嘤嘤 <[email protected]> Co-authored-by: stone <[email protected]>

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

* fix: 修复单元格宽高为0时的无意义渲染 * fix: 修复 facet 处理过程中忽略 0 的情况 * test: 修复单测 * test: 添加宽高为 0 时的单元格测试 * refactor: 在 base cell 中应用 shouldInit

* fix: 修复点击行列头无法整行高亮的问题 * test: 添加修复点击行列头无法整行高亮的问题的单测 * docs: 完善 selectedCellHighlight 相关文档 * docs: 完善 selectedCellHighlight 相关文档 Co-authored-by: zishang <[email protected]>

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

* fix(layout): 修复无列头时行头对应的角头不显示 close #1929 * test: 修复测试

Co-authored-by: zishang <[email protected]>

…merge-master

codecov · 2023-01-16T03:38:07Z

Codecov Report

Base: 77.02% // Head: 75.66% // Decreases project coverage by -1.36% ⚠️

Coverage data is based on head (fa105a5) compared to base (f10e5d4).
Patch has no changes to coverable lines.

Additional details and impacted files

@@            Coverage Diff             @@
##             next    #2036      +/-   ##
==========================================
- Coverage   77.02%   75.66%   -1.37%     
==========================================
  Files         234      257      +23     
  Lines       11506    12023     +517     
  Branches     2446     2471      +25     
==========================================
+ Hits         8863     9097     +234     
- Misses       1268     1412     +144     
- Partials     1375     1514     +139

Impacted Files	Coverage Δ
packages/s2-core/src/cell/base-cell.ts	`84.21% <ø> (-2.61%)`	⬇️
packages/s2-core/src/cell/col-cell.ts	`86.76% <ø> (-1.89%)`	⬇️
packages/s2-core/src/cell/corner-cell.ts	`82.85% <ø> (+5.71%)`	⬆️
packages/s2-core/src/cell/data-cell.ts	`66.66% <ø> (-8.03%)`	⬇️
packages/s2-core/src/cell/header-cell.ts	`65.82% <ø> (+4.34%)`	⬆️
packages/s2-core/src/cell/index.ts	`100.00% <ø> (ø)`
packages/s2-core/src/cell/merged-cell.ts	`37.50% <ø> (+1.13%)`	⬆️
packages/s2-core/src/cell/row-cell.ts	`70.80% <ø> (-3.86%)`	⬇️
packages/s2-core/src/cell/series-number-cell.ts	`93.10% <ø> (ø)`
packages/s2-core/src/cell/table-col-cell.ts	`81.13% <ø> (-5.15%)`	⬇️
... and 348 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-16T07:02:40Z

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

The release is available on:

Your semantic-release bot 📦🚀

lijinke666 · 2023-01-16T07:08:15Z

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

The release is available on:

Your semantic-release bot 📦🚀

lijinke666 · 2023-01-16T07:12:10Z

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

The release is available on:

Your semantic-release bot 📦🚀

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

🎉 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:03:05Z

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

The release is available on:

Your semantic-release bot 📦🚀

lijinke666 · 2023-12-15T10:21:42Z

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

The release is available on:

Your semantic-release bot 📦🚀

lijinke666 and others added 29 commits December 8, 2022 15:31

docs: 修复错误 API 文档格式 (#1976)

4fcd8bf

fix: 修复 enableCopy 和 hideMeasureColumn 都开启为 true 时，复制报错问题 (#1984)

528d2b6

* fix: 修复 enableCopy 和 hideMeasureColumn 都开启为 true 时，复制报错问题 * test: 添加单测 Co-authored-by: zishang <[email protected]>

feat: 暴露afterRealCellRender，这样能够更灵活的使用datacell (#1970)

66c5ab9

Co-authored-by: 杨骥 <[email protected]>

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

37506f8

refactor: 优化智能反色功能 (#1974)

a8494a0

* feat: 优化智能反色需求 * feat: 优化智能反色需求 Co-authored-by: zishang <[email protected]>

docs: 官网自定义目录树链接跳转 demo (#2001)

c1981f4

feat: 官网自定义目录树链接跳转 demo Co-authored-by: gaofuhong.gfh <[email protected]>

fix: gui icon 加载完成后，增加检测步骤，避免无意义的渲染 warning (#1997)

6f13aa4

docs: 更新列分组demo配图 (#1998)

b1f1772

docs: 修复自定义 schema 示例demo (#2000)

8cf663b

fix: 明细表紧凑模式宽度计算错误 (#2006)

89f5c9e

* fix: 明细表紧凑模式宽度计算错误 * test: 补充紧凑模式测试用例 * test: table-facet测试异常 Co-authored-by: 沫君 <[email protected]>

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

e42cb30

fix: 明细表linkField失效 (#2007)

122552b

* fix: 明细表linkField失效 * test: 补充测试用例 Co-authored-by: 沫君 <[email protected]>

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

57cd4c9

feat: 子弹图为空时使用placeholder占位 (#2010)

8d28254

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

fix: bullet占位符绘制错误 (#2022)

c95c446

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

fix: 修复单元格宽高为0时的无意义渲染 (#2024)

9f952fd

* fix: 修复单元格宽高为0时的无意义渲染 * fix: 修复 facet 处理过程中忽略 0 的情况 * test: 修复单测 * test: 添加宽高为 0 时的单元格测试 * refactor: 在 base cell 中应用 shouldInit

docs: 替换antgroup主站 (#2029)

7c80f8e

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

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

1089288

fix(layout): 修复无列头时行头对应的角头不显示 close #1929 (#2026)

c073578

* fix(layout): 修复无列头时行头对应的角头不显示 close #1929 * test: 修复测试

refactor: rowCells 重命名为 currentRow，避免与行头 rowCell 定义冲突 (#2032)

179fa5c

Co-authored-by: zishang <[email protected]>

chore: merge master into next

d5d466f

chore: 修复严格模式下 eslint 错误的问题

71d1659

github-actions bot added the pr(chore) configuration changes label Jan 9, 2023

lcx-seima and others added 2 commits January 10, 2023 15:43

fix: 明细表列头clip错误

4de138f

chore: compressed action 优化

42cf56e

wjgogogo force-pushed the chore-merge-master branch from 040f50b to 42cf56e Compare January 10, 2023 07:54

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

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

1443d93

…merge-master

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

lijinke666 added 2 commits January 10, 2023 16:27

fix: 修复列头隐藏时角头不显示

e563404

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

9d5daa5

…merge-master

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

test: g-mini-charts 单测文字处理

6ffa619

vercel bot had a problem deploying to Preview January 11, 2023 02:55 Failure

stone-lyl and others added 2 commits January 13, 2023 15:45

test: 修复 next 版本，不将 border width 作为 Interval 宽度。

3adf2d6

test: 更新 corner 单测

6493fe4

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

fix: 明细表compact模式宽度计算错误

6e9268f

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

test: 修改单测，添加border width

fa105a5

vercel bot had a problem deploying to Preview January 16, 2023 02:43 Failure

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

lijinke666 merged commit f7a9c6c into next Jan 16, 2023

lijinke666 deleted the chore-merge-master branch January 16, 2023 03:42

lijinke666 added the released on @next label Jan 16, 2023

lijinke666 added the released label Dec 15, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: 合并master 到 next 分支 #2036

chore: 合并master 到 next 分支 #2036

stone-lyl commented Jan 9, 2023 •

edited

Loading

codecov bot commented Jan 16, 2023

lijinke666 commented Jan 16, 2023

lijinke666 commented Jan 16, 2023

lijinke666 commented Jan 16, 2023

lijinke666 commented Feb 22, 2023

lijinke666 commented Feb 22, 2023

lijinke666 commented Dec 15, 2023

chore: 合并master 到 next 分支 #2036

chore: 合并master 到 next 分支 #2036

Conversation

stone-lyl commented Jan 9, 2023 • edited Loading

👀 PR includes

📝 Description

🖼️ Screenshot

🔗 Related issue link

🔍 Self-Check before the merge

codecov bot commented Jan 16, 2023

Codecov Report

lijinke666 commented Jan 16, 2023

lijinke666 commented Jan 16, 2023

lijinke666 commented Jan 16, 2023

lijinke666 commented Feb 22, 2023

lijinke666 commented Feb 22, 2023

lijinke666 commented Dec 15, 2023

stone-lyl commented Jan 9, 2023 •

edited

Loading