Merge branch 'master' of github.com:ecomfe/echarts

src/chart/bar/BarView.js

@@ -145,7 +145,7 @@ define(function (require) {
 
                 rect.setShape('r', itemStyleModel.get('barBorderRadius') || 0);
 
-                rect.setStyle(zrUtil.defaults(
+                rect.useStyle(zrUtil.defaults(
                     {
                         fill: color,
                         opacity: opacity

src/chart/candlestick/CandlestickView.js

@@ -36,15 +36,13 @@ define(function(require) {
         );
 
         var whiskerEl = itemGroup.childAt(itemGroup.whiskerIndex);
-        whiskerEl.style.set(itemStyle);
+        whiskerEl.useStyle(itemStyle);
         whiskerEl.style.stroke = borderColor;
-        whiskerEl.dirty();
 
         var bodyEl = itemGroup.childAt(itemGroup.bodyIndex);
-        bodyEl.style.set(itemStyle);
+        bodyEl.useStyle(itemStyle);
         bodyEl.style.fill = color;
         bodyEl.style.stroke = borderColor;
-        bodyEl.dirty();
 
         var hoverStyle = itemModel.getModel(emphasisStyleAccessPath).getItemStyle();
         graphic.setHoverStyle(itemGroup, hoverStyle);

src/chart/funnel/FunnelView.js

@@ -63,6 +63,10 @@ define(function (require) {
         var layout = data.getItemLayout(idx);
         var opacity = data.getItemModel(idx).get(opacityAccessPath);
         opacity = opacity == null ? 1 : opacity;
+
+        // Reset style
+        polygon.useStyle({});
+
         if (firstCreate) {
             polygon.setShape({
                 points: layout.points

src/chart/gauge/GaugeView.js

@@ -314,18 +314,17 @@ define(function (require) {
                 var itemModel = data.getItemModel(idx);
                 var pointerModel = itemModel.getModel('pointer');
 
-                pointer.attr({
-                    shape: {
-                        x: posInfo.cx,
-                        y: posInfo.cy,
-                        width: parsePercent(
-                            pointerModel.get('width'), posInfo.r
-                        ),
-                        r: parsePercent(pointerModel.get('length'), posInfo.r)
-                    },
-                    style: itemModel.getModel('itemStyle.normal').getItemStyle()
+                pointer.setShape({
+                    x: posInfo.cx,
+                    y: posInfo.cy,
+                    width: parsePercent(
+                        pointerModel.get('width'), posInfo.r
+                    ),
+                    r: parsePercent(pointerModel.get('length'), posInfo.r)
                 });
 
+                pointer.useStyle(itemModel.getModel('itemStyle.normal').getItemStyle());
+
                 if (pointer.style.fill === 'auto') {
                     pointer.setStyle('fill', getColor(
                         (data.get('value', idx) - valueExtent[0]) / (valueExtent[1] - valueExtent[0])

src/chart/helper/LargeSymbolDraw.js

@@ -81,7 +81,7 @@ define(function (require) {
         // Use symbolProxy setColor method
         symbolEl.setColor = symbolEl.symbolProxy.setColor;
 
-        symbolEl.setStyle(
+        symbolEl.useStyle(
             seriesModel.getModel('itemStyle.normal').getItemStyle(['color'])
         );
 

src/chart/helper/Line.js

@@ -234,8 +234,9 @@ define(function (require) {
             // Use name
             defaultText = lineData.getName(idx);
         }
-        line.setStyle(zrUtil.extend(
+        line.useStyle(zrUtil.extend(
             {
+                fill: 'none',
                 stroke: lineData.getItemVisual(idx, 'color')
             },
             itemModel.getModel('lineStyle.normal').getLineStyle()

src/chart/helper/Symbol.js

@@ -46,9 +46,6 @@ define(function (require) {
         );
 
         symbolPath.attr({
-            style: {
-                strokeNoScale: true
-            },
             z2: 100,
             culling: true,
             scale: [0, 0]
@@ -149,6 +146,11 @@ define(function (require) {
         var itemModel = data.getItemModel(idx);
         var normalItemStyleModel = itemModel.getModel(normalStyleAccessPath);
         var color = data.getItemVisual(idx, 'color');
+
+        // Reset style
+        symbolPath.useStyle({
+            strokeNoScale: true
+        });
         var elStyle = symbolPath.style;
 
         var hoverStyle = itemModel.getModel(emphasisStyleAccessPath).getItemStyle();

src/chart/line/LineView.js

@@ -292,10 +292,11 @@ define(function(require) {
                 }
             }
 
-            polyline.setStyle(zrUtil.defaults(
+            polyline.useStyle(zrUtil.defaults(
                 // Use color in lineStyle first
                 lineStyleModel.getLineStyle(),
                 {
+                    fill: 'none',
                     stroke: data.getVisual('color'),
                     lineJoin: 'bevel'
                 }
@@ -312,11 +313,11 @@ define(function(require) {
                 var stackedOn = data.stackedOn;
                 var stackedOnSmooth = 0;
 
-                polygon.style.opacity = 0.7;
-                polygon.setStyle(zrUtil.defaults(
+                polygon.useStyle(zrUtil.defaults(
                     areaStyleModel.getAreaStyle(),
                     {
                         fill: data.getVisual('color'),
+                        opacity: 0.7,
                         lineJoin: 'bevel'
                     }
                 ));

src/chart/parallel/ParallelView.js

@@ -44,9 +44,10 @@ define(function (require) {
                 var itemModel = data.getItemModel(idx);
                 var lineStyleModel = itemModel.getModel('lineStyle.normal');
                 elGroup.eachChild(function (child) {
-                    child.setStyle(zrUtil.extend(
+                    child.useStyle(zrUtil.extend(
                         lineStyleModel.getLineStyle(),
                         {
+                            fill: null,
                             stroke: data.getItemVisual(idx, 'color'),
                             opacity: data.getItemVisual(idx, 'opacity')
                         }

src/chart/pie/PieView.js

@@ -138,7 +138,7 @@ define(function (require) {
         var itemStyleModel = itemModel.getModel('itemStyle');
         var visualColor = data.getItemVisual(idx, 'color');
 
-        sector.setStyle(
+        sector.useStyle(
             zrUtil.defaults(
                 {
                     fill: visualColor

src/chart/radar/RadarView.js

@@ -133,10 +133,11 @@ define(function (require) {
 
                 group.add(itemGroup);
 
-                polyline.setStyle(
+                polyline.useStyle(
                     zrUtil.extend(
                         itemModel.getModel('lineStyle.normal').getLineStyle(),
                         {
+                            fill: 'none',
                             stroke: color
                         }
                     )
@@ -151,7 +152,7 @@ define(function (require) {
                 hoverPolygonIgnore = hoverPolygonIgnore && polygonIgnore;
                 polygon.ignore = polygonIgnore;
 
-                polygon.setStyle(
+                polygon.useStyle(
                     zrUtil.defaults(
                         areaStyleModel.getAreaStyle(),
                         {
@@ -167,7 +168,7 @@ define(function (require) {
                 var labelModel = itemModel.getModel('label.normal');
                 var labelHoverModel = itemModel.getModel('label.emphasis');
                 symbolGroup.eachChild(function (symbolPath) {
-                    symbolPath.setStyle(itemStyle);
+                    symbolPath.useStyle(itemStyle);
                     symbolPath.hoverStyle = zrUtil.clone(itemHoverStyle);
 
                     var defaultText = data.get(data.dimensions[symbolPath.__dimIdx], idx);

src/chart/sankey/SankeyView.js

@@ -95,7 +95,7 @@ define(function (require) {
                     }
                 });
 
-                rect.setStyle(zrUtil.defaults(
+                rect.useStyle(zrUtil.defaults(
                     {
                         fill: node.getVisual('color')
                     },

src/component/visualMap/ContinuousView.js

@@ -625,8 +625,8 @@ define(function(require) {
          */
         _hideIndicator: function () {
             var shapes = this._shapes;
-            shapes.indicator.attr('invisible', true);
-            shapes.indicatorLabel.attr('invisible', true);
+            shapes.indicator && shapes.indicator.attr('invisible', true);
+            shapes.indicatorLabel && shapes.indicatorLabel.attr('invisible', true);
         },
 
         /**

src/coord/View.js

@@ -217,6 +217,16 @@ define(function (require) {
             return this._viewRect;
         },
 
+        /**
+         * Get view rect after roam transform
+         * @return {module:zrender/core/BoundingRect}
+         */
+        getViewRectAfterRoam: function () {
+            var rect = this._viewRect.clone();
+            rect.applyTransform(this.transform);
+            return rect;
+        },
+
         /**
          * Convert a single (lon, lat) data item to (x, y) point.
          * @param {Array.<number>} data