fixed apache/echarts#442

文字显示策略
ecomfe · Jul 22, 2014 · b813474 · b813474
1 parent a243372
commit b813474
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/src/shape/Base.js b/src/shape/Base.js
@@ -269,9 +269,7 @@ define(
                     ctx.fill();
             }
 
-            if (style.text) {
-                this.drawText(ctx, style, this.style);
-            }
+            this.drawText(ctx, style, this.style);
 
             ctx.restore();
         };
@@ -437,6 +435,9 @@ define(
          * @param {Object} normalStyle 默认样式，用于定位文字显示
          */
         Base.prototype.drawText = function (ctx, style, normalStyle) {
+            if (style.text == undefined || style.text === false ) {
+                return;
+            }
             // 字体颜色策略
             var textColor = style.textColor || style.color || style.strokeColor;
             ctx.fillStyle = textColor;

diff --git a/src/shape/Image.js b/src/shape/Image.js
@@ -180,9 +180,7 @@ define(
                     this.style.height = height;
 
 
-                    if (style.text) {
-                        this.drawText(ctx, style, this.style);
-                    }
+                    this.drawText(ctx, style, this.style);
 
                     ctx.restore();
                 }

diff --git a/src/shape/Polygon.js b/src/shape/Polygon.js
@@ -145,9 +145,7 @@ define(
                     ctx.stroke();
                 }
 
-                if (style.text) {
-                    this.drawText(ctx, style, this.style);
-                }
+                this.drawText(ctx, style, this.style);
 
                 ctx.restore();
 

diff --git a/src/shape/Text.js b/src/shape/Text.js
@@ -92,7 +92,7 @@ define(
                     );
                 }
 
-                if (typeof style.text == 'undefined') {
+                if (style.text == undefined || style.text === false) {
                     return;
                 }