feat: 增加 pattern 贴图 #2777

visiky · 2021-08-09T10:39:33Z

PR includes

add / modify test cases
documents, demos

待办事项

已接入 plot: 面积图、柱形图、条形图、饼图、直方图、矩阵树图、热力图、玉珏图、迷你柱状图等
line pattern 绘制问题，当 lineWidth >= spacing 时，会导致绘制出错（估计是实现方案问题 @Angelii ）
旭日图（接入会默认黑色）
玫瑰图支持 pattern：feat: rose support pattern #2810
水波图支持 pattern：feat: liquid pattern #2812
迷你面积图支持 pattern: feat: tiny area pattern #2811
双轴图支持 pattern: feat: dual axes pattern #2813
各 plot 接入 pattern 之后的单测、API 说明
精选 pattern 案例

文档和单测：

其他：

waterfall 由于自定义 shape，需要额外处理下（后续再增加）

Screenshot

Before	After
❌	✅

github-actions · 2021-08-09T10:45:12Z

🎊 PR Preview 3e71f47 has been successfully built and deployed to https://antvis-G2Plot-preview-pr-2777.surge.sh?type=diff&date=2021-08-23

🕐 Build time: 110.144s

_{🤖 By surge-preview}

coveralls · 2021-08-09T11:03:09Z

Pull Request Test Coverage Report for Build 1158085907

203 of 204 (99.51%) changed or added relevant lines in 19 files are covered.
6 unchanged lines in 2 files lost coverage.
Overall coverage decreased (-0.03%) to 95.605%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
src/adaptor/pattern.ts	32	33	96.97%

Files with Coverage Reduction	New Missed Lines	%
src/plots/circle-packing/adaptor.ts	3	91.49%
src/plots/heatmap/adaptor.ts	3	91.92%

Totals
Change from base Build 1141813207:	-0.03%
Covered Lines:	6491
Relevant Lines:	6611

💛 - Coveralls

pearmini

感觉可以写的更加简洁一点 🤣

src/adaptor/pattern.ts

src/plugin/pattern/dot.ts

src/plugin/pattern/line.ts

src/utils/pattern/dot.ts

src/utils/pattern/index.ts

examples/plugin/pattern/demo/column-pattern.ts

Co-authored-by: 酥云 <lisuwen.lsw@antgroup.com>

* feat: 初始化pattern * feat: 增加可配置的dot贴图，并将patternAdptor用于饼图 * refactor: 将pattern统一赋给color，不用style Co-authored-by: 酥云 <lisuwen.lsw@antgroup.com>

* feat(pattern): pattern 填充作用在 style 上 * feat(pattern): pattern 通道 & 接入柱条形图、玉珏图 * docs(pattern-demo): 增加若干 demo * refactor: 优化下代码 * docs: 增加 demos 上新标识 * refactor(pattern): 修改 cr 内容 & 优化 demo

* feat: 初始化pattern * feat: 增加可配置的dot贴图，并将patternAdptor用于饼图 * feat: 初始化pattern (#2763) Co-authored-by: 酥云 <lisuwen.lsw@antgroup.com> * refactor: 将pattern统一赋给color，不用style * fix: 修改pattern文件引入路径 Co-authored-by: 酥云 <lisuwen.lsw@antgroup.com>

* feat(square-pattern): 添加square样式贴图 * fix: 修复square形状stroke的rotate问题 Co-authored-by: 酥云 <lisuwen.lsw@antgroup.com>

* feat(dot-pattern): 优化 dot pattern, 修复 stagger 展示 * feat(square-pattern): 优化 square pattern, 修复 stagger 展示 * refactor(pattern): 优化 line pattern & 删除无用代码 * refactor: 一些代码上的优化 & 删除无用的代码 * refactor(pattern): 初始化 canvas 的逻辑，抽取为一个 util 函数

* feat(square-pattern): 添加square样式贴图 * fix: 修复square形状stroke的rotate问题 * refactor(pattern): 对代码进行一点整理，含类型定义 * refactor(types): 重新定义下 pattern 的属性定义 * chore: 升级官网 * refactor(pattern): 内置 pattern 的属性设计 & 优化下创建逻辑 (#2785) * feat(dot-pattern): 优化 dot pattern, 修复 stagger 展示 * feat(square-pattern): 优化 square pattern, 修复 stagger 展示 * refactor(pattern): 优化 line pattern & 删除无用代码 * refactor: 一些代码上的优化 & 删除无用的代码 * refactor(pattern): 初始化 canvas 的逻辑，抽取为一个 util 函数 * test: 修复dot的stagger呈现问题，初步添加util中getCanvasPattern的单测 * 修复: [BUG] 双轴图图例legend使用symbol的时候，颜色不能自动调整 (#2776) * fix: 修复 [BUG] 双轴图图例legend使用symbol的时候，颜色不能自动调整 * fix: 修复 [BUG] 双轴图图例legend使用symbol的时候，颜色不能自动调整 -2 Co-authored-by: ai-qing-hai <wb-xcf804241@antgroup.com> * test: 修复dot的stagger呈现问题，初步添加util中getCanvasPattern的单测 * refactor: 修改pattern单测中的写法 Co-authored-by: 酥云 <lisuwen.lsw@antgroup.com> Co-authored-by: visiky <736929286@qq.com> Co-authored-by: ai-qing-hai <65594180+ai-qing-hai@users.noreply.github.com> Co-authored-by: ai-qing-hai <wb-xcf804241@antgroup.com>

* refactor(pattern): 优化代码写法 * refactor(pattern): 优化pattern的写法，抽出一些方法 * refactor(pattern): 抽出util文件 Co-authored-by: 酥云 <lisuwen.lsw@antgroup.com>

* test(pattern-in-plot): 逐个给每个plot添加pattern的单测，并添加对应的pattern文档 * docs: 修改部分pattern的文档说明以及默认值等 * fix: 修复pattern回调问题，对应的图形如果没有pattern，默认为主题色 * test: 添加column引入pattern的单测，并添加文档 * test: 添加bar引入pattern的单测，并添加文档 * test: 给pie添加pattern的单测，添加文档 * fix(pattern-util): 处理color为数组导致pie的图形变黑情况，统一返回字符串 * test: 给直方图添加pattern的单测，增加文档 * test: 给treemap添加pattern的单测，增加文档 * test: 给heatmap添加pattern的单测和文档，并给patternAttr的类型增加布尔值 * test: 给radial-bar添加pattern的单测，增加文档 * test: 给tiny-column添加pattern的单测，增加文档 * test: 给circle-packing添加pattern的单测，增加文档 * docs: 修改接入文档方式，把标题抽出来 * fix: 给patternAdaptor补充stackFields映射字段，修复stack模式的直方图添加pattern变黑问题 Co-authored-by: 酥云 <lisuwen.lsw@antgroup.com>

src/types/attr.ts

* test: 补充其旭日图等单测和文档 * refactor: 删除pattern的boolean类型 * test(pattern): 添加rose、tiny-area、liquid的单测和文档 Co-authored-by: 酥云 <lisuwen.lsw@antgroup.com> Co-authored-by: Visiky <736929286@qq.com>

pr-triage bot added the PR: unreviewed label Aug 9, 2021

visiky changed the title ~~feat: 增加 pattern 贴图~~ wip: feat: 增加 pattern 贴图 Aug 9, 2021

pr-triage bot removed the PR: unreviewed label Aug 9, 2021

pearmini reviewed Aug 10, 2021

View reviewed changes

src/adaptor/pattern.ts Outdated Show resolved Hide resolved

src/plugin/pattern/dot.ts Outdated Show resolved Hide resolved

src/plugin/pattern/dot.ts Outdated Show resolved Hide resolved

src/plugin/pattern/line.ts Outdated Show resolved Hide resolved

visiky force-pushed the pattern branch from ed354d8 to 2d967ab Compare August 10, 2021 04:33

pearmini requested changes Aug 10, 2021

View reviewed changes

src/utils/pattern/dot.ts Outdated Show resolved Hide resolved

visiky force-pushed the pattern branch from ce8d825 to 6cb3b48 Compare August 11, 2021 16:00

visiky commented Aug 12, 2021

View reviewed changes

src/utils/pattern/index.ts Outdated Show resolved Hide resolved

visiky commented Aug 12, 2021

View reviewed changes

examples/plugin/pattern/demo/column-pattern.ts Outdated Show resolved Hide resolved

visiky force-pushed the pattern branch 5 times, most recently from ebea51b to 6c939bd Compare August 15, 2021 02:57

visiky changed the title ~~wip: feat: 增加 pattern 贴图~~ feat: 增加 pattern 贴图 Aug 15, 2021

pr-triage bot added the PR: unreviewed label Aug 15, 2021

Angelii and others added 12 commits August 19, 2021 17:33

feat: 初始化pattern (#2763)

3e9b797

Co-authored-by: 酥云 <lisuwen.lsw@antgroup.com>

feat(pattern): 增加可配置的dot贴图，并将patternAdaptor用于饼图 (#2766)

4d78ace

* feat: 初始化pattern * feat: 增加可配置的dot贴图，并将patternAdptor用于饼图 * refactor: 将pattern统一赋给color，不用style Co-authored-by: 酥云 <lisuwen.lsw@antgroup.com>

refactor(pattern): 内置 pattern 不使用 class 的方式 (#2781)

376d3fe

feat(square-pattern): 添加square样式贴图 (#2782)

f418e84

* feat(square-pattern): 添加square样式贴图 * fix: 修复square形状stroke的rotate问题 Co-authored-by: 酥云 <lisuwen.lsw@antgroup.com>

refactor(pattern): 对代码进行一点整理，含类型定义

4faadf4

refactor(types): 重新定义下 pattern 的属性定义

9f2e86b

refactor(pattern): 优化pattern的写法，抽出一些方法 (#2788)

82bfee9

* refactor(pattern): 优化代码写法 * refactor(pattern): 优化pattern的写法，抽出一些方法 * refactor(pattern): 抽出util文件 Co-authored-by: 酥云 <lisuwen.lsw@antgroup.com>

fix(pattern): 解决 pattern 展示模糊问题

5aa0b50

visiky and others added 13 commits August 19, 2021 17:33

refactor: 抽取获取设备像素比的 util

becf1b2

docs(pattern): pattern 文档完善

3dfdabd

docs: 完善 legend marker 配置文档 & 优化 pattern demo

1f5b13b

fix(pattern): 修复 dot pattern 单测

e83b2fd

feat(pattern): 直方图、水波图、矩阵树图添加 pattern

0cbc191

test(pattern): 增加 pattern adaptor 的单测

3980c91

chore: 优化官网展示

844eda7

feat(pattern): 面积图、热力图、迷你柱状图接入 pattern

ee74112

fix: 修复单测

971f9aa

fix: 尝试修复单测

27b17ed

fix(line-pattern): 修复linewidth>=spacing 时，绘制异常问题 (#2801)

c08e879

docs: 更新 pattern demo 的截图

47a5320

visiky force-pushed the pattern branch from a3900fb to 47a5320 Compare August 19, 2021 09:33

feat(pattern): 修改下 pattern adaptor 获取 color & 旭日图支持 pattern

afcce57

visiky commented Aug 19, 2021

View reviewed changes

src/types/attr.ts Outdated Show resolved Hide resolved

visiky and others added 6 commits August 19, 2021 19:27

fix: 修复一些 lint 问题

3f37134

feat(tiny-area): 迷你面积图支持 pattern，同时添加 pattern 与渐变色无法共存的说明文档 (#2811)

b4fe6d7

feat(rose): 玫瑰图支持 pattern & demo (#2810)

0f766b2

feat(liquid): 水波图支持 pattern & demo (#2812)

bf6e020

feat(dual-axes): 双轴图支持 pattern (#2813)

7051d93

visiky changed the title ~~feat: 增加 pattern 贴图~~ wip: feat: 增加 pattern 贴图 Aug 23, 2021

pr-triage bot removed the PR: unreviewed label Aug 23, 2021

visiky changed the title ~~wip: feat: 增加 pattern 贴图~~ feat: 增加 pattern 贴图 Aug 24, 2021

pr-triage bot added the PR: unreviewed label Aug 24, 2021

visiky merged commit b517666 into master Aug 24, 2021

visiky deleted the pattern branch August 24, 2021 01:52

pr-triage bot added PR: merged and removed PR: unreviewed labels Aug 24, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: 增加 pattern 贴图 #2777

feat: 增加 pattern 贴图 #2777

visiky commented Aug 9, 2021 •

edited

Loading

github-actions bot commented Aug 9, 2021 •

edited

Loading

coveralls commented Aug 9, 2021 •

edited

Loading

pearmini left a comment

feat: 增加 pattern 贴图 #2777

feat: 增加 pattern 贴图 #2777

Conversation

visiky commented Aug 9, 2021 • edited Loading

PR includes

待办事项

Screenshot

github-actions bot commented Aug 9, 2021 • edited Loading

coveralls commented Aug 9, 2021 • edited Loading

Pull Request Test Coverage Report for Build 1158085907

💛 - Coveralls

pearmini left a comment

Choose a reason for hiding this comment

visiky commented Aug 9, 2021 •

edited

Loading

github-actions bot commented Aug 9, 2021 •

edited

Loading

coveralls commented Aug 9, 2021 •

edited

Loading