[markArea] Fix #4723 (enable label show)

apache · Dec 25, 2016 · 253bf28 · 253bf28
1 parent 9697715
commit 253bf28
Showing 1 changed file with 21 additions and 10 deletions.
diff --git a/src/component/marker/MarkAreaView.js b/src/component/marker/MarkAreaView.js
@@ -228,17 +228,28 @@ define(function (require) {
 
                 var defaultValue = areaData.getName(idx) || '';
                 var textColor = color || polygon.style.fill;
-                graphic.setText(polygon.style, labelModel, textColor);
-                polygon.style.text = zrUtil.retrieve(
-                    maModel.getFormattedLabel(idx, 'normal'),
-                    defaultValue
-                );
 
-                graphic.setText(polygon.hoverStyle, labelHoverModel, textColor);
-                polygon.hoverStyle.text = zrUtil.retrieve(
-                    maModel.getFormattedLabel(idx, 'emphasis'),
-                    defaultValue
-                );
+                if (labelModel.getShallow('show')) {
+                    graphic.setText(polygon.style, labelModel, textColor);
+                    polygon.style.text = zrUtil.retrieve(
+                        maModel.getFormattedLabel(idx, 'normal'),
+                        defaultValue
+                    );
+                }
+                else {
+                    polygon.style.text = '';
+                }
+
+                if (labelHoverModel.getShallow('show')) {
+                    graphic.setText(polygon.hoverStyle, labelHoverModel, textColor);
+                    polygon.hoverStyle.text = zrUtil.retrieve(
+                        maModel.getFormattedLabel(idx, 'emphasis'),
+                        defaultValue
+                    );
+                }
+                else {
+                    polygon.hoverStyle.text = '';
+                }
 
                 graphic.setHoverStyle(polygon, {});