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: 趋势分析表支持配置图标条件 #1683

Merged
merged 32 commits into from
Aug 12, 2022
Merged

Conversation

xingwanying
Copy link
Member

👀 PR includes

✨ Feature

  • New feature

🎨 Enhance

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

📝 Description

  • 重构 drawObjectText ,将单元格按照指标矩阵划分包围盒,复用 getTextAndFollowingIconPosition 方法,支持指标居左、居中、居右对齐。
    *趋势分析表支持配置图标条件

image

TODO

  • 单测
  • 文档
  • demo
  • 指标间 padding 处理

🖼️ Screenshot

image

stone-lyl and others added 30 commits July 22, 2022 10:16
* 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 <906626481@qq.com>

* fix: rename

Co-authored-by: Wenjun Xu <906626481@qq.com>

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

* refactor: 评审细节修改

Co-authored-by: zishang <lyl275911@antgroup.com>
Co-authored-by: Jinke Li <a1231236677287@163.com>
Co-authored-by: Wenjun Xu <906626481@qq.com>
* fix: 有冻结行且有垂直scrollWidth时冻结航无法resize

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

Co-authored-by: owen.wjh <owen.wjh@antgroup.com>
* fix: 明细表复制时无需使用formatter格式化列头label

* test: 完善明细表导出case
* feat: 支持resize最右侧column

* fix: 添加testing-library/dom dep

* fix: npm源

* fix: npm源

* fix: 切换成dispatchEvent

* fix: testcase fix

Co-authored-by: owen.wjh <owen.wjh@antgroup.com>
* fix(strategysheet): 修复趋势分析表列头格式化不生效

* fix: update

* test: 增加测试

* fix: test
* docs: 让 demo 展示符合主题

* docs: 排序文档优化

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

* docs: getAllCells()获取数据说明问题
* fix: 修复存在 0 时,排序错误的问题

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

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

Co-authored-by: zishang <lyl275911@antgroup.com>
* feat: 复制支持html格式

* fix: 修复复制测试用例

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

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

Co-authored-by: stone <stone-lyl@users.noreply.github.com>

* fix: moved mimetype as enum

* chore: generic type narrowing

* fix: html escaping special chars

Co-authored-by: owen.wjh <owen.wjh@antgroup.com>
Co-authored-by: stone <stone-lyl@users.noreply.github.com>
* feat(interaction): 宽高调整事件透出 resizedWidth/resizedHeight, 修复错误类型定义

* docs: 优化文档

* chore: 更新 reviewer
fix: 修复pivot-table cell事件无法触发BUG
* fix(layout): 修复 treeRowsWidth 配置不生效 close #1622

* test: 修复测试
* refactor: measureTextWidth移动为spreadsheet实例方法

* test: 调整 text 测试用例
* feat: 明细表行头单元格支持拖拽

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

* test: 添加单测
* fix: 优化reset性能

* fix: icon draw
Co-authored-by: 卿珂 <lijinke.ljk@antgroup.com>
@xingwanying xingwanying merged commit 2137372 into alpha Aug 12, 2022
@xingwanying xingwanying deleted the feat_condition branch August 12, 2022 09:04
@github-actions
Copy link
Contributor

github-actions bot commented Aug 12, 2022

Size Change: +172 kB (+68%) 🆘

Total Size: 426 kB

Filename Size Change
./packages/s2-core/dist/index.min.js 166 kB +1.64 kB (+1%)
./packages/s2-react/dist/index.min.js 64.1 kB +60 B (0%)
./packages/s2-react/dist/style.min.css 3.21 kB +4 B (0%)
./packages/s2-vue/dist/index.min.js 20.4 kB +1 B (0%)
./packages/s2-core/node_modules/@testing-library/dom/dist/@testing-library/dom.cjs.js 21.7 kB +21.7 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/@testing-library/dom.esm.js 21.2 kB +21.2 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/@testing-library/dom.umd.js 60.3 kB +60.3 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/@testing-library/dom.umd.min.js 33.9 kB +33.9 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/config.js 1.16 kB +1.16 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/DOMElementFilter.js 1.87 kB +1.87 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/event-map.js 1.18 kB +1.18 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/events.js 1.55 kB +1.55 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/get-node-text.js 300 B +300 B (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/get-queries-for-element.js 738 B +738 B (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/get-user-code-frame.js 810 B +810 B (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/helpers.js 1.07 kB +1.07 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/index.js 1.14 kB +1.14 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/label-helpers.js 1.05 kB +1.05 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/matches.js 1.14 kB +1.14 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/pretty-dom.js 1.47 kB +1.47 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/all-utils.js 337 B +337 B (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/alt-text.js 573 B +573 B (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/display-value.js 713 B +713 B (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/index.js 418 B +418 B (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/label-text.js 1.8 kB +1.8 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/placeholder-text.js 491 B +491 B (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/role.js 2.67 kB +2.67 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/test-id.js 498 B +498 B (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/text.js 958 B +958 B (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/queries/title.js 718 B +718 B (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/query-helpers.js 1.81 kB +1.81 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/role-helpers.js 2.82 kB +2.82 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/screen.js 1.51 kB +1.51 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/suggestions.js 1.5 kB +1.5 kB (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/wait-for-element-to-be-removed.js 748 B +748 B (new file) 🆕
./packages/s2-core/node_modules/@testing-library/dom/dist/wait-for.js 2.38 kB +2.38 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size
./packages/s2-core/dist/style.min.css 389 B
./packages/s2-vue/dist/style.min.css 1.61 kB

compressed-size-action

@lgtm-com
Copy link

lgtm-com bot commented Aug 12, 2022

This pull request introduces 3 alerts and fixes 5 when merging 83454d4 into 5088034 - view on LGTM.com

new alerts:

  • 2 for Unused variable, import, function or class
  • 1 for Useless assignment to local variable

fixed alerts:

  • 4 for Unused variable, import, function or class
  • 1 for Useless assignment to local variable

@lijinke666
Copy link
Member

🎉 This PR is included in version @antv/s2-v1.26.0-alpha.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

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

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

🎉 This PR is included in version @antv/s2-vue-v1.3.0-alpha.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

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

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

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

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

🎉 This PR is included in version @antv/s2-v1.28.0-alpha.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

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

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

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

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

🎉 This PR is included in version @antv/s2-v1.30.0-alpha.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

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

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

🎉 This PR is included in version @antv/s2-vue-v1.4.0-alpha.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

🎉 This PR is included in version @antv/s2-v1.31.0-alpha.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

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

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

🎉 This PR is included in version @antv/s2-v1.33.0-alpha.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

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

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

🎉 This PR is included in version 1.0.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

🎉 This PR is included in version @antv/s2-v1.37.0-alpha.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

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

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

🎉 This PR is included in version @antv/s2-vue-v1.5.0-alpha.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

🎉 This PR is included in version @antv/s2-v1.40.0-alpha.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member

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

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-alpha.1 🎉

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants