提交 793946d6 编写于 作者: S sushuang

Fix themeRiver about dimensions.

上级 b685ee67
......@@ -139,9 +139,10 @@ var ThemeRiverSeries = SeriesModel.extend({
}
var dimensionsInfo = createDimensions(data, {
sysDimensions: [
sysDimensions: ['single'],
dimensionsDefine: [
{
name: 'single',
name: 'time',
type: getDimensionTypeByAxis(axisType)
},
{
......@@ -156,7 +157,7 @@ var ThemeRiverSeries = SeriesModel.extend({
encodeDefine: {
single: 0,
value: 1,
name: 2
itemName: 2
}
});
......@@ -194,12 +195,14 @@ var ThemeRiverSeries = SeriesModel.extend({
};
});
var timeDim = data.mapDimension('single');
for (var j = 0; j < layerSeries.length; ++j) {
layerSeries[j].indices.sort(comparer);
}
function comparer(index1, index2) {
return data.get('time', index1) - data.get('time', index2);
return data.get(timeDim, index1) - data.get(timeDim, index2);
}
return layerSeries;
......
......@@ -60,7 +60,7 @@ function themeRiverLayout(data, seriesModel, height) {
var layerSeries = seriesModel.getLayerSeries();
// the points in each layer.
var timeDim = data.mapDimension('time');
var timeDim = data.mapDimension('single');
var valueDim = data.mapDimension('value');
var layerPoints = zrUtil.map(layerSeries, function (singleLayer) {
return zrUtil.map(singleLayer.indices, function (idx) {
......
......@@ -11,13 +11,15 @@ import completeDimensions from './completeDimensions';
* @param {number} [opt.dimensionsCount]
* @param {string} [opt.extraPrefix]
* @param {boolean} [opt.extraFromZero]
* @param {Array.<string|Object>} [opt.dimensionsDefine=source.dimensionsDefine] Overwrite source define.
* @param {Object|HashMap} [opt.encodeDefine=source.encodeDefine] Overwrite source define.
* @return {Array.<Object>} dimensionsInfo
*/
export default function (source, opt) {
opt = opt || {};
return completeDimensions(opt.sysDimensions || [], source, {
dimsDef: source.dimensionsDefine,
encodeDef: source.encodeDefine,
dimsDef: opt.dimensionsDefine || source.dimensionsDefine,
encodeDef: opt.encodeDefine || source.encodeDefine,
dimCount: opt.dimensionsCount,
extraPrefix: opt.extraPrefix,
extraFromZero: opt.extraFromZero
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册