提交 6e0260bb 编写于 作者: S sushuang

tweak.

上级 1be0144b
...@@ -374,6 +374,15 @@ function makeDefaultEncode( ...@@ -374,6 +374,15 @@ function makeDefaultEncode(
if (coordSysDefine.firstCategoryDimIndex == null) { if (coordSysDefine.firstCategoryDimIndex == null) {
var dataDim = datasetRecord.valueWayDim++; var dataDim = datasetRecord.valueWayDim++;
encode[coordDim] = dataDim; encode[coordDim] = dataDim;
// ??? TODO give a better default series name rule?
// especially when encode x y specified.
// consider: when mutiple series share one dimension
// category axis, series name should better use
// the other dimsion name. On the other hand, use
// both dimensions name.
encodeSeriesName.push(dataDim);
// encodeTooltip.push(dataDim); // encodeTooltip.push(dataDim);
// encodeLabel.push(dataDim); // encodeLabel.push(dataDim);
} }
......
...@@ -19,13 +19,8 @@ ...@@ -19,13 +19,8 @@
</style> </style>
<!-- <h1>dynamic category</h1>
<div class="chart" id="dynamic-category"></div>
<h1>category appendData</h1>
<div class="chart" id="parallel-with-category"></div> -->
<div id="specify-dimensions"></div> <div id="specify-dimensions"></div>
<div id="key-columns"></div> <!-- <div id="key-columns"></div>
<div id="category-no-encode-two-value-axis"></div> <div id="category-no-encode-two-value-axis"></div>
<div id="category-no-axis-data-multi"></div> <div id="category-no-axis-data-multi"></div>
<div id="category-no-encode-no-axis-data-single"></div> <div id="category-no-encode-no-axis-data-single"></div>
...@@ -34,7 +29,7 @@ ...@@ -34,7 +29,7 @@
<div id="two-value-axes"></div> <div id="two-value-axes"></div>
<div id="empty-data"></div> <div id="empty-data"></div>
<div id="dynamic-category"></div> <div id="dynamic-category"></div>
<div id="dynamic-time"></div> <div id="dynamic-time"></div> -->
...@@ -60,12 +55,12 @@ ...@@ -60,12 +55,12 @@
], function (echarts) { ], function (echarts) {
var source = [ var source = [
[21, 120, 220, 150, 320, 820], [21, 120, 220, 150, 320, 820],
[21, 132, 182, 232, 332, 932], [31, 132, 182, 232, 332, 932],
[21, 101, 191, 201, 301, 901], [41, 101, 191, 201, 301, 901],
[21, 134, 234, 154, 334, 934], [51, 134, 234, 154, 334, 934],
[21, 90, 290, 190, 309, 1290], [61, 90, 290, 190, 309, 1290],
[21, 230, 330, 330, 330, 1330], [71, 230, 330, 330, 330, 1330],
[21, 210, 310, 410, 320, 1320] [81, 210, 310, 410, 320, 1320]
]; ];
var option = { var option = {
...@@ -74,16 +69,16 @@ ...@@ -74,16 +69,16 @@
grid: {}, grid: {},
xAxis: {}, xAxis: {},
yAxis: {}, yAxis: {},
dataZoom: [{}, {type: 'inside'}],
dataset: [{ dataset: [{
dimensions: ['G', 'H', 'I', 'Q', 'R'], dimensions: ['G', 'H', 'I', 'Q', 'R'],
// sourceHeader: true,
source: source source: source
}], }],
series: [ series: [
{type:'scatter'}, {type:'scatter', label: {show: true, position: 'top', textBorderWidth: 2, textBorderColor: '#fff'}, dimensions: ['cccccccccc', 'ddddddddddd']},
{type:'scatter'}, {type:'scatter', label: {show: true, position: 'top', textBorderWidth: 2, textBorderColor: '#fff'}},
{type:'scatter'}, {type:'scatter', label: {show: true, position: 'top', textBorderWidth: 2, textBorderColor: '#fff'}, sourceHeader: true}
{type:'scatter'},
{type:'scatter'}
] ]
}; };
testHelper.create(echarts, 'specify-dimensions', { testHelper.create(echarts, 'specify-dimensions', {
...@@ -91,7 +86,8 @@ ...@@ -91,7 +86,8 @@
dataTable: source, dataTable: source,
option: option, option: option,
info: { info: {
dimensions: option.dataset[0].dimensions dimensions: option.dataset[0].dimensions,
serise: option.series
} }
}); });
}); });
......
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
str = preStr + quotationMark + obj + quotationMark; str = preStr + quotationMark + obj + quotationMark;
break; break;
default: default:
throw new Error('Illegal type "' + objType + '" at "' + obj + quotationMark); str = preStr + obj + '';
} }
return { return {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册