hot fix

ecomfe · Dec 22, 2015 · 7eeb706 · 7eeb706
1 parent 292540b
commit 7eeb706
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/echarts-dev-3/chart/helper/createListFromArray.js b/src/echarts-dev-3/chart/helper/createListFromArray.js
@@ -44,14 +44,21 @@ define(function(require) {
             ? function (itemOpt, dimName, dataIndex, dimIndex) {
                 // Use dataIndex as ordinal value in categoryAxis
                 return dimIndex === categoryDimIndex ?
-                    dataIndex : +getItemValue(itemOpt);
+                    dataIndex : convertValue(dimIndex, getItemValue(itemOpt));
             }
             : function (itemOpt, dimName, dataIndex, dimIndex) {
                 var val = getItemValue(itemOpt);
-                return val && +val[dimIndex];
+                return convertValue(dimIndex, val && val[dimIndex]);
             };
         list.initData(data, nameList, dimValueGetter);
 
+        function convertValue(dimIndex, val) {
+            var dim = dimensions[dimIndex];
+            if (dim && dim.type !== 'ordinal') {
+                val = +val;
+            }
+            return val;
+        }
         return list;
     }
 

diff --git a/src/zrender-dev-3/Handler.js b/src/zrender-dev-3/Handler.js
@@ -187,7 +187,7 @@ define(function (require) {
             event = normalizeEvent(this.root, event);
 
             // Find hover again to avoid click event is dispatched manually. Or click is triggered without mouseover
-            var hovered = this._hovered || this._findHover(event.zrX, event.zrY, null);
+            var hovered = this._findHover(event.zrX, event.zrY, null);
             this._dispatchProxy(hovered, name, event);
         };
     });

diff --git a/src/zrender-dev-3/core/util.js b/src/zrender-dev-3/core/util.js
@@ -429,6 +429,17 @@ define(function(require) {
         }
     }
 
+    /**
+     * @memberOf module:zrender/tool/util
+     * @param {Array} arr
+     * @param {number} startIndex
+     * @param {number} endIndex
+     * @return {Array}
+     */
+    function slice() {
+        return Function.call.apply(nativeSlice, arguments);
+    }
+
     var util = {
         inherits: inherits,
         mixin: mixin,
@@ -440,6 +451,7 @@ define(function(require) {
         getContext: getContext,
         createCanvas: createCanvas,
         indexOf: indexOf,
+        slice: slice,
         find: find,
         isArrayLike: isArrayLike,
         each: each,