@visactor/vchart 1.7.2 → 1.7.3

package/esm/component/marker/base-marker.d.ts

@@ -2,11 +2,11 @@ import type { DataView } from '@visactor/vdataset';
 import type { IModelRenderOption } from '../../model/interface';
 import type { IRegion } from '../../region/interface';
 import type { ICartesianSeries } from '../../series/interface';
-import type { ILayoutRect, ILayoutType, IRect, StringOrNumber } from '../../typings';
+import type { ILayoutRect, ILayoutType, IRect } from '../../typings';
 import { BaseComponent } from '../base/base-component';
-import type { IAggrType, IDataPos, IDataPosCallback, IMarkerAxisSpec, IMarkerSpec } from './interface';
-import type { IGraphic } from '@visactor/vrender-core';
-export declare abstract class BaseMarker<T extends IMarkerSpec & IMarkerAxisSpec> extends BaseComponent<T> {
+import type { IAggrType, IDataPos, IDataPosCallback, IMarkerSpec } from './interface';
+import type { IGraphic, IGroup } from '@visactor/vrender-core';
+export declare abstract class BaseMarker<T extends IMarkerSpec> extends BaseComponent<T> {
     layoutType: ILayoutType | 'none';
     protected _startRelativeSeries: ICartesianSeries;
     protected _endRelativeSeries: ICartesianSeries;
@@ -16,55 +16,53 @@ export declare abstract class BaseMarker<T extends IMarkerSpec & IMarkerAxisSpec
     protected _markerComponent: any;
     protected _layoutOffsetX: number;
     protected _layoutOffsetY: number;
+    private _firstSeries;
     created(): void;
-    private _isSpecAggr;
     private _getAllRelativeSeries;
+    private _getFieldInfoFromSpec;
     protected _processSpecX(specX: IDataPos | IDataPosCallback): {
         getRelativeSeries: () => ICartesianSeries;
         getStartRelativeSeries: () => ICartesianSeries;
         getEndRelativeSeries: () => ICartesianSeries;
-        x: {
+        x: string | number | IDataPosCallback | {
             field: any;
             aggrType: IAggrType;
         };
-    } | {
-        getRelativeSeries: () => ICartesianSeries;
-        getStartRelativeSeries: () => ICartesianSeries;
-        getEndRelativeSeries: () => ICartesianSeries;
-        x: IDataPos | IDataPosCallback;
     };
     protected _processSpecY(specY: IDataPos | IDataPosCallback): {
         getRelativeSeries: () => ICartesianSeries;
         getStartRelativeSeries: () => ICartesianSeries;
         getEndRelativeSeries: () => ICartesianSeries;
-        y: {
+        y: string | number | IDataPosCallback | {
             field: any;
             aggrType: IAggrType;
         };
-    } | {
+    };
+    protected _processSpecXY(specX: IDataPos | IDataPosCallback, specY: IDataPos | IDataPosCallback): {
         getRelativeSeries: () => ICartesianSeries;
         getStartRelativeSeries: () => ICartesianSeries;
         getEndRelativeSeries: () => ICartesianSeries;
-        y: IDataPos | IDataPosCallback;
+        x: string | number | IDataPosCallback | {
+            field: any;
+            aggrType: IAggrType;
+        };
+        y: string | number | IDataPosCallback | {
+            field: any;
+            aggrType: IAggrType;
+        };
     };
-    protected _processSpecXY(specX: IDataPos | IDataPosCallback, specY: IDataPos | IDataPosCallback): any;
     protected _processSpecCoo(spec: any): any;
     updateLayoutAttribute(): void;
-    protected _getSeriesByIdOrIndex(seriesUserId: StringOrNumber, seriesIndex: number): ICartesianSeries;
+    private _getSeriesByIdOrIndex;
     protected _bindSeries(): void;
-    protected _computeClipRange(regions: IRegion[]): {
-        minX: number;
-        maxX: number;
-        minY: number;
-        maxY: number;
-    };
     protected abstract _initDataView(): void;
-    protected abstract _createMarkerComponent(): void;
+    protected abstract _createMarkerComponent(): IGroup;
     protected abstract _markerLayout(): void;
     protected initEvent(): void;
     onRender(ctx: IModelRenderOption): void;
     changeRegions(regions: IRegion[]): void;
-    protected getFirstSeries(): ICartesianSeries;
+    clear(): void;
+    private _getFirstSeries;
     protected _getNeedClearVRenderComponents(): IGraphic[];
     onLayoutStart(layoutRect: IRect, chartViewRect: ILayoutRect, ctx: any): void;
 }

package/esm/component/marker/base-marker.js

@@ -1,11 +1,11 @@
-import { array, isValid, isNil } from "@visactor/vutils";
-
-import { AGGR_TYPE } from "../../constant/marker";
+import { array, isValid, isNil, isString } from "@visactor/vutils";
 
 import { BaseComponent } from "../base/base-component";
 
 import { calcLayoutNumber } from "../../util/space";
 
+import { isAggrSpec } from "./utils";
+
 export class BaseMarker extends BaseComponent {
     constructor() {
         super(...arguments), this.layoutType = "none", this._layoutOffsetX = 0, this._layoutOffsetY = 0;
@@ -16,9 +16,6 @@ export class BaseMarker extends BaseComponent {
     created() {
         super.created(), this.initEvent(), this._bindSeries(), this._initDataView();
     }
-    _isSpecAggr(spec) {
-        return AGGR_TYPE.includes(spec);
-    }
     _getAllRelativeSeries() {
         return {
             getRelativeSeries: () => this._relativeSeries,
@@ -26,37 +23,31 @@ export class BaseMarker extends BaseComponent {
             getEndRelativeSeries: () => this._endRelativeSeries
         };
     }
+    _getFieldInfoFromSpec(dim, spec, relativeSeries) {
+        const field = "x" === dim ? relativeSeries.getSpec().xField : relativeSeries.getSpec().yField;
+        return isString(spec) && isAggrSpec(spec) ? {
+            field: field,
+            aggrType: spec
+        } : spec;
+    }
     _processSpecX(specX) {
         const relativeSeries = this._relativeSeries;
-        return this._isSpecAggr(specX) ? Object.assign({
-            x: {
-                field: relativeSeries.getSpec().xField,
-                aggrType: specX
-            }
-        }, this._getAllRelativeSeries()) : Object.assign({
-            x: specX
+        return Object.assign({
+            x: this._getFieldInfoFromSpec("x", specX, relativeSeries)
         }, this._getAllRelativeSeries());
     }
     _processSpecY(specY) {
         const relativeSeries = this._relativeSeries;
-        return this._isSpecAggr(specY) ? Object.assign({
-            y: {
-                field: relativeSeries.getSpec().yField,
-                aggrType: specY
-            }
-        }, this._getAllRelativeSeries()) : Object.assign({
-            y: specY
+        return Object.assign({
+            y: this._getFieldInfoFromSpec("y", specY, relativeSeries)
         }, this._getAllRelativeSeries());
     }
     _processSpecXY(specX, specY) {
-        const result = Object.assign({}, this._getAllRelativeSeries()), relativeSeries = this._relativeSeries;
-        return this._isSpecAggr(specX) ? result.x = {
-            field: relativeSeries.getSpec().xField,
-            aggrType: specX
-        } : result.x = specX, this._isSpecAggr(specY) ? result.y = {
-            field: relativeSeries.getSpec().yField,
-            aggrType: specY
-        } : result.y = specY, result;
+        const relativeSeries = this._relativeSeries;
+        return Object.assign({
+            x: this._getFieldInfoFromSpec("x", specX, relativeSeries),
+            y: this._getFieldInfoFromSpec("y", specY, relativeSeries)
+        }, this._getAllRelativeSeries());
     }
     _processSpecCoo(spec) {
         var _a;
@@ -70,10 +61,10 @@ export class BaseMarker extends BaseComponent {
                 x: void 0,
                 y: void 0
             }, this._getAllRelativeSeries());
-            return this._isSpecAggr(coordinate[bindXField]) ? option.x = {
+            return isString(coordinate[bindXField]) && isAggrSpec(coordinate[bindXField]) ? option.x = {
                 field: bindXField,
                 aggrType: coordinate[bindXField]
-            } : option.x = array(bindXField).map((field => coordinate[field])), this._isSpecAggr(coordinate[bindYField]) ? option.y = {
+            } : option.x = array(bindXField).map((field => coordinate[field])), isString(coordinate[bindYField]) && isAggrSpec(coordinate[bindYField]) ? option.y = {
                 field: bindYField,
                 aggrType: coordinate[bindYField]
             } : option.y = array(bindYField).map((field => coordinate[field])), option.getRefRelativeSeries = () => refRelativeSeries, 
@@ -81,16 +72,24 @@ export class BaseMarker extends BaseComponent {
         }));
     }
     updateLayoutAttribute() {
-        var _a;
-        (null === (_a = this._spec.visible) || void 0 === _a || _a) && (this._markerComponent || (this._createMarkerComponent(), 
-        this._markerComponent.on("*", ((event, type) => this._delegateEvent(this._markerComponent, event, type)))), 
-        this._markerLayout()), super.updateLayoutAttribute();
+        var _a, _b, _c;
+        if (null === (_a = this._spec.visible) || void 0 === _a || _a) {
+            if (!this._markerComponent) {
+                const markerComponent = this._createMarkerComponent();
+                markerComponent.name = null !== (_b = this._spec.name) && void 0 !== _b ? _b : this.type, 
+                markerComponent.id = null !== (_c = this._spec.id) && void 0 !== _c ? _c : `${this.type}-${this.id}`, 
+                this._markerComponent = markerComponent, this.getContainer().add(this._markerComponent), 
+                this._markerComponent.on("*", ((event, type) => this._delegateEvent(this._markerComponent, event, type)));
+            }
+            this._markerLayout();
+        }
+        super.updateLayoutAttribute();
     }
     _getSeriesByIdOrIndex(seriesUserId, seriesIndex) {
         var _a, _b;
         let series;
-        return series = null === (_a = this._option.getSeriesInUserIdOrIndex(array(seriesUserId), [ seriesIndex ])) || void 0 === _a ? void 0 : _a[0], 
-        series || (series = null !== (_b = this._relativeSeries) && void 0 !== _b ? _b : this.getFirstSeries()), 
+        return series = null === (_a = this._option.getSeriesInUserIdOrIndex(isValid(seriesUserId) ? [ seriesUserId ] : [], [ seriesIndex ])) || void 0 === _a ? void 0 : _a[0], 
+        series || (series = null !== (_b = this._relativeSeries) && void 0 !== _b ? _b : this._getFirstSeries()), 
         series;
     }
     _bindSeries() {
@@ -99,30 +98,20 @@ export class BaseMarker extends BaseComponent {
         this._startRelativeSeries = this._getSeriesByIdOrIndex(spec.startRelativeSeriesId, spec.startRelativeSeriesIndex), 
         this._endRelativeSeries = this._getSeriesByIdOrIndex(spec.endRelativeSeriesId, spec.endRelativeSeriesIndex);
     }
-    _computeClipRange(regions) {
-        let minX = 1 / 0, maxX = -1 / 0, minY = 1 / 0, maxY = -1 / 0;
-        return regions.forEach((region => {
-            region.getLayoutStartPoint().x < minX && (minX = region.getLayoutStartPoint().x), 
-            region.getLayoutStartPoint().x + region.getLayoutRect().width > maxX && (maxX = region.getLayoutStartPoint().x + region.getLayoutRect().width), 
-            region.getLayoutStartPoint().y < minY && (minY = region.getLayoutStartPoint().y), 
-            region.getLayoutStartPoint().y + region.getLayoutRect().height > maxY && (maxY = region.getLayoutStartPoint().y + region.getLayoutRect().height);
-        })), {
-            minX: minX,
-            maxX: maxX,
-            minY: minY,
-            maxY: maxY
-        };
-    }
     initEvent() {}
     onRender(ctx) {}
     changeRegions(regions) {}
-    getFirstSeries() {
+    clear() {
+        super.clear(), this._firstSeries = null;
+    }
+    _getFirstSeries() {
         var _a;
+        if (this._firstSeries) return this._firstSeries;
         for (let i = 0; i < this._regions.length; i++) {
             const series = this._regions[i].getSeries();
             for (let j = 0; j < series.length; j++) {
                 const s = series[j];
-                if (s) return s;
+                if (s) return this._firstSeries = s, s;
             }
         }
         return null === (_a = this._option) || void 0 === _a || _a.onError("need at least one series"), 

package/esm/component/marker/base-marker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/marker/base-marker.ts"],"names":[],"mappings":"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","file":"base-marker.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport { array, isFunction, isValid, isNil } from '@visactor/vutils';\nimport { AGGR_TYPE } from '../../constant/marker';\nimport type { IOptionAggr } from '../../data/transforms/aggregation';\nimport type { IModelRenderOption } from '../../model/interface';\nimport type { IRegion } from '../../region/interface';\nimport type { ICartesianSeries } from '../../series/interface';\nimport type { ILayoutRect, ILayoutType, IRect, StringOrNumber } from '../../typings';\nimport { BaseComponent } from '../base/base-component';\nimport type { IAggrType, IDataPointSpec, IDataPos, IDataPosCallback, IMarkerAxisSpec, IMarkerSpec } from './interface';\nimport type { IGraphic, IGroup } from '@visactor/vrender-core';\nimport { calcLayoutNumber } from '../../util/space';\n\nexport abstract class BaseMarker<T extends IMarkerSpec & IMarkerAxisSpec> extends BaseComponent<T> {\n  layoutType: ILayoutType | 'none' = 'none';\n\n  protected _startRelativeSeries!: ICartesianSeries;\n  protected _endRelativeSeries!: ICartesianSeries;\n  protected _relativeSeries!: ICartesianSeries;\n  getRelativeSeries() {\n    return this._relativeSeries;\n  }\n\n  // marker 组件数据\n  protected _markerData!: DataView;\n  // marker 组件\n  protected _markerComponent!: any;\n\n  protected _layoutOffsetX: number = 0;\n  protected _layoutOffsetY: number = 0;\n\n  created() {\n    super.created();\n    // event\n    this.initEvent();\n    this._bindSeries();\n    this._initDataView();\n  }\n\n  private _isSpecAggr(spec: IDataPos | IDataPosCallback) {\n    return AGGR_TYPE.includes(spec as any);\n  }\n\n  private _getAllRelativeSeries() {\n    return {\n      getRelativeSeries: () => this._relativeSeries,\n      getStartRelativeSeries: () => this._startRelativeSeries,\n      getEndRelativeSeries: () => this._endRelativeSeries\n    };\n  }\n\n  protected _processSpecX(specX: IDataPos | IDataPosCallback) {\n    const relativeSeries = this._relativeSeries;\n    if (this._isSpecAggr(specX)) {\n      return {\n        x: {\n          field: relativeSeries.getSpec().xField,\n          aggrType: specX as unknown as IAggrType\n        },\n        ...this._getAllRelativeSeries()\n      };\n    }\n    return { x: specX, ...this._getAllRelativeSeries() };\n  }\n\n  protected _processSpecY(specY: IDataPos | IDataPosCallback) {\n    const relativeSeries = this._relativeSeries;\n    if (this._isSpecAggr(specY)) {\n      return {\n        y: {\n          field: relativeSeries.getSpec().yField,\n          aggrType: specY as unknown as IAggrType\n        },\n        ...this._getAllRelativeSeries()\n      };\n    }\n    return { y: specY, ...this._getAllRelativeSeries() };\n  }\n\n  protected _processSpecXY(specX: IDataPos | IDataPosCallback, specY: IDataPos | IDataPosCallback) {\n    const result: any = {\n      ...this._getAllRelativeSeries()\n    };\n    const relativeSeries = this._relativeSeries;\n    if (this._isSpecAggr(specX)) {\n      result.x = {\n        field: relativeSeries.getSpec().xField,\n        aggrType: specX as unknown as IAggrType\n      };\n    } else {\n      result.x = specX;\n    }\n\n    if (this._isSpecAggr(specY)) {\n      result.y = {\n        field: relativeSeries.getSpec().yField,\n        aggrType: specY as unknown as IAggrType\n      };\n    } else {\n      result.y = specY;\n    }\n\n    return result;\n  }\n\n  protected _processSpecCoo(spec: any) {\n    const coordinates = spec.coordinates ?? array(spec.coordinate);\n    return coordinates.map((coordinate: IDataPointSpec) => {\n      const refRelativeSeries = this._getSeriesByIdOrIndex(\n        coordinate.refRelativeSeriesId,\n        coordinate.refRelativeSeriesIndex\n      );\n\n      const { xField, yField } = refRelativeSeries.getSpec();\n      const { xFieldDim, xFieldIndex, yFieldDim, yFieldIndex } = coordinate;\n      let bindXField = xField;\n      if (isValid(xFieldIndex)) {\n        bindXField = array(xField)[xFieldIndex];\n      }\n      if (xFieldDim && array(xField).includes(xFieldDim)) {\n        bindXField = xFieldDim;\n      }\n\n      let bindYField = yField;\n      if (isValid(yFieldIndex)) {\n        bindYField = array(yField)[yFieldIndex];\n      }\n      if (yFieldDim && array(yField).includes(yFieldDim)) {\n        bindYField = yFieldDim;\n      }\n\n      // const { [xField]: coordinateX, [yField]: coordinateY } = coordinate;\n      const option: IOptionAggr = {\n        x: undefined,\n        y: undefined,\n        ...this._getAllRelativeSeries()\n      };\n\n      if (this._isSpecAggr(coordinate[bindXField])) {\n        option.x = { field: bindXField, aggrType: coordinate[bindXField] as IAggrType };\n      } else {\n        option.x = array(bindXField).map(field => coordinate[field]);\n      }\n\n      if (this._isSpecAggr(coordinate[bindYField])) {\n        option.y = { field: bindYField, aggrType: coordinate[bindYField] as IAggrType };\n      } else {\n        option.y = array(bindYField).map(field => coordinate[field]);\n      }\n      option.getRefRelativeSeries = () => refRelativeSeries;\n      return option;\n    });\n  }\n\n  updateLayoutAttribute(): void {\n    const markerVisible = this._spec.visible ?? true;\n    if (markerVisible) {\n      // 创建marker组件\n      if (!this._markerComponent) {\n        this._createMarkerComponent();\n        // 代理 marker 组件上的事件\n        this._markerComponent.on('*', (event: any, type: string) =>\n          this._delegateEvent(this._markerComponent as unknown as IGraphic, event, type)\n        );\n      }\n      this._markerLayout();\n    }\n\n    super.updateLayoutAttribute();\n  }\n\n  protected _getSeriesByIdOrIndex(seriesUserId: StringOrNumber, seriesIndex: number) {\n    let series: ICartesianSeries;\n    series = this._option.getSeriesInUserIdOrIndex(array(seriesUserId), [seriesIndex])?.[0] as ICartesianSeries;\n    if (!series) {\n      series = this._relativeSeries ?? this.getFirstSeries();\n    }\n    return series;\n  }\n\n  protected _bindSeries() {\n    const spec = this._spec;\n    this._relativeSeries = this._getSeriesByIdOrIndex(spec.relativeSeriesId, spec.relativeSeriesIndex);\n    this._startRelativeSeries = this._getSeriesByIdOrIndex(spec.startRelativeSeriesId, spec.startRelativeSeriesIndex);\n    this._endRelativeSeries = this._getSeriesByIdOrIndex(spec.endRelativeSeriesId, spec.endRelativeSeriesIndex);\n  }\n\n  protected _computeClipRange(regions: IRegion[]) {\n    let minX = Infinity;\n    let maxX = -Infinity;\n    let minY = Infinity;\n    let maxY = -Infinity;\n    regions.forEach((region: IRegion) => {\n      if (region.getLayoutStartPoint().x < minX) {\n        minX = region.getLayoutStartPoint().x;\n      }\n      if (region.getLayoutStartPoint().x + region.getLayoutRect().width > maxX) {\n        maxX = region.getLayoutStartPoint().x + region.getLayoutRect().width;\n      }\n      if (region.getLayoutStartPoint().y < minY) {\n        minY = region.getLayoutStartPoint().y;\n      }\n      if (region.getLayoutStartPoint().y + region.getLayoutRect().height > maxY) {\n        maxY = region.getLayoutStartPoint().y + region.getLayoutRect().height;\n      }\n    });\n    return { minX, maxX, minY, maxY };\n  }\n\n  protected abstract _initDataView(): void;\n  protected abstract _createMarkerComponent(): void;\n  protected abstract _markerLayout(): void;\n\n  protected initEvent() {\n    // do nothing\n  }\n  onRender(ctx: IModelRenderOption): void {\n    // do nothing\n  }\n  changeRegions(regions: IRegion[]): void {\n    // do nothing\n  }\n\n  protected getFirstSeries(): ICartesianSeries {\n    for (let i = 0; i < this._regions.length; i++) {\n      const r = this._regions[i];\n      const series = r.getSeries();\n      for (let j = 0; j < series.length; j++) {\n        const s = series[j];\n        if (s) {\n          return s as ICartesianSeries;\n        }\n      }\n    }\n    this._option?.onError('need at least one series');\n    return null;\n  }\n\n  protected _getNeedClearVRenderComponents(): IGraphic[] {\n    return [this._markerComponent] as unknown as IGroup[];\n  }\n\n  onLayoutStart(layoutRect: IRect, chartViewRect: ILayoutRect, ctx: any): void {\n    // offset\n    if (!isNil(this._spec.offsetX)) {\n      this._layoutOffsetX = calcLayoutNumber(this._spec.offsetX, chartViewRect.width, chartViewRect);\n    }\n    if (!isNil(this._spec.offsetY)) {\n      this._layoutOffsetY = calcLayoutNumber(this._spec.offsetY, chartViewRect.height, chartViewRect);\n    }\n    super.onLayoutStart(layoutRect, chartViewRect, ctx);\n  }\n}\n"]}
+{"version":3,"sources":["../src/component/marker/base-marker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAKnE,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAUvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,MAAM,OAAgB,UAAkC,SAAQ,aAAgB;IAAhF;;QACE,eAAU,GAAyB,MAAM,CAAC;QAchC,mBAAc,GAAW,CAAC,CAAC;QAC3B,mBAAc,GAAW,CAAC,CAAC;IA2MvC,CAAC;IArNC,iBAAiB;QACf,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAYD,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;QAEhB,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAEO,qBAAqB;QAC3B,OAAO;YACL,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe;YAC7C,sBAAsB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,oBAAoB;YACvD,oBAAoB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB;SACpD,CAAC;IACJ,CAAC;IAEO,qBAAqB,CAAC,GAAc,EAAE,IAAiC,EAAE,cAAgC;QAC/G,MAAM,KAAK,GAAG,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC;QAC9F,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE;YACtC,OAAO;gBACL,KAAK;gBACL,QAAQ,EAAE,IAA4B;aACvC,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAES,aAAa,CAAC,KAAkC;QACxD,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC;QAC5C,uBACE,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,KAAK,EAAE,cAAc,CAAC,IACtD,IAAI,CAAC,qBAAqB,EAAE,EAC/B;IACJ,CAAC;IAES,aAAa,CAAC,KAAkC;QACxD,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC;QAC5C,uBACE,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,KAAK,EAAE,cAAc,CAAC,IACtD,IAAI,CAAC,qBAAqB,EAAE,EAC/B;IACJ,CAAC;IAES,cAAc,CAAC,KAAkC,EAAE,KAAkC;QAC7F,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC;QAE5C,uBACE,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,KAAK,EAAE,cAAc,CAAC,EACzD,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,KAAK,EAAE,cAAc,CAAC,IACtD,IAAI,CAAC,qBAAqB,EAAE,EAC/B;IACJ,CAAC;IAES,eAAe,CAAC,IAAS;;QACjC,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,WAAW,mCAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC/D,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,UAA0B,EAAE,EAAE;YACpD,MAAM,iBAAiB,GAAG,IAAI,CAAC,qBAAqB,CAClD,UAAU,CAAC,mBAAmB,EAC9B,UAAU,CAAC,sBAAsB,CAClC,CAAC;YAEF,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,iBAAiB,CAAC,OAAO,EAAE,CAAC;YACvD,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,UAAU,CAAC;YACtE,IAAI,UAAU,GAAG,MAAM,CAAC;YACxB,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE;gBACxB,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC;aACzC;YACD,IAAI,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBAClD,UAAU,GAAG,SAAS,CAAC;aACxB;YAED,IAAI,UAAU,GAAG,MAAM,CAAC;YACxB,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE;gBACxB,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC;aACzC;YACD,IAAI,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBAClD,UAAU,GAAG,SAAS,CAAC;aACxB;YAED,MAAM,MAAM,mBACV,CAAC,EAAE,SAAS,EACZ,CAAC,EAAE,SAAS,IACT,IAAI,CAAC,qBAAqB,EAAE,CAChC,CAAC;YAEF,IAAI,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,UAAU,CAAa,CAAC,EAAE;gBACtF,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAc,EAAE,CAAC;aACjF;iBAAM;gBACL,MAAM,CAAC,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;aAC9D;YAED,IAAI,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,UAAU,CAAa,CAAC,EAAE;gBACtF,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAc,EAAE,CAAC;aACjF;iBAAM;gBACL,MAAM,CAAC,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;aAC9D;YACD,MAAM,CAAC,oBAAoB,GAAG,GAAG,EAAE,CAAC,iBAAiB,CAAC;YACtD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,qBAAqB;;QACnB,MAAM,aAAa,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,OAAO,mCAAI,IAAI,CAAC;QACjD,IAAI,aAAa,EAAE;YAEjB,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;gBAC1B,MAAM,eAAe,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBACtD,eAAe,CAAC,IAAI,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,mCAAI,IAAI,CAAC,IAAI,CAAC;gBACpD,eAAe,CAAC,EAAE,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,EAAE,mCAAI,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;gBAChE,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;gBAExC,IAAI,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBAE/C,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,KAAU,EAAE,IAAY,EAAE,EAAE,CACzD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAuC,EAAE,KAAK,EAAE,IAAI,CAAC,CAC/E,CAAC;aACH;YACD,IAAI,CAAC,aAAa,EAAE,CAAC;SACtB;QAED,KAAK,CAAC,qBAAqB,EAAE,CAAC;IAChC,CAAC;IAEO,qBAAqB,CAAC,YAA4B,EAAE,WAAmB;;QAC7E,IAAI,MAAwB,CAAC;QAC7B,MAAM,GAAG,MAAA,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;YAC1F,WAAW;SACZ,CAAC,0CAAG,CAAC,CAAqB,CAAC;QAC5B,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,GAAG,MAAA,IAAI,CAAC,eAAe,mCAAI,IAAI,CAAC,eAAe,EAAE,CAAC;SACzD;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAES,WAAW;QACnB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACnG,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,qBAAqB,CACnD,IAAY,CAAC,qBAAqB,EAClC,IAAY,CAAC,wBAAwB,CACvC,CAAC;QACF,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CACjD,IAAY,CAAC,mBAAmB,EAChC,IAAY,CAAC,sBAAsB,CACrC,CAAC;IACJ,CAAC;IAMS,SAAS;IAEnB,CAAC;IACD,QAAQ,CAAC,GAAuB;IAEhC,CAAC;IACD,aAAa,CAAC,OAAkB;IAEhC,CAAC;IAED,KAAK;QACH,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;IAC3B,CAAC;IAEO,eAAe;;QACrB,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO,IAAI,CAAC,YAAY,CAAC;SAC1B;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC7C,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC3B,MAAM,MAAM,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;YAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACtC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACpB,IAAI,CAAC,EAAE;oBACL,IAAI,CAAC,YAAY,GAAG,CAAqB,CAAC;oBAC1C,OAAO,CAAqB,CAAC;iBAC9B;aACF;SACF;QACD,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IAES,8BAA8B;QACtC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAwB,CAAC;IACxD,CAAC;IAED,aAAa,CAAC,UAAiB,EAAE,aAA0B,EAAE,GAAQ;QAEnE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;YAC9B,IAAI,CAAC,cAAc,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,aAAa,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;SAChG;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;YAC9B,IAAI,CAAC,cAAc,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;SACjG;QACD,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;IACtD,CAAC;CACF","file":"base-marker.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport { array, isValid, isNil, isString } from '@visactor/vutils';\nimport type { IModelRenderOption } from '../../model/interface';\nimport type { IRegion } from '../../region/interface';\nimport type { ICartesianSeries } from '../../series/interface';\nimport type { ILayoutRect, ILayoutType, IRect, StringOrNumber } from '../../typings';\nimport { BaseComponent } from '../base/base-component';\nimport type {\n  IAggrType,\n  ICoordinateOption,\n  IDataPointSpec,\n  IDataPos,\n  IDataPosCallback,\n  IMarkerSpec\n} from './interface';\nimport type { IGraphic, IGroup } from '@visactor/vrender-core';\nimport { calcLayoutNumber } from '../../util/space';\nimport { isAggrSpec } from './utils';\n\nexport abstract class BaseMarker<T extends IMarkerSpec> extends BaseComponent<T> {\n  layoutType: ILayoutType | 'none' = 'none';\n\n  protected _startRelativeSeries!: ICartesianSeries;\n  protected _endRelativeSeries!: ICartesianSeries;\n  protected _relativeSeries!: ICartesianSeries;\n  getRelativeSeries() {\n    return this._relativeSeries;\n  }\n\n  // marker 组件数据\n  protected _markerData!: DataView;\n  // marker 组件\n  protected _markerComponent!: any;\n\n  protected _layoutOffsetX: number = 0;\n  protected _layoutOffsetY: number = 0;\n\n  private _firstSeries: ICartesianSeries;\n\n  created() {\n    super.created();\n    // event\n    this.initEvent();\n    this._bindSeries();\n    this._initDataView();\n  }\n\n  private _getAllRelativeSeries() {\n    return {\n      getRelativeSeries: () => this._relativeSeries,\n      getStartRelativeSeries: () => this._startRelativeSeries,\n      getEndRelativeSeries: () => this._endRelativeSeries\n    };\n  }\n\n  private _getFieldInfoFromSpec(dim: 'x' | 'y', spec: IDataPos | IDataPosCallback, relativeSeries: ICartesianSeries) {\n    const field = dim === 'x' ? relativeSeries.getSpec().xField : relativeSeries.getSpec().yField;\n    if (isString(spec) && isAggrSpec(spec)) {\n      return {\n        field,\n        aggrType: spec as unknown as IAggrType\n      };\n    }\n    return spec;\n  }\n\n  protected _processSpecX(specX: IDataPos | IDataPosCallback) {\n    const relativeSeries = this._relativeSeries;\n    return {\n      x: this._getFieldInfoFromSpec('x', specX, relativeSeries),\n      ...this._getAllRelativeSeries()\n    };\n  }\n\n  protected _processSpecY(specY: IDataPos | IDataPosCallback) {\n    const relativeSeries = this._relativeSeries;\n    return {\n      y: this._getFieldInfoFromSpec('y', specY, relativeSeries),\n      ...this._getAllRelativeSeries()\n    };\n  }\n\n  protected _processSpecXY(specX: IDataPos | IDataPosCallback, specY: IDataPos | IDataPosCallback) {\n    const relativeSeries = this._relativeSeries;\n\n    return {\n      x: this._getFieldInfoFromSpec('x', specX, relativeSeries),\n      y: this._getFieldInfoFromSpec('y', specY, relativeSeries),\n      ...this._getAllRelativeSeries()\n    };\n  }\n\n  protected _processSpecCoo(spec: any) {\n    const coordinates = spec.coordinates ?? array(spec.coordinate);\n    return coordinates.map((coordinate: IDataPointSpec) => {\n      const refRelativeSeries = this._getSeriesByIdOrIndex(\n        coordinate.refRelativeSeriesId,\n        coordinate.refRelativeSeriesIndex\n      );\n\n      const { xField, yField } = refRelativeSeries.getSpec();\n      const { xFieldDim, xFieldIndex, yFieldDim, yFieldIndex } = coordinate;\n      let bindXField = xField;\n      if (isValid(xFieldIndex)) {\n        bindXField = array(xField)[xFieldIndex];\n      }\n      if (xFieldDim && array(xField).includes(xFieldDim)) {\n        bindXField = xFieldDim;\n      }\n\n      let bindYField = yField;\n      if (isValid(yFieldIndex)) {\n        bindYField = array(yField)[yFieldIndex];\n      }\n      if (yFieldDim && array(yField).includes(yFieldDim)) {\n        bindYField = yFieldDim;\n      }\n\n      const option: ICoordinateOption = {\n        x: undefined,\n        y: undefined,\n        ...this._getAllRelativeSeries()\n      };\n\n      if (isString(coordinate[bindXField]) && isAggrSpec(coordinate[bindXField] as IDataPos)) {\n        option.x = { field: bindXField, aggrType: coordinate[bindXField] as IAggrType };\n      } else {\n        option.x = array(bindXField).map(field => coordinate[field]);\n      }\n\n      if (isString(coordinate[bindYField]) && isAggrSpec(coordinate[bindYField] as IDataPos)) {\n        option.y = { field: bindYField, aggrType: coordinate[bindYField] as IAggrType };\n      } else {\n        option.y = array(bindYField).map(field => coordinate[field]);\n      }\n      option.getRefRelativeSeries = () => refRelativeSeries;\n      return option;\n    });\n  }\n\n  updateLayoutAttribute(): void {\n    const markerVisible = this._spec.visible ?? true;\n    if (markerVisible) {\n      // 创建marker组件\n      if (!this._markerComponent) {\n        const markerComponent = this._createMarkerComponent();\n        markerComponent.name = this._spec.name ?? this.type;\n        markerComponent.id = this._spec.id ?? `${this.type}-${this.id}`;\n        this._markerComponent = markerComponent;\n\n        this.getContainer().add(this._markerComponent);\n        // 代理 marker 组件上的事件\n        this._markerComponent.on('*', (event: any, type: string) =>\n          this._delegateEvent(this._markerComponent as unknown as IGraphic, event, type)\n        );\n      }\n      this._markerLayout();\n    }\n\n    super.updateLayoutAttribute();\n  }\n\n  private _getSeriesByIdOrIndex(seriesUserId: StringOrNumber, seriesIndex: number) {\n    let series: ICartesianSeries;\n    series = this._option.getSeriesInUserIdOrIndex(isValid(seriesUserId) ? [seriesUserId] : [], [\n      seriesIndex\n    ])?.[0] as ICartesianSeries;\n    if (!series) {\n      series = this._relativeSeries ?? this._getFirstSeries();\n    }\n    return series;\n  }\n\n  protected _bindSeries() {\n    const spec = this._spec;\n    this._relativeSeries = this._getSeriesByIdOrIndex(spec.relativeSeriesId, spec.relativeSeriesIndex);\n    this._startRelativeSeries = this._getSeriesByIdOrIndex(\n      (spec as any).startRelativeSeriesId,\n      (spec as any).startRelativeSeriesIndex\n    );\n    this._endRelativeSeries = this._getSeriesByIdOrIndex(\n      (spec as any).endRelativeSeriesId,\n      (spec as any).endRelativeSeriesIndex\n    );\n  }\n\n  protected abstract _initDataView(): void;\n  protected abstract _createMarkerComponent(): IGroup;\n  protected abstract _markerLayout(): void;\n\n  protected initEvent() {\n    // do nothing\n  }\n  onRender(ctx: IModelRenderOption): void {\n    // do nothing\n  }\n  changeRegions(regions: IRegion[]): void {\n    // do nothing\n  }\n\n  clear(): void {\n    super.clear();\n    this._firstSeries = null;\n  }\n\n  private _getFirstSeries(): ICartesianSeries {\n    if (this._firstSeries) {\n      return this._firstSeries;\n    }\n    for (let i = 0; i < this._regions.length; i++) {\n      const r = this._regions[i];\n      const series = r.getSeries();\n      for (let j = 0; j < series.length; j++) {\n        const s = series[j];\n        if (s) {\n          this._firstSeries = s as ICartesianSeries;\n          return s as ICartesianSeries;\n        }\n      }\n    }\n    this._option?.onError('need at least one series');\n    return null;\n  }\n\n  protected _getNeedClearVRenderComponents(): IGraphic[] {\n    return [this._markerComponent] as unknown as IGroup[];\n  }\n\n  onLayoutStart(layoutRect: IRect, chartViewRect: ILayoutRect, ctx: any): void {\n    // offset\n    if (!isNil(this._spec.offsetX)) {\n      this._layoutOffsetX = calcLayoutNumber(this._spec.offsetX, chartViewRect.width, chartViewRect);\n    }\n    if (!isNil(this._spec.offsetY)) {\n      this._layoutOffsetY = calcLayoutNumber(this._spec.offsetY, chartViewRect.height, chartViewRect);\n    }\n    super.onLayoutStart(layoutRect, chartViewRect, ctx);\n  }\n}\n"]}

package/esm/component/marker/interface.d.ts

@@ -3,11 +3,18 @@ import type { SymbolType, IRichTextCharacter } from '@visactor/vrender-core';
 import type { IRectMarkSpec, ISymbolMarkSpec, ITextMarkSpec, StringOrNumber } from '../../typings';
 import type { IComponentSpec } from '../base/interface';
 import type { Datum } from '@visactor/vrender-components';
+import type { ICartesianSeries } from '../../series/interface';
+import type { IOptionAggrField, IOptionSeries } from '../../data/transforms/aggregation';
+export type OffsetPoint = {
+    x?: number | string;
+    y?: number | string;
+};
 export type IAggrType = 'sum' | 'average' | 'min' | 'max' | 'variance' | 'standardDeviation' | 'median';
 export type IDataPos = StringOrNumber | IAggrType;
-export type IDataPosCallback = (relativeSeriesData: any, startRelativeSeriesData: any, endRelativeSeriesData: any) => IDataPos;
+export type IDataPosCallback = (relativeSeriesData: Datum[], startRelativeSeriesData: Datum[], endRelativeSeriesData: Datum[], relativeSeries: ICartesianSeries, startRelativeSeries: ICartesianSeries, endRelativeSeries: ICartesianSeries) => StringOrNumber;
+export type IDataPointCallback = (relativeSeriesData: Datum[], relativeSeries: ICartesianSeries) => StringOrNumber;
 export type IDataPointSpec = {
-    [key: string]: IDataPos;
+    [key: string]: IDataPos | IDataPointCallback;
     refRelativeSeriesIndex?: number;
     refRelativeSeriesId?: StringOrNumber;
     xFieldIndex?: number;
@@ -15,12 +22,17 @@ export type IDataPointSpec = {
     yFieldIndex?: number;
     yFieldDim?: string;
 };
-type Point = {
-    x: number;
-    y: number;
+export type MarkerPositionPoint = {
+    x: StringOrNumber;
+    y: StringOrNumber;
 };
+export type ICoordinateOption = {
+    x?: IOptionAggrField | (IDataPointCallback | StringOrNumber)[];
+    y?: IOptionAggrField | (IDataPointCallback | StringOrNumber)[];
+    getRefRelativeSeries?: () => ICartesianSeries;
+} & IOptionSeries;
 export type IMarkerPositionsSpec = {
-    positions: Point[];
+    positions: MarkerPositionPoint[];
     regionRelative?: boolean;
 };
 export type IMarkerLabelWithoutRefSpec = {
@@ -52,12 +64,11 @@ export interface IMarkerRef {
     refY?: number;
     refAngle?: number;
 }
-export interface IMarkerAxisSpec {
+export interface IMarkerCrossSeriesSpec {
     startRelativeSeriesIndex?: number;
     endRelativeSeriesIndex?: number;
     startRelativeSeriesId?: string;
     endRelativeSeriesId?: string;
-    relativeRelativeSeriesIndex?: number;
 }
 export interface IMarkerSpec extends IComponentSpec {
     relativeSeriesIndex?: number;
@@ -74,4 +85,3 @@ export interface IMarkerSymbol extends IMarkerRef {
     size?: number;
     style?: Omit<ISymbolMarkSpec, 'visible'>;
 }
-export {};

package/esm/component/marker/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/marker/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IPadding } from '@visactor/vutils';\nimport type { SymbolType, IRichTextCharacter } from '@visactor/vrender-core';\nimport type { IRectMarkSpec, ISymbolMarkSpec, ITextMarkSpec, StringOrNumber } from '../../typings';\nimport type { IComponentSpec } from '../base/interface';\nimport type { Datum } from '@visactor/vrender-components';\n\nexport type IAggrType = 'sum' | 'average' | 'min' | 'max' | 'variance' | 'standardDeviation' | 'median';\nexport type IDataPos = StringOrNumber | IAggrType;\nexport type IDataPosCallback = (\n  relativeSeriesData: any,\n  startRelativeSeriesData: any,\n  endRelativeSeriesData: any\n) => IDataPos;\nexport type IDataPointSpec = {\n  [key: string]: IDataPos;\n  /**\n   * 具体某个数据元素关联的series（仅在标注目标：数据元素下有效）\n   */\n  refRelativeSeriesIndex?: number;\n  refRelativeSeriesId?: StringOrNumber;\n  /**\n   * 指定使用 xField 上的那个维度索引，因为 xField 字段有可能会包含多个维度，比如分组场景\n   * @default 0\n   * @since 1.7.0\n   */\n  xFieldIndex?: number;\n  /**\n   * 指定使用 xField 上的维度名称，因为 xField 字段有可能会包含多个维度，比如分组场景。\n   * `xFieldIndex` 和 `xFieldDim` 声明一个即可，同时声明则 `xFieldDim` 优先级更高。\n   * @since 1.7.0\n   */\n  xFieldDim?: string;\n  /**\n   * 指定使用 yField 上的那个维度索引，因为 yField 字段有可能会包含多个维度，比如分组场景。\n   * @default 0\n   * @since 1.7.0\n   */\n  yFieldIndex?: number;\n  /**\n   * 指定使用 yField 上的维度名称，因为 yField 字段有可能会包含多个维度，比如分组场景。\n   * `yFieldIndex` 和 `yFieldDim` 声明一个即可，同时声明则 `yFieldDim` 优先级更高。\n   * @since 1.7.0\n   */\n  yFieldDim?: string;\n};\n\ntype Point = {\n  x: number;\n  y: number;\n};\nexport type IMarkerPositionsSpec = {\n  positions: Point[];\n  /**\n   * 是否为相对 region 的坐标，默认为 false，即相对画布的坐标\n   * @default false\n   * @since 1.7.0\n   */\n  regionRelative?: boolean;\n};\n\nexport type IMarkerLabelWithoutRefSpec = {\n  visible?: boolean;\n  /**\n   * label整体 - 是否自动旋转\n   */\n  autoRotate?: boolean;\n  /**\n   * label整体 - 最小宽度，像素值\n   * @default 30\n   */\n  minWidth?: number;\n  /**\n   * label整体 - 最大宽度，像素值。当文字超过最大宽度时，会自动省略。\n   */\n  maxWidth?: number;\n  /**\n   * label整体 - 背景面板配置\n   */\n  labelBackground?: {\n    visible?: boolean;\n    /**\n     * 内部边距\n     */\n    padding?: IPadding | number[] | number;\n    /**\n     * 背景面板样式\n     */\n    style?: Omit<IRectMarkSpec, 'visible'>;\n  };\n  /**\n   * 文本类型：text, rich, html\n   */\n  type?: 'text' | 'rich' | 'html';\n  /**\n   * 文本内容，如果需要进行换行，则使用数组形式，如 ['abc', '123']\n   * 支持富文本内容, 如textConfig, html, 设置富文本时要配置type类型为'rich'或'html'\n   */\n  text?: string | string[] | number | number[] | IRichTextCharacter[];\n  /**\n   * label文本 - 文本格式化\n   * @param markData 组成标注的数据\n   * @param seriesData 标注关联的数据\n   * @returns 格式化后的文本\n   */\n  formatMethod?: (\n    markData: Datum[],\n    seriesData: Datum[]\n  ) => string | string[] | number | number[] | IRichTextCharacter[];\n  /**\n   * label文本 - 文本样式\n   */\n  style?: Omit<ITextMarkSpec, 'visible'>;\n\n  /**\n   * label文本 - 文本前 mark 图元\n   */\n  shape?: {\n    visible?: boolean;\n    style: Omit<ISymbolMarkSpec, 'visible'>;\n  };\n  /**\n   * label文本 - shape 同文本之间的间距\n   */\n  space?: number;\n\n  /**\n   * 是否自动调整 label 使其展示在 marker 可见区域内。\n   * @default false\n   * @since 1.4.0\n   */\n  confine?: boolean;\n  /**\n   * 水平方向的偏移\n   */\n  dx?: number;\n  /**\n   * 垂直方向的偏移\n   */\n  dy?: number;\n};\n\nexport type IMarkerLabelSpec = IMarkerLabelWithoutRefSpec & IMarkerRef;\n\nexport interface IMarkerRef {\n  /**\n   * label or symbol 相对line平行方向上的偏移\n   */\n  refX?: number;\n  /**\n   * label or symbol 相对line正交方向上的偏移\n   */\n  refY?: number;\n  /**\n   * label or symbol 相对默认角度的偏移 （label跟随line的角度做自动旋转时，默认按照line的平行向量作为初始角度）\n   */\n  refAngle?: number;\n}\n\nexport interface IMarkerAxisSpec {\n  /**\n   * 起点和终点关联的series（仅在标注目标：坐标空间下有效）\n   */\n  startRelativeSeriesIndex?: number;\n  endRelativeSeriesIndex?: number;\n  startRelativeSeriesId?: string;\n  endRelativeSeriesId?: string;\n  /**\n   * 被标注数据关联的series\n   */\n  relativeRelativeSeriesIndex?: number;\n}\n\nexport interface IMarkerSpec extends IComponentSpec {\n  /**\n   * 标注数据关联的series\n   */\n  relativeSeriesIndex?: number;\n  relativeSeriesId?: number | string;\n  /**\n   * marker组件是否可见\n   * @default true\n   */\n  visible?: boolean;\n  /**\n   * marker组件是否可交互\n   * @default false\n   */\n  interactive?: boolean;\n  /**\n   * marker组件是否自动拓展轴范围\n   * @default false\n   * @since 1.1.0\n   */\n  autoRange?: boolean;\n  /**\n   * marker组件超出图表区域是否被裁剪\n   * @default false\n   * @since 1.3.0\n   */\n  clip?: boolean;\n\n  /**\n   * 标注组件的名称标识\n   * @since 1.7.0\n   */\n  name?: string;\n}\n\nexport interface IMarkerSymbol extends IMarkerRef {\n  /** 是否展示 symbol */\n  visible: boolean;\n  /**\n   * symbol 形状，默认为带左右方向的箭头\n   */\n  symbolType?: SymbolType;\n  /**\n   * symbol 大小\n   */\n  size?: number;\n  style?: Omit<ISymbolMarkSpec, 'visible'>;\n}\n"]}
+{"version":3,"sources":["../src/component/marker/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IPadding } from '@visactor/vutils';\nimport type { SymbolType, IRichTextCharacter } from '@visactor/vrender-core';\nimport type { IRectMarkSpec, ISymbolMarkSpec, ITextMarkSpec, StringOrNumber } from '../../typings';\nimport type { IComponentSpec } from '../base/interface';\nimport type { Datum } from '@visactor/vrender-components';\nimport type { ICartesianSeries } from '../../series/interface';\nimport type { IOptionAggrField, IOptionSeries } from '../../data/transforms/aggregation';\n\nexport type OffsetPoint = {\n  /**\n   * x 方向的偏移\n   * 1. number 类型表示像素值，如 12\n   * 2. string 类型表示百分比，如 '10%' 表示相对于所在 region 宽度的占比\n   */\n  x?: number | string;\n  /**\n   * y 方向的偏移\n   * 1. number 类型表示像素值，如 12\n   * 2. string 类型表示百分比，如 '10%' 表示相对于所在 region 高度的占比\n   */\n  y?: number | string;\n};\n\nexport type IAggrType = 'sum' | 'average' | 'min' | 'max' | 'variance' | 'standardDeviation' | 'median';\nexport type IDataPos = StringOrNumber | IAggrType;\nexport type IDataPosCallback = (\n  relativeSeriesData: Datum[],\n  startRelativeSeriesData: Datum[],\n  endRelativeSeriesData: Datum[],\n  relativeSeries: ICartesianSeries,\n  startRelativeSeries: ICartesianSeries,\n  endRelativeSeries: ICartesianSeries\n) => StringOrNumber;\n\nexport type IDataPointCallback = (relativeSeriesData: Datum[], relativeSeries: ICartesianSeries) => StringOrNumber;\nexport type IDataPointSpec = {\n  /**\n   * 数据字段配置\n   */\n  [key: string]: IDataPos | IDataPointCallback;\n  /**\n   * 具体某个数据元素关联的series（仅在标注目标：数据元素下有效）\n   */\n  refRelativeSeriesIndex?: number;\n  refRelativeSeriesId?: StringOrNumber;\n  /**\n   * 指定使用 xField 上的那个维度索引，因为 xField 字段有可能会包含多个维度，比如分组场景\n   * @default 0\n   * @since 1.7.0\n   */\n  xFieldIndex?: number;\n  /**\n   * 指定使用 xField 上的维度名称，因为 xField 字段有可能会包含多个维度，比如分组场景。\n   * `xFieldIndex` 和 `xFieldDim` 声明一个即可，同时声明则 `xFieldDim` 优先级更高。\n   * @since 1.7.0\n   */\n  xFieldDim?: string;\n  /**\n   * 指定使用 yField 上的那个维度索引，因为 yField 字段有可能会包含多个维度，比如分组场景。\n   * @default 0\n   * @since 1.7.0\n   */\n  yFieldIndex?: number;\n  /**\n   * 指定使用 yField 上的维度名称，因为 yField 字段有可能会包含多个维度，比如分组场景。\n   * `yFieldIndex` 和 `yFieldDim` 声明一个即可，同时声明则 `yFieldDim` 优先级更高。\n   * @since 1.7.0\n   */\n  yFieldDim?: string;\n};\n\nexport type MarkerPositionPoint = {\n  /**\n   * x 坐标位置，number 类型表示像素值，string 类型表示相对画布宽度或者 region 宽度的占比（从左往右）\n   */\n  x: StringOrNumber;\n  /**\n   * y 坐标位置，number 类型表示像素值，string 类型表示相对画布高度或者 region 高度的占比（从上至下）\n   */\n  y: StringOrNumber;\n};\n\nexport type ICoordinateOption = {\n  x?: IOptionAggrField | (IDataPointCallback | StringOrNumber)[];\n  y?: IOptionAggrField | (IDataPointCallback | StringOrNumber)[];\n  getRefRelativeSeries?: () => ICartesianSeries;\n} & IOptionSeries;\n\nexport type IMarkerPositionsSpec = {\n  /**\n   * 画布坐标\n   */\n  positions: MarkerPositionPoint[];\n  /**\n   * 是否为相对 region 的坐标，默认为 false，即相对画布的坐标\n   * @default false\n   * @since 1.7.0\n   */\n  regionRelative?: boolean;\n};\n\nexport type IMarkerLabelWithoutRefSpec = {\n  visible?: boolean;\n  /**\n   * label整体 - 是否自动旋转\n   */\n  autoRotate?: boolean;\n  /**\n   * label整体 - 最小宽度，像素值\n   * @default 30\n   */\n  minWidth?: number;\n  /**\n   * label整体 - 最大宽度，像素值。当文字超过最大宽度时，会自动省略。\n   */\n  maxWidth?: number;\n  /**\n   * label整体 - 背景面板配置\n   */\n  labelBackground?: {\n    visible?: boolean;\n    /**\n     * 内部边距\n     */\n    padding?: IPadding | number[] | number;\n    /**\n     * 背景面板样式\n     */\n    style?: Omit<IRectMarkSpec, 'visible'>;\n  };\n  /**\n   * 文本类型：text, rich, html\n   */\n  type?: 'text' | 'rich' | 'html';\n  /**\n   * 文本内容，如果需要进行换行，则使用数组形式，如 ['abc', '123']\n   * 支持富文本内容, 如textConfig, html, 设置富文本时要配置type类型为'rich'或'html'\n   */\n  text?: string | string[] | number | number[] | IRichTextCharacter[];\n  /**\n   * label文本 - 文本格式化\n   * @param markData 组成标注的数据\n   * @param seriesData 标注关联的数据\n   * @returns 格式化后的文本\n   */\n  formatMethod?: (\n    markData: Datum[],\n    seriesData: Datum[]\n  ) => string | string[] | number | number[] | IRichTextCharacter[];\n  /**\n   * label文本 - 文本样式\n   */\n  style?: Omit<ITextMarkSpec, 'visible'>;\n\n  /**\n   * label文本 - 文本前 mark 图元\n   */\n  shape?: {\n    visible?: boolean;\n    style: Omit<ISymbolMarkSpec, 'visible'>;\n  };\n  /**\n   * label文本 - shape 同文本之间的间距\n   */\n  space?: number;\n\n  /**\n   * 是否自动调整 label 使其展示在 marker 可见区域内。\n   * @default false\n   * @since 1.4.0\n   */\n  confine?: boolean;\n  /**\n   * 水平方向的偏移\n   */\n  dx?: number;\n  /**\n   * 垂直方向的偏移\n   */\n  dy?: number;\n};\n\nexport type IMarkerLabelSpec = IMarkerLabelWithoutRefSpec & IMarkerRef;\n\nexport interface IMarkerRef {\n  /**\n   * label or symbol 相对line平行方向上的偏移\n   */\n  refX?: number;\n  /**\n   * label or symbol 相对line正交方向上的偏移\n   */\n  refY?: number;\n  /**\n   * label or symbol 相对默认角度的偏移 （label跟随line的角度做自动旋转时，默认按照line的平行向量作为初始角度）\n   */\n  refAngle?: number;\n}\n\n// 跨越系列的配置\nexport interface IMarkerCrossSeriesSpec {\n  /**\n   * 起点和终点关联的series（仅在标注目标：坐标空间下有效）\n   */\n  startRelativeSeriesIndex?: number;\n  endRelativeSeriesIndex?: number;\n  startRelativeSeriesId?: string;\n  endRelativeSeriesId?: string;\n}\n\nexport interface IMarkerSpec extends IComponentSpec {\n  /**\n   * 标注数据关联的series\n   */\n  relativeSeriesIndex?: number;\n  relativeSeriesId?: number | string;\n  /**\n   * marker组件是否可见\n   * @default true\n   */\n  visible?: boolean;\n  /**\n   * marker组件是否可交互\n   * @default false\n   */\n  interactive?: boolean;\n  /**\n   * marker组件是否自动拓展轴范围\n   * @default false\n   * @since 1.1.0\n   */\n  autoRange?: boolean;\n  /**\n   * marker组件超出图表区域是否被裁剪\n   * @default false\n   * @since 1.3.0\n   */\n  clip?: boolean;\n\n  /**\n   * 标注组件的名称标识\n   * @since 1.7.0\n   */\n  name?: string;\n}\n\nexport interface IMarkerSymbol extends IMarkerRef {\n  /** 是否展示 symbol */\n  visible: boolean;\n  /**\n   * symbol 形状，默认为带左右方向的箭头\n   */\n  symbolType?: SymbolType;\n  /**\n   * symbol 大小\n   */\n  size?: number;\n  style?: Omit<ISymbolMarkSpec, 'visible'>;\n}\n"]}

package/esm/component/marker/mark-area/interface/spec.d.ts

@@ -1,26 +1,24 @@
 import type { IComponent } from '../../../interface';
-import type { IMarkerPositionsSpec, IDataPointSpec, IDataPos, IMarkerSpec, IMarkerAxisSpec, IDataPosCallback } from '../../interface';
+import type { IMarkerPositionsSpec, IDataPointSpec, IDataPos, IMarkerSpec, IDataPosCallback, IMarkerCrossSeriesSpec, OffsetPoint } from '../../interface';
 import type { IMarkAreaTheme } from './theme';
 export type IMarkArea = IComponent;
 export type IRegressType = 'regression';
-export type IMarkAreaSpec = IMarkerSpec & (IMarkAreaXSpec | IMarkAreaYSpec | (IMarkAreaXSpec & IMarkAreaYSpec) | IMarkAreaCoordinateSpec | IMarkAreaPositionsSpec) & IMarkAreaTheme;
-export interface IMarkAreaXSpec extends IMarkerAxisSpec {
+export type IMarkAreaSpec = IMarkerSpec & (IMarkAreaXSpec | IMarkAreaYSpec | IMarkAreaXYSpec | IMarkAreaCoordinateSpec | IMarkerPositionsSpec) & IMarkAreaTheme;
+export interface IMarkAreaXSpec extends IMarkerCrossSeriesSpec {
     x: IDataPos | IDataPosCallback;
     x1: IDataPos | IDataPosCallback;
 }
-export interface IMarkAreaYSpec extends IMarkerAxisSpec {
+export interface IMarkAreaYSpec extends IMarkerCrossSeriesSpec {
     y: IDataPos | IDataPosCallback;
     y1: IDataPos | IDataPosCallback;
 }
-export interface IMarkAreaAngleSpec extends IMarkerAxisSpec {
-    startAngle: IDataPos | IDataPosCallback;
-    endAngle: IDataPos | IDataPosCallback;
-}
-export interface IMarkAreaRadiusSpec extends IMarkerAxisSpec {
-    startRadius: IDataPos | IDataPosCallback;
-    endRadius: IDataPos | IDataPosCallback;
+export interface IMarkAreaXYSpec extends IMarkerCrossSeriesSpec {
+    x: IDataPos | IDataPosCallback;
+    x1: IDataPos | IDataPosCallback;
+    y: IDataPos | IDataPosCallback;
+    y1: IDataPos | IDataPosCallback;
 }
 export type IMarkAreaCoordinateSpec = {
     coordinates: IDataPointSpec[];
+    coordinatesOffset?: OffsetPoint[];
 };
-export type IMarkAreaPositionsSpec = IMarkerPositionsSpec;

package/esm/component/marker/mark-area/interface/spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/marker/mark-area/interface/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { IComponent } from '../../../interface';\nimport type {\n  IMarkerPositionsSpec,\n  IDataPointSpec,\n  IDataPos,\n  IMarkerSpec,\n  IMarkerAxisSpec,\n  IDataPosCallback\n} from '../../interface';\nimport type { IMarkAreaTheme } from './theme';\n\nexport type IMarkArea = IComponent;\n\nexport type IRegressType = 'regression';\n\nexport type IMarkAreaSpec = IMarkerSpec &\n  (\n    | IMarkAreaXSpec // 标注目标：笛卡尔坐标系坐标空间\n    | IMarkAreaYSpec // 标注目标：笛卡尔坐标系坐标空间\n    | (IMarkAreaXSpec & IMarkAreaYSpec)\n    // | IMarkAreaAngleSpec // TODO: 标注目标：极坐标系坐标空间\n    // | IMarkAreaRadiusSpec // TODO: 标注目标：极坐标系坐标空间\n    | IMarkAreaCoordinateSpec // 标注目标：数据元素\n    | IMarkAreaPositionsSpec\n  ) &\n  IMarkAreaTheme; // 标注目标：任意位置\n\nexport interface IMarkAreaXSpec extends IMarkerAxisSpec {\n  /**\n   * x轴上的参考线。可以配置参考线在x轴上的值，或者聚合计算类型\n   * 可以将 x 配置为 '15%' 百分比的形式，用于表示将 x 绘制在 marker 所在 region 横轴（从左往右）的百分之 15 位置处\n   */\n  x: IDataPos | IDataPosCallback;\n  x1: IDataPos | IDataPosCallback;\n}\n\nexport interface IMarkAreaYSpec extends IMarkerAxisSpec {\n  /**\n   * y轴上的参考线。可以配置参考线在y轴上的值，或者聚合计算类型\n   * 可以将 y 配置为 '15%' 百分比的形式，用于表示将 y 绘制在 marker 所在 region 纵轴（从上到下）的百分之 15 位置处\n   */\n  y: IDataPos | IDataPosCallback;\n  y1: IDataPos | IDataPosCallback;\n}\n\nexport interface IMarkAreaAngleSpec extends IMarkerAxisSpec {\n  /**\n   * todo: angle轴上的参考线。可以配置参考线在angle轴上的值，或者聚合计算类型\n   */\n  startAngle: IDataPos | IDataPosCallback;\n  endAngle: IDataPos | IDataPosCallback;\n}\n\nexport interface IMarkAreaRadiusSpec extends IMarkerAxisSpec {\n  /**\n   * todo: radius轴上的参考线。可以配置参考线在radius轴上的值，或者聚合计算类型\n   */\n  startRadius: IDataPos | IDataPosCallback;\n  endRadius: IDataPos | IDataPosCallback;\n}\n\nexport type IMarkAreaCoordinateSpec = {\n  /**\n   * 指定数据点的参考线。基于指定数据点进行参考线的绘制，可以对数据点进行数据处理\n   */\n  coordinates: IDataPointSpec[];\n};\n\n/**\n * 指定坐标点的参考线。基于指定坐标进行参考线的绘制\n */\nexport type IMarkAreaPositionsSpec = IMarkerPositionsSpec;\n"]}
+{"version":3,"sources":["../src/component/marker/mark-area/interface/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { IComponent } from '../../../interface';\nimport type {\n  IMarkerPositionsSpec,\n  IDataPointSpec,\n  IDataPos,\n  IMarkerSpec,\n  IDataPosCallback,\n  IMarkerCrossSeriesSpec,\n  OffsetPoint\n} from '../../interface';\nimport type { IMarkAreaTheme } from './theme';\n\nexport type IMarkArea = IComponent;\n\nexport type IRegressType = 'regression';\n\nexport type IMarkAreaSpec = IMarkerSpec &\n  (\n    | IMarkAreaXSpec // 标注目标：笛卡尔坐标系坐标空间\n    | IMarkAreaYSpec // 标注目标：笛卡尔坐标系坐标空间\n    | IMarkAreaXYSpec // 标注目标：笛卡尔坐标系坐标空间\n    | IMarkAreaCoordinateSpec // 标注目标：数据元素\n    | IMarkerPositionsSpec\n  ) &\n  IMarkAreaTheme; // 标注目标：任意位置\n\nexport interface IMarkAreaXSpec extends IMarkerCrossSeriesSpec {\n  /**\n   * x轴上的参考线。可以配置参考线在x轴上的值，或者聚合计算类型\n   * 可以将 x 配置为 '15%' 百分比的形式，用于表示将 x 绘制在 marker 所在 region 横轴（从左往右）的百分之 15 位置处\n   */\n  x: IDataPos | IDataPosCallback;\n  x1: IDataPos | IDataPosCallback;\n}\n\nexport interface IMarkAreaYSpec extends IMarkerCrossSeriesSpec {\n  /**\n   * y轴上的参考线。可以配置参考线在y轴上的值，或者聚合计算类型\n   * 可以将 y 配置为 '15%' 百分比的形式，用于表示将 y 绘制在 marker 所在 region 纵轴（从上到下）的百分之 15 位置处\n   */\n  y: IDataPos | IDataPosCallback;\n  y1: IDataPos | IDataPosCallback;\n}\n\nexport interface IMarkAreaXYSpec extends IMarkerCrossSeriesSpec {\n  /**\n   * x轴上的参考线。可以配置参考线在x轴上的值，或者聚合计算类型\n   * 可以将 x 配置为 '15%' 百分比的形式，用于表示将 x 绘制在 marker 所在 region 横轴（从左往右）的百分之 15 位置处\n   */\n  x: IDataPos | IDataPosCallback;\n  x1: IDataPos | IDataPosCallback;\n  /**\n   * y轴上的参考线。可以配置参考线在y轴上的值，或者聚合计算类型\n   * 可以将 y 配置为 '15%' 百分比的形式，用于表示将 y 绘制在 marker 所在 region 纵轴（从上到下）的百分之 15 位置处\n   */\n  y: IDataPos | IDataPosCallback;\n  y1: IDataPos | IDataPosCallback;\n}\n\nexport type IMarkAreaCoordinateSpec = {\n  /**\n   * 指定数据点的参考线。基于指定数据点进行参考线的绘制，可以对数据点进行数据处理\n   */\n  coordinates: IDataPointSpec[];\n\n  /**\n   * 对每个数据点转化后的画布坐标点进行偏移，该偏移值可以是像素值，也可以是 string 类型，如 '20%' 代表百分比\n   * 每个元素对应一个坐标点的偏移量\n   * @since 1.7.3\n   */\n  coordinatesOffset?: OffsetPoint[];\n};\n"]}

package/esm/component/marker/mark-area/mark-area.d.ts

@@ -3,7 +3,8 @@ import type { IComponentOption } from '../../interface';
 import { ComponentTypeEnum } from '../../interface/type';
 import { MarkArea as MarkAreaComponent } from '@visactor/vrender-components';
 import { BaseMarker } from '../base-marker';
-export declare class MarkArea extends BaseMarker<IMarkAreaSpec & IMarkAreaTheme> implements IMarkArea {
+import type { IGroup } from '@visactor/vrender-core';
+export declare class MarkArea extends BaseMarker<IMarkAreaSpec> implements IMarkArea {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
@@ -11,7 +12,7 @@ export declare class MarkArea extends BaseMarker<IMarkAreaSpec & IMarkAreaTheme>
     protected _theme: IMarkAreaTheme;
     protected _markerComponent: MarkAreaComponent;
     static createComponent(spec: any, options: IComponentOption): MarkArea | MarkArea[];
-    protected _createMarkerComponent(): void;
+    protected _createMarkerComponent(): IGroup;
     protected _markerLayout(): void;
     protected _initDataView(): void;
 }

package/esm/component/marker/mark-area/mark-area.js

@@ -4,7 +4,7 @@ import { ComponentTypeEnum } from "../../interface/type";
 
 import { markerAggregation } from "../../../data/transforms/aggregation";
 
-import { coordinateLayout, xyLayout } from "../utils";
+import { computeClipRange, coordinateLayout, positionLayout, xyLayout } from "../utils";
 
 import { registerDataSetInstanceTransform } from "../../../data/register";
 
@@ -18,8 +18,6 @@ import { BaseMarker } from "../base-marker";
 
 import { LayoutZIndex } from "../../../constant";
 
-import { markerRegression } from "../../../data/transforms/regression";
-
 import { Factory } from "../../../core/factory";
 
 export class MarkArea extends BaseMarker {
@@ -39,8 +37,8 @@ export class MarkArea extends BaseMarker {
         })), markAreas;
     }
     _createMarkerComponent() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
-        const markArea = new MarkAreaComponent({
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        return new MarkAreaComponent({
             zIndex: this.layoutZIndex,
             interactive: null !== (_a = this._spec.interactive) && void 0 !== _a && _a,
             points: [ {
@@ -60,34 +58,24 @@ export class MarkArea extends BaseMarker {
             }),
             clipInRange: null !== (_q = this._spec.clip) && void 0 !== _q && _q
         });
-        this._markerComponent = markArea, this._markerComponent.name = null !== (_r = this._spec.name) && void 0 !== _r ? _r : this.type, 
-        this._markerComponent.id = null !== (_s = this._spec.id) && void 0 !== _s ? _s : `${this.type}-${this.id}`, 
-        this.getContainer().add(this._markerComponent);
     }
     _markerLayout() {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         const spec = this._spec, data = this._markerData, startRelativeSeries = this._startRelativeSeries, endRelativeSeries = this._endRelativeSeries, relativeSeries = this._relativeSeries, isXLayout = isValid(spec.x) && isValid(spec.x1), isYLayout = isValid(spec.y) && isValid(spec.y1), isXYLayout = isXLayout && isYLayout, isCoordinateLayout = isValid(spec.coordinates), isPositionLayout = isValid(spec.positions), autoRange = null !== (_a = spec.autoRange) && void 0 !== _a && _a;
         let points = [], lines = [];
-        if (isXYLayout) lines = xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange), 
+        isXYLayout ? (lines = xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange), 
         points = [ {
             x: lines[0][0].x,
             y: lines[1][0].y
         }, lines[0][0], {
             x: lines[1][0].x,
             y: lines[0][0].y
-        }, lines[1][0] ]; else if (isXLayout) lines = xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange), 
-        points = [ ...lines[0], lines[1][1], lines[1][0] ]; else if (isYLayout) lines = xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange), 
-        points = [ ...lines[0], lines[1][1], lines[1][0] ]; else if (isCoordinateLayout) points = coordinateLayout(data, relativeSeries, autoRange); else if (isPositionLayout) if (spec.regionRelative) {
-            const region = relativeSeries.getRegion(), {x: regionStartX, y: regionStartY} = region.getLayoutStartPoint();
-            points = spec.positions.map((point => ({
-                x: point.x + regionStartX,
-                y: point.y + regionStartY
-            })));
-        } else points = spec.positions;
+        }, lines[1][0] ]) : isXLayout || isYLayout ? (lines = xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange), 
+        points = [ ...lines[0], lines[1][1], lines[1][0] ]) : isCoordinateLayout ? points = coordinateLayout(data, relativeSeries, autoRange, spec.coordinatesOffset) : isPositionLayout && (points = positionLayout(spec.positions, relativeSeries, spec.regionRelative));
         const seriesData = this._relativeSeries.getViewData().latestData, dataPoints = data ? data.latestData[0].latestData ? data.latestData[0].latestData : data.latestData : seriesData;
         let limitRect;
         if (spec.clip || (null === (_b = spec.label) || void 0 === _b ? void 0 : _b.confine)) {
-            const {minX: minX, maxX: maxX, minY: minY, maxY: maxY} = this._computeClipRange([ startRelativeSeries.getRegion(), endRelativeSeries.getRegion(), relativeSeries.getRegion() ]);
+            const {minX: minX, maxX: maxX, minY: minY, maxY: maxY} = computeClipRange([ startRelativeSeries.getRegion(), endRelativeSeries.getRegion(), relativeSeries.getRegion() ]);
             limitRect = {
                 x: minX,
                 y: minY,
@@ -109,13 +97,13 @@ export class MarkArea extends BaseMarker {
         const spec = this._spec, relativeSeries = this._relativeSeries, isXProcess = isValid(spec.x) && isValid(spec.x1), isYProcess = isValid(spec.y) && isValid(spec.y1), isXYProcess = isXProcess && isYProcess, isCoordinateProcess = isValid(spec.coordinates);
         if (!isXProcess && !isYProcess && !isCoordinateProcess) return null;
         let options;
-        registerDataSetInstanceTransform(this._option.dataSet, "markerAggregation", markerAggregation), 
-        registerDataSetInstanceTransform(this._option.dataSet, "markerRegression", markerRegression), 
         isXYProcess ? options = [ this._processSpecXY(spec.x, spec.y), this._processSpecXY(spec.x1, spec.y1) ] : isXProcess ? options = [ this._processSpecX(spec.x), this._processSpecX(spec.x1) ] : isYProcess ? options = [ this._processSpecY(spec.y), this._processSpecY(spec.y1) ] : isCoordinateProcess && (options = this._processSpecCoo(spec));
+        const seriesData = relativeSeries.getViewData();
+        registerDataSetInstanceTransform(this._option.dataSet, "markerAggregation", markerAggregation);
         const data = new DataView(this._option.dataSet, {
             name: `${this.type}_${this.id}_data`
         });
-        data.parse([ relativeSeries.getViewData() ], {
+        data.parse([ seriesData ], {
             type: "dataview"
         }), data.transform({
             type: "markerAggregation",