提交 e336b7e5 编写于 作者: L lang

Marker on pie. Fix #2827

上级 06ed9a7b
...@@ -147,7 +147,6 @@ define(function (require) { ...@@ -147,7 +147,6 @@ define(function (require) {
this.group.add(lineDraw.group); this.group.add(lineDraw.group);
var mlData = createList(coordSys, seriesModel, mlModel); var mlData = createList(coordSys, seriesModel, mlModel);
var dims = coordSys.dimensions;
var fromData = mlData.from; var fromData = mlData.from;
var toData = mlData.to; var toData = mlData.to;
...@@ -218,6 +217,7 @@ define(function (require) { ...@@ -218,6 +217,7 @@ define(function (require) {
); );
} }
else { else {
var dims = coordSys.dimensions;
var x = data.get(dims[0], idx); var x = data.get(dims[0], idx);
var y = data.get(dims[1], idx); var y = data.get(dims[1], idx);
point = coordSys.dataToPoint([x, y]); point = coordSys.dataToPoint([x, y]);
...@@ -259,40 +259,50 @@ define(function (require) { ...@@ -259,40 +259,50 @@ define(function (require) {
*/ */
function createList(coordSys, seriesModel, mlModel) { function createList(coordSys, seriesModel, mlModel) {
var coordDimsInfos = zrUtil.map(coordSys.dimensions, function (coordDim) { var coordDimsInfos;
var info = seriesModel.getData().getDimensionInfo( if (coordSys) {
seriesModel.coordDimToDataDim(coordDim)[0] coordDimsInfos = zrUtil.map(coordSys && coordSys.dimensions, function (coordDim) {
); var info = seriesModel.getData().getDimensionInfo(
info.name = coordDim; seriesModel.coordDimToDataDim(coordDim)[0]
return info; );
}); info.name = coordDim;
return info;
});
}
else {
coordDimsInfos =[{
name: 'value',
type: 'float'
}];
}
var fromData = new List(coordDimsInfos, mlModel); var fromData = new List(coordDimsInfos, mlModel);
var toData = new List(coordDimsInfos, mlModel); var toData = new List(coordDimsInfos, mlModel);
// No dimensions // No dimensions
var lineData = new List([], mlModel); var lineData = new List([], mlModel);
var optData = zrUtil.map(mlModel.get('data'), zrUtil.curry(
markLineTransform, seriesModel, coordSys, mlModel
));
if (coordSys) { if (coordSys) {
var optData = zrUtil.filter( optData = zrUtil.filter(
zrUtil.map(mlModel.get('data'), zrUtil.curry( optData, zrUtil.curry(markLineFilter, coordSys)
markLineTransform, seriesModel, coordSys, mlModel
)),
zrUtil.curry(markLineFilter, coordSys)
);
fromData.initData(
zrUtil.map(optData, function (item) { return item[0]; }),
null,
markerHelper.dimValueGetter
);
toData.initData(
zrUtil.map(optData, function (item) { return item[1]; }),
null,
markerHelper.dimValueGetter
); );
lineData.initData(
zrUtil.map(optData, function (item) { return item[2]; })
);
} }
var dimValueGetter = coordSys ? markerHelper.dimValueGetter : function (item) {
return item.value;
};
fromData.initData(
zrUtil.map(optData, function (item) { return item[0]; }),
null, dimValueGetter
);
toData.initData(
zrUtil.map(optData, function (item) { return item[1]; }),
null, dimValueGetter
);
lineData.initData(
zrUtil.map(optData, function (item) { return item[2]; })
);
return { return {
from: fromData, from: fromData,
to: toData, to: toData,
......
...@@ -149,29 +149,38 @@ define(function (require) { ...@@ -149,29 +149,38 @@ define(function (require) {
* @param {module:echarts/model/Model} mpModel * @param {module:echarts/model/Model} mpModel
*/ */
function createList(coordSys, seriesModel, mpModel) { function createList(coordSys, seriesModel, mpModel) {
var coordDimsInfos = zrUtil.map(coordSys.dimensions, function (coordDim) { var coordDimsInfos;
var info = seriesModel.getData().getDimensionInfo( if (coordSys) {
seriesModel.coordDimToDataDim(coordDim)[0] coordDimsInfos = zrUtil.map(coordSys && coordSys.dimensions, function (coordDim) {
); var info = seriesModel.getData().getDimensionInfo(
info.name = coordDim; seriesModel.coordDimToDataDim(coordDim)[0]
return info; );
}); info.name = coordDim;
return info;
});
}
else {
coordDimsInfos =[{
name: 'value',
type: 'float'
}];
}
var mpData = new List(coordDimsInfos, mpModel); var mpData = new List(coordDimsInfos, mpModel);
var dataOpt = zrUtil.map(mpModel.get('data'), zrUtil.curry(
markerHelper.dataTransform, seriesModel
));
if (coordSys) { if (coordSys) {
mpData.initData( dataOpt = zrUtil.filter(
zrUtil.filter( dataOpt, zrUtil.curry(markerHelper.dataFilter, coordSys)
zrUtil.map(mpModel.get('data'), zrUtil.curry(
markerHelper.dataTransform, seriesModel
)),
zrUtil.curry(markerHelper.dataFilter, coordSys)
),
null,
markerHelper.dimValueGetter
); );
} }
mpData.initData(dataOpt, null,
coordSys ? markerHelper.dimValueGetter : function (item) {
return item.value;
}
);
return mpData; return mpData;
} }
......
...@@ -154,7 +154,7 @@ define(function (require) { ...@@ -154,7 +154,7 @@ define(function (require) {
return item.coord && item.coord[dimIndex]; return item.coord && item.coord[dimIndex];
} }
else { else {
item.value; return item.value;
} }
}; };
......
...@@ -748,8 +748,6 @@ define(function (require) { ...@@ -748,8 +748,6 @@ define(function (require) {
// Components that use _seriesIndices should depends on series component, // Components that use _seriesIndices should depends on series component,
// which make sure that their initialization is after series. // which make sure that their initialization is after series.
if (!ecModel._seriesIndices) { if (!ecModel._seriesIndices) {
// FIXME
// 验证和提示怎么写
throw new Error('Series has not been initialized yet.'); throw new Error('Series has not been initialized yet.');
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册