代码优化

src/component/roamController.js

@@ -16,6 +16,7 @@ define(function (require) {
     var ecConfig = require('../config');
     var zrUtil = require('zrender/tool/util');
     var zrColor = require('zrender/tool/color');
+    var zrEvent = require('zrender/tool/event');
 
     /**
      * 构造函数
@@ -43,8 +44,8 @@ define(function (require) {
         this._drictionMouseUp = function(params) {
             return self.__drictionMouseUp(params);
         };
-        this._drictionMouseOver = function(params) {
-            return self.__drictionMouseOver(params);
+        this._drictionMouseMove = function(params) {
+            return self.__drictionMouseMove(params);
         };
         this._drictionMouseOut = function(params) {
             return self.__drictionMouseOut(params);
@@ -126,7 +127,7 @@ define(function (require) {
             sectorShape._roamType = direction;
             sectorShape.onmousedown = this._drictionMouseDown;
             sectorShape.onmouseup = this._drictionMouseUp;
-            sectorShape.onmouseover = this._drictionMouseOver;
+            sectorShape.onmousemove = this._drictionMouseMove;
             sectorShape.onmouseout = this._drictionMouseOut;
             
             return sectorShape;
@@ -167,7 +168,7 @@ define(function (require) {
             
             scaleShape = new CircleShape(scaleShape);
             scaleShape._roamType = text;
-            scaleShape.onclick = this._scaleHandler;
+            scaleShape.onmousedown = this._scaleHandler;
             
             return scaleShape;
         },
@@ -263,7 +264,7 @@ define(function (require) {
             this._drictionHandlerOff(params);
         },
         
-        __drictionMouseOver: function(params) {
+        __drictionMouseMove: function(params) {
             if (this.mousedown) {
                 this._drictionHandlerOn(params);
             }
@@ -301,6 +302,7 @@ define(function (require) {
                 },
                 this.myChart
             );
+            zrEvent.stop(event);
         },
         /**
          * 刷新

src/echarts.js

@@ -27,9 +27,9 @@ define(function (require) {
     var _instances = {};    // ECharts实例map索引
     var DOM_ATTRIBUTE_KEY = '_echarts_instance_';
     
-    self.version = '2.0.2';
+    self.version = '2.0.3';
     self.dependencies = {
-        zrender : '2.0.2'
+        zrender : '2.0.3'
     };
     /**
      * 入口方法 
@@ -238,7 +238,7 @@ define(function (require) {
             componentLibrary.define('tooltip', require('./component/tooltip'));
             componentLibrary.define('legend', require('./component/legend'));
             
-            if (_zr.getWidth() == 0 || _zr.getHeight() == 0) {
+            if (_zr.getWidth() === 0 || _zr.getHeight() === 0) {
                 console.error('Dom’s width & height should be ready before init.');
             }
         },
@@ -597,7 +597,7 @@ define(function (require) {
                             : dataIndex;
                 return {
                     seriesIndex : seriesIndex,
-                    seriesName : ecData.get(target, 'series').name,
+                    seriesName : (ecData.get(target, 'series') || {}).name,
                     dataIndex : dataIndex,
                     data : ecData.get(target, 'data'),
                     name : ecData.get(target, 'name'),