fix 数值轴取值范围兼顾marker标记

Author: quao

src/coord/cartesian/Grid.ts

@@ -44,7 +44,7 @@ import GlobalModel from '../../model/Global';
 import ExtensionAPI from '../../core/ExtensionAPI';
 import { Dictionary } from 'zrender/src/core/types';
 import {CoordinateSystemMaster} from '../CoordinateSystem';
-import { NullUndefined, ScaleDataValue } from '../../util/types';
+import { NullUndefined, ScaleDataValue, SeriesOption } from '../../util/types';
 import SeriesData from '../../data/SeriesData';
 import OrdinalScale from '../../scale/Ordinal';
 import {
@@ -81,6 +81,8 @@ type AxesMap = {
 
 type ParsedOuterBoundsContain = 'all' | 'axisLabel';
 
+type MarkerTypes = 'markPoint' | 'markLine' | 'markArea';
+
 // margin is [top, right, bottom, left]
 const XY_TO_MARGIN_IDX = [
     [3, 1], // xyIdx 0 => 'x'
@@ -542,6 +544,16 @@ class Grid implements CoordinateSystemMaster {
 
                 unionExtent(data, xAxis);
                 unionExtent(data, yAxis);
+
+                // 处理 markPoint、markLine、markArea
+                const markerTypes: MarkerTypes[] = ['markPoint', 'markLine', 'markArea'];
+
+                markerTypes.forEach(markerType => {
+                    const markerOpt = seriesModel.get(markerType as keyof SeriesOption);
+                    if (markerOpt && markerOpt.data) {
+                        unionMarkerExtent(markerOpt.data, xAxis, yAxis);
+                    }
+                });
             }
         }, this);
 
@@ -550,6 +562,48 @@ class Grid implements CoordinateSystemMaster {
                 axis.scale.unionExtentFromData(data, dim);
             });
         }
+
+        function UnionExtentForAxisByValue(
+            value: any,
+            axis: Axis2D,
+            axisType: string,
+        ): void {
+            if (value != null && typeof value !== 'string' && axisType !== 'category') {
+                const val = axis.scale.parse(value);
+                if (!isNaN(val)) {
+                    axis.scale._innerUnionExtent([val, val]);
+                }
+            }
+        }
+
+        function unionMarkerExtent(
+            markerData: any[],
+            xAxis: Axis2D,
+            yAxis: Axis2D,
+        ): void {
+            each(markerData, function (item) {
+                if (!item) {
+                    return;
+                }
+                const items = isObject(item) && !item.coord && !item.xAxis && !item.yAxis
+                    ? (Array.isArray(item) ? item : [item])
+                    : [item];
+
+                each(items, function (markerItem) {
+                    if (!markerItem) {
+                        return;
+                    }
+
+                    UnionExtentForAxisByValue(markerItem.xAxis, xAxis, xAxis.type);
+                    UnionExtentForAxisByValue(markerItem.yAxis, yAxis, yAxis.type);
+
+                    if (markerItem.coord && Array.isArray(markerItem.coord)) {
+                        UnionExtentForAxisByValue(markerItem.coord[0], xAxis, xAxis.type);
+                        UnionExtentForAxisByValue(markerItem.coord[1], yAxis, yAxis.type);
+                    }
+                });
+            });
+        }
     }
 
     /**