From b10a83e3c453320d41caefe76b50891b25786a20 Mon Sep 17 00:00:00 2001
From: lang <bm2736892@gmail.com>
Date: Mon, 14 Dec 2015 19:14:18 +0800
Subject: [PATCH] Marker can't use in box plot fix

---
 src/component/marker/MarkLineView.js  | 18 ++++--------------
 src/component/marker/MarkPointView.js | 13 +------------
 src/component/marker/markerHelper.js  |  7 ++-----
 3 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/src/component/marker/MarkLineView.js b/src/component/marker/MarkLineView.js
index b60ae8214..f8b4a452d 100644
--- a/src/component/marker/MarkLineView.js
+++ b/src/component/marker/MarkLineView.js
@@ -63,9 +63,9 @@ define(function (require) {
         return item;
     };
 
-    function markLineFilter(coordSys, dimensionInverse, item) {
-        return markerHelper.dataFilter(coordSys, dimensionInverse, item[0])
-            && markerHelper.dataFilter(coordSys, dimensionInverse, item[1]);
+    function markLineFilter(coordSys, item) {
+        return markerHelper.dataFilter(coordSys, item[0])
+            && markerHelper.dataFilter(coordSys, item[1]);
     }
 
     var markLineFormatMixin = {
@@ -241,22 +241,12 @@ define(function (require) {
         if (coordSys) {
             var baseAxis = coordSys.getBaseAxis();
             var valueAxis = coordSys.getOtherAxis(baseAxis);
-            var coordDimensions = coordSys.dimensions;
-
-            var indexOf = zrUtil.indexOf;
-            // FIXME 公用？
-            var coordDataIdx = [
-                indexOf(dataDimensions, coordDimensions[0]),
-                indexOf(dataDimensions, coordDimensions[1])
-            ];
 
             var optData = zrUtil.filter(
                 zrUtil.map(mlModel.get('data'), zrUtil.curry(
                     markLineTransform, seriesData, coordSys, baseAxis, valueAxis
                 )),
-                zrUtil.curry(
-                    markLineFilter, coordSys, coordDataIdx
-                )
+                zrUtil.curry(markLineFilter, coordSys)
             );
             fromData.initData(
                 zrUtil.map(optData, function (item) { return item[0]; })
diff --git a/src/component/marker/MarkPointView.js b/src/component/marker/MarkPointView.js
index a68b99e05..a5d1eedac 100644
--- a/src/component/marker/MarkPointView.js
+++ b/src/component/marker/MarkPointView.js
@@ -145,23 +145,12 @@ define(function (require) {
         ), mpModel);
 
         if (coordSys) {
-            var coordDimensions = coordSys.dimensions;
-
-            var indexOf = zrUtil.indexOf;
-            // FIXME 公用？
-            var coordDataIdx = [
-                indexOf(dataDimensions, coordDimensions[0]),
-                indexOf(dataDimensions, coordDimensions[1])
-            ];
-
             mpData.initData(
                 zrUtil.filter(
                     zrUtil.map(mpModel.get('data'), zrUtil.curry(
                         markerHelper.dataTransform, seriesData, coordSys
                     )),
-                    zrUtil.curry(
-                        markerHelper.dataFilter, coordSys, coordDataIdx
-                    )
+                    zrUtil.curry(markerHelper.dataFilter, coordSys)
                 )
             );
         }
diff --git a/src/component/marker/markerHelper.js b/src/component/marker/markerHelper.js
index ce33e4fad..27da9271d 100644
--- a/src/component/marker/markerHelper.js
+++ b/src/component/marker/markerHelper.js
@@ -130,15 +130,12 @@ define(function (require) {
      * Filter data which is out of coordinateSystem range
      * [dataFilter description]
      * @param  {module:echarts/coord/*} [coordSys]
-     * @param  {Array.<number>} coordDataIdx
      * @param  {Object} item
      * @return {boolean}
      */
-    var dataFilter = function (coordSys, coordDataIdx, item) {
-        var value = item.value;
-        value = [value[coordDataIdx[0]], value[coordDataIdx[1]]];
+    var dataFilter = function (coordSys, item) {
         // Alwalys return true if there is no coordSys
-        return coordSys ? coordSys.containData(value) : true;
+        return coordSys ? coordSys.containData(item.value) : true;
     };
 
     return {
-- 
GitLab