Merge pull request #21117 from sz-p/feat-21089

feat(marker): markPoint markLine markArea support z option

Author: 100pah

src/component/marker/MarkLineModel.ts

@@ -34,7 +34,7 @@ interface MarkLineStateOption {
      * itemStyle for symbol
      */
     itemStyle?: ItemStyleOption
-    label?: SeriesLineLabelOption,
+    label?: SeriesLineLabelOption
     z2?: number
 }
 interface MarkLineDataItemOptionBase extends MarkLineStateOption,

src/component/marker/MarkerModel.ts

@@ -108,6 +108,8 @@ abstract class MarkerModel<Opts extends MarkerOption = MarkerOption> extends Com
      */
     createdBySelf = false;
 
+    preventAutoZ = true;
+
     static readonly dependencies = ['series', 'grid', 'polar', 'geo'];
 
     __hostSeries: SeriesModel;

src/component/marker/MarkerView.ts

@@ -26,6 +26,7 @@ import { makeInner } from '../../util/model';
 import SeriesModel from '../../model/Series';
 import Group from 'zrender/src/graphic/Group';
 import { enterBlur, leaveBlur } from '../../util/states';
+import { traverseUpdateZ, retrieveZInfo } from '../../util/graphic';
 
 const inner = makeInner<{
     keep: boolean
@@ -65,6 +66,8 @@ abstract class MarkerView extends ComponentView {
         markerGroupMap.each(item => {
             !inner(item).keep && this.group.remove(item.group);
         });
+
+        updateZ(ecModel, markerGroupMap, this.type as 'markPoint' | 'markLine' | 'markArea');
     }
 
     markKeep(drawGroup: MarkerDraw) {
@@ -96,4 +99,25 @@ abstract class MarkerView extends ComponentView {
     ): void;
 }
 
+function updateZ(
+    ecModel: GlobalModel,
+    markerGroupMap: HashMap<MarkerDraw>,
+    type: 'markPoint' | 'markLine' | 'markArea'
+): void {
+    ecModel.eachSeries(seriesModel => {
+
+        const markerModel = MarkerModel.getMarkerModelFromSeries(
+            seriesModel,
+            type
+        );
+
+        const markerDraw = markerGroupMap.get(seriesModel.id);
+
+        if (markerModel && markerDraw && markerDraw.group) {
+            const { z, zlevel } = retrieveZInfo(markerModel);
+            traverseUpdateZ(markerDraw.group, z, zlevel);
+        }
+    });
+}
+
 export default MarkerView;

src/data/SeriesData.ts

@@ -113,7 +113,7 @@ export interface DefaultDataVisual {
     symbolRotate?: number
     symbolKeepAspect?: boolean
     symbolOffset?: string | number | (string | number)[]
-    z2: number,
+    z2: number
     liftZ?: number
     // For legend.
     legendIcon?: string