Skip to content

fix(custom): set ignore only if old child exists#17450

Merged
Ovilia merged 3 commits intomasterfrom
fix-custom
Aug 1, 2022
Merged

fix(custom): set ignore only if old child exists#17450
Ovilia merged 3 commits intomasterfrom
fix-custom

Conversation

@Ovilia
Copy link
Contributor

@Ovilia Ovilia commented Aug 1, 2022

Brief Information

This pull request is in the type of:

  • bug fixing
  • new feature
  • others

What does this PR do?

This PR fixes an error brought by #17349.

If custom renderItem returns null in the first setOption, then in the next setOption if it's set to be null, oldChild is null so oldChild.ignore = true; will bring an error. null/undefined/{} is not supported because group element should not be null.

Fixed issues

Details

Before: What was the problem?

After: How does it behave after the fixing?

Document Info

One of the following should be checked.

  • This PR doesn't relate to document changes
  • The document should be updated later
  • The document changes have been made in apache/echarts-doc#xxx

Misc

ZRender Changes

  • This PR depends on ZRender changes (ecomfe/zrender#xxx).

Related test cases or examples to use the new APIs

N.A.

Others

Merging options

  • Please squash the commits into a single one when merging.

Other information

@echarts-bot
Copy link

echarts-bot bot commented Aug 1, 2022

Thanks for your contribution!
The community will review it ASAP. In the meanwhile, please checkout the coding standard and Wiki about How to make a pull request.

The pull request is marked to be PR: author is committer because you are a committer of this project.

@Ovilia Ovilia marked this pull request as draft August 1, 2022 05:21
@Ovilia Ovilia marked this pull request as ready for review August 1, 2022 06:27
@Ovilia Ovilia merged commit 715e1da into master Aug 1, 2022
@echarts-bot
Copy link

echarts-bot bot commented Aug 1, 2022

Congratulations! Your PR has been merged. Thanks for your contribution! 👍

@Ovilia Ovilia deleted the fix-custom branch August 1, 2022 06:33
Wetterquarz added a commit to development-scopeland/echarts that referenced this pull request Sep 12, 2022
* chore(type): export type ElementEvent

close apache#15284

* rm newline

* feat(graph): simple layout graph support dragging

* test(graph): add simple graph draggable test case

* feat(graph): update circular layout helper function

* feat(graph): support draggable for all graph layout ('none' | 'circular' | 'force')

* test(graph): add graph draggable test case

* Revert "test(graph): add simple graph draggable test case"

This reverts commit 78b2475.

* fix(graph): node el check for circular layout

* fix(graph): remove GraphNode `_fixed` field

* fix(graph): use zrender/vector calculate node layout

* fix: not trigger roam on el's child

* fix: fix code

* fix: remove useless code

* fix: store fixed state in layout object

* fix: use mouse position calculate circular layout

* feat(LineDraw):series-lines support the effect animation go back

* rename the option from goback to roundTrip

* feat: ignore target size for large charts

* feat: make target size an option

* feat: rename test file

* feat: rename variables

* feat(pie): support specifying coordinate system for pie series.

* feat(bmap): support `convertToPixel` & `convertFromPixel` API.

* fix: sliderZoom in candlestick dataset error

* chore(workflow): close stale issues as not planned rather than completed. [ci skip]

* fix(custom): fix potential NPE when applying leave transition.

* chore: upgrade stale action to v5

fix `close-issue-reason` option is not being recognized

* fix(log): fix log axis breaks a single data whose log value is negative apache#13154

* fix(log): cache base variable

* fix(axis): fix axis symbol is not reverted when axis is reverse.

* feat(gauge): axisLabel support rotate like sunburst. close 15944

* fix(visualMap): fix the indicator doesn't show when hovering on map label.

* chore: fix some typos

* fix(visualMap): fix wrong type of ecData.

* fix(custom): fix elements may not be removed after updates apache#17333

* fix(custom): apply leave transition and add more comments

* test(custom): add a test case with {} that should preserve child

* test(custom): add a test case

* test: add coarse-pointer in test env

* fix(custom): fix the case for element after the null child

* style: spelling mistakes

* style: spelling mistakes

* style: spelling mistakes

* fix(type): add missing type `number` to `emphasis.scale` of scatter/line/graph series.

* style: fix typo of `RoamPayload`.

* refactor(util): import `encodeHTML` function from `zrender`.

* chore(deps-dev): bump terser from 5.3.8 to 5.14.2

Bumps [terser](https://github.com/terser/terser) from 5.3.8 to 5.14.2.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: update zrender to the latest nightly version.

* fix(pie): fix `labelLine` may not be hidden when `minShowLabelRadian` is specified, resolves apache#17013.

* 单轴反向失效问题修复

* fix(custom): ignore element when renderItem returns a group with null elements

* test(custom): update test case for custom update

* fix(bar-race): provide subPixelOptimize option to solve apache#14679

* test(bar-race): update test

* fix(symbol): fix `emphasis.scale` can't be reset and specified value may not be respect.

- null / undefined / true means to use default strategy.
- 0 / false / negative number / NaN / Infinity means no scale.

* test(symbol): add test case for `emphasis.scale`

* test(vrt): fix changing value of select via js doesn't trigger `change` event.

* fix(symbol): remove unused import.

* fix(custom): set ignore only if old child exists (apache#17450)

* feat(axis): set subPixelOptimize to be false during animation

* chore: fix wrong imports from `echarts.all`

* chore: fix wrong imports from `echarts.all`

* fix(axis): remove unnecessary files

* 优化饼图性能

* fix(axis): when update for the first time, make sure done is called

* test(pie): tweak pie-percent case - add time log, percentPrecision & label formatter.

* test(pie): fix test case pie3.html

* fix(theme): fix the abandoned normal level in the theme file. close apache#17473

* fix(coarse-pointer): use retrieve

* fix(theme):  move the label block to the outside.

* fix(subpixel): set animation with subpixel optimization

* fix(subpixel): remove function

* fix(subpixel): refactor

* fix(subpixel): refactor subPixelOptimizeLine

* fix(subpixel): remove an unexpected change

* feat(coarse-pointer): fix test

* feat(coarse-pointer): fix test

* fix: merge conflict

* chore(deps): bump engine.io and socket.io

Bumps [engine.io](https://github.com/socketio/engine.io) and [socket.io](https://github.com/socketio/socket.io). These dependencies needed to be updated together.

Updates `engine.io` from 3.3.2 to 3.6.0
- [Release notes](https://github.com/socketio/engine.io/releases)
- [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md)
- [Commits](socketio/engine.io@3.3.2...3.6.0)

Updates `socket.io` from 2.2.0 to 2.5.0
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/2.5.0/CHANGELOG.md)
- [Commits](socketio/socket.io@2.2.0...2.5.0)

---
updated-dependencies:
- dependency-name: engine.io
  dependency-type: indirect
- dependency-name: socket.io
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix(theme): fix tooltips text style of the theme macarons

* change the  `deprecateReplaceLog` in  sunburstAction.ts

* fix the  deprecateReplaceLog  about downplay

* fix a typo error in `log.ts`

* chore(stale): issues with milestone TBD should not be marked as stale

* chore(stale): exclude all prs with milestones

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Map1en_ <maplenagisa@gmail.com>
Co-authored-by: kongmoumou <kongmoumou666@gmail.com>
Co-authored-by: sushuang <sushuang0322@gmail.com>
Co-authored-by: Yi Shen <bm2736892@gmail.com>
Co-authored-by: wangguisong@sinotrans.com <wangguisong@sinotrans.com>
Co-authored-by: Ovilia <zwl.sjtu@gmail.com>
Co-authored-by: plainheart <yhen@all-my-life.cn>
Co-authored-by: jiawulin001 <jiawulin001@163.com>
Co-authored-by: MeetzhDing <3303652975@qq.com>
Co-authored-by: ZT <2417407179@qq.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: 杨骥 <yangji@hengshi.com>
Co-authored-by: liangism <liangism1995@163.com>
Co-authored-by: mousne <mousne@sina.com>
Co-authored-by: gitforhlp <997960553@qq.com>
Co-authored-by: ChepteaCatalin <71984989+ChepteaCatalin@users.noreply.github.com>
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