@visactor/vchart 2.1.0-alpha.18 → 2.1.0-alpha.19

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

@@ -26,7 +26,7 @@ class BaseMarkPoint extends base_marker_1.BaseMarker {
     }
     _createMarkerComponent() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9;
-        const {itemContent: itemContent = {}, itemLine: itemLine = {}, targetSymbol: targetSymbol = {}} = this._spec, region = this._relativeSeries.getRegion(), _10 = itemContent, {type: type = "text", text: label, symbol: symbol, image: image, richText: richText, customMark: customMark, textStyle: textStyle, symbolStyle: symbolStyle, imageStyle: imageStyle, richTextStyle: richTextStyle, customMarkStyle: customMarkStyle, style: style = {}, state: state = {}} = _10, restItemContent = __rest(_10, [ "type", "text", "symbol", "image", "richText", "customMark", "textStyle", "symbolStyle", "imageStyle", "richTextStyle", "customMarkStyle", "style", "state" ]);
+        const {itemContent: itemContent = {}, itemLine: itemLine = {}, targetSymbol: targetSymbol = {}} = this._spec, _10 = itemContent, {type: type = "text", text: label, symbol: symbol, image: image, richText: richText, customMark: customMark, textStyle: textStyle, symbolStyle: symbolStyle, imageStyle: imageStyle, richTextStyle: richTextStyle, customMarkStyle: customMarkStyle, style: style = {}, state: state = {}} = _10, restItemContent = __rest(_10, [ "type", "text", "symbol", "image", "richText", "customMark", "textStyle", "symbolStyle", "imageStyle", "richTextStyle", "customMarkStyle", "style", "state" ]);
         let itemContentState = null, itemContentStyle = null, defaultStyle = {};
         "text" === type ? (itemContentState = null !== (_a = null == label ? void 0 : label.state) && void 0 !== _a ? _a : state, 
         defaultStyle = {
@@ -63,8 +63,8 @@ class BaseMarkPoint extends base_marker_1.BaseMarker {
             clipInRange: null !== (_v = this._spec.clip) && void 0 !== _v && _v,
             itemContent: Object.assign(Object.assign({
                 type: type,
-                offsetX: (0, utils_1.transformOffset)(itemContent.offsetX, region),
-                offsetY: (0, utils_1.transformOffset)(itemContent.offsetY, region)
+                offsetX: (0, utils_1.transformOffset)(itemContent.offsetX, this._relativeSeries.getRegion()),
+                offsetY: (0, utils_1.transformOffset)(itemContent.offsetX, this._relativeSeries.getRegion())
             }, restItemContent), {
                 style: (0, utils_1.transformStyle)(itemContentStyle, this._markerData, this._markAttributeContext)
             }),
@@ -96,20 +96,10 @@ class BaseMarkPoint extends base_marker_1.BaseMarker {
         return new vrender_components_1.MarkPoint(markPointAttrs);
     }
     _markerLayout() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-        const spec = this._spec, data = this._markerData, relativeSeries = this._relativeSeries, {point: point} = this._computePointsAttr(), seriesData = this._getRelativeDataView().latestData, dataPoints = data ? data.latestData[0] && data.latestData[0].latestData ? data.latestData[0].latestData : data.latestData : seriesData, {itemLine: itemLine = {}, itemContent: itemContent = {}} = this._spec, region = this._relativeSeries.getRegion(), {visible: itemLineVisible, line: line = {}} = itemLine, restItemLine = __rest(itemLine, [ "visible", "line" ]), itemLineAttrs = !1 !== itemLineVisible ? Object.assign(Object.assign({}, restItemLine), {
-            visible: !0,
-            lineStyle: (0, style_1.transformToGraphic)(line.style)
-        }) : {
-            visible: !1
-        }, labelAttrs = (0, utils_1.transformLabelAttributes)(Object.assign(Object.assign({}, itemContent.text), {
-            style: (0, vutils_1.merge)({
-                dx: 0,
-                dy: 0
-            }, null !== (_b = null === (_a = itemContent.text) || void 0 === _a ? void 0 : _a.style) && void 0 !== _b ? _b : itemContent.style)
-        }), data, this._markAttributeContext);
+        var _a, _b, _c, _d, _e;
+        const spec = this._spec, data = this._markerData, relativeSeries = this._relativeSeries, {point: point} = 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 === (_c = spec.itemContent) || void 0 === _c ? void 0 : _c.confine)) {
+        if (spec.clip || (null === (_a = spec.itemContent) || void 0 === _a ? void 0 : _a.confine)) {
             const {minX: minX, maxX: maxX, minY: minY, maxY: maxY} = (0, utils_1.computeClipRange)([ relativeSeries.getRegion() ]);
             limitRect = {
                 x: minX,
@@ -119,24 +109,19 @@ class BaseMarkPoint extends base_marker_1.BaseMarker {
             };
         }
         if (this._markerComponent) {
-            const attribute = null !== (_d = this._markerComponent.attribute) && void 0 !== _d ? _d : {}, textStyle = null !== (_f = null === (_e = attribute.itemContent) || void 0 === _e ? void 0 : _e.textStyle) && void 0 !== _f ? _f : {}, specText = null === (_g = this._spec.itemContent.text) || void 0 === _g ? void 0 : _g.text, offsetX = (0, 
-            utils_1.transformOffset)(itemContent.offsetX, region), offsetY = (0, utils_1.transformOffset)(itemContent.offsetY, region);
+            const attribute = null !== (_b = this._markerComponent.attribute) && void 0 !== _b ? _b : {}, textStyle = null !== (_d = null === (_c = attribute.itemContent) || void 0 === _c ? void 0 : _c.textStyle) && void 0 !== _d ? _d : {};
             this._markerComponent.setAttributes({
                 position: void 0 === point ? {
                     x: null,
                     y: null
                 } : point,
                 itemContent: Object.assign(Object.assign({}, attribute.itemContent), {
-                    panel: null !== (_h = labelAttrs.panel) && void 0 !== _h ? _h : null === (_j = attribute.itemContent) || void 0 === _j ? void 0 : _j.panel,
-                    padding: null !== (_k = labelAttrs.padding) && void 0 !== _k ? _k : null === (_l = attribute.itemContent) || void 0 === _l ? void 0 : _l.padding,
-                    textStyle: Object.assign(Object.assign(Object.assign({}, textStyle), null !== (_m = labelAttrs.textStyle) && void 0 !== _m ? _m : {}), {
-                        text: (null === (_o = this._spec.itemContent.text) || void 0 === _o ? void 0 : _o.formatMethod) ? this._spec.itemContent.text.formatMethod(dataPoints, seriesData) : (0, 
-                        vutils_1.isValid)(specText) ? specText : textStyle.text
+                    textStyle: Object.assign(Object.assign({}, textStyle), {
+                        text: (null === (_e = this._spec.itemContent.text) || void 0 === _e ? void 0 : _e.formatMethod) ? this._spec.itemContent.text.formatMethod(dataPoints, seriesData) : textStyle.text
                     }),
-                    offsetX: (0, utils_1.computeOffsetFromRegion)(point, offsetX, region),
-                    offsetY: (0, utils_1.computeOffsetFromRegion)(point, offsetY, region)
+                    offsetX: (0, utils_1.computeOffsetFromRegion)(point, attribute.itemContent.offsetX, this._relativeSeries.getRegion()),
+                    offsetY: (0, utils_1.computeOffsetFromRegion)(point, attribute.itemContent.offsetY, this._relativeSeries.getRegion())
                 }),
-                itemLine: itemLineAttrs,
                 limitRect: limitRect,
                 dx: this._layoutOffsetX,
                 dy: this._layoutOffsetY

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/marker/mark-point/base-mark-point.ts"],"names":[],"mappings":"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","file":"base-mark-point.js","sourcesContent":["import type { IMarkPoint, IMarkPointSpec } from './interface';\nimport {\n  computeClipRange,\n  computeOffsetFromRegion,\n  getMarkPointProcessInfo,\n  transformLabelAttributes,\n  transformOffset,\n  transformState,\n  transformStyle\n} from '../utils';\nimport type { MarkPointAttrs } from '@visactor/vrender-components';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkPoint as MarkPointComponent } from '@visactor/vrender-components';\nimport { isValid, merge } from '@visactor/vutils';\nimport { transformToGraphic } from '../../../util/style';\nimport { BaseMarker } from '../base-marker';\nimport { LayoutZIndex } from '../../../constant/layout';\nimport type { IGroup } from '@visactor/vrender-core';\nimport type { IMarkerLabelSpec, IMarkerLabelWithoutRefSpec } from '../interface';\n\nexport abstract class BaseMarkPoint extends BaseMarker<IMarkPointSpec> implements IMarkPoint {\n  static specKey = 'markPoint';\n  specKey = 'markPoint';\n\n  layoutZIndex: number = LayoutZIndex.MarkPoint;\n  protected declare _markerComponent: MarkPointComponent;\n\n  protected abstract _computePointsAttr(): any;\n\n  static _getMarkerCoordinateType(markerSpec: any): string {\n    const { doPolarProcess, doGeoProcess } = getMarkPointProcessInfo(markerSpec);\n    if (markerSpec.coordinateType === 'polar' || doPolarProcess) {\n      return 'polar';\n    } else if (markerSpec.coordinateType === 'geo' || doGeoProcess) {\n      return 'geo';\n    }\n    return 'cartesian';\n  }\n\n  protected _createMarkerComponent() {\n    const { itemContent = {}, itemLine = {}, targetSymbol = {} } = this._spec;\n    const region = this._relativeSeries.getRegion();\n    const {\n      type = 'text',\n\n      // 老写法\n      text: label,\n      symbol,\n      image,\n      richText,\n      customMark,\n      textStyle,\n      symbolStyle,\n      imageStyle,\n      richTextStyle,\n      customMarkStyle,\n\n      // 新写法\n      style = {},\n      state = {},\n\n      ...restItemContent\n    } = itemContent as any;\n\n    let itemContentState = null;\n    let itemContentStyle = null;\n    let defaultStyle = {};\n\n    if (type === 'text') {\n      itemContentState = label?.state ?? state;\n      defaultStyle = {\n        dx: 0,\n        dy: 0\n      };\n      itemContentStyle = transformLabelAttributes(\n        {\n          ...label,\n          style: merge(\n            defaultStyle,\n            label?.style ?? label?.textStyle ?? textStyle ?? (style as Pick<IMarkerLabelSpec, 'style'>)\n          )\n        },\n        this._markerData,\n        this._markAttributeContext\n      );\n    } else if ((type as any) === 'richText') {\n      itemContentState = richText?.state ?? state;\n      defaultStyle = {\n        width: 100,\n        height: 100\n      };\n      itemContentStyle = transformStyle(\n        merge(defaultStyle, richText?.style ?? richTextStyle ?? style),\n        this._markerData,\n        this._markAttributeContext\n      );\n    } else if (type === 'symbol') {\n      itemContentState = symbol?.state ?? state;\n      defaultStyle = {\n        symbolType: 'star',\n        fill: 'rgb(48, 115, 242)',\n        fillOpacity: 0.8,\n        size: 20\n      };\n      itemContentStyle = transformToGraphic(\n        transformStyle(\n          merge(defaultStyle, symbol?.style ?? symbolStyle ?? style),\n          this._markerData,\n          this._markAttributeContext\n        )\n      );\n    } else if (type === 'image') {\n      itemContentState = image?.state ?? state;\n      defaultStyle = {\n        width: 80,\n        height: 80\n      };\n      itemContentStyle = transformStyle(\n        merge(defaultStyle, image?.style ?? imageStyle ?? style),\n        this._markerData,\n        this._markAttributeContext\n      );\n    } else if (type === 'custom') {\n      itemContentState = customMark?.state ?? state;\n      itemContentStyle = transformStyle(\n        customMark?.style ?? customMarkStyle ?? style,\n        this._markerData,\n        this._markAttributeContext\n      );\n    }\n    const markPointAttrs: MarkPointAttrs = {\n      zIndex: this.layoutZIndex,\n      interactive: this._spec.interactive ?? true,\n      hover: this._spec.interactive ?? true,\n      select: this._spec.interactive ?? true,\n      position: { x: 0, y: 0 },\n      clipInRange: this._spec.clip ?? false,\n      itemContent: {\n        type,\n        offsetX: transformOffset(itemContent.offsetX, region),\n        offsetY: transformOffset(itemContent.offsetY, region),\n        ...restItemContent, // Tips: 因为网站 demo 上已经透出了 imageStyle richTextStyle 的写法，为了兼容所以这个需要在后面覆盖\n        style: transformStyle(itemContentStyle, this._markerData, this._markAttributeContext)\n      },\n      targetSymbol: {\n        offset: targetSymbol.offset ?? 0,\n        visible: targetSymbol.visible ?? false,\n        size: targetSymbol.size ?? 20,\n        style: transformStyle(targetSymbol.style, this._markerData, this._markAttributeContext)\n      },\n      state: {\n        line: transformState(this._spec.itemLine.line?.state ?? {}, this._markerData, this._markAttributeContext),\n        lineStartSymbol: transformState(\n          this._spec.itemLine.startSymbol?.state ?? {},\n          this._markerData,\n          this._markAttributeContext\n        ),\n        lineEndSymbol: transformState(\n          this._spec.itemLine.endSymbol?.state ?? {},\n          this._markerData,\n          this._markAttributeContext\n        ),\n        itemContent: transformState(itemContentState, this._markerData, this._markAttributeContext),\n        textBackground: transformState(\n          this._spec.itemContent.text?.labelBackground?.state,\n          this._markerData,\n          this._markAttributeContext\n        ),\n        targetItem: transformState(this._spec.targetSymbol?.state ?? {}, this._markerData, this._markAttributeContext)\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 { visible, line = {}, ...restItemLine } = itemLine;\n    if (visible !== false) {\n      markPointAttrs.itemLine = {\n        ...restItemLine,\n        visible: true,\n        lineStyle: transformToGraphic(line.style)\n      } as any;\n    } else {\n      markPointAttrs.itemLine = {\n        visible: false\n      };\n    }\n\n    const markPoint = new MarkPointComponent(markPointAttrs);\n    return markPoint as unknown as IGroup;\n  }\n\n  protected _markerLayout() {\n    const spec = this._spec;\n    const data = this._markerData;\n    const relativeSeries = this._relativeSeries;\n\n    const { point } = 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    const { itemLine = {}, itemContent = {} } = this._spec;\n    const region = this._relativeSeries.getRegion();\n    const { visible: itemLineVisible, line = {}, ...restItemLine } = itemLine;\n    const itemLineAttrs =\n      itemLineVisible !== false\n        ? ({\n            ...restItemLine,\n            visible: true,\n            lineStyle: transformToGraphic(line.style)\n          } as any)\n        : {\n            visible: false\n          };\n    const labelAttrs = transformLabelAttributes(\n      {\n        ...itemContent.text,\n        style: merge({ dx: 0, dy: 0 }, itemContent.text?.style ?? itemContent.style)\n      } as IMarkerLabelWithoutRefSpec,\n      data,\n      this._markAttributeContext\n    ) as any;\n\n    let limitRect;\n    if (spec.clip || spec.itemContent?.confine) {\n      const { minX, maxX, minY, maxY } = computeClipRange([relativeSeries.getRegion()]);\n      limitRect = {\n        x: minX,\n        y: minY,\n        width: maxX - minX,\n        height: maxY - minY\n      };\n    }\n    if (this._markerComponent) {\n      const attribute = this._markerComponent.attribute ?? {};\n      const textStyle = (attribute.itemContent as any)?.textStyle ?? {};\n      const specText = this._spec.itemContent.text?.text;\n      const offsetX = transformOffset(itemContent.offsetX, region);\n      const offsetY = transformOffset(itemContent.offsetY, region);\n      this._markerComponent.setAttributes({\n        position: point === undefined ? { x: null, y: null } : point, // setAttrs时merge时undefined会被忽略, 所以这里做转换\n        itemContent: {\n          ...attribute.itemContent,\n          panel: labelAttrs.panel ?? (attribute.itemContent as any)?.panel,\n          padding: labelAttrs.padding ?? (attribute.itemContent as any)?.padding,\n          textStyle: {\n            ...textStyle,\n            ...(labelAttrs.textStyle ?? {}),\n            text: this._spec.itemContent.text?.formatMethod\n              ? // type error here will be fixed in components\n                (this._spec.itemContent.text.formatMethod(dataPoints, seriesData) as any)\n              : isValid(specText)\n              ? specText\n              : textStyle.text\n          },\n          offsetX: computeOffsetFromRegion(point, offsetX, region),\n          offsetY: computeOffsetFromRegion(point, offsetY, region)\n        } as any,\n        itemLine: itemLineAttrs,\n        limitRect,\n        dx: this._layoutOffsetX,\n        dy: this._layoutOffsetY\n      });\n    }\n  }\n\n  protected _initDataView(): void {\n    const spec = this._spec as any;\n    const { doXYProcess, doPolarProcess, doGeoProcess } = getMarkPointProcessInfo(spec);\n    const isCoordinateProcess = isValid(spec.coordinate);\n    if (!isCoordinateProcess && !doXYProcess && !doPolarProcess && !doGeoProcess) {\n      return;\n    }\n\n    this._initCommonDataView();\n  }\n}\n"]}
+{"version":3,"sources":["../src/component/marker/mark-point/base-mark-point.ts"],"names":[],"mappings":"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","file":"base-mark-point.js","sourcesContent":["import type { IMarkPoint, IMarkPointSpec } from './interface';\nimport {\n  computeClipRange,\n  computeOffsetFromRegion,\n  getMarkPointProcessInfo,\n  transformLabelAttributes,\n  transformOffset,\n  transformState,\n  transformStyle\n} from '../utils';\nimport type { MarkPointAttrs } from '@visactor/vrender-components';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkPoint as MarkPointComponent } from '@visactor/vrender-components';\nimport { isValid, merge } from '@visactor/vutils';\nimport { transformToGraphic } from '../../../util/style';\nimport { BaseMarker } from '../base-marker';\nimport { LayoutZIndex } from '../../../constant/layout';\nimport type { IGroup } from '@visactor/vrender-core';\nimport type { IMarkerLabelSpec, IMarkerLabelWithoutRefSpec } from '../interface';\n\nexport abstract class BaseMarkPoint extends BaseMarker<IMarkPointSpec> implements IMarkPoint {\n  static specKey = 'markPoint';\n  specKey = 'markPoint';\n\n  layoutZIndex: number = LayoutZIndex.MarkPoint;\n  protected declare _markerComponent: MarkPointComponent;\n\n  protected abstract _computePointsAttr(): any;\n\n  static _getMarkerCoordinateType(markerSpec: any): string {\n    const { doPolarProcess, doGeoProcess } = getMarkPointProcessInfo(markerSpec);\n    if (markerSpec.coordinateType === 'polar' || doPolarProcess) {\n      return 'polar';\n    } else if (markerSpec.coordinateType === 'geo' || doGeoProcess) {\n      return 'geo';\n    }\n    return 'cartesian';\n  }\n\n  protected _createMarkerComponent() {\n    const { itemContent = {}, itemLine = {}, targetSymbol = {} } = this._spec;\n    const {\n      type = 'text',\n\n      // 老写法\n      text: label,\n      symbol,\n      image,\n      richText,\n      customMark,\n      textStyle,\n      symbolStyle,\n      imageStyle,\n      richTextStyle,\n      customMarkStyle,\n\n      // 新写法\n      style = {},\n      state = {},\n\n      ...restItemContent\n    } = itemContent as any;\n\n    let itemContentState = null;\n    let itemContentStyle = null;\n    let defaultStyle = {};\n\n    if (type === 'text') {\n      itemContentState = label?.state ?? state;\n      defaultStyle = {\n        dx: 0,\n        dy: 0\n      };\n      itemContentStyle = transformLabelAttributes(\n        {\n          ...label,\n          style: merge(\n            defaultStyle,\n            label?.style ?? label?.textStyle ?? textStyle ?? (style as Pick<IMarkerLabelSpec, 'style'>)\n          )\n        },\n        this._markerData,\n        this._markAttributeContext\n      );\n    } else if ((type as any) === 'richText') {\n      itemContentState = richText?.state ?? state;\n      defaultStyle = {\n        width: 100,\n        height: 100\n      };\n      itemContentStyle = transformStyle(\n        merge(defaultStyle, richText?.style ?? richTextStyle ?? style),\n        this._markerData,\n        this._markAttributeContext\n      );\n    } else if (type === 'symbol') {\n      itemContentState = symbol?.state ?? state;\n      defaultStyle = {\n        symbolType: 'star',\n        fill: 'rgb(48, 115, 242)',\n        fillOpacity: 0.8,\n        size: 20\n      };\n      itemContentStyle = transformToGraphic(\n        transformStyle(\n          merge(defaultStyle, symbol?.style ?? symbolStyle ?? style),\n          this._markerData,\n          this._markAttributeContext\n        )\n      );\n    } else if (type === 'image') {\n      itemContentState = image?.state ?? state;\n      defaultStyle = {\n        width: 80,\n        height: 80\n      };\n      itemContentStyle = transformStyle(\n        merge(defaultStyle, image?.style ?? imageStyle ?? style),\n        this._markerData,\n        this._markAttributeContext\n      );\n    } else if (type === 'custom') {\n      itemContentState = customMark?.state ?? state;\n      itemContentStyle = transformStyle(\n        customMark?.style ?? customMarkStyle ?? style,\n        this._markerData,\n        this._markAttributeContext\n      );\n    }\n    const markPointAttrs: MarkPointAttrs = {\n      zIndex: this.layoutZIndex,\n      interactive: this._spec.interactive ?? true,\n      hover: this._spec.interactive ?? true,\n      select: this._spec.interactive ?? true,\n      position: { x: 0, y: 0 },\n      clipInRange: this._spec.clip ?? false,\n      itemContent: {\n        type,\n        offsetX: transformOffset(itemContent.offsetX, this._relativeSeries.getRegion()),\n        offsetY: transformOffset(itemContent.offsetX, this._relativeSeries.getRegion()),\n        ...restItemContent, // Tips: 因为网站 demo 上已经透出了 imageStyle richTextStyle 的写法，为了兼容所以这个需要在后面覆盖\n        style: transformStyle(itemContentStyle, this._markerData, this._markAttributeContext)\n      },\n      targetSymbol: {\n        offset: targetSymbol.offset ?? 0,\n        visible: targetSymbol.visible ?? false,\n        size: targetSymbol.size ?? 20,\n        style: transformStyle(targetSymbol.style, this._markerData, this._markAttributeContext)\n      },\n      state: {\n        line: transformState(this._spec.itemLine.line?.state ?? {}, this._markerData, this._markAttributeContext),\n        lineStartSymbol: transformState(\n          this._spec.itemLine.startSymbol?.state ?? {},\n          this._markerData,\n          this._markAttributeContext\n        ),\n        lineEndSymbol: transformState(\n          this._spec.itemLine.endSymbol?.state ?? {},\n          this._markerData,\n          this._markAttributeContext\n        ),\n        itemContent: transformState(itemContentState, this._markerData, this._markAttributeContext),\n        textBackground: transformState(\n          this._spec.itemContent.text?.labelBackground?.state,\n          this._markerData,\n          this._markAttributeContext\n        ),\n        targetItem: transformState(this._spec.targetSymbol?.state ?? {}, this._markerData, this._markAttributeContext)\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 { visible, line = {}, ...restItemLine } = itemLine;\n    if (visible !== false) {\n      markPointAttrs.itemLine = {\n        ...restItemLine,\n        visible: true,\n        lineStyle: transformToGraphic(line.style)\n      } as any;\n    } else {\n      markPointAttrs.itemLine = {\n        visible: false\n      };\n    }\n\n    const markPoint = new MarkPointComponent(markPointAttrs);\n    return markPoint as unknown as IGroup;\n  }\n\n  protected _markerLayout() {\n    const spec = this._spec;\n    const data = this._markerData;\n    const relativeSeries = this._relativeSeries;\n\n    const { point } = 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.itemContent?.confine) {\n      const { minX, maxX, minY, maxY } = computeClipRange([relativeSeries.getRegion()]);\n      limitRect = {\n        x: minX,\n        y: minY,\n        width: maxX - minX,\n        height: maxY - minY\n      };\n    }\n    if (this._markerComponent) {\n      const attribute = this._markerComponent.attribute ?? {};\n      const textStyle = (attribute.itemContent as any)?.textStyle ?? {};\n      this._markerComponent.setAttributes({\n        position: point === undefined ? { x: null, y: null } : point, // setAttrs时merge时undefined会被忽略, 所以这里做转换\n        itemContent: {\n          ...attribute.itemContent,\n          textStyle: {\n            ...textStyle,\n            text: this._spec.itemContent.text?.formatMethod\n              ? // type error here will be fixed in components\n                (this._spec.itemContent.text.formatMethod(dataPoints, seriesData) as any)\n              : textStyle.text\n          },\n          offsetX: computeOffsetFromRegion(point, attribute.itemContent.offsetX, this._relativeSeries.getRegion()),\n          offsetY: computeOffsetFromRegion(point, attribute.itemContent.offsetY, this._relativeSeries.getRegion())\n        } as any,\n        limitRect,\n        dx: this._layoutOffsetX,\n        dy: this._layoutOffsetY\n      });\n    }\n  }\n\n  protected _initDataView(): void {\n    const spec = this._spec as any;\n    const { doXYProcess, doPolarProcess, doGeoProcess } = getMarkPointProcessInfo(spec);\n    const isCoordinateProcess = isValid(spec.coordinate);\n    if (!isCoordinateProcess && !doXYProcess && !doPolarProcess && !doGeoProcess) {\n      return;\n    }\n\n    this._initCommonDataView();\n  }\n}\n"]}

package/cjs/component/marker/mark-point/cartesian-mark-point.js

@@ -17,8 +17,8 @@ class CartesianMarkPoint extends base_mark_point_1.BaseMarkPoint {
         vutils_1.isValid)(spec.x) && (0, vutils_1.isValid)(spec.y), isCoordinateLayout = (0, 
         vutils_1.isValid)(spec.coordinate), isPositionLayout = (0, vutils_1.isValid)(spec.position), autoRange = null !== (_a = null == spec ? void 0 : spec.autoRange) && void 0 !== _a && _a;
         let point;
-        return isXYLayout ? point = null === (_c = null === (_b = (0, utils_1.xyLayout)(data, relativeSeries, relativeSeries, relativeSeries, autoRange, !1, this._getAutoRangeExtendDomainKeyPrefix())) || void 0 === _b ? void 0 : _b[0]) || void 0 === _c ? void 0 : _c[0] : isCoordinateLayout ? point = (0, 
-        utils_1.cartesianCoordinateLayout)(data, relativeSeries, autoRange, spec.coordinatesOffset, this._getAutoRangeExtendDomainKeyPrefix())[0] : isPositionLayout && (point = (0, 
+        return isXYLayout ? point = null === (_c = null === (_b = (0, utils_1.xyLayout)(data, relativeSeries, relativeSeries, relativeSeries, autoRange)) || void 0 === _b ? void 0 : _b[0]) || void 0 === _c ? void 0 : _c[0] : isCoordinateLayout ? point = (0, 
+        utils_1.cartesianCoordinateLayout)(data, relativeSeries, autoRange, spec.coordinatesOffset)[0] : isPositionLayout && (point = (0, 
         utils_1.positionLayout)(spec.position, relativeSeries, spec.regionRelative)[0]), 
         {
             point: point

package/cjs/component/marker/mark-point/cartesian-mark-point.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/marker/mark-point/cartesian-mark-point.ts"],"names":[],"mappings":"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","file":"cartesian-mark-point.js","sourcesContent":["import type { IMarkPointCoordinateSpec } from './interface';\nimport { ComponentTypeEnum } from '../../interface/type';\nimport { cartesianCoordinateLayout, getMarkPointProcessInfo, positionLayout, xyLayout } from '../utils';\nimport { registerMarkPointAnimate } from '@visactor/vrender-components';\nimport { isValid } from '@visactor/vutils';\nimport { Factory } from '../../../core/factory';\nimport type { CoordinateType, IPoint } from '../../../typings';\nimport { BaseMarkPoint } from './base-mark-point';\nimport type { IMarkProcessOptions } from '../interface';\nimport type { IOptionAggr, IOptionWithCoordinates } from '../../../data/transforms/interface';\nimport { markPoint } from '../../../theme/builtin/common/component/mark-point';\n\nexport class CartesianMarkPoint extends BaseMarkPoint {\n  static type = ComponentTypeEnum.markPoint;\n  type = ComponentTypeEnum.markPoint;\n  name: string = ComponentTypeEnum.markPoint;\n  static coordinateType = 'cartesian';\n  coordinateType = 'cartesian' as CoordinateType;\n\n  static readonly builtInTheme = {\n    markPoint: markPoint\n  };\n\n  protected _computePointsAttr() {\n    const spec = this._spec as any;\n    const data = this._markerData;\n    const relativeSeries = this._relativeSeries;\n    const isXYLayout = isValid(spec.x) && isValid(spec.y);\n    const isCoordinateLayout = isValid(spec.coordinate);\n    const isPositionLayout = isValid(spec.position);\n    const autoRange = spec?.autoRange ?? false;\n\n    let point: IPoint;\n\n    if (isXYLayout) {\n      point = xyLayout(\n        data,\n        relativeSeries,\n        relativeSeries,\n        relativeSeries,\n        autoRange,\n        false,\n        this._getAutoRangeExtendDomainKeyPrefix()\n      )?.[0]?.[0];\n    } else if (isCoordinateLayout) {\n      point = cartesianCoordinateLayout(\n        data,\n        relativeSeries,\n        autoRange,\n        (spec as IMarkPointCoordinateSpec).coordinatesOffset,\n        this._getAutoRangeExtendDomainKeyPrefix()\n      )[0];\n    } else if (isPositionLayout) {\n      point = positionLayout(spec.position, relativeSeries, spec.regionRelative)[0];\n    }\n\n    return { point };\n  }\n\n  protected _computeOptions(): IMarkProcessOptions {\n    const spec = this._spec as any;\n    const { doXYProcess } = getMarkPointProcessInfo(spec);\n    const isCoordinateProcess = isValid(spec.coordinate);\n\n    let options: IOptionAggr[] | IOptionWithCoordinates;\n    if (doXYProcess) {\n      options = [\n        this._processSpecByDims([\n          { dim: 'x', specValue: spec.x },\n          { dim: 'y', specValue: spec.y }\n        ])\n      ];\n    } else if (isCoordinateProcess) {\n      options = this._processSpecCoo(spec);\n    }\n\n    return { options };\n  }\n}\n\nexport const registerMarkPoint = () => {\n  Factory.registerComponent(CartesianMarkPoint.type, CartesianMarkPoint);\n  registerMarkPointAnimate();\n};\n"]}
+{"version":3,"sources":["../src/component/marker/mark-point/cartesian-mark-point.ts"],"names":[],"mappings":"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","file":"cartesian-mark-point.js","sourcesContent":["import type { IMarkPointCoordinateSpec } from './interface';\nimport { ComponentTypeEnum } from '../../interface/type';\nimport { cartesianCoordinateLayout, getMarkPointProcessInfo, positionLayout, xyLayout } from '../utils';\nimport { registerMarkPointAnimate } from '@visactor/vrender-components';\nimport { isValid } from '@visactor/vutils';\nimport { Factory } from '../../../core/factory';\nimport type { CoordinateType, IPoint } from '../../../typings';\nimport { BaseMarkPoint } from './base-mark-point';\nimport type { IMarkProcessOptions } from '../interface';\nimport type { IOptionAggr, IOptionWithCoordinates } from '../../../data/transforms/interface';\nimport { markPoint } from '../../../theme/builtin/common/component/mark-point';\n\nexport class CartesianMarkPoint extends BaseMarkPoint {\n  static type = ComponentTypeEnum.markPoint;\n  type = ComponentTypeEnum.markPoint;\n  name: string = ComponentTypeEnum.markPoint;\n  static coordinateType = 'cartesian';\n  coordinateType = 'cartesian' as CoordinateType;\n\n  static readonly builtInTheme = {\n    markPoint: markPoint\n  };\n\n  protected _computePointsAttr() {\n    const spec = this._spec as any;\n    const data = this._markerData;\n    const relativeSeries = this._relativeSeries;\n    const isXYLayout = isValid(spec.x) && isValid(spec.y);\n    const isCoordinateLayout = isValid(spec.coordinate);\n    const isPositionLayout = isValid(spec.position);\n    const autoRange = spec?.autoRange ?? false;\n\n    let point: IPoint;\n\n    if (isXYLayout) {\n      point = xyLayout(data, relativeSeries, relativeSeries, relativeSeries, autoRange)?.[0]?.[0];\n    } else if (isCoordinateLayout) {\n      point = cartesianCoordinateLayout(\n        data,\n        relativeSeries,\n        autoRange,\n        (spec as IMarkPointCoordinateSpec).coordinatesOffset\n      )[0];\n    } else if (isPositionLayout) {\n      point = positionLayout(spec.position, relativeSeries, spec.regionRelative)[0];\n    }\n\n    return { point };\n  }\n\n  protected _computeOptions(): IMarkProcessOptions {\n    const spec = this._spec as any;\n    const { doXYProcess } = getMarkPointProcessInfo(spec);\n    const isCoordinateProcess = isValid(spec.coordinate);\n\n    let options: IOptionAggr[] | IOptionWithCoordinates;\n    if (doXYProcess) {\n      options = [\n        this._processSpecByDims([\n          { dim: 'x', specValue: spec.x },\n          { dim: 'y', specValue: spec.y }\n        ])\n      ];\n    } else if (isCoordinateProcess) {\n      options = this._processSpecCoo(spec);\n    }\n\n    return { options };\n  }\n}\n\nexport const registerMarkPoint = () => {\n  Factory.registerComponent(CartesianMarkPoint.type, CartesianMarkPoint);\n  registerMarkPointAnimate();\n};\n"]}

package/cjs/component/marker/mark-point/polar-mark-point.js

@@ -14,7 +14,7 @@ class PolarMarkPoint extends base_mark_point_1.BaseMarkPoint {
     _computePointsAttr() {
         var _a, _b;
         const data = this._markerData, relativeSeries = this._relativeSeries, autoRange = null !== (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.autoRange) && void 0 !== _b && _b, polarPoint = (0, 
-        utils_1.polarLayout)(data, relativeSeries, relativeSeries, relativeSeries, autoRange, this._getAutoRangeExtendDomainKeyPrefix())[0][0], center = {
+        utils_1.polarLayout)(data, relativeSeries, relativeSeries, relativeSeries, autoRange)[0][0], center = {
             x: this._relativeSeries.getRegion().getLayoutStartPoint().x + this._relativeSeries.angleAxisHelper.center().x,
             y: this._relativeSeries.getRegion().getLayoutStartPoint().y + this._relativeSeries.angleAxisHelper.center().y
         };

package/cjs/component/marker/mark-point/polar-mark-point.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/marker/mark-point/polar-mark-point.ts"],"names":[],"mappings":";;;AAAA,+CAAyD;AACzD,oCAAuC;AACvC,qEAAwE;AACxE,mDAAgD;AAChD,uDAAkD;AAGlD,6CAAoD;AAEpD,mFAA+E;AAE/E,MAAa,cAAe,SAAQ,+BAAa;IAAjD;;QAEE,SAAI,GAAG,wBAAiB,CAAC,cAAc,CAAC;QACxC,SAAI,GAAW,wBAAiB,CAAC,cAAc,CAAC;QAEhD,mBAAc,GAAG,OAAyB,CAAC;IAyC7C,CAAC;IAnCW,kBAAkB;;QAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC;QAC9B,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC;QAC5C,MAAM,SAAS,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,SAAS,mCAAI,KAAK,CAAC;QACjD,MAAM,UAAU,GAAG,IAAA,mBAAW,EAC5B,IAAI,EACJ,cAAc,EACd,cAAc,EACd,cAAc,EACd,SAAS,EACT,IAAI,CAAC,kCAAkC,EAAE,CAC1C,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACR,MAAM,MAAM,GAAG;YACb,CAAC,EACC,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,mBAAmB,EAAE,CAAC,CAAC;gBACvD,IAAI,CAAC,eAAgC,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC;YACnE,CAAC,EACC,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,mBAAmB,EAAE,CAAC,CAAC;gBACvD,IAAI,CAAC,eAAgC,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC;SACpE,CAAC;QACF,MAAM,KAAK,GAAG,IAAA,yBAAgB,EAAC,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;QAE5E,OAAO,EAAE,KAAK,EAAE,CAAC;IACnB,CAAC;IAES,eAAe;QACvB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAY,CAAC;QAC/B,MAAM,OAAO,GAAG;YACd,IAAI,CAAC,kBAAkB,CAAC;gBACtB,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE;gBACzC,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE;aACxC,CAAC;SACH,CAAC;QACF,OAAO,EAAE,OAAO,EAAE,CAAC;IACrB,CAAC;;AA7CH,wCA8CC;AA7CQ,mBAAI,GAAG,wBAAiB,CAAC,cAAc,CAAC;AAGxC,6BAAc,GAAG,OAAO,CAAC;AAGhB,2BAAY,GAAG;IAC7B,cAAc,EAAE,sBAAS;CAC1B,CAAC;AAuCG,MAAM,sBAAsB,GAAG,GAAG,EAAE;IACzC,iBAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC/D,IAAA,6CAAwB,GAAE,CAAC;AAC7B,CAAC,CAAC;AAHW,QAAA,sBAAsB,0BAGjC","file":"polar-mark-point.js","sourcesContent":["import { ComponentTypeEnum } from '../../interface/type';\nimport { polarLayout } from '../utils';\nimport { registerMarkPointAnimate } from '@visactor/vrender-components';\nimport { Factory } from '../../../core/factory';\nimport { BaseMarkPoint } from './base-mark-point';\nimport type { IPolarSeries } from 'src/series';\nimport type { IMarkProcessOptions } from '../interface';\nimport { polarToCartesian } from '@visactor/vutils';\nimport type { CoordinateType } from '../../../typings';\nimport { markPoint } from '../../../theme/builtin/common/component/mark-point';\n\nexport class PolarMarkPoint extends BaseMarkPoint {\n  static type = ComponentTypeEnum.polarMarkPoint;\n  type = ComponentTypeEnum.polarMarkPoint;\n  name: string = ComponentTypeEnum.polarMarkPoint;\n  static coordinateType = 'polar';\n  coordinateType = 'polar' as CoordinateType;\n\n  static readonly builtInTheme = {\n    polarMarkPoint: markPoint\n  };\n\n  protected _computePointsAttr() {\n    const data = this._markerData;\n    const relativeSeries = this._relativeSeries;\n    const autoRange = this._spec?.autoRange ?? false;\n    const polarPoint = polarLayout(\n      data,\n      relativeSeries,\n      relativeSeries,\n      relativeSeries,\n      autoRange,\n      this._getAutoRangeExtendDomainKeyPrefix()\n    )[0][0];\n    const center = {\n      x:\n        this._relativeSeries.getRegion().getLayoutStartPoint().x +\n        (this._relativeSeries as IPolarSeries).angleAxisHelper.center().x,\n      y:\n        this._relativeSeries.getRegion().getLayoutStartPoint().y +\n        (this._relativeSeries as IPolarSeries).angleAxisHelper.center().y\n    };\n    const point = polarToCartesian(center, polarPoint.radius, polarPoint.angle);\n\n    return { point };\n  }\n\n  protected _computeOptions(): IMarkProcessOptions {\n    const spec = this._spec as any;\n    const options = [\n      this._processSpecByDims([\n        { dim: 'radius', specValue: spec.radius },\n        { dim: 'angle', specValue: spec.angle }\n      ])\n    ];\n    return { options };\n  }\n}\n\nexport const registerPolarMarkPoint = () => {\n  Factory.registerComponent(PolarMarkPoint.type, PolarMarkPoint);\n  registerMarkPointAnimate();\n};\n"]}
+{"version":3,"sources":["../src/component/marker/mark-point/polar-mark-point.ts"],"names":[],"mappings":";;;AAAA,+CAAyD;AACzD,oCAAuC;AACvC,qEAAwE;AACxE,mDAAgD;AAChD,uDAAkD;AAGlD,6CAAoD;AAEpD,mFAA+E;AAE/E,MAAa,cAAe,SAAQ,+BAAa;IAAjD;;QAEE,SAAI,GAAG,wBAAiB,CAAC,cAAc,CAAC;QACxC,SAAI,GAAW,wBAAiB,CAAC,cAAc,CAAC;QAEhD,mBAAc,GAAG,OAAyB,CAAC;IAkC7C,CAAC;IA5BW,kBAAkB;;QAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC;QAC9B,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC;QAC5C,MAAM,SAAS,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,SAAS,mCAAI,KAAK,CAAC;QACjD,MAAM,UAAU,GAAG,IAAA,mBAAW,EAAC,IAAI,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACtG,MAAM,MAAM,GAAG;YACb,CAAC,EACC,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,mBAAmB,EAAE,CAAC,CAAC;gBACvD,IAAI,CAAC,eAAgC,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC;YACnE,CAAC,EACC,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,mBAAmB,EAAE,CAAC,CAAC;gBACvD,IAAI,CAAC,eAAgC,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC;SACpE,CAAC;QACF,MAAM,KAAK,GAAG,IAAA,yBAAgB,EAAC,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;QAE5E,OAAO,EAAE,KAAK,EAAE,CAAC;IACnB,CAAC;IAES,eAAe;QACvB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAY,CAAC;QAC/B,MAAM,OAAO,GAAG;YACd,IAAI,CAAC,kBAAkB,CAAC;gBACtB,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE;gBACzC,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE;aACxC,CAAC;SACH,CAAC;QACF,OAAO,EAAE,OAAO,EAAE,CAAC;IACrB,CAAC;;AAtCH,wCAuCC;AAtCQ,mBAAI,GAAG,wBAAiB,CAAC,cAAc,CAAC;AAGxC,6BAAc,GAAG,OAAO,CAAC;AAGhB,2BAAY,GAAG;IAC7B,cAAc,EAAE,sBAAS;CAC1B,CAAC;AAgCG,MAAM,sBAAsB,GAAG,GAAG,EAAE;IACzC,iBAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC/D,IAAA,6CAAwB,GAAE,CAAC;AAC7B,CAAC,CAAC;AAHW,QAAA,sBAAsB,0BAGjC","file":"polar-mark-point.js","sourcesContent":["import { ComponentTypeEnum } from '../../interface/type';\nimport { polarLayout } from '../utils';\nimport { registerMarkPointAnimate } from '@visactor/vrender-components';\nimport { Factory } from '../../../core/factory';\nimport { BaseMarkPoint } from './base-mark-point';\nimport type { IPolarSeries } from 'src/series';\nimport type { IMarkProcessOptions } from '../interface';\nimport { polarToCartesian } from '@visactor/vutils';\nimport type { CoordinateType } from '../../../typings';\nimport { markPoint } from '../../../theme/builtin/common/component/mark-point';\n\nexport class PolarMarkPoint extends BaseMarkPoint {\n  static type = ComponentTypeEnum.polarMarkPoint;\n  type = ComponentTypeEnum.polarMarkPoint;\n  name: string = ComponentTypeEnum.polarMarkPoint;\n  static coordinateType = 'polar';\n  coordinateType = 'polar' as CoordinateType;\n\n  static readonly builtInTheme = {\n    polarMarkPoint: markPoint\n  };\n\n  protected _computePointsAttr() {\n    const data = this._markerData;\n    const relativeSeries = this._relativeSeries;\n    const autoRange = this._spec?.autoRange ?? false;\n    const polarPoint = polarLayout(data, relativeSeries, relativeSeries, relativeSeries, autoRange)[0][0];\n    const center = {\n      x:\n        this._relativeSeries.getRegion().getLayoutStartPoint().x +\n        (this._relativeSeries as IPolarSeries).angleAxisHelper.center().x,\n      y:\n        this._relativeSeries.getRegion().getLayoutStartPoint().y +\n        (this._relativeSeries as IPolarSeries).angleAxisHelper.center().y\n    };\n    const point = polarToCartesian(center, polarPoint.radius, polarPoint.angle);\n\n    return { point };\n  }\n\n  protected _computeOptions(): IMarkProcessOptions {\n    const spec = this._spec as any;\n    const options = [\n      this._processSpecByDims([\n        { dim: 'radius', specValue: spec.radius },\n        { dim: 'angle', specValue: spec.angle }\n      ])\n    ];\n    return { options };\n  }\n}\n\nexport const registerPolarMarkPoint = () => {\n  Factory.registerComponent(PolarMarkPoint.type, PolarMarkPoint);\n  registerMarkPointAnimate();\n};\n"]}

package/cjs/component/marker/utils.d.ts

@@ -5,11 +5,11 @@ import type { IDataPos, IMarkerAttributeContext, IMarkerLabelSpec, IMarkerState,
 import type { IRegion } from '../../region/interface';
 import type { OffsetPoint } from './interface';
 export declare function isAggrSpec(spec: IDataPos): boolean;
-export declare function xyLayout(data: DataView, startRelativeSeries: IMarkerSupportSeries, endRelativeSeries: IMarkerSupportSeries, relativeSeries: IMarkerSupportSeries, autoRange: boolean, includeFullBand?: boolean, autoRangeExtendDomainKeyPrefix?: string): IPoint[][];
-export declare function polarLayout(data: DataView, startRelativeSeries: IMarkerSupportSeries, endRelativeSeries: IMarkerSupportSeries, relativeSeries: IMarkerSupportSeries, autoRange: boolean, autoRangeExtendDomainKeyPrefix?: string): IPolarPoint[][];
+export declare function xyLayout(data: DataView, startRelativeSeries: IMarkerSupportSeries, endRelativeSeries: IMarkerSupportSeries, relativeSeries: IMarkerSupportSeries, autoRange: boolean, includeFullBand?: boolean): IPoint[][];
+export declare function polarLayout(data: DataView, startRelativeSeries: IMarkerSupportSeries, endRelativeSeries: IMarkerSupportSeries, relativeSeries: IMarkerSupportSeries, autoRange: boolean): IPolarPoint[][];
 export declare function geoLayout(data: DataView, relativeSeries: IMarkerSupportSeries): IPoint[][];
-export declare function cartesianCoordinateLayout(data: DataView, relativeSeries: IMarkerSupportSeries, autoRange: boolean, coordinatesOffset: OffsetPoint[] | OffsetPoint, autoRangeExtendDomainKeyPrefix?: string): IPoint[];
-export declare function polarCoordinateLayout(data: DataView, relativeSeries: IMarkerSupportSeries, autoRange: boolean, autoRangeExtendDomainKeyPrefix?: string): IPolarPoint[];
+export declare function cartesianCoordinateLayout(data: DataView, relativeSeries: IMarkerSupportSeries, autoRange: boolean, coordinatesOffset: OffsetPoint[] | OffsetPoint): IPoint[];
+export declare function polarCoordinateLayout(data: DataView, relativeSeries: IMarkerSupportSeries, autoRange: boolean): IPolarPoint[];
 export declare function positionLayout(positions: MarkerPositionPoint | MarkerPositionPoint[] | ((seriesData: Datum[], relativeSeries: IMarkerSupportSeries) => MarkerPositionPoint) | ((seriesData: Datum[], relativeSeries: IMarkerSupportSeries) => MarkerPositionPoint[]), series: IMarkerSupportSeries, regionRelative: boolean): IPoint[];
 export declare function computeClipRange(regions: IRegion[]): {
     minX: number;

package/cjs/component/marker/utils.js

@@ -23,39 +23,35 @@ function isNeedExtendDomain(domain, datum, autoRange) {
     return datum < min || datum > max;
 }
 
-function getAutoRangeExtendDomainKey(keyPrefix, axisKey) {
-    return keyPrefix ? `${keyPrefix}_${axisKey}_extend` : `marker_${axisKey}_extend`;
-}
-
-function getXValue(datum, xDomain, autoRange, refSeries, regionWidth, regionStartLayoutStartPoint, autoRangeExtendDomainKeyPrefix) {
+function getXValue(datum, xDomain, autoRange, refSeries, regionWidth, regionStartLayoutStartPoint) {
     var _a, _b;
     const {relativeSeries: relativeSeries} = refSeries;
     let x;
-    return (0, vutils_1.isNumber)(datum.x) && isNeedExtendDomain(xDomain, datum.x, autoRange) && (null === (_b = null == relativeSeries ? void 0 : (_a = relativeSeries.getXAxisHelper()).setExtendDomain) || void 0 === _b || _b.call(_a, getAutoRangeExtendDomainKey(autoRangeExtendDomainKeyPrefix, "xAxis"), datum.x)), 
+    return (0, vutils_1.isNumber)(datum.x) && isNeedExtendDomain(xDomain, datum.x, autoRange) && (null === (_b = null == relativeSeries ? void 0 : (_a = relativeSeries.getXAxisHelper()).setExtendDomain) || void 0 === _b || _b.call(_a, "marker_xAxis_extend", datum.x)), 
     x = (0, util_1.isPercent)(datum.x) ? convertPercentToValue(datum.x, regionWidth) + regionStartLayoutStartPoint.x : convertDatumToValue(relativeSeries.getXAxisHelper(), [ datum.x ]) + regionStartLayoutStartPoint.x, 
     x;
 }
 
-function getYValue(datum, yDomain, autoRange, refSeries, regionHeight, regionStartLayoutStartPoint, autoRangeExtendDomainKeyPrefix) {
+function getYValue(datum, yDomain, autoRange, refSeries, regionHeight, regionStartLayoutStartPoint) {
     var _a, _b;
     const {relativeSeries: relativeSeries} = refSeries;
     let y;
-    return (0, vutils_1.isNumber)(datum.y) && isNeedExtendDomain(yDomain, datum.y, autoRange) && (null === (_b = null === (_a = relativeSeries.getYAxisHelper()) || void 0 === _a ? void 0 : _a.setExtendDomain) || void 0 === _b || _b.call(_a, getAutoRangeExtendDomainKey(autoRangeExtendDomainKeyPrefix, "yAxis"), datum.y)), 
+    return (0, vutils_1.isNumber)(datum.y) && isNeedExtendDomain(yDomain, datum.y, autoRange) && (null === (_b = null === (_a = relativeSeries.getYAxisHelper()) || void 0 === _a ? void 0 : _a.setExtendDomain) || void 0 === _b || _b.call(_a, "marker_yAxis_extend", datum.y)), 
     y = (0, util_1.isPercent)(datum.y) ? convertPercentToValue(datum.y, regionHeight) + regionStartLayoutStartPoint.y : convertDatumToValue(relativeSeries.getYAxisHelper(), [ datum.y ]) + regionStartLayoutStartPoint.y, 
     y;
 }
 
-function getAngleValue(datum, angleDomain, autoRange, refSeries, autoRangeExtendDomainKeyPrefix) {
+function getAngleValue(datum, angleDomain, autoRange, refSeries) {
     var _a, _b;
     const {relativeSeries: relativeSeries} = refSeries;
-    return (0, vutils_1.isNumber)(datum.angle) && isNeedExtendDomain(angleDomain, datum.angle, autoRange) && (null === (_b = null === (_a = relativeSeries.angleAxisHelper) || void 0 === _a ? void 0 : _a.setExtendDomain) || void 0 === _b || _b.call(_a, getAutoRangeExtendDomainKey(autoRangeExtendDomainKeyPrefix, "angleAxis"), datum.angle)), 
+    return (0, vutils_1.isNumber)(datum.angle) && isNeedExtendDomain(angleDomain, datum.angle, autoRange) && (null === (_b = null === (_a = relativeSeries.angleAxisHelper) || void 0 === _a ? void 0 : _a.setExtendDomain) || void 0 === _b || _b.call(_a, "marker_angleAxis_extend", datum.angle)), 
     convertDatumToValue(relativeSeries.angleAxisHelper, [ datum.angle ]);
 }
 
-function getRadiusValue(datum, radiusDomain, autoRange, refSeries, autoRangeExtendDomainKeyPrefix) {
+function getRadiusValue(datum, radiusDomain, autoRange, refSeries) {
     var _a, _b;
     const {relativeSeries: relativeSeries} = refSeries;
-    return (0, vutils_1.isNumber)(datum.radius) && isNeedExtendDomain(radiusDomain, datum.radius, autoRange) && (null === (_b = null === (_a = relativeSeries.radiusAxisHelper) || void 0 === _a ? void 0 : _a.setExtendDomain) || void 0 === _b || _b.call(_a, getAutoRangeExtendDomainKey(autoRangeExtendDomainKeyPrefix, "radiusAxis"), datum.radius)), 
+    return (0, vutils_1.isNumber)(datum.radius) && isNeedExtendDomain(radiusDomain, datum.radius, autoRange) && (null === (_b = null === (_a = relativeSeries.radiusAxisHelper) || void 0 === _a ? void 0 : _a.setExtendDomain) || void 0 === _b || _b.call(_a, "marker_radiusAxis_extend", datum.radius)), 
     convertDatumToValue(relativeSeries.radiusAxisHelper, [ datum.radius ]);
 }
 
@@ -72,7 +68,7 @@ function isAggrSpec(spec) {
     return marker_1.AGGR_TYPE.includes(spec);
 }
 
-function xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange, includeFullBand = !1, autoRangeExtendDomainKeyPrefix) {
+function xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange, includeFullBand = !1) {
     const regionStart = startRelativeSeries.getRegion(), regionStartLayoutStartPoint = regionStart.getLayoutStartPoint(), regionEnd = endRelativeSeries.getRegion(), regionEndLayoutStartPoint = regionEnd.getLayoutStartPoint(), regionWidth = Math.abs(Math.min(regionStartLayoutStartPoint.x, regionEndLayoutStartPoint.x) - Math.max(regionStartLayoutStartPoint.x + regionStart.getLayoutRect().width, regionEndLayoutStartPoint.x + regionEnd.getLayoutRect().width)), regionHeight = Math.abs(Math.min(regionStartLayoutStartPoint.y, regionEndLayoutStartPoint.y) - Math.max(regionStartLayoutStartPoint.y + regionStart.getLayoutRect().height, regionEndLayoutStartPoint.y + regionEnd.getLayoutRect().height)), refSeries = {
         relativeSeries: relativeSeries,
         startRelativeSeries: startRelativeSeries,
@@ -87,14 +83,14 @@ function xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries,
     return dataPoints.forEach((datum => {
         const isValidX = (0, vutils_1.isValid)(datum.x), isValidY = (0, vutils_1.isValid)(datum.y);
         let x, y;
-        if (isValidX && isValidY) x = getXValue(datum, xDomain, autoRange, refSeries, regionWidth, regionStartLayoutStartPoint, autoRangeExtendDomainKeyPrefix), 
-        y = getYValue(datum, yDomain, autoRange, refSeries, regionHeight, regionStartLayoutStartPoint, autoRangeExtendDomainKeyPrefix), 
+        if (isValidX && isValidY) x = getXValue(datum, xDomain, autoRange, refSeries, regionWidth, regionStartLayoutStartPoint), 
+        y = getYValue(datum, yDomain, autoRange, refSeries, regionHeight, regionStartLayoutStartPoint), 
         setTempWithValid(x, isXExpand, xTemp, lines.length), setTempWithValid(y, isyExpand, yTemp, lines.length), 
         lines.push([ {
             x: x,
             y: y
         } ]); else if (isValidX) {
-            x = getXValue(datum, xDomain, autoRange, refSeries, regionWidth, regionStartLayoutStartPoint, autoRangeExtendDomainKeyPrefix), 
+            x = getXValue(datum, xDomain, autoRange, refSeries, regionWidth, regionStartLayoutStartPoint), 
             y = Math.max(regionStartLayoutStartPoint.y + regionStart.getLayoutRect().height, regionEndLayoutStartPoint.y + regionEnd.getLayoutRect().height);
             const y1 = Math.min(regionStartLayoutStartPoint.y, regionEndLayoutStartPoint.y);
             setTempWithValid(x, isXExpand, xTemp, lines.length), lines.push([ {
@@ -105,7 +101,7 @@ function xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries,
                 y: y1
             } ]);
         } else if (isValidY) {
-            x = Math.min(regionStartLayoutStartPoint.x, regionEndLayoutStartPoint.x), y = getYValue(datum, yDomain, autoRange, refSeries, regionHeight, regionStartLayoutStartPoint, autoRangeExtendDomainKeyPrefix);
+            x = Math.min(regionStartLayoutStartPoint.x, regionEndLayoutStartPoint.x), y = getYValue(datum, yDomain, autoRange, refSeries, regionHeight, regionStartLayoutStartPoint);
             const x1 = Math.max(regionStartLayoutStartPoint.x + regionStart.getLayoutRect().width, regionEndLayoutStartPoint.x + regionEnd.getLayoutRect().width);
             setTempWithValid(y, isyExpand, yTemp, lines.length), lines.push([ {
                 x: x,
@@ -139,7 +135,7 @@ function setTempWithValid(v, isExpand, temp, index) {
     })), v;
 }
 
-function polarLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange, autoRangeExtendDomainKeyPrefix) {
+function polarLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange) {
     const refSeries = {
         relativeSeries: relativeSeries,
         startRelativeSeries: startRelativeSeries,
@@ -148,13 +144,13 @@ function polarLayout(data, startRelativeSeries, endRelativeSeries, relativeSerie
     return dataPoints.forEach((datum => {
         const isValidAngle = (0, vutils_1.isValid)(datum.angle), isValidRadius = (0, vutils_1.isValid)(datum.radius);
         if (isValidAngle && isValidRadius) {
-            const angle = getAngleValue(datum, angleDomain, autoRange, refSeries, autoRangeExtendDomainKeyPrefix), radius = getRadiusValue(datum, radiusDomain, autoRange, refSeries, autoRangeExtendDomainKeyPrefix);
+            const angle = getAngleValue(datum, angleDomain, autoRange, refSeries), radius = getRadiusValue(datum, radiusDomain, autoRange, refSeries);
             lines.push([ {
                 angle: angle,
                 radius: radius
             } ]);
         } else if (isValidAngle) {
-            const angle = getAngleValue(datum, angleDomain, autoRange, refSeries, autoRangeExtendDomainKeyPrefix);
+            const angle = getAngleValue(datum, angleDomain, autoRange, refSeries);
             lines.push([ {
                 angle: angle,
                 radius: -regionRadius
@@ -163,7 +159,7 @@ function polarLayout(data, startRelativeSeries, endRelativeSeries, relativeSerie
                 radius: regionRadius
             } ]);
         } else if (isValidRadius) {
-            const radius = getRadiusValue(datum, radiusDomain, autoRange, refSeries, autoRangeExtendDomainKeyPrefix);
+            const radius = getRadiusValue(datum, radiusDomain, autoRange, refSeries);
             lines.push([ {
                 radius: radius,
                 angle: 0
@@ -185,7 +181,7 @@ function geoLayout(data, relativeSeries) {
     })), lines;
 }
 
-function cartesianCoordinateLayout(data, relativeSeries, autoRange, coordinatesOffset, autoRangeExtendDomainKeyPrefix) {
+function cartesianCoordinateLayout(data, relativeSeries, autoRange, coordinatesOffset) {
     const points = [], dataPoints = data.latestData[0] && data.latestData[0].latestData ? data.latestData[0].latestData : data.latestData, isArrayCoordinatesOffset = (0, 
     vutils_1.isArray)(coordinatesOffset);
     return dataPoints.forEach(((datum, index) => {
@@ -199,8 +195,8 @@ function cartesianCoordinateLayout(data, relativeSeries, autoRange, coordinatesO
         }
         const xDomain = refRelativeSeries.getXAxisHelper().getScale(0).domain(), yDomain = refRelativeSeries.getYAxisHelper().getScale(0).domain(), xValue = (0, 
         vutils_1.array)(datum.x), yValue = (0, vutils_1.array)(datum.y);
-        1 === xValue.length && (0, vutils_1.isNumber)(xValue[0]) && isNeedExtendDomain(xDomain, xValue[0], autoRange) && (null === (_b = null === (_a = refRelativeSeries.getXAxisHelper()) || void 0 === _a ? void 0 : _a.setExtendDomain) || void 0 === _b || _b.call(_a, getAutoRangeExtendDomainKey(autoRangeExtendDomainKeyPrefix, "xAxis"), xValue[0])), 
-        1 === yValue.length && (0, vutils_1.isNumber)(yValue[0]) && isNeedExtendDomain(yDomain, yValue[0], autoRange) && (null === (_d = null === (_c = refRelativeSeries.getYAxisHelper()) || void 0 === _c ? void 0 : _c.setExtendDomain) || void 0 === _d || _d.call(_c, getAutoRangeExtendDomainKey(autoRangeExtendDomainKeyPrefix, "yAxis"), yValue[0])), 
+        1 === xValue.length && (0, vutils_1.isNumber)(xValue[0]) && isNeedExtendDomain(xDomain, xValue[0], autoRange) && (null === (_b = null === (_a = refRelativeSeries.getXAxisHelper()) || void 0 === _a ? void 0 : _a.setExtendDomain) || void 0 === _b || _b.call(_a, "marker_xAxis_extend", xValue[0])), 
+        1 === yValue.length && (0, vutils_1.isNumber)(yValue[0]) && isNeedExtendDomain(yDomain, yValue[0], autoRange) && (null === (_d = null === (_c = refRelativeSeries.getYAxisHelper()) || void 0 === _c ? void 0 : _c.setExtendDomain) || void 0 === _d || _d.call(_c, "marker_yAxis_extend", yValue[0])), 
         points.push({
             x: convertDatumToValue(refRelativeSeries.getXAxisHelper(), xValue) + regionStartLayoutStartPoint.x + offsetX,
             y: convertDatumToValue(refRelativeSeries.getYAxisHelper(), yValue) + regionStartLayoutStartPoint.y + offsetY
@@ -208,14 +204,14 @@ function cartesianCoordinateLayout(data, relativeSeries, autoRange, coordinatesO
     })), points;
 }
 
-function polarCoordinateLayout(data, relativeSeries, autoRange, autoRangeExtendDomainKeyPrefix) {
+function polarCoordinateLayout(data, relativeSeries, autoRange) {
     const points = [];
     return (data.latestData[0] && data.latestData[0].latestData ? data.latestData[0].latestData : data.latestData).forEach((datum => {
         var _a, _b, _c, _d;
         const refRelativeSeries = (null == datum ? void 0 : datum.getRefRelativeSeries) ? datum.getRefRelativeSeries() : relativeSeries, angleDomain = refRelativeSeries.angleAxisHelper.getScale(0).domain(), radiusDomain = refRelativeSeries.radiusAxisHelper.getScale(0).domain(), angleValue = (0, 
         vutils_1.array)(datum.angle), radiusValue = (0, vutils_1.array)(datum.radius);
-        1 === angleValue.length && (0, vutils_1.isNumber)(angleValue[0]) && isNeedExtendDomain(angleDomain, angleValue[0], autoRange) && (null === (_b = null === (_a = refRelativeSeries.angleAxisHelper) || void 0 === _a ? void 0 : _a.setExtendDomain) || void 0 === _b || _b.call(_a, getAutoRangeExtendDomainKey(autoRangeExtendDomainKeyPrefix, "angleAxis"), angleValue[0])), 
-        1 === radiusValue.length && (0, vutils_1.isNumber)(radiusValue[0]) && isNeedExtendDomain(radiusDomain, radiusValue[0], autoRange) && (null === (_d = null === (_c = refRelativeSeries.radiusAxisHelper) || void 0 === _c ? void 0 : _c.setExtendDomain) || void 0 === _d || _d.call(_c, getAutoRangeExtendDomainKey(autoRangeExtendDomainKeyPrefix, "radiusAxis"), radiusValue[0])), 
+        1 === angleValue.length && (0, vutils_1.isNumber)(angleValue[0]) && isNeedExtendDomain(angleDomain, angleValue[0], autoRange) && (null === (_b = null === (_a = refRelativeSeries.angleAxisHelper) || void 0 === _a ? void 0 : _a.setExtendDomain) || void 0 === _b || _b.call(_a, "marker_xAxis_extend", angleValue[0])), 
+        1 === radiusValue.length && (0, vutils_1.isNumber)(radiusValue[0]) && isNeedExtendDomain(radiusDomain, radiusValue[0], autoRange) && (null === (_d = null === (_c = refRelativeSeries.radiusAxisHelper) || void 0 === _c ? void 0 : _c.setExtendDomain) || void 0 === _d || _d.call(_c, "marker_yAxis_extend", radiusValue[0])), 
         points.push({
             angle: convertDatumToValue(refRelativeSeries.angleAxisHelper, angleValue),
             radius: convertDatumToValue(refRelativeSeries.radiusAxisHelper, radiusValue)