提交 d8e82cd1 编写于 作者: P pah100

Fix #6252 (dimensions does not work in bar)

上级 9c94ea9b
...@@ -55,20 +55,6 @@ define(function(require) { ...@@ -55,20 +55,6 @@ define(function(require) {
&& this.getAxis('y').containData(data[1]); && this.getAxis('y').containData(data[1]);
}, },
/**
* Convert series data to an array of points
* @param {module:echarts/data/List} data
* @param {boolean} stack
* @return {Array}
* Return array of points. For example:
* `[[10, 10], [20, 20], [30, 30]]`
*/
dataToPoints: function (data, stack) {
return data.mapArray(['x', 'y'], function (x, y) {
return this.dataToPoint([x, y]);
}, stack, this);
},
/** /**
* @param {Array.<number>} data * @param {Array.<number>} data
* @param {boolean} [clamp=false] * @param {boolean} [clamp=false]
......
...@@ -192,23 +192,6 @@ define(function (require) { ...@@ -192,23 +192,6 @@ define(function (require) {
return (this._rect = rect || new BoundingRect(0, 0, 0, 0)); return (this._rect = rect || new BoundingRect(0, 0, 0, 0));
}, },
/**
* Convert series data to a list of points
* @param {module:echarts/data/List} data
* @param {boolean} stack
* @return {Array}
* Return list of points. For example:
* `[[10, 10], [20, 20], [30, 30]]`
*/
dataToPoints: function (data) {
var item = [];
return data.mapArray(['lng', 'lat'], function (lon, lat) {
item[0] = lon;
item[1] = lat;
return this.dataToPoint(item);
}, this);
},
/** /**
* @param {string|Array.<number>} data * @param {string|Array.<number>} data
* @return {Array.<number>} * @return {Array.<number>}
......
...@@ -164,19 +164,6 @@ define(function(require) { ...@@ -164,19 +164,6 @@ define(function(require) {
}; };
}, },
/**
* Convert series data to a list of (x, y) points
* @param {module:echarts/data/List} data
* @return {Array}
* Return list of coordinates. For example:
* `[[10, 10], [20, 20], [30, 30]]`
*/
dataToPoints: function (data) {
return data.mapArray(this.dimensions, function (radius, angle) {
return this.dataToPoint([radius, angle]);
}, true, this);
},
/** /**
* Convert a single data item to (x, y) point. * Convert a single data item to (x, y) point.
* Parameter data is an array which the first element is radius and the second is angle * Parameter data is an array which the first element is radius and the second is angle
......
...@@ -244,7 +244,14 @@ define(function(require) { ...@@ -244,7 +244,14 @@ define(function(require) {
? valueAxis.toGlobalCoord(valueAxis.dataToCoord(0)) ? valueAxis.toGlobalCoord(valueAxis.dataToCoord(0))
: valueAxis.getGlobalExtent()[0]; : valueAxis.getGlobalExtent()[0];
var coords = cartesian.dataToPoints(data, true); var coordDims = [
seriesModel.coordDimToDataDim('x')[0],
seriesModel.coordDimToDataDim('y')[0]
];
var coords = data.mapArray(coordDims, function (x, y) {
return cartesian.dataToPoint([x, y]);
}, true);
lastStackCoords[stackId] = lastStackCoords[stackId] || []; lastStackCoords[stackId] = lastStackCoords[stackId] || [];
lastStackCoordsOrigin[stackId] = lastStackCoordsOrigin[stackId] || []; // Fix #4243 lastStackCoordsOrigin[stackId] = lastStackCoordsOrigin[stackId] || []; // Fix #4243
...@@ -253,7 +260,7 @@ define(function(require) { ...@@ -253,7 +260,7 @@ define(function(require) {
size: columnWidth size: columnWidth
}); });
data.each(valueAxis.dim, function (value, idx) { data.each(seriesModel.coordDimToDataDim(valueAxis.dim)[0], function (value, idx) {
if (isNaN(value)) { if (isNaN(value)) {
return; return;
} }
......
...@@ -67,11 +67,18 @@ define(function (require) { ...@@ -67,11 +67,18 @@ define(function (require) {
var valueMax = valueAxis.model.get('max'); var valueMax = valueAxis.model.get('max');
var valueMin = valueAxis.model.get('min'); var valueMin = valueAxis.model.get('min');
var coords = polar.dataToPoints(data); var coordDims = [
seriesModel.coordDimToDataDim('radius')[0],
seriesModel.coordDimToDataDim('angle')[0]
];
var coords = data.mapArray(coordDims, function (radius, angle) {
return polar.dataToPoint([radius, angle]);
}, true);
lastStackCoords[stackId] = lastStackCoords[stackId] || []; lastStackCoords[stackId] = lastStackCoords[stackId] || [];
lastStackCoordsOrigin[stackId] = lastStackCoordsOrigin[stackId] || []; // Fix #4243 lastStackCoordsOrigin[stackId] = lastStackCoordsOrigin[stackId] || []; // Fix #4243
data.each(valueAxis.dim, function (value, idx) { data.each(seriesModel.coordDimToDataDim(valueAxis.dim)[0], function (value, idx) {
if (isNaN(value)) { if (isNaN(value)) {
return; return;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册