提交 96f2fae1 编写于 作者: S sushuang

Fix radar.

上级 dde51711
...@@ -23,8 +23,7 @@ var RadarSeries = SeriesModel.extend({ ...@@ -23,8 +23,7 @@ var RadarSeries = SeriesModel.extend({
getInitialData: function (option, ecModel) { getInitialData: function (option, ecModel) {
return createListSimply(this, { return createListSimply(this, {
extraPrefix: 'indicator_', generateCoord: 'indicator_'
extraFromZero: true
}); });
}, },
......
...@@ -29,11 +29,11 @@ import {OTHER_DIMENSIONS} from './dimensionHelper'; ...@@ -29,11 +29,11 @@ import {OTHER_DIMENSIONS} from './dimensionHelper';
* @param {Array.<Object|string>} [opt.dimsDef] option.series.dimensions User defined dimensions * @param {Array.<Object|string>} [opt.dimsDef] option.series.dimensions User defined dimensions
* For example: ['asdf', {name, type}, ...]. * For example: ['asdf', {name, type}, ...].
* @param {Object|HashMap} [opt.encodeDef] option.series.encode {x: 2, y: [3, 1], tooltip: [1, 2], label: 3} * @param {Object|HashMap} [opt.encodeDef] option.series.encode {x: 2, y: [3, 1], tooltip: [1, 2], label: 3}
* @param {string} [opt.extraPrefix] Prefix of name when filling the left dimensions. * @param {string} [opt.generateCoord] Generate coord dim with the given prefix.
* @param {string} [opt.extraFromZero] If specified, extra dim names will be: * The generated dim names will be:
* extraPrefix + 0, extraPrefix + extraBaseIndex + 1 ... * generateCoord + 0, generateCoord + 1, ...
* If not specified, extra dim names will be: * If not specified, extra dim names will be:
* extraPrefix, extraPrefix + 0, extraPrefix + 1 ... * 'value', 'value0', 'value1', ...
* @param {number} [opt.dimCount] If not specified, guess by the first data item. * @param {number} [opt.dimCount] If not specified, guess by the first data item.
* @param {number} [opt.encodeDefaulter] If not specified, auto find the next available data dim. * @param {number} [opt.encodeDefaulter] If not specified, auto find the next available data dim.
* @return {Array.<Object>} [{ * @return {Array.<Object>} [{
...@@ -162,7 +162,8 @@ function completeDimensions(sysDims, source, opt) { ...@@ -162,7 +162,8 @@ function completeDimensions(sysDims, source, opt) {
} }
// Make sure the first extra dim is 'value'. // Make sure the first extra dim is 'value'.
var extra = opt.extraPrefix || 'value'; var doesGenerateCoord = !!opt.generateCoord;
var extra = opt.generateCoord || 'value';
// Set dim `name` and other `coordDim` and other props. // Set dim `name` and other `coordDim` and other props.
for (var resultDimIdx = 0; resultDimIdx < dimCount; resultDimIdx++) { for (var resultDimIdx = 0; resultDimIdx < dimCount; resultDimIdx++) {
...@@ -171,10 +172,10 @@ function completeDimensions(sysDims, source, opt) { ...@@ -171,10 +172,10 @@ function completeDimensions(sysDims, source, opt) {
if (coordDim == null) { if (coordDim == null) {
resultItem.coordDim = genName( resultItem.coordDim = genName(
extra, coordDimNameMap, opt.extraFromZero extra, coordDimNameMap, doesGenerateCoord
); );
resultItem.coordDimIndex = 0; resultItem.coordDimIndex = 0;
resultItem.isExtraCoord = true; resultItem.isExtraCoord = !doesGenerateCoord;
} }
resultItem.name == null && (resultItem.name = genName( resultItem.name == null && (resultItem.name = genName(
......
...@@ -9,8 +9,7 @@ import completeDimensions from './completeDimensions'; ...@@ -9,8 +9,7 @@ import completeDimensions from './completeDimensions';
* @param {Object|Array} [opt] * @param {Object|Array} [opt]
* @param {Array.<string|Object>} [opt.coordDimensions=[]] * @param {Array.<string|Object>} [opt.coordDimensions=[]]
* @param {number} [opt.dimensionsCount] * @param {number} [opt.dimensionsCount]
* @param {string} [opt.extraPrefix] * @param {string} [opt.generateCoord]
* @param {boolean} [opt.extraFromZero]
* @param {Array.<string|Object>} [opt.dimensionsDefine=source.dimensionsDefine] Overwrite source define. * @param {Array.<string|Object>} [opt.dimensionsDefine=source.dimensionsDefine] Overwrite source define.
* @param {Object|HashMap} [opt.encodeDefine=source.encodeDefine] Overwrite source define. * @param {Object|HashMap} [opt.encodeDefine=source.encodeDefine] Overwrite source define.
* @return {Array.<Object>} dimensionsInfo * @return {Array.<Object>} dimensionsInfo
...@@ -21,7 +20,6 @@ export default function (source, opt) { ...@@ -21,7 +20,6 @@ export default function (source, opt) {
dimsDef: opt.dimensionsDefine || source.dimensionsDefine, dimsDef: opt.dimensionsDefine || source.dimensionsDefine,
encodeDef: opt.encodeDefine || source.encodeDefine, encodeDef: opt.encodeDefine || source.encodeDefine,
dimCount: opt.dimensionsCount, dimCount: opt.dimensionsCount,
extraPrefix: opt.extraPrefix, generateCoord: opt.generateCoord
extraFromZero: opt.extraFromZero
}); });
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册