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.

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

chore: 合并 master 到 next 分支 #2034

Merged
merged 30 commits into from
Jan 9, 2023
Merged

chore: 合并 master 到 next 分支 #2034

merged 30 commits into from
Jan 9, 2023

Conversation

stone-lyl
Copy link
Member

@stone-lyl stone-lyl commented Jan 9, 2023 •
edited
Loading

👀 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

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

lijinke666 and others added 29 commits December 8, 2022 15:31
@lijinke666
docs: 修复错误 API 文档格式 (#1976)
4fcd8bf
@stone-lyl
fix: 修复 enableCopy 和 hideMeasureColumn 都开启为 true 时，复制报错问题 (#1984)
528d2b6 
* fix: 修复 enableCopy 和 hideMeasureColumn 都开启为 true 时，复制报错问题

* test: 添加单测

Co-authored-by: zishang <lyl275911@antgroup.com>
@wind108369
feat: 暴露afterRealCellRender，这样能够更灵活的使用datacell (#1970)
66c5ab9 
Co-authored-by: 杨骥 <yangji@hengshi.com>
@stone-lyl
feat: 实现树状模式下可复制 (#1986)
96ccb1e 
* feat: 树状结构下复制，非叶子节点也需要被复制到

* fix: 修复存在空数据时复制错误的问题

* test: 添加树状结构下复制的单测

* chore: 删除无用代码

* chore: 删除无用代码

Co-authored-by: zishang <lyl275911@antgroup.com>
@GaoFuhong
feat: 适配链接跳转的判断方式 (#1983)
2a26259 
* fix: 适配链接跳转的判断方式

* fix: 增加点击链接返回参数 id

* test: 完善链接跳转测试

* fix: 透传整个cellData

* docs: 补充链接跳转文档

* test: 修复链接跳转单测

* test: 修复链接跳转单测

Co-authored-by: gaofuhong.gfh <gaofuhong.gfh@antgroup.com>
@lijinke666
chore: 🤖 更新 changelog 文件 (#1989)
37506f8
@GaoFuhong
feat: 增加 linkFields 参数传入类型 (#1992)
66bce2a 
* feat: 增加 linkFields 参数传入类型

* docs: 补充 linkFields 文档

* docs: 补充 linkFields 文档

* fix: 抽取判断是否需要添加链接为公共方法

* fix: 修改公共方法名

Co-authored-by: gaofuhong.gfh <gaofuhong.gfh@antgroup.com>
@stone-lyl
refactor: 优化智能反色功能 (#1974)
a8494a0 
* feat: 优化智能反色需求

* feat: 优化智能反色需求

Co-authored-by: zishang <lyl275911@antgroup.com>
@GaoFuhong
docs: 官网自定义目录树链接跳转 demo (#2001)
c1981f4 
feat: 官网自定义目录树链接跳转 demo

Co-authored-by: gaofuhong.gfh <gaofuhong.gfh@antgroup.com>
@wjgogogo
fix: gui icon 加载完成后，增加检测步骤，避免无意义的渲染 warning (#1997)
6f13aa4
@xingwanying
docs: 更新列分组demo配图 (#1998)
b1f1772
@xingwanying
docs: 修复自定义 schema 示例demo (#2000)
8cf663b
@stone-lyl
feat: 添加字段标记中，定制柱状图的长度的功能 （filedValue） (#2002)
457e5e7 
* feat: 添加字段标记中，定制柱状图的长度的功能

* chore: 添加字段标记中，定制柱状图的长度的demo

* test: 添加字段标记中，定制柱状图的长度的单测

Co-authored-by: zishang <lyl275911@antgroup.com>
@lcx-seima
fix: 明细表紧凑模式宽度计算错误 (#2006)
89f5c9e 
* fix: 明细表紧凑模式宽度计算错误

* test: 补充紧凑模式测试用例

* test: table-facet测试异常

Co-authored-by: 沫君 <chuxiao.lcx@alibaba-inc.com>
@lijinke666
chore: 🤖 更新 changelog 文件 (#2005)
e42cb30
@lcx-seima
fix: 明细表linkField失效 (#2007)
122552b 
* fix: 明细表linkField失效

* test: 补充测试用例

Co-authored-by: 沫君 <chuxiao.lcx@alibaba-inc.com>
@lijinke666
chore: 🤖 更新 changelog 文件 (#2008)
57cd4c9
@lcx-seima
feat: 子弹图为空时使用placeholder占位 (#2010)
8d28254 
Co-authored-by: 沫君 <chuxiao.lcx@alibaba-inc.com>
@mmmml-zhao
fix: 列头label存在数组，复制导出列头层级补齐错误 (#1990)
ec62409 
* fix: 列头label存在数组，层级补齐错误
当headers存在数组，但不是每一列都存在数组时，仅需要对header[0]为数组的项进行补齐（当列各层级都是string类型时会补齐过多的空格）

* test: 添加单测
@LHC8888 @xingwanying @stone-lyl
feat: selected cell highlight (#1878)
3e11a37 
* 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: 嘤嘤嘤 <yingying.xwy@antgroup.com>
Co-authored-by: stone <stone-lyl@users.noreply.github.com>
@lcx-seima
fix: bullet占位符绘制错误 (#2022)
c95c446 
Co-authored-by: 沫君 <chuxiao.lcx@alibaba-inc.com>
@wjgogogo
fix: 修复单元格宽高为0时的无意义渲染 (#2024)
9f952fd 
* fix: 修复单元格宽高为0时的无意义渲染

* fix: 修复 facet 处理过程中忽略 0 的情况

* test: 修复单测

* test: 添加宽高为 0 时的单元格测试

* refactor: 在 base cell 中应用 shouldInit
@stone-lyl
fix : 修复点击行列头无法整行高亮的问题 (#2025)
84558ca 
* fix: 修复点击行列头无法整行高亮的问题

* test: 添加修复点击行列头无法整行高亮的问题的单测

* docs: 完善 selectedCellHighlight 相关文档

* docs: 完善 selectedCellHighlight 相关文档

Co-authored-by: zishang <lyl275911@antgroup.com>
@lcx-seima
docs: 替换antgroup主站 (#2029)
7c80f8e 
Co-authored-by: 沫君 <chuxiao.lcx@alibaba-inc.com>
@lijinke666
chore: 🤖 更新 changelog 文件 (#2028)
1089288
@lijinke666
fix(layout): 修复无列头时行头对应的角头不显示 close #1929 (#2026)
c073578 
* fix(layout): 修复无列头时行头对应的角头不显示 close #1929

* test: 修复测试
@stone-lyl
refactor: rowCells 重命名为 currentRow，避免与行头 rowCell 定义冲突 (#2032)
179fa5c 
Co-authored-by: zishang <lyl275911@antgroup.com>
@stone-lyl
chore: merge master into next
d5d466f
@stone-lyl
chore: 修复严格模式下 eslint 错误的问题
71d1659
@vercel
Copy link

vercel bot commented Jan 9, 2023 •
edited
Loading

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

Name Status Preview Updated
antvis-s2 ✅ Ready (Inspect) Visit Preview Jan 9, 2023 at 6:49AM (UTC)

@github-actions github-actions bot added the pr(chore) configuration changes label Jan 9, 2023
@stone-lyl stone-lyl merged commit 490292f into next Jan 9, 2023
@stone-lyl stone-lyl deleted the chore-merge-master branch January 9, 2023 06:45
stone-lyl added a commit that referenced this pull request Jan 9, 2023
@stone-lyl
Revert "chore: 合并 master 到 next 分支 (#2034)"
3e3c3d0 
This reverts commit 490292f.
@stone-lyl stone-lyl mentioned this pull request Jan 9, 2023
Closed
@github-actions
Copy link
Contributor

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

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

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

@github-actions github-actions bot added 🚨 lint failed 静态检查失败 🚨 test failed 单元测试挂了 labels Jan 9, 2023
@lijinke666
Copy link
Member

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

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

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

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

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

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

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

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

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

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

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

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

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

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

🎉 This PR is included in version @antv/s2-vue-v1.6.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

@GaoFuhong GaoFuhong Awaiting requested review from GaoFuhong

@lcx-seima lcx-seima Awaiting requested review from lcx-seima

@lijinke666 lijinke666 Awaiting requested review from lijinke666

@serializedowen serializedowen Awaiting requested review from serializedowen

@wjgogogo wjgogogo Awaiting requested review from wjgogogo

@xingwanying xingwanying Awaiting requested review from xingwanying

@YardWill YardWill Awaiting requested review from YardWill

Assignees

@stone-lyl stone-lyl

Labels
🚨 lint failed 静态检查失败 pr(chore) configuration changes released on @next released 🚨 test failed 单元测试挂了
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@stone-lyl @lijinke666 @wind108369 @GaoFuhong @wjgogogo @xingwanying @lcx-seima @mmmml-zhao @LHC8888