Merge pull request #21439 from apache/fix/marker-dataset

fix(marker): fix marker fails to render with dataset and encode

Author: 100pah

src/component/marker/MarkAreaView.ts

@@ -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) => ({

src/component/marker/MarkLineView.ts

@@ -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,
             });
         });
     }

src/component/marker/MarkPointView.ts

@@ -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,
             });
         });
     }

src/data/SeriesData.ts

@@ -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;

src/data/SeriesDimensionDefine.ts

@@ -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
      * {

src/data/helper/createDimensions.ts

@@ -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;
         }