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

fix(label): fix labelLine default style when normal state not show but other state show #18800

Merged
merged 4 commits into from
Oct 23, 2023

Conversation

linghaoSu
Copy link
Contributor

@linghaoSu linghaoSu commented Jun 25, 2023

Brief Information

This pull request is in the type of:

  • bug fixing
  • new feature
  • others

What does this PR do?

fix labelLine style not follow label style when normal state show: false, other state show: true;

Fixed issues

Details

Before: What was the problem?

when set normal state label show is false, and other state(such as emphasis) state label show: true

labelLine style cannot inherit sector color, and always #000

image

After: How does it behave after the fixing?

although normal state label is show: false, but once any state has show: true, labelStyle will inhreit sector style

image

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 Jun 25, 2023

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.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 28, 2023

The changes brought by this PR can be previewed at: https://echarts.apache.org/examples/editor?version=PR-18800@301b13d

Ovilia

This comment was marked as resolved.

Copy link
Contributor

@Ovilia Ovilia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the logic is all right but I'd prefer the way #19180 because setLabelLineState is not a frequent operation and thus checking show in all states can be ignored.

However, this PR gives a very solid test for it so I would also like to merge it. Can you revert the changes of src and pull & merge from the master and submit again? Thanks!

@Ovilia Ovilia added this to the 5.5.0 milestone Oct 20, 2023
@linghaoSu
Copy link
Contributor Author

I think the logic is all right but I'd prefer the way #19180 because setLabelLineState is not a frequent operation and thus checking show in all states can be ignored.

However, this PR gives a very solid test for it so I would also like to merge it. Can you revert the changes of src and pull & merge from the master and submit again? Thanks!

I apologize for the delayed response. I am pleased to see that the bug has already been resolved, and I am willing to revert the code in the src directory.

@linghaoSu linghaoSu requested a review from Ovilia October 23, 2023 01:45
Copy link
Contributor

@Ovilia Ovilia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for co-author the PR!

@Ovilia Ovilia merged commit babe688 into apache:master Oct 23, 2023
2 checks passed
@echarts-bot
Copy link

echarts-bot bot commented Oct 23, 2023

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants