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

feat(interaction): 行列宽高支持控制拖拽范围 #1583

Merged
merged 7 commits into from
Jul 20, 2022
Merged

Conversation

lijinke666
Copy link
Member

@lijinke666 lijinke666 commented Jul 19, 2022

👀 PR includes

✨ Feature

  • New feature

📝 Description

宽高调整新支持两个能力

  • 在特定单元格下隐藏拖拽热区
const s2Options = {
  interaction: {
    resize: {
     visible: (cell) => {
        const meta = cell.getMeta();
        return meta.colIndex % 2 === 0;
      },
    },
  }
}

image

  • 支持控制拖拽范围 (比如只能拖宽, 不能拖小)
const s2Options = {
  interaction: {
    resize: {
      disbaled: (resizeInfo) => {
        return resizeInfo.resizedWidth < resizeInfo.width;
      },
    },
  }
}

Kapture 2022-07-19 at 13 36 34

TODO:

  • 单测
  • 文档/demo

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

@github-actions
Copy link
Contributor

github-actions bot commented Jul 19, 2022

Size Change: +274 B (0%)

Total Size: 253 kB

Filename Size Change
./packages/s2-core/dist/index.min.js 164 kB +274 B (0%)
ℹ️ View Unchanged
Filename Size
./packages/s2-core/dist/style.min.css 389 B
./packages/s2-react/dist/index.min.js 64 kB
./packages/s2-react/dist/style.min.css 3.21 kB
./packages/s2-vue/dist/index.min.js 20.4 kB
./packages/s2-vue/dist/style.min.css 1.61 kB

compressed-size-action

@codecov
Copy link

codecov bot commented Jul 19, 2022

Codecov Report

Merging #1583 (f22e73c) into master (e4c1742) will increase coverage by 0.44%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #1583      +/-   ##
==========================================
+ Coverage   76.97%   77.41%   +0.44%     
==========================================
  Files         230      230              
  Lines       11025    11275     +250     
  Branches     2305     2397      +92     
==========================================
+ Hits         8486     8729     +243     
- Misses       1252     1254       +2     
- Partials     1287     1292       +5     
Impacted Files Coverage Δ
packages/s2-core/src/cell/corner-cell.ts 76.92% <ø> (ø)
packages/s2-core/src/cell/row-cell.ts 74.12% <ø> (ø)
packages/s2-core/src/cell/table-series-cell.ts 82.75% <ø> (ø)
packages/s2-core/src/theme/index.ts 100.00% <ø> (ø)
packages/s2-core/src/cell/base-cell.ts 87.80% <100.00%> (-0.95%) ⬇️
packages/s2-core/src/cell/col-cell.ts 88.32% <100.00%> (ø)
packages/s2-core/src/facet/table-facet.ts 85.82% <100.00%> (ø)
...kages/s2-core/src/interaction/row-column-resize.ts 83.97% <100.00%> (+12.95%) ⬆️
packages/s2-core/src/group/panel-scroll-group.ts 88.23% <0.00%> (-11.77%) ⬇️
... and 8 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 e4c1742...f22e73c. Read the comment docs.

@github-actions
Copy link
Contributor

github-actions bot commented Jul 19, 2022

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

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

@lijinke666 lijinke666 enabled auto-merge (squash) July 19, 2022 15:03
@github-actions github-actions bot added 🚨 lint failed 静态检查失败 🚨 test failed 单元测试挂了 and removed 🚨 lint failed 静态检查失败 🚨 test failed 单元测试挂了 labels Jul 20, 2022
@lijinke666 lijinke666 merged commit 1d51272 into master Jul 20, 2022
@lijinke666 lijinke666 deleted the feat-resize branch July 20, 2022 08:44
@lijinke666
Copy link
Member Author

🎉 This PR is included in version @antv/s2-v1.24.0-alpha.4 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member Author

🎉 This PR is included in version @antv/s2-react-v1.22.0-alpha.4 🎉

The release is available on:

Your semantic-release bot 📦🚀

stone-lyl pushed a commit that referenced this pull request Jul 22, 2022
* feat(interaction): 行列宽高支持控制拖拽范围

* feat(interaction): 增加测试和文档

* feat(interaction): 增加主题色

* Update row-column-resize-spec.ts

* Update packages/s2-core/src/interaction/row-column-resize.ts

Co-authored-by: Wenjun Xu <[email protected]>

* fix: rename

Co-authored-by: Wenjun Xu <[email protected]>
stone-lyl pushed a commit that referenced this pull request Jul 22, 2022
* feat(interaction): 行列宽高支持控制拖拽范围

* feat(interaction): 增加测试和文档

* feat(interaction): 增加主题色

* Update row-column-resize-spec.ts

* Update packages/s2-core/src/interaction/row-column-resize.ts

Co-authored-by: Wenjun Xu <[email protected]>

* fix: rename

Co-authored-by: Wenjun Xu <[email protected]>
lijinke666 added a commit that referenced this pull request Jul 22, 2022
* feat: 添加通过 cellMetas 获取单元格对应的列头文本的方法

* feat: 添加通过 cellMetas 获取单元格对应的行头文本的方法

* feat: 只复制数据单元格时可以携带行列头

* feat: 选择某X行/列数据时可以携带行列头

* feat: 提取矩阵转换为字符串的方法

* test: 添加带行列头复制的单测

* test: 明细表添加带行列头复制的单测

* docs: 复制数据是否带表头信息

* feat(interaction): 行列宽高支持控制拖拽范围 (#1583)

* feat(interaction): 行列宽高支持控制拖拽范围

* feat(interaction): 增加测试和文档

* feat(interaction): 增加主题色

* Update row-column-resize-spec.ts

* Update packages/s2-core/src/interaction/row-column-resize.ts

Co-authored-by: Wenjun Xu <[email protected]>

* fix: rename

Co-authored-by: Wenjun Xu <[email protected]>

* docs: 复制数据是否带表头信息

* refactor: 评审细节修改

Co-authored-by: zishang <[email protected]>
Co-authored-by: Jinke Li <[email protected]>
Co-authored-by: Wenjun Xu <[email protected]>
@lijinke666
Copy link
Member Author

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

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member Author

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

The release is available on:

Your semantic-release bot 📦🚀

xingwanying added a commit that referenced this pull request Aug 12, 2022
* feat: 当前只能复制数值可带表头复制 (#1590)

* feat: 添加通过 cellMetas 获取单元格对应的列头文本的方法

* feat: 添加通过 cellMetas 获取单元格对应的行头文本的方法

* feat: 只复制数据单元格时可以携带行列头

* feat: 选择某X行/列数据时可以携带行列头

* feat: 提取矩阵转换为字符串的方法

* test: 添加带行列头复制的单测

* test: 明细表添加带行列头复制的单测

* docs: 复制数据是否带表头信息

* feat(interaction): 行列宽高支持控制拖拽范围 (#1583)

* feat(interaction): 行列宽高支持控制拖拽范围

* feat(interaction): 增加测试和文档

* feat(interaction): 增加主题色

* Update row-column-resize-spec.ts

* Update packages/s2-core/src/interaction/row-column-resize.ts

Co-authored-by: Wenjun Xu <[email protected]>

* fix: rename

Co-authored-by: Wenjun Xu <[email protected]>

* docs: 复制数据是否带表头信息

* refactor: 评审细节修改

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

* fix(layout): 修复 Firefox 浏览器部分 icon 渲染失败 close #1571 (#1599)

* fix: 有冻结行且有垂直scrollWidth时冻结行无法 resize (#1594)

* fix: 有冻结行且有垂直scrollWidth时冻结航无法resize

* fix: 有冻结行且有垂直scrollWidth时冻结航无法resize

Co-authored-by: owen.wjh <[email protected]>

* chore: 🤖 更新 lock 和 changelog 文件 (#1601)

* fix: sortByFunc 排序后行列维度节点丢失 (#1606)

* fix(interaction): 向左移动到不完全可见cell的时候,没有滚动过去 (#1607)

* fix: 明细表复制时无需使用formatter格式化列头label (#1610)

* fix: 明细表复制时无需使用formatter格式化列头label

* test: 完善明细表导出case

* feat: 支持resize最右侧column (#1611)

* feat: 支持resize最右侧column

* fix: 添加testing-library/dom dep

* fix: npm源

* fix: npm源

* fix: 切换成dispatchEvent

* fix: testcase fix

Co-authored-by: owen.wjh <[email protected]>

* docs: 将 S2Event 提取到 API 文档中, 方便查看 (#1618)

* fix(strategysheet): 修复趋势分析表列头格式化不生效 (#1616)

* fix(strategysheet): 修复趋势分析表列头格式化不生效

* fix: update

* test: 增加测试

* fix: test

* docs: 优化文档说法和校正有误的内容 (#1640)

* docs: 让 demo 展示符合主题

* docs: 排序文档优化

* docs: 合并单元格文档更新

* docs: getAllCells()获取数据说明问题

* fix:  修复存在 0 时,数值为 number 时,排序错误的问题 (#1644)

* fix: 修复存在 0 时,排序错误的问题

* test: 补充存在 0 时,排序错误的单测

* fix: 修复单测字典序排序错误

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

* fix(pagination): 分页配置未传 current 参数时表格渲染空白 (#1633)

* feat: 复制支持html格式 (#1647)

* feat: 复制支持html格式

* fix: 修复复制测试用例

* fix: 添加复制格式测试用例

* Update packages/s2-core/src/utils/export/copy.ts

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

* fix: moved mimetype as enum

* chore: generic type narrowing

* fix: html escaping special chars

Co-authored-by: owen.wjh <[email protected]>
Co-authored-by: stone <[email protected]>

* feat(interaction): 宽高调整事件透出 resizedWidth/resizedHeight, 修复错误类型定义 (#1638)

* feat(interaction): 宽高调整事件透出 resizedWidth/resizedHeight, 修复错误类型定义

* docs: 优化文档

* chore: 更新 reviewer

* fix: 修复pivot模式 cell点击事件无法触发BUG (#1623)

fix: 修复pivot-table cell事件无法触发BUG

* chore: 发布成功后自动部署官网 (#1649)

* fix(layout): 修复 treeRowsWidth 配置不生效 close #1622 (#1646)

* fix(layout): 修复 treeRowsWidth 配置不生效 close #1622

* test: 修复测试

* chore: 🤖 更新 lock 和 changelog 文件 (#1650)

* fix: 修复选中态的描边宽度样式问题 (#1654)

* fix: 链接字段高亮下划线过长 (#1652)

* refactor: measureTextWidth移动为spreadsheet实例方法

* test: 调整 text 测试用例

* feat: 明细表行头单元格支持拖拽 (#1655)

* feat: 明细表行头单元格支持拖拽

* feat: 明细表行头单元格支持拖拽

* test: 添加单测

* fix(interaction): 优化resetSheetStyle性能 (#1653)

* fix: 优化reset性能

* fix: icon draw

* docs: 官网文档优化 (#1661)

* fix(scroll): 修复滚动边界判断错误导致无法滚动 (#1664)

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

* chore: update the reviewers (#1673)

* fix(resize): 修复总计列存在子节点时无法调整宽度 (#1675)

* fix: 修复明细表 onRaneSort 失效问题 (#1678)

* docs: 修改排序API文档 (#1677)

* refactor: 重构多指标绘制文本布局逻辑

* feat: 趋势分析表支持icon字段标记

Co-authored-by: stone <[email protected]>
Co-authored-by: zishang <[email protected]>
Co-authored-by: Jinke Li <[email protected]>
Co-authored-by: Wenjun Xu <[email protected]>
Co-authored-by: serializedowen <[email protected]>
Co-authored-by: owen.wjh <[email protected]>
Co-authored-by: 刘嘉一 <[email protected]>
Co-authored-by: YardWill <[email protected]>
Co-authored-by: xiaochong44 <[email protected]>
Co-authored-by: 卿珂 <[email protected]>
@lijinke666
Copy link
Member Author

🎉 This PR is included in version 1.0.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

wjgogogo added a commit that referenced this pull request Oct 25, 2023
* feat(interaction): 行列宽高支持控制拖拽范围

* feat(interaction): 增加测试和文档

* feat(interaction): 增加主题色

* Update row-column-resize-spec.ts

* Update packages/s2-core/src/interaction/row-column-resize.ts

Co-authored-by: Wenjun Xu <[email protected]>

* fix: rename

Co-authored-by: Wenjun Xu <[email protected]>
wjgogogo added a commit that referenced this pull request Oct 25, 2023
* feat: 添加通过 cellMetas 获取单元格对应的列头文本的方法

* feat: 添加通过 cellMetas 获取单元格对应的行头文本的方法

* feat: 只复制数据单元格时可以携带行列头

* feat: 选择某X行/列数据时可以携带行列头

* feat: 提取矩阵转换为字符串的方法

* test: 添加带行列头复制的单测

* test: 明细表添加带行列头复制的单测

* docs: 复制数据是否带表头信息

* feat(interaction): 行列宽高支持控制拖拽范围 (#1583)

* feat(interaction): 行列宽高支持控制拖拽范围

* feat(interaction): 增加测试和文档

* feat(interaction): 增加主题色

* Update row-column-resize-spec.ts

* Update packages/s2-core/src/interaction/row-column-resize.ts

Co-authored-by: Wenjun Xu <[email protected]>

* fix: rename

Co-authored-by: Wenjun Xu <[email protected]>

* docs: 复制数据是否带表头信息

* refactor: 评审细节修改

Co-authored-by: zishang <[email protected]>
Co-authored-by: Jinke Li <[email protected]>
Co-authored-by: Wenjun Xu <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants