Merge pull request #12762 from plainheart/fix-geo-label-formatter

fix(geo): label formatter in geo works incorrectly, tweaks #10666 & #8612.
apache · Jun 22, 2020 · 300f75d · 300f75d
2 parents 5c1a5fb + 940b872
commit 300f75d
Show file tree

Hide file tree

Showing 2 changed files with 367 additions and 6 deletions.
diff --git a/src/coord/geo/GeoModel.js b/src/coord/geo/GeoModel.js
@@ -147,12 +147,9 @@ var GeoModel = ComponentModel.extend({
      * @return {string}
      */
     getFormattedLabel: function (name, status) {
+        status = status || 'normal';
         var regionModel = this.getRegionModel(name);
-        var formatter = regionModel.get(
-            'label'
-            + (status === 'normal' ? '.' : status + '.')
-            + 'formatter'
-        );
+        var formatter = regionModel.get((status === 'normal' ? '' : status + '.') + 'label.formatter');
         var params = {
             name: name
         };
@@ -176,4 +173,4 @@ var GeoModel = ComponentModel.extend({
 
 zrUtil.mixin(GeoModel, selectableMixin);
 
-export default GeoModel;
+export default GeoModel;