提交 b10a83e3 编写于 作者: L lang

Marker can't use in box plot fix

上级 08891f04
...@@ -63,9 +63,9 @@ define(function (require) { ...@@ -63,9 +63,9 @@ define(function (require) {
return item; return item;
}; };
function markLineFilter(coordSys, dimensionInverse, item) { function markLineFilter(coordSys, item) {
return markerHelper.dataFilter(coordSys, dimensionInverse, item[0]) return markerHelper.dataFilter(coordSys, item[0])
&& markerHelper.dataFilter(coordSys, dimensionInverse, item[1]); && markerHelper.dataFilter(coordSys, item[1]);
} }
var markLineFormatMixin = { var markLineFormatMixin = {
...@@ -241,22 +241,12 @@ define(function (require) { ...@@ -241,22 +241,12 @@ define(function (require) {
if (coordSys) { if (coordSys) {
var baseAxis = coordSys.getBaseAxis(); var baseAxis = coordSys.getBaseAxis();
var valueAxis = coordSys.getOtherAxis(baseAxis); 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( var optData = zrUtil.filter(
zrUtil.map(mlModel.get('data'), zrUtil.curry( zrUtil.map(mlModel.get('data'), zrUtil.curry(
markLineTransform, seriesData, coordSys, baseAxis, valueAxis markLineTransform, seriesData, coordSys, baseAxis, valueAxis
)), )),
zrUtil.curry( zrUtil.curry(markLineFilter, coordSys)
markLineFilter, coordSys, coordDataIdx
)
); );
fromData.initData( fromData.initData(
zrUtil.map(optData, function (item) { return item[0]; }) zrUtil.map(optData, function (item) { return item[0]; })
......
...@@ -145,23 +145,12 @@ define(function (require) { ...@@ -145,23 +145,12 @@ define(function (require) {
), mpModel); ), mpModel);
if (coordSys) { if (coordSys) {
var coordDimensions = coordSys.dimensions;
var indexOf = zrUtil.indexOf;
// FIXME 公用?
var coordDataIdx = [
indexOf(dataDimensions, coordDimensions[0]),
indexOf(dataDimensions, coordDimensions[1])
];
mpData.initData( mpData.initData(
zrUtil.filter( zrUtil.filter(
zrUtil.map(mpModel.get('data'), zrUtil.curry( zrUtil.map(mpModel.get('data'), zrUtil.curry(
markerHelper.dataTransform, seriesData, coordSys markerHelper.dataTransform, seriesData, coordSys
)), )),
zrUtil.curry( zrUtil.curry(markerHelper.dataFilter, coordSys)
markerHelper.dataFilter, coordSys, coordDataIdx
)
) )
); );
} }
......
...@@ -130,15 +130,12 @@ define(function (require) { ...@@ -130,15 +130,12 @@ define(function (require) {
* Filter data which is out of coordinateSystem range * Filter data which is out of coordinateSystem range
* [dataFilter description] * [dataFilter description]
* @param {module:echarts/coord/*} [coordSys] * @param {module:echarts/coord/*} [coordSys]
* @param {Array.<number>} coordDataIdx
* @param {Object} item * @param {Object} item
* @return {boolean} * @return {boolean}
*/ */
var dataFilter = function (coordSys, coordDataIdx, item) { var dataFilter = function (coordSys, item) {
var value = item.value;
value = [value[coordDataIdx[0]], value[coordDataIdx[1]]];
// Alwalys return true if there is no coordSys // Alwalys return true if there is no coordSys
return coordSys ? coordSys.containData(value) : true; return coordSys ? coordSys.containData(item.value) : true;
}; };
return { return {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册