@visactor/vchart 1.11.0-alpha.2 → 1.11.0-alpha.3

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseMarker = void 0;
 
-const vutils_1 = require("@visactor/vutils"), base_component_1 = require("../base/base-component"), space_1 = require("../../util/space"), utils_1 = require("./utils"), util_1 = require("../../util");
+const vdataset_1 = require("@visactor/vdataset"), vutils_1 = require("@visactor/vutils"), base_component_1 = require("../base/base-component"), space_1 = require("../../util/space"), utils_1 = require("./utils"), util_1 = require("../../util"), array_1 = require("../../data/parser/array");
 
 class BaseMarker extends base_component_1.BaseComponent {
     constructor() {
@@ -13,8 +13,33 @@ class BaseMarker extends base_component_1.BaseComponent {
     getRelativeSeries() {
         return this._relativeSeries;
     }
+    getMarkerData() {
+        return this._markerData;
+    }
+    static _getMarkerCoordinateType(markerSpec) {
+        return "cartesian";
+    }
+    static getSpecInfo(chartSpec) {
+        const markerSpec = chartSpec[this.specKey];
+        if ((0, vutils_1.isEmpty)(markerSpec)) return;
+        if (!(0, vutils_1.isArray)(markerSpec) && !1 !== markerSpec.visible && this._getMarkerCoordinateType(markerSpec) === this.coordinateType) return [ {
+            spec: markerSpec,
+            specPath: [ this.specKey ],
+            specInfoPath: [ "component", this.specKey, 0 ],
+            type: this.type
+        } ];
+        const specInfos = [];
+        return (0, vutils_1.array)(markerSpec).forEach(((m, i) => {
+            !1 !== m.visible && this._getMarkerCoordinateType(m) === this.coordinateType && specInfos.push({
+                spec: m,
+                specPath: [ this.specKey, i ],
+                specInfoPath: [ "component", this.specKey, i ],
+                type: this.type
+            });
+        })), specInfos;
+    }
     created() {
-        super.created(), this.initEvent(), this._bindSeries(), this._initDataView();
+        super.created(), this._bindSeries(), this._initDataView(), this.initEvent();
     }
     _getAllRelativeSeries() {
         return {
@@ -24,56 +49,83 @@ class BaseMarker extends base_component_1.BaseComponent {
         };
     }
     _getFieldInfoFromSpec(dim, spec, relativeSeries) {
-        const field = "x" === dim ? relativeSeries.getSpec().xField : relativeSeries.getSpec().yField;
+        const specKeyByDim = {
+            x: "xField",
+            y: "yField",
+            radius: "valueField",
+            angle: "categoryField",
+            areaName: "nameField"
+        };
         return (0, vutils_1.isString)(spec) && (0, utils_1.isAggrSpec)(spec) ? {
-            field: field,
+            field: relativeSeries.getSpec()[specKeyByDim[dim]],
             aggrType: spec
         } : spec;
     }
-    _processSpecX(specX) {
-        const relativeSeries = this._relativeSeries;
-        return Object.assign({
-            x: this._getFieldInfoFromSpec("x", specX, relativeSeries)
-        }, this._getAllRelativeSeries());
-    }
-    _processSpecY(specY) {
-        const relativeSeries = this._relativeSeries;
-        return Object.assign({
-            y: this._getFieldInfoFromSpec("y", specY, relativeSeries)
-        }, this._getAllRelativeSeries());
-    }
-    _processSpecXY(specX, specY) {
-        const relativeSeries = this._relativeSeries;
-        return Object.assign({
-            x: this._getFieldInfoFromSpec("x", specX, relativeSeries),
-            y: this._getFieldInfoFromSpec("y", specY, relativeSeries)
-        }, this._getAllRelativeSeries());
+    _processSpecByDims(dimSpec) {
+        const relativeSeries = this._relativeSeries, dimMap = {};
+        return dimSpec.forEach((d => dimMap[d.dim] = this._getFieldInfoFromSpec(d.dim, d.specValue, relativeSeries))), 
+        Object.assign(Object.assign({}, dimMap), this._getAllRelativeSeries());
     }
     _processSpecCoo(spec) {
         var _a;
+        let option;
         return (null !== (_a = spec.coordinates) && void 0 !== _a ? _a : (0, vutils_1.array)(spec.coordinate)).map((coordinate => {
-            const refRelativeSeries = this._getSeriesByIdOrIndex(coordinate.refRelativeSeriesId, coordinate.refRelativeSeriesIndex), {xField: xField, yField: yField} = refRelativeSeries.getSpec(), {xFieldDim: xFieldDim, xFieldIndex: xFieldIndex, yFieldDim: yFieldDim, yFieldIndex: yFieldIndex} = coordinate;
-            let bindXField = xField;
-            (0, vutils_1.isValid)(xFieldIndex) && (bindXField = (0, vutils_1.array)(xField)[xFieldIndex]), 
-            xFieldDim && (0, vutils_1.array)(xField).includes(xFieldDim) && (bindXField = xFieldDim);
-            let bindYField = yField;
-            (0, vutils_1.isValid)(yFieldIndex) && (bindYField = (0, vutils_1.array)(yField)[yFieldIndex]), 
-            yFieldDim && (0, vutils_1.array)(yField).includes(yFieldDim) && (bindYField = yFieldDim);
-            const option = Object.assign({
-                x: void 0,
-                y: void 0
-            }, this._getAllRelativeSeries());
-            return (0, vutils_1.isString)(coordinate[bindXField]) && (0, utils_1.isAggrSpec)(coordinate[bindXField]) ? option.x = {
-                field: bindXField,
-                aggrType: coordinate[bindXField]
-            } : option.x = (0, vutils_1.array)(bindXField).map((field => coordinate[field])), 
-            (0, vutils_1.isString)(coordinate[bindYField]) && (0, utils_1.isAggrSpec)(coordinate[bindYField]) ? option.y = {
-                field: bindYField,
-                aggrType: coordinate[bindYField]
-            } : option.y = (0, vutils_1.array)(bindYField).map((field => coordinate[field])), 
-            option.getRefRelativeSeries = () => refRelativeSeries, option;
+            const refRelativeSeries = this._getSeriesByIdOrIndex(coordinate.refRelativeSeriesId, coordinate.refRelativeSeriesIndex);
+            if ("cartesian" === this.coordinateType) {
+                const {xField: xField, yField: yField} = refRelativeSeries.getSpec(), {xFieldDim: xFieldDim, xFieldIndex: xFieldIndex, yFieldDim: yFieldDim, yFieldIndex: yFieldIndex} = coordinate;
+                let bindXField = xField;
+                (0, vutils_1.isValid)(xFieldIndex) && (bindXField = (0, vutils_1.array)(xField)[xFieldIndex]), 
+                xFieldDim && (0, vutils_1.array)(xField).includes(xFieldDim) && (bindXField = xFieldDim);
+                let bindYField = yField;
+                (0, vutils_1.isValid)(yFieldIndex) && (bindYField = (0, vutils_1.array)(yField)[yFieldIndex]), 
+                yFieldDim && (0, vutils_1.array)(yField).includes(yFieldDim) && (bindYField = yFieldDim), 
+                option = Object.assign({
+                    x: void 0,
+                    y: void 0
+                }, this._getAllRelativeSeries()), (0, vutils_1.isString)(coordinate[bindXField]) && (0, 
+                utils_1.isAggrSpec)(coordinate[bindXField]) ? option.x = {
+                    field: bindXField,
+                    aggrType: coordinate[bindXField]
+                } : option.x = (0, vutils_1.array)(bindXField).map((field => coordinate[field])), 
+                (0, vutils_1.isString)(coordinate[bindYField]) && (0, utils_1.isAggrSpec)(coordinate[bindYField]) ? option.y = {
+                    field: bindYField,
+                    aggrType: coordinate[bindYField]
+                } : option.y = (0, vutils_1.array)(bindYField).map((field => coordinate[field]));
+            } else if ("polar" === this.coordinateType) {
+                const {valueField: radiusField, categoryField: angleField} = refRelativeSeries.getSpec(), {angleFieldDim: angleFieldDim, angleFieldIndex: angleFieldIndex} = coordinate;
+                let bindAngleField = angleField;
+                (0, vutils_1.isValid)(angleFieldIndex) && (bindAngleField = (0, vutils_1.array)(angleField)[angleFieldIndex]), 
+                angleFieldDim && (0, vutils_1.array)(angleField).includes(angleFieldDim) && (bindAngleField = angleFieldDim);
+                const bindRadiusField = radiusField;
+                option = Object.assign({
+                    angle: void 0,
+                    radius: void 0
+                }, this._getAllRelativeSeries()), (0, vutils_1.isString)(coordinate[bindAngleField]) && (0, 
+                utils_1.isAggrSpec)(coordinate[bindAngleField]) ? option.angle = {
+                    field: bindAngleField,
+                    aggrType: coordinate[bindAngleField]
+                } : option.angle = (0, vutils_1.array)(bindAngleField).map((field => coordinate[field])), 
+                (0, vutils_1.isString)(coordinate[bindRadiusField]) && (0, utils_1.isAggrSpec)(coordinate[bindRadiusField]) ? option.radius = {
+                    field: bindRadiusField,
+                    aggrType: coordinate[bindRadiusField]
+                } : option.radius = (0, vutils_1.array)(bindRadiusField).map((field => coordinate[field]));
+            }
+            return option.getRefRelativeSeries = () => refRelativeSeries, option;
         }));
     }
+    _getRelativeDataView() {
+        if (this._specifiedDataSeries) {
+            let resultData = [];
+            (0, vutils_1.array)(this._specifiedDataSeries).forEach((series => {
+                resultData = resultData.concat(series.getViewData().latestData);
+            }));
+            const dataSet = new vdataset_1.DataSet;
+            return dataSet.registerParser("array", array_1.arrayParser), new vdataset_1.DataView(dataSet).parse(resultData, {
+                type: "array"
+            });
+        }
+        return this._relativeSeries.getViewData();
+    }
     updateLayoutAttribute() {
         var _a, _b, _c;
         if (null === (_a = this._spec.visible) || void 0 === _a || _a) {
@@ -82,7 +134,9 @@ class BaseMarker extends base_component_1.BaseComponent {
                 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._markerComponent.on("*", ((event, type) => {
+                    this._delegateEvent(this._markerComponent, event, type, null, this.getMarkerData.bind(this));
+                }));
             }
             this._markerLayout();
         }
@@ -99,9 +153,13 @@ class BaseMarker extends base_component_1.BaseComponent {
         const spec = this._spec;
         this._relativeSeries = this._getSeriesByIdOrIndex(spec.relativeSeriesId, spec.relativeSeriesIndex), 
         this._startRelativeSeries = this._getSeriesByIdOrIndex(spec.startRelativeSeriesId, spec.startRelativeSeriesIndex), 
-        this._endRelativeSeries = this._getSeriesByIdOrIndex(spec.endRelativeSeriesId, spec.endRelativeSeriesIndex);
+        this._endRelativeSeries = this._getSeriesByIdOrIndex(spec.endRelativeSeriesId, spec.endRelativeSeriesIndex), 
+        spec.specifiedDataSeriesIndex && "all" === spec.specifiedDataSeriesIndex || spec.specifiedDataSeriesId && "all" === spec.specifiedDataSeriesId ? this._specifiedDataSeries = this._option.getAllSeries() : (spec.specifiedDataSeriesIndex || spec.specifiedDataSeriesId) && (this._specifiedDataSeries = this._getSeriesByIdOrIndex(spec.specifiedDataSeriesId, spec.specifiedDataSeriesIndex));
+    }
+    initEvent() {
+        "cartesian" !== this._relativeSeries.coordinate && (this._relativeSeries.event.on("zoom", this._markerLayout.bind(this)), 
+        this._relativeSeries.event.on("panmove", this._markerLayout.bind(this)), this._relativeSeries.event.on("scroll", this._markerLayout.bind(this)));
     }
-    initEvent() {}
     onRender(ctx) {}
     changeRegions(regions) {}
     clear() {

package/cjs/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, 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';\nimport { getFirstSeries } from '../../util';\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  protected _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    const firstSeries = getFirstSeries(this._regions) as ICartesianSeries;\n    if (firstSeries) {\n      this._firstSeries = firstSeries;\n      return firstSeries;\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":"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","file":"base-marker.js","sourcesContent":["import { DataSet, DataView } from '@visactor/vdataset';\nimport type { Maybe } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { array, isValid, isNil, isString, isEmpty, isArray } from '@visactor/vutils';\nimport type { IModelRenderOption, IModelSpecInfo } 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  IMarkerSupportSeries\n} from './interface';\nimport type { IGraphic, IGroup } from '@visactor/vrender-core';\nimport { calcLayoutNumber } from '../../util/space';\nimport { isAggrSpec } from './utils';\nimport { getFirstSeries } from '../../util';\nimport { arrayParser } from '../../data/parser/array';\n\nexport abstract class BaseMarker<T extends IMarkerSpec> extends BaseComponent<T> {\n  layoutType: ILayoutType | 'none' = 'none';\n\n  // 下面三个属性需要子组件复写\n  static specKey: string;\n  static type: string;\n  static coordinateType: string;\n  coordinateType: string;\n\n  protected _startRelativeSeries!: IMarkerSupportSeries;\n  protected _endRelativeSeries!: IMarkerSupportSeries;\n  protected _relativeSeries!: IMarkerSupportSeries;\n  protected _specifiedDataSeries!: IMarkerSupportSeries | IMarkerSupportSeries[];\n  getRelativeSeries() {\n    return this._relativeSeries;\n  }\n\n  // marker 组件数据\n  protected _markerData!: DataView;\n  getMarkerData() {\n    return this._markerData;\n  }\n  // marker 组件\n  protected _markerComponent!: any;\n\n  protected _layoutOffsetX: number = 0;\n  protected _layoutOffsetY: number = 0;\n\n  private _firstSeries: ICartesianSeries;\n\n  protected abstract _initDataView(): void;\n  protected abstract _createMarkerComponent(): IGroup;\n  protected abstract _markerLayout(): void;\n  // 该方法需要子组件复写\n  static _getMarkerCoordinateType(markerSpec: any): string {\n    return 'cartesian';\n  }\n\n  static getSpecInfo(chartSpec: any): Maybe<IModelSpecInfo[]> {\n    const markerSpec = chartSpec[this.specKey];\n    if (isEmpty(markerSpec)) {\n      return undefined;\n    }\n    if (\n      !isArray(markerSpec) &&\n      markerSpec.visible !== false &&\n      this._getMarkerCoordinateType(markerSpec) === this.coordinateType\n    ) {\n      return [\n        {\n          spec: markerSpec,\n          specPath: [this.specKey],\n          specInfoPath: ['component', this.specKey, 0],\n          type: this.type\n        }\n      ];\n    }\n    const specInfos: IModelSpecInfo[] = [];\n    array(markerSpec).forEach((m: any, i: number) => {\n      if (m.visible !== false && this._getMarkerCoordinateType(m) === this.coordinateType) {\n        specInfos.push({\n          spec: m,\n          specPath: [this.specKey, i],\n          specInfoPath: ['component', this.specKey, i],\n          type: this.type\n        });\n      }\n    });\n    return specInfos;\n  }\n\n  created() {\n    super.created();\n    this._bindSeries();\n    this._initDataView();\n    this.initEvent();\n  }\n\n  protected _getAllRelativeSeries() {\n    return {\n      getRelativeSeries: () => this._relativeSeries,\n      getStartRelativeSeries: () => this._startRelativeSeries,\n      getEndRelativeSeries: () => this._endRelativeSeries\n    };\n  }\n\n  private _getFieldInfoFromSpec(\n    dim: 'x' | 'y' | 'angle' | 'radius' | 'areaName',\n    spec: IDataPos | IDataPosCallback,\n    relativeSeries: IMarkerSupportSeries\n  ) {\n    const specKeyByDim = {\n      x: 'xField',\n      y: 'yField',\n      radius: 'valueField',\n      angle: 'categoryField',\n      areaName: 'nameField'\n    };\n\n    if (isString(spec) && isAggrSpec(spec)) {\n      return {\n        field: relativeSeries.getSpec()[specKeyByDim[dim]],\n        aggrType: spec as unknown as IAggrType\n      };\n    }\n    return spec;\n  }\n\n  protected _processSpecByDims(\n    dimSpec: {\n      dim: 'x' | 'y' | 'angle' | 'radius' | 'areaName';\n      specValue: IDataPos | IDataPosCallback;\n    }[]\n  ) {\n    const relativeSeries = this._relativeSeries;\n    const dimMap = {};\n    dimSpec.forEach(d => (dimMap[d.dim] = this._getFieldInfoFromSpec(d.dim, d.specValue, relativeSeries)));\n    return {\n      ...dimMap,\n      ...this._getAllRelativeSeries()\n    };\n  }\n\n  protected _processSpecCoo(spec: any) {\n    const coordinates = spec.coordinates ?? array(spec.coordinate);\n    let option: ICoordinateOption;\n    return coordinates.map((coordinate: IDataPointSpec) => {\n      const refRelativeSeries = this._getSeriesByIdOrIndex(\n        coordinate.refRelativeSeriesId,\n        coordinate.refRelativeSeriesIndex\n      );\n\n      if (this.coordinateType === 'cartesian') {\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        option = {\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      } else if (this.coordinateType === 'polar') {\n        const { valueField: radiusField, categoryField: angleField } = refRelativeSeries.getSpec();\n        const { angleFieldDim, angleFieldIndex } = coordinate;\n        let bindAngleField = angleField;\n        if (isValid(angleFieldIndex)) {\n          bindAngleField = array(angleField)[angleFieldIndex];\n        }\n        if (angleFieldDim && array(angleField).includes(angleFieldDim)) {\n          bindAngleField = angleFieldDim;\n        }\n\n        const bindRadiusField = radiusField;\n\n        option = {\n          angle: undefined,\n          radius: undefined,\n          ...this._getAllRelativeSeries()\n        };\n\n        if (isString(coordinate[bindAngleField]) && isAggrSpec(coordinate[bindAngleField] as IDataPos)) {\n          option.angle = { field: bindAngleField, aggrType: coordinate[bindAngleField] as IAggrType };\n        } else {\n          option.angle = array(bindAngleField).map(field => coordinate[field]);\n        }\n\n        if (isString(coordinate[bindRadiusField]) && isAggrSpec(coordinate[bindRadiusField] as IDataPos)) {\n          option.radius = { field: bindRadiusField, aggrType: coordinate[bindRadiusField] as IAggrType };\n        } else {\n          option.radius = array(bindRadiusField).map(field => coordinate[field]);\n        }\n      }\n\n      option.getRefRelativeSeries = () => refRelativeSeries;\n      return option;\n    });\n  }\n\n  protected _getRelativeDataView() {\n    if (this._specifiedDataSeries) {\n      let resultData: any[] = [];\n      array(this._specifiedDataSeries).forEach(series => {\n        resultData = resultData.concat(series.getViewData().latestData);\n      });\n      const dataSet = new DataSet();\n      dataSet.registerParser('array', arrayParser);\n      return new DataView(dataSet).parse(resultData, { type: 'array' });\n    }\n    return this._relativeSeries.getViewData();\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(\n            this._markerComponent as unknown as IGraphic,\n            event,\n            type,\n            null,\n            this.getMarkerData.bind(this)\n          );\n        });\n      }\n      this._markerLayout();\n    }\n\n    super.updateLayoutAttribute();\n  }\n\n  private _getSeriesByIdOrIndex(seriesUserId: StringOrNumber, seriesIndex: number) {\n    let series: IMarkerSupportSeries;\n    series = this._option.getSeriesInUserIdOrIndex(isValid(seriesUserId) ? [seriesUserId] : [], [\n      seriesIndex\n    ])?.[0] as IMarkerSupportSeries;\n    if (!series) {\n      series = this._relativeSeries ?? this._getFirstSeries();\n    }\n    return series;\n  }\n\n  protected _bindSeries() {\n    const spec: any = 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    if (\n      (spec.specifiedDataSeriesIndex && spec.specifiedDataSeriesIndex === 'all') ||\n      (spec.specifiedDataSeriesId && spec.specifiedDataSeriesId === 'all')\n    ) {\n      this._specifiedDataSeries = this._option.getAllSeries() as IMarkerSupportSeries[];\n    } else if (spec.specifiedDataSeriesIndex || spec.specifiedDataSeriesId) {\n      this._specifiedDataSeries = this._getSeriesByIdOrIndex(spec.specifiedDataSeriesId, spec.specifiedDataSeriesIndex);\n    }\n  }\n\n  protected initEvent() {\n    // 在极坐标系/地理坐标系中, 滚动或缩放画布不会update layout, 所以需要通过事件监听来更新标注的位置\n    // 在直角坐标系中, update layout中已经更新标注位置, 在这里不需要重复监听\n    if (this._relativeSeries.coordinate !== 'cartesian') {\n      this._relativeSeries.event.on('zoom', this._markerLayout.bind(this));\n      this._relativeSeries.event.on('panmove', this._markerLayout.bind(this));\n      this._relativeSeries.event.on('scroll', this._markerLayout.bind(this));\n    }\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    const firstSeries = getFirstSeries(this._regions) as ICartesianSeries;\n    if (firstSeries) {\n      this._firstSeries = firstSeries;\n      return firstSeries;\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/cjs/component/marker/interface.d.ts

@@ -1,17 +1,24 @@
+import type { DataView } from '@visactor/vdataset';
 import type { IPadding } from '@visactor/vutils';
 import type { SymbolType } from '@visactor/vrender-core';
 import type { IComposedTextMarkSpec, IFormatMethod, IRectMarkSpec, IRichTextFormatMethod, ISymbolMarkSpec, 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';
+import type { ICartesianSeries, IGeoSeries, IPolarSeries } from '../../series/interface';
+import type { IOptionAggr, IOptionAggrField, IOptionSeries } from '../../data/transforms/aggregation';
+import type { IOptionRegr } from '../../data/transforms/regression';
+export type IMarkerSupportSeries = ICartesianSeries | IPolarSeries | IGeoSeries;
+export type IPolarPoint = {
+    angle: number;
+    radius: number;
+};
 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: Datum[], startRelativeSeriesData: Datum[], endRelativeSeriesData: Datum[], relativeSeries: ICartesianSeries, startRelativeSeries: ICartesianSeries, endRelativeSeries: ICartesianSeries) => StringOrNumber;
+export type IDataPosCallback = (relativeSeriesData: Datum[], startRelativeSeriesData: Datum[], endRelativeSeriesData: Datum[], relativeSeries: IMarkerSupportSeries, startRelativeSeries: IMarkerSupportSeries, endRelativeSeries: IMarkerSupportSeries) => StringOrNumber;
 export type IDataPointSpec = {
     [key: string]: IDataPos | IDataPosCallback;
     refRelativeSeriesIndex?: number;
@@ -20,6 +27,10 @@ export type IDataPointSpec = {
     xFieldDim?: string;
     yFieldIndex?: number;
     yFieldDim?: string;
+    angleFieldIndex?: number;
+    angleFieldDim?: string;
+    radiusFieldIndex?: number;
+    radiusFieldDim?: string;
 };
 export type MarkerPositionPoint = {
     x: StringOrNumber;
@@ -28,7 +39,9 @@ export type MarkerPositionPoint = {
 export type ICoordinateOption = {
     x?: IOptionAggrField | (IDataPosCallback | StringOrNumber)[];
     y?: IOptionAggrField | (IDataPosCallback | StringOrNumber)[];
-    getRefRelativeSeries?: () => ICartesianSeries;
+    angle?: IOptionAggrField | (IDataPosCallback | StringOrNumber)[];
+    radius?: IOptionAggrField | (IDataPosCallback | StringOrNumber)[];
+    getRefRelativeSeries?: () => IMarkerSupportSeries;
 } & IOptionSeries;
 export type IMarkerPositionsSpec = {
     positions: MarkerPositionPoint[];
@@ -42,12 +55,10 @@ export type IMarkerLabelWithoutRefSpec = {
     labelBackground?: {
         visible?: boolean;
         padding?: IPadding | number[] | number;
-        style?: Omit<IRectMarkSpec, 'visible'>;
-    };
+    } & Partial<IMarkerState<Omit<IRectMarkSpec, 'visible'>>>;
     type?: 'rich' | 'text';
     text?: string | string[] | number | number[] | ReturnType<IRichTextFormatMethod<[]>>;
     formatMethod?: IFormatMethod<[markData: Datum[], seriesData: Datum[]]>;
-    style?: Omit<IComposedTextMarkSpec, 'visible'>;
     shape?: {
         visible?: boolean;
         style: Omit<ISymbolMarkSpec, 'visible'>;
@@ -56,7 +67,7 @@ export type IMarkerLabelWithoutRefSpec = {
     confine?: boolean;
     dx?: number;
     dy?: number;
-};
+} & Partial<IMarkerState<Omit<IComposedTextMarkSpec, 'visible'>>>;
 export type IMarkerLabelSpec = IMarkerLabelWithoutRefSpec & IMarkerRef;
 export interface IMarkerRef {
     refX?: number;
@@ -68,8 +79,10 @@ export interface IMarkerCrossSeriesSpec {
     endRelativeSeriesIndex?: number;
     startRelativeSeriesId?: string;
     endRelativeSeriesId?: string;
+    specifiedDataSeriesIndex?: 'all' | number | number[];
+    specifiedDataSeriesId?: 'all' | string | string[];
 }
-export interface IMarkerSpec extends IComponentSpec {
+export type IMarkerSpec = IComponentSpec & {
     relativeSeriesIndex?: number;
     relativeSeriesId?: number | string;
     visible?: boolean;
@@ -77,10 +90,24 @@ export interface IMarkerSpec extends IComponentSpec {
     autoRange?: boolean;
     clip?: boolean;
     name?: string;
-}
-export interface IMarkerSymbol extends IMarkerRef {
+    coordinateType?: string;
+};
+export type IMarkerSymbol = IMarkerRef & {
     visible: boolean;
     symbolType?: SymbolType;
     size?: number;
-    style?: Omit<ISymbolMarkSpec, 'visible'>;
-}
+} & Partial<IMarkerState<Omit<ISymbolMarkSpec, 'visible'>>>;
+export type MarkerStyleCallback<T> = (markerData: DataView) => T;
+export type MarkerStateCallback<T> = (markerData: DataView) => T;
+export type MarkerStateValue = 'hover' | 'hover_reverse' | 'selected' | 'selected_reverse';
+export type IMarkerState<T> = {
+    style?: T | MarkerStyleCallback<T>;
+    state?: Record<MarkerStateValue, T | MarkerStateCallback<T>>;
+};
+export type MarkCoordinateType = 'cartesian' | 'polar' | 'geo';
+export type IMarkProcessOptions = {
+    options: IOptionAggr[] | IOptionRegr;
+    needAggr?: boolean;
+    needRegr?: boolean;
+    processData?: DataView;
+};

package/cjs/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 } from '@visactor/vrender-core';\nimport type {\n  IComposedTextMarkSpec,\n  IFormatMethod,\n  IRectMarkSpec,\n  IRichTextFormatMethod,\n  ISymbolMarkSpec,\n  StringOrNumber\n} 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 IDataPointSpec = {\n  /**\n   * 数据字段配置\n   */\n  [key: string]: IDataPos | IDataPosCallback;\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 | (IDataPosCallback | StringOrNumber)[];\n  y?: IOptionAggrField | (IDataPosCallback | 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  /** @deprecated  */\n  type?: 'rich' | 'text';\n  /**\n   * 文本内容，如果需要进行换行，则使用数组形式，如 ['abc', '123']\n   * 支持富文本内容 textConfig，设置富文本时要配置 textType 类型为 'rich'\n   */\n  text?: string | string[] | number | number[] | ReturnType<IRichTextFormatMethod<[]>>;\n  /**\n   * label文本 - 文本格式化\n   * @param markData 组成标注的数据\n   * @param seriesData 标注关联的数据\n   * @returns 格式化后的文本\n   */\n  formatMethod?: IFormatMethod<[markData: Datum[], seriesData: Datum[]]>;\n  /**\n   * label文本 - 文本样式\n   */\n  style?: Omit<IComposedTextMarkSpec, '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};\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"]}
+{"version":3,"sources":["../src/component/marker/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport type { IPadding } from '@visactor/vutils';\nimport type { SymbolType } from '@visactor/vrender-core';\nimport type {\n  IComposedTextMarkSpec,\n  IFormatMethod,\n  IRectMarkSpec,\n  IRichTextFormatMethod,\n  ISymbolMarkSpec,\n  StringOrNumber\n} from '../../typings';\nimport type { IComponentSpec } from '../base/interface';\nimport type { Datum } from '@visactor/vrender-components';\nimport type { ICartesianSeries, IGeoSeries, IPolarSeries } from '../../series/interface';\nimport type { IOptionAggr, IOptionAggrField, IOptionSeries } from '../../data/transforms/aggregation';\nimport type { IOptionRegr } from '../../data/transforms/regression';\n\nexport type IMarkerSupportSeries = ICartesianSeries | IPolarSeries | IGeoSeries;\n\nexport type IPolarPoint = {\n  angle: number;\n  radius: number;\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: IMarkerSupportSeries,\n  startRelativeSeries: IMarkerSupportSeries,\n  endRelativeSeries: IMarkerSupportSeries\n) => StringOrNumber;\n\nexport type IDataPointSpec = {\n  /**\n   * 数据字段配置\n   */\n  [key: string]: IDataPos | IDataPosCallback;\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   * 指定使用 angleField 上的那个维度索引，因为 angleField 字段有可能会包含多个维度，比如分组场景\n   * @default 0\n   * @since 1.11.0\n   */\n  angleFieldIndex?: number;\n  /**\n   * 指定使用 angleField 上的维度名称，因为 angleField 字段有可能会包含多个维度，比如分组场景。\n   * `angleFieldIndex` 和 `angleFieldDim` 声明一个即可，同时声明则 `angleFieldDim` 优先级更高。\n   * @since 1.11.0\n   */\n  angleFieldDim?: string;\n  /**\n   * 指定使用 radiusField 上的那个维度索引，因为 radiusField 字段有可能会包含多个维度，比如分组场景\n   * @default 0\n   * @since 1.11.0\n   */\n  radiusFieldIndex?: number;\n  /**\n   * 指定使用 radiusField 上的维度名称，因为 radiusField 字段有可能会包含多个维度，比如分组场景。\n   * `radiusFieldIndex` 和 `radiusFieldDim` 声明一个即可，同时声明则 `radiusFieldDim` 优先级更高。\n   * @since 1.11.0\n   */\n  radiusFieldDim?: 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 | (IDataPosCallback | StringOrNumber)[];\n  y?: IOptionAggrField | (IDataPosCallback | StringOrNumber)[];\n  angle?: IOptionAggrField | (IDataPosCallback | StringOrNumber)[];\n  radius?: IOptionAggrField | (IDataPosCallback | StringOrNumber)[];\n  getRefRelativeSeries?: () => IMarkerSupportSeries;\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  } & Partial<IMarkerState<Omit<IRectMarkSpec, 'visible'>>>;\n\n  /** @deprecated  */\n  type?: 'rich' | 'text';\n  /**\n   * 文本内容，如果需要进行换行，则使用数组形式，如 ['abc', '123']\n   * 支持富文本内容 textConfig，设置富文本时要配置 textType 类型为 'rich'\n   */\n  text?: string | string[] | number | number[] | ReturnType<IRichTextFormatMethod<[]>>;\n  /**\n   * label文本 - 文本格式化\n   * @param markData 组成标注的数据\n   * @param seriesData 标注关联的数据\n   * @returns 格式化后的文本\n   */\n  formatMethod?: IFormatMethod<[markData: Datum[], seriesData: Datum[]]>;\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} & Partial<IMarkerState<Omit<IComposedTextMarkSpec, 'visible'>>>; // label文本 - 文本样式\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   * 数据处理需要单独关联系列, 当配置为'all'时代表关联当前region下所有系列\n   * @since 1.11.0\n   */\n  specifiedDataSeriesIndex?: 'all' | number | number[];\n  specifiedDataSeriesId?: 'all' | string | string[];\n}\n\nexport type IMarkerSpec = 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 true\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   * 标注所在的坐标系类型\n   * @description 一般情况下内部逻辑会根据配置自动推导类型，但如果是coordinates的配置方式，则无法推导，需要用户自行配置\n   * @since 1.11.0\n   */\n  coordinateType?: string;\n};\n\nexport type IMarkerSymbol = IMarkerRef & {\n  /** 是否展示 symbol */\n  visible: boolean;\n  /**\n   * symbol 形状，默认为带左右方向的箭头\n   */\n  symbolType?: SymbolType;\n  /**\n   * symbol 大小\n   */\n  size?: number;\n} & Partial<IMarkerState<Omit<ISymbolMarkSpec, 'visible'>>>;\n\nexport type MarkerStyleCallback<T> = (markerData: DataView) => T;\nexport type MarkerStateCallback<T> = (markerData: DataView) => T;\nexport type MarkerStateValue = 'hover' | 'hover_reverse' | 'selected' | 'selected_reverse';\nexport type IMarkerState<T> = {\n  /** 默认样式设置 */\n  style?: T | MarkerStyleCallback<T>;\n  /** 不同状态下的样式配置 */\n  state?: Record<MarkerStateValue, T | MarkerStateCallback<T>>;\n};\n\nexport type MarkCoordinateType = 'cartesian' | 'polar' | 'geo';\n\nexport type IMarkProcessOptions = {\n  options: IOptionAggr[] | IOptionRegr;\n  needAggr?: boolean;\n  needRegr?: boolean;\n  processData?: DataView;\n};\n"]}

package/cjs/component/marker/mark-area/base-mark-area.d.ts

@@ -0,0 +1,18 @@
+import type { IMarkArea, IMarkAreaSpec } from './interface';
+import type { MarkArcAreaAttrs, MarkAreaAttrs } from '@visactor/vrender-components';
+import type { MarkArea as MarkAreaComponent, MarkArcArea as MarkArcAreaComponent } from '@visactor/vrender-components';
+import { BaseMarker } from '../base-marker';
+import type { IGroup } from '@visactor/vrender-core';
+import type { IMarkProcessOptions } from '../interface';
+export declare abstract class BaseMarkArea extends BaseMarker<IMarkAreaSpec> implements IMarkArea {
+    static specKey: string;
+    specKey: string;
+    layoutZIndex: number;
+    protected abstract _newMarkAreaComponent(attr: MarkAreaAttrs | MarkArcAreaAttrs): MarkAreaComponent | MarkArcAreaComponent;
+    protected abstract _computePointsAttr(): any;
+    protected abstract _computeOptions(): IMarkProcessOptions;
+    static _getMarkerCoordinateType(markerSpec: any): string;
+    protected _createMarkerComponent(): IGroup;
+    protected _markerLayout(): void;
+    protected _initDataView(): void;
+}

package/cjs/component/marker/mark-area/base-mark-area.js

@@ -0,0 +1,99 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.BaseMarkArea = void 0;
+
+const vdataset_1 = require("@visactor/vdataset"), aggregation_1 = require("../../../data/transforms/aggregation"), utils_1 = require("../utils"), register_1 = require("../../../data/register"), style_1 = require("../../../util/style"), base_marker_1 = require("../base-marker"), constant_1 = require("../../../constant"), marker_filter_1 = require("../../../data/transforms/marker-filter");
+
+class BaseMarkArea extends base_marker_1.BaseMarker {
+    constructor() {
+        super(...arguments), this.specKey = "markArea", this.layoutZIndex = constant_1.LayoutZIndex.MarkArea;
+    }
+    static _getMarkerCoordinateType(markerSpec) {
+        const {doAngleProcess: doAngleProcess, doRadiusProcess: doRadiusProcess, doRadAngProcess: doRadAngProcess} = (0, 
+        utils_1.getMarkAreaProcessInfo)(markerSpec);
+        return "polar" === markerSpec.coordinateType || doAngleProcess || doRadiusProcess || doRadAngProcess ? "polar" : "cartesian";
+    }
+    _createMarkerComponent() {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        const label = null !== (_a = this._spec.label) && void 0 !== _a ? _a : {}, markAreaAttrs = {
+            zIndex: this.layoutZIndex,
+            interactive: null === (_b = this._spec.interactive) || void 0 === _b || _b,
+            hover: null === (_c = this._spec.interactive) || void 0 === _c || _c,
+            select: null === (_d = this._spec.interactive) || void 0 === _d || _d,
+            points: [ {
+                x: 0,
+                y: 0
+            } ],
+            center: {
+                x: 0,
+                y: 0
+            },
+            innerRadius: 0,
+            outerRadius: 0,
+            startAngle: 0,
+            endAngle: 0,
+            areaStyle: (0, utils_1.transformStyle)((0, style_1.transformToGraphic)(null === (_e = this._spec.area) || void 0 === _e ? void 0 : _e.style), this._markerData),
+            clipInRange: null !== (_f = this._spec.clip) && void 0 !== _f && _f,
+            label: (0, utils_1.transformLabelAttributes)(label, this._markerData),
+            state: {
+                area: (0, utils_1.transformState)(null === (_g = this._spec.area) || void 0 === _g ? void 0 : _g.state, this._markerData),
+                label: (0, utils_1.transformState)(null === (_h = this._spec.label) || void 0 === _h ? void 0 : _h.state, this._markerData),
+                labelBackground: (0, utils_1.transformState)(null === (_l = null === (_k = null === (_j = this._spec) || void 0 === _j ? void 0 : _j.label) || void 0 === _k ? void 0 : _k.labelBackground) || void 0 === _l ? void 0 : _l.state, this._markerData)
+            },
+            animation: null !== (_m = this._spec.animation) && void 0 !== _m && _m,
+            animationEnter: this._spec.animationEnter,
+            animationExit: this._spec.animationExit,
+            animationUpdate: this._spec.animationUpdate
+        };
+        return this._newMarkAreaComponent(markAreaAttrs);
+    }
+    _markerLayout() {
+        var _a, _b, _c, _d;
+        const spec = this._spec, data = this._markerData, startRelativeSeries = this._startRelativeSeries, endRelativeSeries = this._endRelativeSeries, relativeSeries = this._relativeSeries, pointsAttr = this._computePointsAttr(), seriesData = this._getRelativeDataView().latestData, dataPoints = data ? data.latestData[0] && data.latestData[0].latestData ? data.latestData[0].latestData : data.latestData : seriesData;
+        let limitRect;
+        if (spec.clip || (null === (_a = spec.label) || void 0 === _a ? void 0 : _a.confine)) {
+            const {minX: minX, maxX: maxX, minY: minY, maxY: maxY} = (0, utils_1.computeClipRange)([ startRelativeSeries.getRegion(), endRelativeSeries.getRegion(), relativeSeries.getRegion() ]);
+            limitRect = {
+                x: minX,
+                y: minY,
+                width: maxX - minX,
+                height: maxY - minY
+            };
+        }
+        this._markerComponent && this._markerComponent.setAttributes(Object.assign(Object.assign({}, pointsAttr), {
+            label: Object.assign(Object.assign({}, null === (_b = this._markerComponent.attribute) || void 0 === _b ? void 0 : _b.label), {
+                text: this._spec.label.formatMethod ? this._spec.label.formatMethod(dataPoints, seriesData) : null === (_d = null === (_c = this._markerComponent.attribute) || void 0 === _c ? void 0 : _c.label) || void 0 === _d ? void 0 : _d.text
+            }),
+            limitRect: limitRect,
+            dx: this._layoutOffsetX,
+            dy: this._layoutOffsetY
+        }));
+    }
+    _initDataView() {
+        const spec = this._spec, {doXProcess: doXProcess, doYProcess: doYProcess, doXYProcess: doXYProcess, doAngleProcess: doAngleProcess, doRadiusProcess: doRadiusProcess, doRadAngProcess: doRadAngProcess, doCoordinatesProcess: doCoordinatesProcess} = (0, 
+        utils_1.getMarkAreaProcessInfo)(spec);
+        if (!(doXProcess || doYProcess || doXYProcess || doAngleProcess || doRadiusProcess || doRadAngProcess || doCoordinatesProcess)) return null;
+        const {options: options} = this._computeOptions(), seriesData = this._getRelativeDataView();
+        (0, register_1.registerDataSetInstanceTransform)(this._option.dataSet, "markerAggregation", aggregation_1.markerAggregation), 
+        (0, register_1.registerDataSetInstanceTransform)(this._option.dataSet, "markerFilter", marker_filter_1.markerFilter);
+        const data = new vdataset_1.DataView(this._option.dataSet, {
+            name: `${this.type}_${this.id}_data`
+        });
+        data.parse([ seriesData ], {
+            type: "dataview"
+        }), data.transform({
+            type: "markerAggregation",
+            options: options
+        }), data.transform({
+            type: "markerFilter",
+            options: this._getAllRelativeSeries()
+        }), data.target.on("change", (() => {
+            this._markerLayout();
+        })), this._markerData = data;
+    }
+}
+
+exports.BaseMarkArea = BaseMarkArea, BaseMarkArea.specKey = "markArea";
+//# sourceMappingURL=base-mark-area.js.map

package/cjs/component/marker/mark-area/base-mark-area.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/component/marker/mark-area/base-mark-area.ts"],"names":[],"mappings":";;;AAAA,iDAA8C;AAE9C,sEAAyE;AACzE,oCAMkB;AAClB,qDAA0E;AAI1E,+CAAyD;AACzD,gDAA4C;AAC5C,gDAAiD;AAEjD,0EAAsE;AAGtE,MAAsB,YAAa,SAAQ,wBAAyB;IAApE;;QAEE,YAAO,GAAG,UAAU,CAAC;QAErB,iBAAY,GAAW,uBAAY,CAAC,QAAQ,CAAC;IAwJ/C,CAAC;IA/IC,MAAM,CAAC,wBAAwB,CAAC,UAAe;QAC7C,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,IAAA,8BAAsB,EAAC,UAAU,CAAC,CAAC;QAEhG,IAAI,UAAU,CAAC,cAAc,KAAK,OAAO,IAAI,cAAc,IAAI,eAAe,IAAI,eAAe,EAAE;YACjG,OAAO,OAAO,CAAC;SAChB;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAES,sBAAsB;;QAC9B,MAAM,KAAK,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,mCAAI,EAAE,CAAC;QACrC,MAAM,aAAa,GAAqC;YACtD,MAAM,EAAE,IAAI,CAAC,YAAY;YACzB,WAAW,EAAE,MAAA,IAAI,CAAC,KAAK,CAAC,WAAW,mCAAI,IAAI;YAC3C,KAAK,EAAE,MAAA,IAAI,CAAC,KAAK,CAAC,WAAW,mCAAI,IAAI;YACrC,MAAM,EAAE,MAAA,IAAI,CAAC,KAAK,CAAC,WAAW,mCAAI,IAAI;YACtC,MAAM,EAAE;gBACN;oBACE,CAAC,EAAE,CAAC;oBACJ,CAAC,EAAE,CAAC;iBACL;aACF;YACD,MAAM,EAAE;gBACN,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,CAAC;aACL;YACD,WAAW,EAAE,CAAC;YACd,WAAW,EAAE,CAAC;YACd,UAAU,EAAE,CAAC;YACb,QAAQ,EAAE,CAAC;YACX,SAAS,EAAE,IAAA,sBAAc,EAAC,IAAA,0BAAkB,EAAC,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,0CAAE,KAAK,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC;YACvF,WAAW,EAAE,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,mCAAI,KAAK;YACrC,KAAK,EAAE,IAAA,gCAAwB,EAAC,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC;YACxD,KAAK,EAAE;gBACL,IAAI,EAAE,IAAA,sBAAc,EAAC,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,0CAAE,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC;gBAC9D,KAAK,EAAE,IAAA,sBAAc,EAAC,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,0CAAE,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC;gBAChE,eAAe,EAAE,IAAA,sBAAc,EAAC,MAAA,MAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,KAAK,0CAAE,eAAe,0CAAE,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC;aAC7F;YACD,SAAS,EAAE,MAAA,IAAI,CAAC,KAAK,CAAC,SAAS,mCAAI,KAAK;YACxC,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc;YACzC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa;YACvC,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe;SAC5C,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC;QAC3D,OAAO,QAA6B,CAAC;IACvC,CAAC;IAES,aAAa;;QACrB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAY,CAAC;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC;QAC9B,MAAM,mBAAmB,GAAG,IAAI,CAAC,oBAAoB,CAAC;QACtD,MAAM,iBAAiB,GAAG,IAAI,CAAC,kBAAkB,CAAC;QAClD,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC;QAE5C,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE7C,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC,UAAU,CAAC;QAC1D,MAAM,UAAU,GAAG,IAAI;YACrB,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU;gBACnD,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU;gBAC/B,CAAC,CAAC,IAAI,CAAC,UAAU;YACnB,CAAC,CAAC,UAAU,CAAC;QAEf,IAAI,SAAS,CAAC;QACd,IAAI,IAAI,CAAC,IAAI,KAAI,MAAA,IAAI,CAAC,KAAK,0CAAE,OAAO,CAAA,EAAE;YACpC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAA,wBAAgB,EAAC;gBAClD,mBAAmB,CAAC,SAAS,EAAE;gBAC/B,iBAAiB,CAAC,SAAS,EAAE;gBAC7B,cAAc,CAAC,SAAS,EAAE;aAC3B,CAAC,CAAC;YACH,SAAS,GAAG;gBACV,CAAC,EAAE,IAAI;gBACP,CAAC,EAAE,IAAI;gBACP,KAAK,EAAE,IAAI,GAAG,IAAI;gBAClB,MAAM,EAAE,IAAI,GAAG,IAAI;aACpB,CAAC;SACH;QAED,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,gCAC/B,UAAU,KACb,KAAK,kCACA,MAAA,IAAI,CAAC,gBAAgB,CAAC,SAAS,0CAAE,KAAK,KACzC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY;wBACjC,CAAC;4BACE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE,UAAU,CAAS;wBAChE,CAAC,CAAC,MAAA,MAAA,IAAI,CAAC,gBAAgB,CAAC,SAAS,0CAAE,KAAK,0CAAE,IAAI,KAElD,SAAS,EACT,EAAE,EAAE,IAAI,CAAC,cAAc,EACvB,EAAE,EAAE,IAAI,CAAC,cAAc,GACjB,CAAC,CAAC;SACX;IACH,CAAC;IAES,aAAa;QACrB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAY,CAAC;QAC/B,MAAM,EACJ,UAAU,EACV,UAAU,EACV,WAAW,EACX,cAAc,EACd,eAAe,EACf,eAAe,EACf,oBAAoB,EACrB,GAAG,IAAA,8BAAsB,EAAC,IAAI,CAAC,CAAC;QACjC,IACE,CAAC,UAAU;YACX,CAAC,UAAU;YACX,CAAC,WAAW;YACZ,CAAC,cAAc;YACf,CAAC,eAAe;YAChB,CAAC,eAAe;YAChB,CAAC,oBAAoB,EACrB;YACA,OAAO,IAAI,CAAC;SACb;QAED,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAE3C,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC/C,IAAA,2CAAgC,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,mBAAmB,EAAE,+BAAiB,CAAC,CAAC;QAC/F,IAAA,2CAAgC,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,EAAE,4BAAY,CAAC,CAAC;QACrF,MAAM,IAAI,GAAG,IAAI,mBAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1F,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,EAAE;YACvB,IAAI,EAAE,UAAU;SACjB,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,mBAAmB;YACzB,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE;SACtC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YAC5B,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;;AA3JH,oCA4JC;AA3JQ,oBAAO,GAAG,UAAU,CAAC","file":"base-mark-area.js","sourcesContent":["import { DataView } from '@visactor/vdataset';\nimport type { IMarkArea, IMarkAreaSpec } from './interface';\nimport { markerAggregation } from '../../../data/transforms/aggregation';\nimport {\n  computeClipRange,\n  transformLabelAttributes,\n  transformState,\n  transformStyle,\n  getMarkAreaProcessInfo\n} from '../utils';\nimport { registerDataSetInstanceTransform } from '../../../data/register';\nimport type { MarkArcAreaAttrs, MarkAreaAttrs } from '@visactor/vrender-components';\n// eslint-disable-next-line no-duplicate-imports\nimport type { MarkArea as MarkAreaComponent, MarkArcArea as MarkArcAreaComponent } from '@visactor/vrender-components';\nimport { transformToGraphic } from '../../../util/style';\nimport { BaseMarker } from '../base-marker';\nimport { LayoutZIndex } from '../../../constant';\nimport type { IGroup } from '@visactor/vrender-core';\nimport { markerFilter } from '../../../data/transforms/marker-filter';\nimport type { IMarkProcessOptions } from '../interface';\n\nexport abstract class BaseMarkArea extends BaseMarker<IMarkAreaSpec> implements IMarkArea {\n  static specKey = 'markArea';\n  specKey = 'markArea';\n\n  layoutZIndex: number = LayoutZIndex.MarkArea;\n\n  // eslint-disable-next-line max-len\n  protected abstract _newMarkAreaComponent(\n    attr: MarkAreaAttrs | MarkArcAreaAttrs\n  ): MarkAreaComponent | MarkArcAreaComponent;\n  protected abstract _computePointsAttr(): any;\n  protected abstract _computeOptions(): IMarkProcessOptions;\n\n  static _getMarkerCoordinateType(markerSpec: any): string {\n    const { doAngleProcess, doRadiusProcess, doRadAngProcess } = getMarkAreaProcessInfo(markerSpec);\n\n    if (markerSpec.coordinateType === 'polar' || doAngleProcess || doRadiusProcess || doRadAngProcess) {\n      return 'polar';\n    }\n    return 'cartesian';\n  }\n\n  protected _createMarkerComponent() {\n    const label = this._spec.label ?? {};\n    const markAreaAttrs: MarkAreaAttrs | MarkArcAreaAttrs = {\n      zIndex: this.layoutZIndex,\n      interactive: this._spec.interactive ?? true,\n      hover: this._spec.interactive ?? true,\n      select: this._spec.interactive ?? true,\n      points: [\n        {\n          x: 0,\n          y: 0\n        }\n      ],\n      center: {\n        x: 0,\n        y: 0\n      },\n      innerRadius: 0,\n      outerRadius: 0,\n      startAngle: 0,\n      endAngle: 0,\n      areaStyle: transformStyle(transformToGraphic(this._spec.area?.style), this._markerData),\n      clipInRange: this._spec.clip ?? false,\n      label: transformLabelAttributes(label, this._markerData),\n      state: {\n        area: transformState(this._spec.area?.state, this._markerData),\n        label: transformState(this._spec.label?.state, this._markerData),\n        labelBackground: transformState(this._spec?.label?.labelBackground?.state, this._markerData)\n      },\n      animation: this._spec.animation ?? false,\n      animationEnter: this._spec.animationEnter,\n      animationExit: this._spec.animationExit,\n      animationUpdate: this._spec.animationUpdate\n    };\n\n    const markArea = this._newMarkAreaComponent(markAreaAttrs);\n    return markArea as unknown as IGroup;\n  }\n\n  protected _markerLayout() {\n    const spec = this._spec as any;\n    const data = this._markerData;\n    const startRelativeSeries = this._startRelativeSeries;\n    const endRelativeSeries = this._endRelativeSeries;\n    const relativeSeries = this._relativeSeries;\n\n    const pointsAttr = this._computePointsAttr();\n\n    const seriesData = this._getRelativeDataView().latestData;\n    const dataPoints = data\n      ? data.latestData[0] && data.latestData[0].latestData\n        ? data.latestData[0].latestData\n        : data.latestData\n      : seriesData;\n\n    let limitRect;\n    if (spec.clip || spec.label?.confine) {\n      const { minX, maxX, minY, maxY } = computeClipRange([\n        startRelativeSeries.getRegion(),\n        endRelativeSeries.getRegion(),\n        relativeSeries.getRegion()\n      ]);\n      limitRect = {\n        x: minX,\n        y: minY,\n        width: maxX - minX,\n        height: maxY - minY\n      };\n    }\n\n    if (this._markerComponent) {\n      this._markerComponent.setAttributes({\n        ...pointsAttr,\n        label: {\n          ...this._markerComponent.attribute?.label,\n          text: this._spec.label.formatMethod\n            ? // type error here will be fixed in components\n              (this._spec.label.formatMethod(dataPoints, seriesData) as any)\n            : this._markerComponent.attribute?.label?.text\n        },\n        limitRect,\n        dx: this._layoutOffsetX,\n        dy: this._layoutOffsetY\n      } as any);\n    }\n  }\n\n  protected _initDataView(): void {\n    const spec = this._spec as any;\n    const {\n      doXProcess,\n      doYProcess,\n      doXYProcess,\n      doAngleProcess,\n      doRadiusProcess,\n      doRadAngProcess,\n      doCoordinatesProcess\n    } = getMarkAreaProcessInfo(spec);\n    if (\n      !doXProcess &&\n      !doYProcess &&\n      !doXYProcess &&\n      !doAngleProcess &&\n      !doRadiusProcess &&\n      !doRadAngProcess &&\n      !doCoordinatesProcess\n    ) {\n      return null;\n    }\n\n    const { options } = this._computeOptions();\n\n    const seriesData = this._getRelativeDataView();\n    registerDataSetInstanceTransform(this._option.dataSet, 'markerAggregation', markerAggregation);\n    registerDataSetInstanceTransform(this._option.dataSet, 'markerFilter', markerFilter);\n    const data = new DataView(this._option.dataSet, { name: `${this.type}_${this.id}_data` });\n    data.parse([seriesData], {\n      type: 'dataview'\n    });\n    data.transform({\n      type: 'markerAggregation',\n      options\n    });\n\n    data.transform({\n      type: 'markerFilter',\n      options: this._getAllRelativeSeries()\n    });\n\n    data.target.on('change', () => {\n      this._markerLayout();\n    });\n    this._markerData = data;\n  }\n}\n"]}

package/cjs/component/marker/mark-area/cartesian-mark-area.d.ts

@@ -0,0 +1,19 @@
+import { ComponentTypeEnum } from '../../interface/type';
+import type { MarkAreaAttrs } from '@visactor/vrender-components';
+import { MarkArea as MarkAreaComponent } from '@visactor/vrender-components';
+import type { IPoint } from '../../../typings';
+import type { IMarkProcessOptions } from '../interface';
+import { BaseMarkArea } from './base-mark-area';
+export declare class CartesianMarkArea extends BaseMarkArea {
+    static type: ComponentTypeEnum;
+    type: ComponentTypeEnum;
+    name: string;
+    static coordinateType: string;
+    coordinateType: string;
+    protected _newMarkAreaComponent(attr: MarkAreaAttrs): MarkAreaComponent;
+    protected _computePointsAttr(): {
+        points: IPoint[];
+    };
+    protected _computeOptions(): IMarkProcessOptions;
+}
+export declare const registerMarkArea: () => void;