fix(geo): label formatter in geo works incorrectly, tweaks #10666 & #8612.

[plainheart]

Brief Information

This pull request is in the type of:

• bug fixing
• new feature
• others

What does this PR do?

Because of the change about the structure of normal style and emphasis style, original logic about fetching formatter of label has been not suitable. There are some changes to be done.

Original way to fetch label formatter:
normal: label.formatter (It's okay now)
emphasis: label.emphasis.formatter(in #10666, a dot is also missing, but even if we add it, it is still not correct for present option structure).

Present way to fetch label formatter:
normal: label.formatter (same as original way)
emphasis: emphasis.label.formatter (See geo.emphasis.label.formatter).

Fixed issues

• Fix #8489 geo.label.formatter is not working #10666
• geo label formatter不生效bug修复 #8612

Details

Before: What was the problem?

geo.label.formatter is not working.

After: How is it fixed in this PR?

Using the way suitable for current option structure.

var formatter = regionModel.get((status === 'normal' ? '' : 'emphasis.') + 'label.formatter');

Usage

Are there any API changes?

• The API has been changed.

Related test cases or examples to use the new APIs

Please refer to test/geo-labelFormatter.html.

Others

Merging options

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

[echarts-bot]

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.

[pissang]

Looks good.

[echarts-bot]

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