Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/component/marker/MarkAreaView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -412,12 +412,12 @@ function createList(
const data = seriesModel.getData();
const info = data.getDimensionInfo(
data.mapDimension(coordDim)
) || {};
) || {} as SeriesDimensionDefine;
// In map series data don't have lng and lat dimension. Fallback to same with coordSys
return extend(extend({}, info), {
name: coordDim,
// DON'T use ordinalMeta to parse and collect ordinal.
ordinalMeta: null
ordinalMeta: null,
});
});
dataDims = map(dims, (dim, idx) => ({
Expand Down
9 changes: 5 additions & 4 deletions src/component/marker/MarkLineView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -443,14 +443,15 @@ function createList(coordSys: CoordinateSystem, seriesModel: SeriesModel, mlMode
let coordDimsInfos: SeriesDimensionDefine[];
if (coordSys) {
coordDimsInfos = map(coordSys && coordSys.dimensions, function (coordDim) {
const info = seriesModel.getData().getDimensionInfo(
seriesModel.getData().mapDimension(coordDim)
) || {};
const data = seriesModel.getData();
const info = data.getDimensionInfo(
data.mapDimension(coordDim)
) || {} as SeriesDimensionDefine;
// In map series data don't have lng and lat dimension. Fallback to same with coordSys
return extend(extend({}, info), {
name: coordDim,
// DON'T use ordinalMeta to parse and collect ordinal.
ordinalMeta: null
ordinalMeta: null,
});
});
}
Expand Down
9 changes: 5 additions & 4 deletions src/component/marker/MarkPointView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,15 @@ function createData(
let coordDimsInfos: SeriesDimensionDefine[];
if (coordSys) {
coordDimsInfos = map(coordSys && coordSys.dimensions, function (coordDim) {
const info = seriesModel.getData().getDimensionInfo(
seriesModel.getData().mapDimension(coordDim)
) || {};
const data = seriesModel.getData();
const info = data.getDimensionInfo(
data.mapDimension(coordDim)
) || {} as SeriesDimensionDefine;
// In map series data don't have lng and lat dimension. Fallback to same with coordSys
return extend(extend({}, info), {
name: coordDim,
// DON'T use ordinalMeta to parse and collect ordinal.
ordinalMeta: null
ordinalMeta: null,
});
});
}
Expand Down
18 changes: 7 additions & 11 deletions src/data/SeriesData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -317,23 +317,19 @@ class SeriesData<
invertedIndicesMap[dimensionName] = [];
}

let dimIdx = i;
if (zrUtil.isNumber(dimensionInfo.storeDimIndex)) {
dimIdx = dimensionInfo.storeDimIndex;
}
if (otherDims.itemName === 0) {
this._nameDimIdx = dimIdx;
}
if (otherDims.itemId === 0) {
this._idDimIdx = dimIdx;
}

if (__DEV__) {
zrUtil.assert(assignStoreDimIdx || dimensionInfo.storeDimIndex >= 0);
}
if (assignStoreDimIdx) {
dimensionInfo.storeDimIndex = i;
}

if (otherDims.itemName === 0) {
this._nameDimIdx = dimensionInfo.storeDimIndex;
}
if (otherDims.itemId === 0) {
this._idDimIdx = dimensionInfo.storeDimIndex;
}
}

this.dimensions = dimensionNames;
Expand Down
16 changes: 16 additions & 0 deletions src/data/SeriesDimensionDefine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,25 @@ class SeriesDimensionDefine {
/**
* The index of this dimension in `series.encode[coordDim]`.
* Mandatory.
*
* For example,
* Suppose
* - encode option:
* ```js
* encode: {
* x: [1, 3, 5],
* y: [0, 2],
* }
* ```
* - This `seriesDimensionDefine` corresponds to series dimension index `3`,
* - `coordDim` is `x`
* Then
* coordDimIndex should be `1`, where `encode[coordDim][coordDimIndex] === 3`
*/
coordDimIndex?: number;

/**
* The term "other" means "other than coord".
* The format of `otherDims` is:
* ```js
* {
Expand Down
6 changes: 5 additions & 1 deletion src/data/helper/createDimensions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,11 @@ export default function prepareSeriesDataSchema(
});
});

function applyDim(resultItem: SeriesDimensionDefine, coordDim: DimensionName, coordDimIndex: DimensionIndex) {
function applyDim(
resultItem: SeriesDimensionDefine,
coordDim: SeriesDimensionDefine['coordDim'],
coordDimIndex: SeriesDimensionDefine['coordDimIndex']
): void {
if (VISUAL_DIMENSIONS.get(coordDim as keyof DataVisualDimensions) != null) {
resultItem.otherDims[coordDim as keyof DataVisualDimensions] = coordDimIndex;
}
Expand Down
Loading