提交 c111e8b7 编写于 作者: L lang

List data name using category

上级 0b63ce41
...@@ -380,6 +380,7 @@ define(function(require) { ...@@ -380,6 +380,7 @@ define(function(require) {
var independentVar; var independentVar;
var dependentVar; var dependentVar;
var categoryAxisModel;
// FIXME // FIXME
// 这里 List 跟几个坐标系和坐标系 Model 耦合了 // 这里 List 跟几个坐标系和坐标系 Model 耦合了
if (coordinateSystem === 'cartesian2d') { if (coordinateSystem === 'cartesian2d') {
...@@ -388,10 +389,14 @@ define(function(require) { ...@@ -388,10 +389,14 @@ define(function(require) {
if (xAxisModel.get('type') === 'category') { if (xAxisModel.get('type') === 'category') {
independentVar = ['x']; independentVar = ['x'];
dependentVar = 'y'; dependentVar = 'y';
categoryAxisModel = xAxisModel;
} }
else if (yAxisModel.get('type') === 'category') { else if (yAxisModel.get('type') === 'category') {
independentVar = ['y']; independentVar = ['y'];
dependentVar = 'x'; dependentVar = 'x';
categoryAxisModel = xAxisModel;
} }
else { else {
// PENDING // PENDING
...@@ -417,12 +422,17 @@ define(function(require) { ...@@ -417,12 +422,17 @@ define(function(require) {
if (angleAxisModel.get('type') === 'category') { if (angleAxisModel.get('type') === 'category') {
independentVar = ['angle']; independentVar = ['angle'];
dependentVar = 'radius'; dependentVar = 'radius';
categoryAxisModel = angleAxisModel;
} }
else if (radiusAxisModel.get('type') === 'category') { else if (radiusAxisModel.get('type') === 'category') {
independentVar = ['radius']; independentVar = ['radius'];
dependentVar = 'angle'; dependentVar = 'angle';
categoryAxisModel = radiusAxisModel;
} }
else { else {
// PENDING
var dim = data[0] && data[0].length; var dim = data[0] && data[0].length;
if (dim === 2) { if (dim === 2) {
independentVar = ['radius']; independentVar = ['radius'];
...@@ -437,12 +447,12 @@ define(function(require) { ...@@ -437,12 +447,12 @@ define(function(require) {
var list = new List(independentVar, dependentVar); var list = new List(independentVar, dependentVar);
var categoryAxisData = categoryAxisModel && categoryAxisModel.getData();
// Normalize data // Normalize data
zrUtil.each(data, function (dataItem, index) { zrUtil.each(data, function (dataItem, idx) {
var entry = list.add(dataItem, seriesModel); var entry = list.add(dataItem, seriesModel);
// FIXME
if (! dataItem.name) { if (! dataItem.name) {
entry.name = index; entry.name = categoryAxisData && categoryAxisData[idx] || idx;
} }
return entry; return entry;
}); });
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册