echarts 3.6.1 → 3.7.2

package/dist/extension/bmap.js

@@ -52,7 +52,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /************************************************************************/
 /******/ ([
 /* 0 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
 	var __WEBPACK_AMD_DEFINE_RESULT__;/**
 	 * BMap component extension
@@ -83,19 +83,20 @@ return /******/ (function(modules) { // webpackBootstrap
 	    };
 	}.call(exports, __webpack_require__, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
 
-/***/ },
+/***/ }),
 /* 1 */
-/***/ function(module, exports) {
+/***/ (function(module, exports) {
 
 	module.exports = __WEBPACK_EXTERNAL_MODULE_1__;
 
-/***/ },
+/***/ }),
 /* 2 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
 	var __WEBPACK_AMD_DEFINE_RESULT__;!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require) {
 
 	    var echarts = __webpack_require__(1);
+	    var zrUtil = echarts.util;
 
 	    function BMapCoordSys(bmap, api) {
 	        this._bmap = bmap;
@@ -160,6 +161,38 @@ return /******/ (function(modules) { // webpackBootstrap
 	        return echarts.matrix.create();
 	    };
 
+	    BMapCoordSys.prototype.prepareCustoms = function (data) {
+	        var rect = this.getViewRect();
+	        return {
+	            coordSys: {
+	                // The name exposed to user is always 'cartesian2d' but not 'grid'.
+	                type: 'bmap',
+	                x: rect.x,
+	                y: rect.y,
+	                width: rect.width,
+	                height: rect.height
+	            },
+	            api: {
+	                coord: zrUtil.bind(this.dataToPoint, this),
+	                size: zrUtil.bind(dataToCoordSize, this)
+	            }
+	        };
+	    };
+
+	    function dataToCoordSize(dataSize, dataItem) {
+	        dataItem = dataItem || [0, 0];
+	        return zrUtil.map([0, 1], function (dimIdx) {
+	            var val = dataItem[dimIdx];
+	            var halfSize = dataSize[dimIdx] / 2;
+	            var p1 = [];
+	            var p2 = [];
+	            p1[dimIdx] = val - halfSize;
+	            p2[dimIdx] = val + halfSize;
+	            p1[1 - dimIdx] = p2[1 - dimIdx] = dataItem[1 - dimIdx];
+	            return Math.abs(this.dataToPoint(p1)[dimIdx] - this.dataToPoint(p2)[dimIdx]);
+	        }, this);
+	    }
+
 	    var Overlay;
 
 	    // For deciding which dimensions to use when creating list data
@@ -195,7 +228,8 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	        // TODO Dispose
 	        ecModel.eachComponent('bmap', function (bmapModel) {
-	            var viewportRoot = api.getZr().painter.getViewportRoot();
+	            var painter = api.getZr().painter;
+	            var viewportRoot = painter.getViewportRoot();
 	            if (typeof BMap === 'undefined') {
 	                throw new Error('BMap api is not loaded');
 	            }
@@ -222,6 +256,11 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	                var overlay = new Overlay(viewportRoot);
 	                bmap.addOverlay(overlay);
+
+	                // Override
+	                painter.getViewportRootOffset = function () {
+	                    return {offsetLeft: 0, offsetTop: 0};
+	                };
 	            }
 	            var bmap = bmapModel.__bmap;
 
@@ -252,9 +291,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	    return BMapCoordSys;
 	}.call(exports, __webpack_require__, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
 
-/***/ },
+/***/ }),
 /* 3 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
 	var __WEBPACK_AMD_DEFINE_RESULT__;!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require) {
 
@@ -293,9 +332,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	    });
 	}.call(exports, __webpack_require__, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
 
-/***/ },
+/***/ }),
 /* 4 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
 	var __WEBPACK_AMD_DEFINE_RESULT__;!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require) {
 
@@ -385,7 +424,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    });
 	}.call(exports, __webpack_require__, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
 
-/***/ }
+/***/ })
 /******/ ])
 });
 ;

package/dist/extension/bmap.min.js

@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("echarts")):"function"==typeof define&&define.amd?define(["echarts"],t):"object"==typeof exports?exports.bmap=t(require("echarts")):(e.echarts=e.echarts||{},e.echarts.bmap=t(e.echarts))}(this,function(e){return function(e){function t(n){if(o[n])return o[n].exports;var r=o[n]={exports:{},id:n,loaded:!1};return e[n].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var o={};return t.m=e,t.c=o,t.p="",t(0)}([function(e,t,o){var n;n=function(e){return o(1).registerCoordinateSystem("bmap",o(2)),o(3),o(4),o(1).registerAction({type:"bmapRoam",event:"bmapRoam",update:"updateLayout"},function(e,t){t.eachComponent("bmap",function(e){var t=e.getBMap(),o=t.getCenter();e.setCenterAndZoom([o.lng,o.lat],t.getZoom())})}),{version:"1.0.0"}}.call(t,o,t,e),!(void 0!==n&&(e.exports=n))},function(t,o){t.exports=e},function(e,t,o){var n;n=function(e){function t(e,t){this._bmap=e,this.dimensions=["lng","lat"],this._mapOffset=[0,0],this._api=t,this._projection=new BMap.MercatorProjection}function n(){function e(e){this._root=e}return e.prototype=new BMap.Overlay,e.prototype.initialize=function(e){return e.getPanes().labelPane.appendChild(this._root),this._root},e.prototype.draw=function(){},e}var r=o(1);t.prototype.dimensions=["lng","lat"],t.prototype.setZoom=function(e){this._zoom=e},t.prototype.setCenter=function(e){this._center=this._projection.lngLatToPoint(new BMap.Point(e[0],e[1]))},t.prototype.setMapOffset=function(e){this._mapOffset=e},t.prototype.getBMap=function(){return this._bmap},t.prototype.dataToPoint=function(e){var t=new BMap.Point(e[0],e[1]),o=this._bmap.pointToOverlayPixel(t),n=this._mapOffset;return[o.x-n[0],o.y-n[1]]},t.prototype.pointToData=function(e){var t=this._mapOffset,e=this._bmap.overlayPixelToPoint({x:e[0]+t[0],y:e[1]+t[1]});return[e.lng,e.lat]},t.prototype.getViewRect=function(){var e=this._api;return new r.graphic.BoundingRect(0,0,e.getWidth(),e.getHeight())},t.prototype.getRoamTransform=function(){return r.matrix.create()};var i;return t.dimensions=t.prototype.dimensions,t.create=function(e,o){var r,a=o.getDom();e.eachComponent("bmap",function(e){var p=o.getZr().painter.getViewportRoot();if("undefined"==typeof BMap)throw new Error("BMap api is not loaded");if(i=i||n(),r)throw new Error("Only one bmap component can exist");if(!e.__bmap){var s=a.querySelector(".ec-extension-bmap");s&&(p.style.left="0px",p.style.top="0px",a.removeChild(s)),s=document.createElement("div"),s.style.cssText="width:100%;height:100%",s.classList.add("ec-extension-bmap"),a.appendChild(s);var c=e.__bmap=new BMap.Map(s),m=new i(p);c.addOverlay(m)}var c=e.__bmap,l=e.get("center"),d=e.get("zoom");if(l&&d){var f=new BMap.Point(l[0],l[1]);c.centerAndZoom(f,d)}r=new t(c,o),r.setMapOffset(e.__mapOffset||[0,0]),r.setZoom(d),r.setCenter(l),e.coordinateSystem=r}),e.eachSeries(function(e){"bmap"===e.get("coordinateSystem")&&(e.coordinateSystem=r)})},t}.call(t,o,t,e),!(void 0!==n&&(e.exports=n))},function(e,t,o){var n;n=function(e){function t(e,t){return e&&t&&e[0]===t[0]&&e[1]===t[1]}return o(1).extendComponentModel({type:"bmap",getBMap:function(){return this.__bmap},setCenterAndZoom:function(e,t){this.option.center=e,this.option.zoom=t},centerOrZoomChanged:function(e,o){var n=this.option;return!(t(e,n.center)&&o===n.zoom)},defaultOption:{center:[104.114129,37.550339],zoom:5,mapStyle:{},roam:!1}})}.call(t,o,t,e),!(void 0!==n&&(e.exports=n))},function(e,t,o){var n;n=function(e){return o(1).extendComponentView({type:"bmap",render:function(e,t,o){function n(){r||o.dispatchAction({type:"bmapRoam"})}var r=!0,i=e.getBMap(),a=o.getZr().painter.getViewportRoot(),p=e.coordinateSystem,s=function(t,n){if(!r){var i=a.parentNode.parentNode.parentNode,s=[-parseInt(i.style.left,10)||0,-parseInt(i.style.top,10)||0];a.style.left=s[0]+"px",a.style.top=s[1]+"px",p.setMapOffset(s),e.__mapOffset=s,o.dispatchAction({type:"bmapRoam"})}};i.removeEventListener("moving",this._oldMoveHandler),i.removeEventListener("zoomend",this._oldZoomEndHandler),i.addEventListener("moving",s),i.addEventListener("zoomend",n),this._oldMoveHandler=s,this._oldZoomEndHandler=n;var c=e.get("roam");c&&"scale"!==c?i.enableDragging():i.disableDragging(),c&&"move"!==c?(i.enableScrollWheelZoom(),i.enableDoubleClickZoom(),i.enablePinchToZoom()):(i.disableScrollWheelZoom(),i.disableDoubleClickZoom(),i.disablePinchToZoom());var m=e.__mapStyle,l=e.get("mapStyle")||{},d=JSON.stringify(l);JSON.stringify(m)!==d&&(Object.keys(l).length&&i.setMapStyle(l),e.__mapStyle=JSON.parse(d)),r=!1}})}.call(t,o,t,e),!(void 0!==n&&(e.exports=n))}])});
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("echarts")):"function"==typeof define&&define.amd?define(["echarts"],e):"object"==typeof exports?exports.bmap=e(require("echarts")):(t.echarts=t.echarts||{},t.echarts.bmap=e(t.echarts))}(this,function(t){return function(t){function e(n){if(o[n])return o[n].exports;var r=o[n]={exports:{},id:n,loaded:!1};return t[n].call(r.exports,r,r.exports,e),r.loaded=!0,r.exports}var o={};return e.m=t,e.c=o,e.p="",e(0)}([function(t,e,o){var n;n=function(t){return o(1).registerCoordinateSystem("bmap",o(2)),o(3),o(4),o(1).registerAction({type:"bmapRoam",event:"bmapRoam",update:"updateLayout"},function(t,e){e.eachComponent("bmap",function(t){var e=t.getBMap(),o=e.getCenter();t.setCenterAndZoom([o.lng,o.lat],e.getZoom())})}),{version:"1.0.0"}}.call(e,o,e,t),!(void 0!==n&&(t.exports=n))},function(e,o){e.exports=t},function(t,e,o){var n;n=function(t){function e(t,e){this._bmap=t,this.dimensions=["lng","lat"],this._mapOffset=[0,0],this._api=e,this._projection=new BMap.MercatorProjection}function n(t,e){return e=e||[0,0],a.map([0,1],function(o){var n=e[o],r=t[o]/2,i=[],a=[];return i[o]=n-r,a[o]=n+r,i[1-o]=a[1-o]=e[1-o],Math.abs(this.dataToPoint(i)[o]-this.dataToPoint(a)[o])},this)}function r(){function t(t){this._root=t}return t.prototype=new BMap.Overlay,t.prototype.initialize=function(t){return t.getPanes().labelPane.appendChild(this._root),this._root},t.prototype.draw=function(){},t}var i=o(1),a=i.util;e.prototype.dimensions=["lng","lat"],e.prototype.setZoom=function(t){this._zoom=t},e.prototype.setCenter=function(t){this._center=this._projection.lngLatToPoint(new BMap.Point(t[0],t[1]))},e.prototype.setMapOffset=function(t){this._mapOffset=t},e.prototype.getBMap=function(){return this._bmap},e.prototype.dataToPoint=function(t){var e=new BMap.Point(t[0],t[1]),o=this._bmap.pointToOverlayPixel(e),n=this._mapOffset;return[o.x-n[0],o.y-n[1]]},e.prototype.pointToData=function(t){var e=this._mapOffset,t=this._bmap.overlayPixelToPoint({x:t[0]+e[0],y:t[1]+e[1]});return[t.lng,t.lat]},e.prototype.getViewRect=function(){var t=this._api;return new i.graphic.BoundingRect(0,0,t.getWidth(),t.getHeight())},e.prototype.getRoamTransform=function(){return i.matrix.create()},e.prototype.prepareCustoms=function(t){var e=this.getViewRect();return{coordSys:{type:"bmap",x:e.x,y:e.y,width:e.width,height:e.height},api:{coord:a.bind(this.dataToPoint,this),size:a.bind(n,this)}}};var p;return e.dimensions=e.prototype.dimensions,e.create=function(t,o){var n,i=o.getDom();t.eachComponent("bmap",function(t){var a=o.getZr().painter,s=a.getViewportRoot();if("undefined"==typeof BMap)throw new Error("BMap api is not loaded");if(p=p||r(),n)throw new Error("Only one bmap component can exist");if(!t.__bmap){var c=i.querySelector(".ec-extension-bmap");c&&(s.style.left="0px",s.style.top="0px",i.removeChild(c)),c=document.createElement("div"),c.style.cssText="width:100%;height:100%",c.classList.add("ec-extension-bmap"),i.appendChild(c);var m=t.__bmap=new BMap.Map(c),f=new p(s);m.addOverlay(f),a.getViewportRootOffset=function(){return{offsetLeft:0,offsetTop:0}}}var m=t.__bmap,d=t.get("center"),l=t.get("zoom");if(d&&l){var u=new BMap.Point(d[0],d[1]);m.centerAndZoom(u,l)}n=new e(m,o),n.setMapOffset(t.__mapOffset||[0,0]),n.setZoom(l),n.setCenter(d),t.coordinateSystem=n}),t.eachSeries(function(t){"bmap"===t.get("coordinateSystem")&&(t.coordinateSystem=n)})},e}.call(e,o,e,t),!(void 0!==n&&(t.exports=n))},function(t,e,o){var n;n=function(t){function e(t,e){return t&&e&&t[0]===e[0]&&t[1]===e[1]}return o(1).extendComponentModel({type:"bmap",getBMap:function(){return this.__bmap},setCenterAndZoom:function(t,e){this.option.center=t,this.option.zoom=e},centerOrZoomChanged:function(t,o){var n=this.option;return!(e(t,n.center)&&o===n.zoom)},defaultOption:{center:[104.114129,37.550339],zoom:5,mapStyle:{},roam:!1}})}.call(e,o,e,t),!(void 0!==n&&(t.exports=n))},function(t,e,o){var n;n=function(t){return o(1).extendComponentView({type:"bmap",render:function(t,e,o){function n(){r||o.dispatchAction({type:"bmapRoam"})}var r=!0,i=t.getBMap(),a=o.getZr().painter.getViewportRoot(),p=t.coordinateSystem,s=function(e,n){if(!r){var i=a.parentNode.parentNode.parentNode,s=[-parseInt(i.style.left,10)||0,-parseInt(i.style.top,10)||0];a.style.left=s[0]+"px",a.style.top=s[1]+"px",p.setMapOffset(s),t.__mapOffset=s,o.dispatchAction({type:"bmapRoam"})}};i.removeEventListener("moving",this._oldMoveHandler),i.removeEventListener("zoomend",this._oldZoomEndHandler),i.addEventListener("moving",s),i.addEventListener("zoomend",n),this._oldMoveHandler=s,this._oldZoomEndHandler=n;var c=t.get("roam");c&&"scale"!==c?i.enableDragging():i.disableDragging(),c&&"move"!==c?(i.enableScrollWheelZoom(),i.enableDoubleClickZoom(),i.enablePinchToZoom()):(i.disableScrollWheelZoom(),i.disableDoubleClickZoom(),i.disablePinchToZoom());var m=t.__mapStyle,f=t.get("mapStyle")||{},d=JSON.stringify(f);JSON.stringify(m)!==d&&(Object.keys(f).length&&i.setMapStyle(f),t.__mapStyle=JSON.parse(d)),r=!1}})}.call(e,o,e,t),!(void 0!==n&&(t.exports=n))}])});

package/dist/extension/dataTool.js

@@ -52,7 +52,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /************************************************************************/
 /******/ ([
 /* 0 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
 	var __WEBPACK_AMD_DEFINE_RESULT__;!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require) {
 	    var echarts = __webpack_require__(1);
@@ -64,18 +64,18 @@ return /******/ (function(modules) { // webpackBootstrap
 	    return echarts.dataTool;
 	}.call(exports, __webpack_require__, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
 
-/***/ },
+/***/ }),
 /* 1 */
-/***/ function(module, exports) {
+/***/ (function(module, exports) {
 
 	module.exports = __WEBPACK_EXTERNAL_MODULE_1__;
 
-/***/ },
+/***/ }),
 /* 2 */,
 /* 3 */,
 /* 4 */,
 /* 5 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
 	var __WEBPACK_AMD_DEFINE_RESULT__;// GEXF File Parser
 	// http://gexf.net/1.2draft/gexf-12draft-primer.pdf
@@ -282,9 +282,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	    };
 	}.call(exports, __webpack_require__, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
 
-/***/ },
+/***/ }),
 /* 6 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
 	var __WEBPACK_AMD_DEFINE_RESULT__;!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require) {
 
@@ -350,9 +350,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	}.call(exports, __webpack_require__, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
 
-/***/ },
+/***/ }),
 /* 7 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
 	var __WEBPACK_AMD_DEFINE_RESULT__;/**
 	 * Copyright (c) 2010-2015, Michael Bostock
@@ -399,7 +399,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	}.call(exports, __webpack_require__, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
 
-/***/ }
+/***/ })
 /******/ ])
 });
 ;

package/extension/bmap/BMapCoordSys.js

@@ -1,6 +1,7 @@
 define(function (require) {
 
     var echarts = require('echarts');
+    var zrUtil = echarts.util;
 
     function BMapCoordSys(bmap, api) {
         this._bmap = bmap;
@@ -65,6 +66,38 @@ define(function (require) {
         return echarts.matrix.create();
     };
 
+    BMapCoordSys.prototype.prepareCustoms = function (data) {
+        var rect = this.getViewRect();
+        return {
+            coordSys: {
+                // The name exposed to user is always 'cartesian2d' but not 'grid'.
+                type: 'bmap',
+                x: rect.x,
+                y: rect.y,
+                width: rect.width,
+                height: rect.height
+            },
+            api: {
+                coord: zrUtil.bind(this.dataToPoint, this),
+                size: zrUtil.bind(dataToCoordSize, this)
+            }
+        };
+    };
+
+    function dataToCoordSize(dataSize, dataItem) {
+        dataItem = dataItem || [0, 0];
+        return zrUtil.map([0, 1], function (dimIdx) {
+            var val = dataItem[dimIdx];
+            var halfSize = dataSize[dimIdx] / 2;
+            var p1 = [];
+            var p2 = [];
+            p1[dimIdx] = val - halfSize;
+            p2[dimIdx] = val + halfSize;
+            p1[1 - dimIdx] = p2[1 - dimIdx] = dataItem[1 - dimIdx];
+            return Math.abs(this.dataToPoint(p1)[dimIdx] - this.dataToPoint(p2)[dimIdx]);
+        }, this);
+    }
+
     var Overlay;
 
     // For deciding which dimensions to use when creating list data
@@ -100,7 +133,8 @@ define(function (require) {
 
         // TODO Dispose
         ecModel.eachComponent('bmap', function (bmapModel) {
-            var viewportRoot = api.getZr().painter.getViewportRoot();
+            var painter = api.getZr().painter;
+            var viewportRoot = painter.getViewportRoot();
             if (typeof BMap === 'undefined') {
                 throw new Error('BMap api is not loaded');
             }
@@ -127,6 +161,11 @@ define(function (require) {
 
                 var overlay = new Overlay(viewportRoot);
                 bmap.addOverlay(overlay);
+
+                // Override
+                painter.getViewportRootOffset = function () {
+                    return {offsetLeft: 0, offsetTop: 0};
+                };
             }
             var bmap = bmapModel.__bmap;
 

package/index.blank.js

@@ -0,0 +1,4 @@
+/**
+ * Export echarts as CommonJS module
+ */
+module.exports = require('./lib/echarts');

package/index.common.js

@@ -10,7 +10,7 @@ require('./lib/chart/scatter');
 require('./lib/component/graphic');
 require('./lib/component/tooltip');
 require('./lib/component/axisPointer');
-require('./lib/component/legend');
+require('./lib/component/legendScroll');
 
 require('./lib/component/grid');
 require('./lib/component/title');

package/index.js

@@ -28,7 +28,7 @@ require('./lib/chart/custom');
 
 require('./lib/component/graphic');
 require('./lib/component/grid');
-require('./lib/component/legend');
+require('./lib/component/legendScroll');
 require('./lib/component/tooltip');
 require('./lib/component/axisPointer');
 require('./lib/component/polar');

package/lib/action/createDataSelectAction.js

@@ -15,13 +15,17 @@
                     {mainType: 'series', subType: seriesType, query: payload},
                     function (seriesModel) {
                         if (seriesModel[actionInfo.method]) {
-                            seriesModel[actionInfo.method](payload.name);
+                            seriesModel[actionInfo.method](
+                                payload.name,
+                                payload.dataIndex
+                            );
                         }
                         var data = seriesModel.getData();
                         // Create selected map
                         data.each(function (idx) {
                             var name = data.getName(idx);
-                            selected[name] = seriesModel.isSelected(name) || false;
+                            selected[name] = seriesModel.isSelected(name)
+                                || false;
                         });
                     }
                 );

package/lib/chart/bar/BarView.js

@@ -180,7 +180,7 @@
 
     function removeRect(dataIndex, animationModel, el) {
         // Not show text when animating
-        el.style.text = '';
+        el.style.text = null;
         graphic.updateProps(el, {
             shape: {
                 width: 0
@@ -192,7 +192,7 @@
 
     function removeSector(dataIndex, animationModel, el) {
         // Not show text when animating
-        el.style.text = '';
+        el.style.text = null;
         graphic.updateProps(el, {
             shape: {
                 r: el.shape.r0
@@ -239,7 +239,7 @@
         var itemStyleModel = itemModel.getModel('itemStyle.normal');
         var hoverStyle = itemModel.getModel('itemStyle.emphasis').getBarItemStyle();
 
-        if (!isPolar && isHorizontal) {
+        if (!isPolar) {
             el.setShape('r', itemStyleModel.get('barBorderRadius') || 0);
         }
 
@@ -251,6 +251,9 @@
             itemStyleModel.getBarItemStyle()
         ));
 
+        var cursorStyle = itemModel.getShallow('cursor');
+        cursorStyle && el.attr('cursor', cursorStyle);
+
         var labelPositionOutside = isHorizontal
             ? (layout.height > 0 ? 'bottom' : 'top')
             : (layout.width > 0 ? 'left' : 'right');

package/lib/chart/bar/BaseBarSeries.js

@@ -42,6 +42,7 @@
             barMinHeight: 0,
             // 最小角度为0，仅对极坐标系下的柱状图有效
             barMinAngle: 0,
+            // cursor: null,
 
             // barMaxWidth: null,
             // 默认自适应
@@ -56,10 +57,10 @@
             //     }
             // },
             itemStyle: {
-                normal: {
+                // normal: {
                     // color: '各异'
-                },
-                emphasis: {}
+                // },
+                // emphasis: {}
             }
         }
     });

package/lib/chart/bar/PictorialBarSeries.js

@@ -22,7 +22,7 @@
             symbolRepeatDirection: 'end', // 'end' means from 'start' to 'end'.
 
             symbolClip: false,
-            symbolBoundingData: null,
+            symbolBoundingData: null, // Can be 60 or -40 or [-40, 60]
             symbolPatternSize: 400, // 400 * 400 px
 
             barGap: '-100%',      // In most case, overlap is needed.

package/lib/chart/bar/PictorialBarView.js

@@ -183,12 +183,28 @@
         var symbolBoundingData = itemModel.get('symbolBoundingData');
         var valueAxis = opt.coordSys.getOtherAxis(opt.coordSys.getBaseAxis());
         var zeroPx = valueAxis.toGlobalCoord(valueAxis.dataToCoord(0));
+        var pxSignIdx = 1 - +(layout[valueDim.wh] <= 0);
+        var boundingLength;
 
-        var boundingLength = output.boundingLength = symbolBoundingData != null
-            ? valueAxis.toGlobalCoord(valueAxis.dataToCoord(valueAxis.scale.parse(symbolBoundingData))) - zeroPx
-            : symbolRepeat
-            ? opt.coordSysExtent[valueDim.index][1 - +(layout[valueDim.wh] <= 0)] - zeroPx
-            : layout[valueDim.wh];
+        if (zrUtil.isArray(symbolBoundingData)) {
+            var symbolBoundingExtent = [
+                convertToCoordOnAxis(valueAxis, symbolBoundingData[0]) - zeroPx,
+                convertToCoordOnAxis(valueAxis, symbolBoundingData[1]) - zeroPx
+            ];
+            symbolBoundingExtent[1] < symbolBoundingExtent[0] && (symbolBoundingExtent.reverse());
+            boundingLength = symbolBoundingExtent[pxSignIdx];
+        }
+        else if (symbolBoundingData != null) {
+            boundingLength = convertToCoordOnAxis(valueAxis, symbolBoundingData) - zeroPx;
+        }
+        else if (symbolRepeat) {
+            boundingLength = opt.coordSysExtent[valueDim.index][pxSignIdx] - zeroPx;
+        }
+        else {
+            boundingLength = layout[valueDim.wh];
+        }
+
+        output.boundingLength = boundingLength;
 
         if (symbolRepeat) {
             output.repeatCutLength = layout[valueDim.wh];
@@ -197,6 +213,10 @@
         output.pxSign = boundingLength > 0 ? 1 : boundingLength < 0 ? -1 : 0;
     }
 
+    function convertToCoordOnAxis(axis, value) {
+        return axis.toGlobalCoord(axis.dataToCoord(axis.scale.parse(value)));
+    }
+
     // Support ['100%', '100%']
     function prepareSymbolSize(
         data, dataIndex, layout, symbolRepeat, symbolClip, boundingLength,
@@ -405,7 +425,7 @@
             path.__pictorialRepeatTimes = repeatTimes;
             bundle.add(path);
 
-            var target = makeTarget(index, true);
+            var target = makeTarget(index);
 
             updateAttr(
                 path,
@@ -654,7 +674,7 @@
     function removeBar(data, dataIndex, animationModel, bar) {
         // Not show text when animating
         var labelRect = bar.__pictorialBarRect;
-        labelRect && (labelRect.style.text = '');
+        labelRect && (labelRect.style.text = null);
 
         var pathes = [];
         eachPath(bar, function (path) {
@@ -713,6 +733,7 @@
         // Because symbol provide setColor individually to set fill and stroke
         var normalStyle = itemModel.getModel('itemStyle.normal').getItemStyle(['color']);
         var hoverStyle = itemModel.getModel('itemStyle.emphasis').getItemStyle();
+        var cursorStyle = itemModel.getShallow('cursor');
 
         eachPath(bar, function (path) {
             // PENDING setColor should be before setStyle!!!
@@ -726,6 +747,7 @@
             ));
             graphic.setHoverStyle(path, hoverStyle);
 
+            cursorStyle && (path.cursor = cursorStyle);
             path.z2 = symbolMeta.z2;
         });
 

package/lib/chart/bar/helper.js

@@ -1,6 +1,5 @@
 
 
-    var zrUtil = require('zrender/lib/core/util');
     var graphic = require('../../util/graphic');
 
     var helper = {};
@@ -11,38 +10,22 @@
         var labelModel = itemModel.getModel('label.normal');
         var hoverLabelModel = itemModel.getModel('label.emphasis');
 
-        if (labelModel.get('show')) {
-            setLabel(
-                normalStyle, labelModel, color,
-                zrUtil.retrieve(
-                    seriesModel.getFormattedLabel(dataIndex, 'normal'),
-                    seriesModel.getRawValue(dataIndex)
-                ),
-                labelPositionOutside
-            );
-        }
-        else {
-            normalStyle.text = '';
-        }
-
-        if (hoverLabelModel.get('show')) {
-            setLabel(
-                hoverStyle, hoverLabelModel, color,
-                zrUtil.retrieve(
-                    seriesModel.getFormattedLabel(dataIndex, 'emphasis'),
-                    seriesModel.getRawValue(dataIndex)
-                ),
-                labelPositionOutside
-            );
-        }
-        else {
-            hoverStyle.text = '';
-        }
+        graphic.setLabelStyle(
+            normalStyle, hoverStyle, labelModel, hoverLabelModel,
+            {
+                labelFetcher: seriesModel,
+                labelDataIndex: dataIndex,
+                defaultText: seriesModel.getRawValue(dataIndex),
+                isRectText: true,
+                autoColor: color
+            }
+        );
+
+        fixPosition(normalStyle);
+        fixPosition(hoverStyle);
     };
 
-    function setLabel(style, model, color, labelText, labelPositionOutside) {
-        graphic.setText(style, model, color);
-        style.text = labelText;
+    function fixPosition(style, labelPositionOutside) {
         if (style.textPosition === 'outside') {
             style.textPosition = labelPositionOutside;
         }

package/lib/chart/candlestick/candlestickLayout.js

@@ -3,6 +3,7 @@
     var zrUtil = require('zrender/lib/core/util');
     var retrieve = require('zrender/lib/core/util').retrieve;
     var parsePercent = require('../../util/number').parsePercent;
+    var graphic = require('../../util/graphic');
 
     module.exports = function (ecModel) {
 
@@ -33,6 +34,8 @@
                 return;
             }
 
+            var dataIndex = 0;
+
             data.each([cDim].concat(vDims), function () {
                 var args = arguments;
                 var axisDimVal = args[0];
@@ -52,17 +55,44 @@
                 var highestPoint = getPoint(highestVal);
 
                 var whiskerEnds = [
-                    [highestPoint, ocHighPoint],
-                    [lowestPoint, ocLowPoint]
+                    [
+                        subPixelOptimizePoint(highestPoint),
+                        subPixelOptimizePoint(ocHighPoint)
+                    ],
+                    [
+                        subPixelOptimizePoint(lowestPoint),
+                        subPixelOptimizePoint(ocLowPoint)
+                    ]
                 ];
 
                 var bodyEnds = [];
                 addBodyEnd(ocHighPoint, 0);
                 addBodyEnd(ocLowPoint, 1);
 
+                var sign;
+                if (openVal > closeVal) {
+                    sign = -1;
+                }
+                else if (openVal < closeVal) {
+                    sign = 1;
+                }
+                else {
+                    // If close === open, compare with close of last record
+                    if (dataIndex > 0) {
+                        sign = data.getItemModel(dataIndex - 1).get()[2]
+                            <= closeVal
+                                ? 1
+                                : -1;
+                    }
+                    else {
+                        // No record of previous, set to be positive
+                        sign = 1;
+                    }
+                }
+
                 data.setItemLayout(idx, {
                     chartLayout: chartLayout,
-                    sign: openVal > closeVal ? -1 : openVal < closeVal ? 1 : 0,
+                    sign: sign,
                     initBaseline: openVal > closeVal
                         ? ocHighPoint[constDim] : ocLowPoint[constDim], // open point.
                     bodyEnds: bodyEnds,
@@ -70,6 +100,8 @@
                     brushRect: makeBrushRect()
                 });
 
+                ++dataIndex;
+
                 function getPoint(val) {
                     var p = [];
                     p[variableDim] = axisDimVal;
@@ -82,8 +114,14 @@
                 function addBodyEnd(point, start) {
                     var point1 = point.slice();
                     var point2 = point.slice();
-                    point1[variableDim] += candleWidth / 2;
-                    point2[variableDim] -= candleWidth / 2;
+
+                    point1[variableDim] = graphic.subPixelOptimize(
+                        point1[variableDim] + candleWidth / 2, 1, false
+                    );
+                    point2[variableDim] = graphic.subPixelOptimize(
+                        point2[variableDim] - candleWidth / 2, 1, true
+                    );
+
                     start
                         ? bodyEnds.push(point1, point2)
                         : bodyEnds.push(point2, point1);
@@ -104,6 +142,11 @@
                     };
                 }
 
+                function subPixelOptimizePoint(point) {
+                    point[variableDim] = graphic.subPixelOptimize(point[variableDim], 1);
+                    return point;
+                }
+
             }, true);
         });
     };
@@ -132,5 +175,5 @@
             ? parsePercent(barWidth, bandWidth)
             // Put max outer to ensure bar visible in spite of overlap.
             : Math.max(Math.min(bandWidth / 2, barMaxWidth), barMinWidth);
-    }
+        }