@visactor/vchart 1.13.9-alpha.0 → 1.13.9-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/build/es5/index.js +1 -1
  2. package/build/index.es.js +238 -235
  3. package/build/index.js +238 -235
  4. package/build/index.min.js +1 -1
  5. package/build/tsconfig.tsbuildinfo +1 -1
  6. package/cjs/component/marker/mark-area/base-mark-area.js +27 -17
  7. package/cjs/component/marker/mark-area/base-mark-area.js.map +1 -1
  8. package/cjs/component/marker/mark-area/interface/theme.d.ts +4 -3
  9. package/cjs/component/marker/mark-area/interface/theme.js.map +1 -1
  10. package/cjs/component/marker/mark-line/base-mark-line.js +31 -20
  11. package/cjs/component/marker/mark-line/base-mark-line.js.map +1 -1
  12. package/cjs/component/marker/mark-line/cartesian-mark-line.js +20 -16
  13. package/cjs/component/marker/mark-line/cartesian-mark-line.js.map +1 -1
  14. package/cjs/component/marker/mark-line/interface/theme.d.ts +4 -3
  15. package/cjs/component/marker/mark-line/interface/theme.js.map +1 -1
  16. package/cjs/constant/funnel.js +2 -1
  17. package/cjs/constant/sunburst.js +1 -2
  18. package/cjs/core/index.d.ts +1 -1
  19. package/cjs/core/index.js +1 -1
  20. package/cjs/core/index.js.map +1 -1
  21. package/cjs/core/interface.js +2 -1
  22. package/cjs/core/vchart.js +1 -2
  23. package/esm/component/marker/mark-area/base-mark-area.js +27 -16
  24. package/esm/component/marker/mark-area/base-mark-area.js.map +1 -1
  25. package/esm/component/marker/mark-area/interface/theme.d.ts +4 -3
  26. package/esm/component/marker/mark-area/interface/theme.js.map +1 -1
  27. package/esm/component/marker/mark-line/base-mark-line.js +30 -19
  28. package/esm/component/marker/mark-line/base-mark-line.js.map +1 -1
  29. package/esm/component/marker/mark-line/cartesian-mark-line.js +20 -16
  30. package/esm/component/marker/mark-line/cartesian-mark-line.js.map +1 -1
  31. package/esm/component/marker/mark-line/interface/theme.d.ts +4 -3
  32. package/esm/component/marker/mark-line/interface/theme.js.map +1 -1
  33. package/esm/constant/funnel.js +2 -1
  34. package/esm/constant/sunburst.js +1 -2
  35. package/esm/core/index.d.ts +1 -1
  36. package/esm/core/index.js +1 -1
  37. package/esm/core/index.js.map +1 -1
  38. package/esm/core/interface.js +2 -1
  39. package/esm/core/vchart.js +1 -2
  40. package/package.json +15 -15
package/build/index.es.js CHANGED
@@ -31425,10 +31425,6 @@ const SCROLLBAR_START_EVENT = "scrollDown";
31425
31425
  const SCROLLBAR_EVENT$1 = "scrollDrag";
31426
31426
  const SCROLLBAR_END_EVENT$1 = "scrollUp";
31427
31427
 
31428
- function getEndTriggersOfDrag() {
31429
- return "browser" === vglobal.env ? ["pointerup", "pointerleave"] : ["pointerup", "pointerleave", "pointerupoutside"];
31430
- }
31431
-
31432
31428
  const delayMap$3 = {
31433
31429
  debounce: debounce,
31434
31430
  throttle: throttle
@@ -31475,14 +31471,11 @@ let ScrollBar$1 = class ScrollBar extends AbstractComponent {
31475
31471
  this._prePos = "horizontal" === direction ? x : y, this._dispatchEvent(SCROLLBAR_START_EVENT, {
31476
31472
  pos: this._prePos,
31477
31473
  event: e
31478
- });
31479
- const triggers = getEndTriggersOfDrag(),
31480
- obj = "browser" === vglobal.env ? vglobal : this.stage;
31481
- obj.addEventListener("pointermove", this._onSliderPointerMoveWithDelay, {
31474
+ }), "browser" === vglobal.env ? (vglobal.addEventListener("pointermove", this._onSliderPointerMoveWithDelay, {
31482
31475
  capture: !0
31483
- }), triggers.forEach(trigger => {
31484
- obj.addEventListener(trigger, this._onSliderPointerUp);
31485
- });
31476
+ }), vglobal.addEventListener("pointerup", this._onSliderPointerUp)) : (this.stage.addEventListener("pointermove", this._onSliderPointerMoveWithDelay, {
31477
+ capture: !0
31478
+ }), this.stage.addEventListener("pointerup", this._onSliderPointerUp), this.stage.addEventListener("pointerupoutside", this._onSliderPointerUp));
31486
31479
  }, this._computeScrollValue = e => {
31487
31480
  const {
31488
31481
  direction: direction
@@ -31519,14 +31512,11 @@ let ScrollBar$1 = class ScrollBar extends AbstractComponent {
31519
31512
  this._dispatchEvent(SCROLLBAR_END_EVENT$1, {
31520
31513
  pre: preRange,
31521
31514
  value: clampRange$1(range, limitRange[0], limitRange[1])
31522
- });
31523
- const triggers = getEndTriggersOfDrag(),
31524
- obj = "browser" === vglobal.env ? vglobal : this.stage;
31525
- obj.removeEventListener("pointermove", this._onSliderPointerMoveWithDelay, {
31515
+ }), "browser" === vglobal.env ? (vglobal.removeEventListener("pointermove", this._onSliderPointerMoveWithDelay, {
31526
31516
  capture: !0
31527
- }), triggers.forEach(trigger => {
31528
- obj.removeEventListener(trigger, this._onSliderPointerUp);
31529
- });
31517
+ }), vglobal.removeEventListener("pointerup", this._onSliderPointerUp)) : (this.stage.removeEventListener("pointermove", this._onSliderPointerMoveWithDelay, {
31518
+ capture: !0
31519
+ }), this.stage.removeEventListener("pointerup", this._onSliderPointerUp), this.stage.removeEventListener("pointerupoutside", this._onSliderPointerUp));
31530
31520
  };
31531
31521
  }
31532
31522
  setScrollRange(range) {
@@ -39834,17 +39824,26 @@ function commonLineClipIn(line, label, duration, delay, easing) {
39834
39824
  l.animate().wait(delay + startSymbolDuration + index * stepDuration).to({
39835
39825
  clipRange: 1
39836
39826
  }, stepDuration, easing);
39837
- }), graphicFadeIn(line.endSymbol, delay + startSymbolDuration + lineDuration, endSymbolDuration, easing), graphicFadeIn(label.getTextShape(), delay + startSymbolDuration + lineDuration + endSymbolDuration, labelDuration, easing), graphicFadeIn(label.getBgRect(), delay + startSymbolDuration + lineDuration + endSymbolDuration, labelDuration, easing);
39827
+ }), graphicFadeIn(line.endSymbol, delay + startSymbolDuration + lineDuration, endSymbolDuration, easing), array(label).forEach(labelNode => {
39828
+ const delayTime = delay + startSymbolDuration + lineDuration + endSymbolDuration;
39829
+ graphicFadeIn(labelNode.getTextShape(), delayTime, labelDuration, easing), graphicFadeIn(labelNode.getBgRect(), delayTime, labelDuration, easing);
39830
+ });
39838
39831
  }
39839
39832
 
39840
39833
  function commonLineFadeIn(line, label, duration, delay, easing) {
39841
- segmentFadeIn(line, delay, duration, easing), tagFadeIn(label, delay, duration, easing);
39834
+ segmentFadeIn(line, delay, duration, easing), array(label).forEach(labelNode => {
39835
+ tagFadeIn(labelNode, delay, duration, easing);
39836
+ });
39842
39837
  }
39843
39838
  function areaFadeIn(area, label, duration, delay, easing) {
39844
- graphicFadeIn(area, delay, duration, easing), tagFadeIn(label, delay, duration, easing);
39839
+ graphicFadeIn(area, delay, duration, easing), array(label).forEach(labelNode => {
39840
+ tagFadeIn(labelNode, delay, duration, easing);
39841
+ });
39845
39842
  }
39846
39843
  function arcAreaFadeIn(area, label, duration, delay, easing) {
39847
- graphicFadeIn(area, delay, duration, easing), tagFadeIn(label, delay, duration, easing);
39844
+ graphicFadeIn(area, delay, duration, easing), array(label).forEach(labelNode => {
39845
+ tagFadeIn(labelNode, delay, duration, easing);
39846
+ });
39848
39847
  }
39849
39848
  function pointFadeIn(itemLine, decorativeLine, item, duration, delay, easing) {
39850
39849
  var _a;
@@ -39852,13 +39851,19 @@ function pointFadeIn(itemLine, decorativeLine, item, duration, delay, easing) {
39852
39851
  }
39853
39852
 
39854
39853
  function commonLineFadeOut(line, label, duration, delay, easing) {
39855
- segmentFadeOut(line, delay, duration, easing), tagFadeOut(label, delay, duration, easing);
39854
+ segmentFadeOut(line, delay, duration, easing), array(label).forEach(labelNode => {
39855
+ tagFadeOut(labelNode, delay, duration, easing);
39856
+ });
39856
39857
  }
39857
39858
  function areaFadeOut(area, label, duration, delay, easing) {
39858
- graphicFadeOut(area, delay, duration, easing), tagFadeOut(label, delay, duration, easing);
39859
+ graphicFadeOut(area, delay, duration, easing), array(label).forEach(labelNode => {
39860
+ tagFadeOut(labelNode, delay, duration, easing);
39861
+ });
39859
39862
  }
39860
39863
  function arcAreaFadeOut(area, label, duration, delay, easing) {
39861
- graphicFadeOut(area, delay, duration, easing), tagFadeOut(label, delay, duration, easing);
39864
+ graphicFadeOut(area, delay, duration, easing), array(label).forEach(labelNode => {
39865
+ tagFadeOut(labelNode, delay, duration, easing);
39866
+ });
39862
39867
  }
39863
39868
  function pointFadeOut(itemLine, decorativeLine, item, duration, delay, easing) {
39864
39869
  var _a;
@@ -40030,6 +40035,57 @@ const DefaultExitMarkerAnimation = {
40030
40035
  delay: 0
40031
40036
  };
40032
40037
 
40038
+ class MarkLabelMixin {
40039
+ getLabel() {
40040
+ return this._label;
40041
+ }
40042
+ _addMarkLabels(container, labelName, defaultLabelAttrs) {
40043
+ const {
40044
+ label: label,
40045
+ state: state
40046
+ } = this.attribute,
40047
+ labelStates = array(null == state ? void 0 : state.label),
40048
+ labelBackgroundStates = array(null == state ? void 0 : state.labelBackground),
40049
+ labelShapes = array(label).map((labelAttrs, index) => {
40050
+ var _a, _b;
40051
+ const finalLabelAttrs = merge$1({}, defaultLabelAttrs, labelAttrs),
40052
+ markLabel = new Tag(Object.assign(Object.assign({}, finalLabelAttrs), {
40053
+ state: {
40054
+ panel: merge$1({}, DEFAULT_STATES$2, null !== (_a = labelBackgroundStates[index]) && void 0 !== _a ? _a : last(labelBackgroundStates)),
40055
+ text: merge$1({}, DEFAULT_STATES$2, null !== (_b = labelStates[index]) && void 0 !== _b ? _b : last(labelStates))
40056
+ }
40057
+ }));
40058
+ return markLabel.name = labelName, container.add(markLabel), this.setLabelPos(markLabel, finalLabelAttrs), markLabel;
40059
+ });
40060
+ this._label = 1 === array(labelShapes).length ? labelShapes[0] : labelShapes;
40061
+ }
40062
+ _updateMarkLabels(defaultLabelAttrs) {
40063
+ const {
40064
+ label: label,
40065
+ state: state
40066
+ } = this.attribute,
40067
+ labelShapes = array(this._label),
40068
+ labelStates = array(null == state ? void 0 : state.label),
40069
+ labelBackgroundStates = array(null == state ? void 0 : state.labelBackground);
40070
+ if (labelShapes.length) {
40071
+ const labels = array(label);
40072
+ labelShapes.forEach((labelItem, index) => {
40073
+ var _a, _b;
40074
+ const finalLabelAttrs = merge$1({}, defaultLabelAttrs, labels[index]);
40075
+ labelItem.setAttributes(Object.assign(Object.assign({
40076
+ dx: 0,
40077
+ dy: 0
40078
+ }, finalLabelAttrs), {
40079
+ state: {
40080
+ panel: merge$1({}, DEFAULT_STATES$2, null !== (_a = labelBackgroundStates[index]) && void 0 !== _a ? _a : last(labelBackgroundStates)),
40081
+ text: merge$1({}, DEFAULT_STATES$2, null !== (_b = labelStates[index]) && void 0 !== _b ? _b : last(labelStates))
40082
+ }
40083
+ })), this.setLabelPos(labelItem, finalLabelAttrs);
40084
+ });
40085
+ }
40086
+ }
40087
+ }
40088
+
40033
40089
  class MarkCommonLine extends Marker {
40034
40090
  constructor() {
40035
40091
  super(...arguments), this.name = "markCommonLine", this.defaultUpdateAnimation = DefaultUpdateMarkLineAnimation, this.defaultExitAnimation = DefaultExitMarkerAnimation;
@@ -40037,24 +40093,20 @@ class MarkCommonLine extends Marker {
40037
40093
  getLine() {
40038
40094
  return this._line;
40039
40095
  }
40040
- getLabel() {
40041
- return this._label;
40042
- }
40043
- setLabelPos() {
40096
+ setLabelPos(labelNode, labelAttrs) {
40044
40097
  const {
40045
- label = {},
40046
40098
  limitRect: limitRect
40047
40099
  } = this.attribute,
40048
40100
  {
40049
40101
  position: position,
40050
40102
  confine: confine,
40051
40103
  autoRotate: autoRotate
40052
- } = label,
40053
- labelPoint = this.getPointAttrByPosition(position),
40104
+ } = labelAttrs,
40105
+ labelPoint = this.getPointAttrByPosition(position, labelAttrs),
40054
40106
  labelAngle = position.toString().toLocaleLowerCase().includes("start") ? this._line.getStartAngle() || 0 : this._line.getEndAngle() || 0;
40055
- if (this._label.setAttributes(Object.assign(Object.assign({}, labelPoint.position), {
40056
- angle: autoRotate ? this.getRotateByAngle(labelPoint.angle) : 0,
40057
- textStyle: Object.assign(Object.assign({}, this.getTextStyle(position, labelAngle, autoRotate)), label.textStyle)
40107
+ if (labelNode.setAttributes(Object.assign(Object.assign({}, labelPoint.position), {
40108
+ angle: autoRotate ? this.getRotateByAngle(labelPoint.angle, labelAttrs) : 0,
40109
+ textStyle: Object.assign(Object.assign({}, this.getTextStyle(position, labelAngle, autoRotate)), labelAttrs.textStyle)
40058
40110
  })), limitRect && confine) {
40059
40111
  const {
40060
40112
  x: x,
@@ -40062,7 +40114,7 @@ class MarkCommonLine extends Marker {
40062
40114
  width: width,
40063
40115
  height: height
40064
40116
  } = limitRect;
40065
- limitShapeInBounds(this._label, {
40117
+ limitShapeInBounds(labelNode, {
40066
40118
  x1: x,
40067
40119
  y1: y,
40068
40120
  x2: x + width,
@@ -40071,36 +40123,14 @@ class MarkCommonLine extends Marker {
40071
40123
  }
40072
40124
  }
40073
40125
  initMarker(container) {
40074
- const {
40075
- label: label,
40076
- state: state
40077
- } = this.attribute,
40078
- line = this.createSegment();
40079
- line.name = "mark-common-line-line", this._line = line, container.add(line);
40080
- const markLabel = new Tag(Object.assign(Object.assign({}, label), {
40081
- state: {
40082
- panel: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.labelBackground),
40083
- text: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.label)
40084
- }
40085
- }));
40086
- markLabel.name = "mark-common-line-label", this._label = markLabel, container.add(markLabel), this.setLabelPos();
40126
+ const line = this.createSegment();
40127
+ line.name = "mark-common-line-line", this._line = line, container.add(line), this.addMarkLineLabels(container);
40087
40128
  }
40088
40129
  updateMarker() {
40089
- const {
40090
- label: label,
40091
- state: state
40092
- } = this.attribute;
40093
- this.setLineAttributes(), this._label && (this._label.setAttributes(Object.assign(Object.assign({
40094
- dx: 0,
40095
- dy: 0
40096
- }, label), {
40097
- state: {
40098
- panel: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.labelBackground),
40099
- text: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.label)
40100
- }
40101
- })), this.setLabelPos());
40130
+ this.setLineAttributes(), this.updateMarkLineLabels();
40102
40131
  }
40103
40132
  }
40133
+ mixin(MarkCommonLine, MarkLabelMixin);
40104
40134
 
40105
40135
  const FUZZY_EQUAL_DELTA = .001;
40106
40136
  const DEFAULT_MARK_LINE_THEME = {
@@ -40289,6 +40319,7 @@ const DEFAULT_MARK_ARC_LINE_THEME = {
40289
40319
  lineWidth: 0
40290
40320
  },
40291
40321
  label: {
40322
+ autoRotate: !0,
40292
40323
  position: IMarkCommonArcLabelPosition.arcOuterMiddle,
40293
40324
  refX: 0,
40294
40325
  refY: 0,
@@ -40343,6 +40374,7 @@ const DEFAULT_MARK_AREA_THEME = {
40343
40374
  const DEFAULT_MARK_ARC_AREA_THEME = {
40344
40375
  interactive: !0,
40345
40376
  label: {
40377
+ autoRotate: !0,
40346
40378
  position: IMarkCommonArcLabelPosition.arcOuterMiddle,
40347
40379
  textStyle: {
40348
40380
  fill: "#fff",
@@ -40598,15 +40630,12 @@ class MarkLine extends MarkCommonLine {
40598
40630
  constructor(attributes, options) {
40599
40631
  super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, MarkLine.defaultAttributes, attributes)), this.name = "markLine";
40600
40632
  }
40601
- getPointAttrByPosition(position) {
40633
+ getPointAttrByPosition(position, labelAttrs) {
40602
40634
  var _a;
40603
40635
  const {
40604
- label = {}
40605
- } = this.attribute,
40606
- {
40607
40636
  refX = 0,
40608
40637
  refY = 0
40609
- } = label,
40638
+ } = labelAttrs,
40610
40639
  points = this._line.getMainSegmentPoints(),
40611
40640
  lineEndAngle = null !== (_a = this._line.getEndAngle()) && void 0 !== _a ? _a : 0,
40612
40641
  labelAngle = (lineEndAngle),
@@ -40632,9 +40661,9 @@ class MarkLine extends MarkCommonLine {
40632
40661
  angle: labelAngle
40633
40662
  };
40634
40663
  }
40635
- getRotateByAngle(angle) {
40664
+ getRotateByAngle(angle, labelAttrs) {
40636
40665
  var _a;
40637
- return (isPostiveXAxis(angle) ? angle : angle - Math.PI) + (null !== (_a = this.attribute.label.refAngle) && void 0 !== _a ? _a : 0);
40666
+ return (isPostiveXAxis(angle) ? angle : angle - Math.PI) + (null !== (_a = labelAttrs.refAngle) && void 0 !== _a ? _a : 0);
40638
40667
  }
40639
40668
  getTextStyle(position, labelAngle, autoRotate) {
40640
40669
  return fuzzyEqualNumber(Math.abs(labelAngle), Math.PI / 2, FUZZY_EQUAL_DELTA) || fuzzyEqualNumber(Math.abs(labelAngle), 3 * Math.PI / 2, FUZZY_EQUAL_DELTA) ? getTextAlignAttrOfVerticalDir(autoRotate, labelAngle, position) : isPostiveXAxis(labelAngle) ? DEFAULT_CARTESIAN_MARK_LINE_TEXT_STYLE_MAP.postiveXAxis[position] : DEFAULT_CARTESIAN_MARK_LINE_TEXT_STYLE_MAP.negativeXAxis[position];
@@ -40700,6 +40729,12 @@ class MarkLine extends MarkCommonLine {
40700
40729
  });else if (!isValidNumber$1(point.x) || !isValidNumber$1(point.y)) return void (validFlag = !1);
40701
40730
  }), validFlag;
40702
40731
  }
40732
+ addMarkLineLabels(container) {
40733
+ this._addMarkLabels(container, "mark-common-line-label", MarkLine.defaultAttributes.label);
40734
+ }
40735
+ updateMarkLineLabels() {
40736
+ this._updateMarkLabels(MarkLine.defaultAttributes.label);
40737
+ }
40703
40738
  }
40704
40739
  MarkLine.defaultAttributes = DEFAULT_MARK_LINE_THEME;
40705
40740
 
@@ -40714,9 +40749,6 @@ class MarkArea extends Marker {
40714
40749
  getArea() {
40715
40750
  return this._area;
40716
40751
  }
40717
- getLabel() {
40718
- return this._label;
40719
- }
40720
40752
  constructor(attributes, options) {
40721
40753
  super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, MarkArea.defaultAttributes, attributes)), this.name = "markArea", this.defaultUpdateAnimation = DefaultUpdateMarkAreaAnimation, this.defaultExitAnimation = DefaultExitMarkerAnimation;
40722
40754
  }
@@ -40733,24 +40765,21 @@ class MarkArea extends Marker {
40733
40765
  };
40734
40766
  return (position.includes("left") || position.includes("Left")) && (result.x = x1), (position.includes("right") || position.includes("Right")) && (result.x = x2), (position.includes("top") || position.includes("Top")) && (result.y = y1), (position.includes("bottom") || position.includes("Bottom")) && (result.y = y2), result;
40735
40767
  }
40736
- setLabelPos() {
40768
+ setLabelPos(labelNode, labelAttrs) {
40737
40769
  var _a;
40738
- if (this._label && this._area) {
40739
- const {
40740
- label = {}
40741
- } = this.attribute,
40742
- labelPosition = null !== (_a = label.position) && void 0 !== _a ? _a : "middle",
40770
+ if (this._area) {
40771
+ const labelPosition = null !== (_a = labelAttrs.position) && void 0 !== _a ? _a : "middle",
40743
40772
  labelPoint = this.getPointAttrByPosition(labelPosition);
40744
- if (this._label.setAttributes(Object.assign(Object.assign({}, labelPoint), {
40745
- textStyle: Object.assign(Object.assign({}, DEFAULT_CARTESIAN_MARK_AREA_TEXT_STYLE_MAP[labelPosition]), label.textStyle)
40746
- })), this.attribute.limitRect && label.confine) {
40773
+ if (labelNode.setAttributes(Object.assign(Object.assign({}, labelPoint), {
40774
+ textStyle: Object.assign(Object.assign({}, DEFAULT_CARTESIAN_MARK_AREA_TEXT_STYLE_MAP[labelPosition]), labelAttrs.textStyle)
40775
+ })), this.attribute.limitRect && labelAttrs.confine) {
40747
40776
  const {
40748
40777
  x: x,
40749
40778
  y: y,
40750
40779
  width: width,
40751
40780
  height: height
40752
40781
  } = this.attribute.limitRect;
40753
- limitShapeInBounds(this._label, {
40782
+ limitShapeInBounds(labelNode, {
40754
40783
  x1: x,
40755
40784
  y1: y,
40756
40785
  x2: x + width,
@@ -40762,40 +40791,23 @@ class MarkArea extends Marker {
40762
40791
  initMarker(container) {
40763
40792
  const {
40764
40793
  points: points,
40765
- label: label,
40766
40794
  areaStyle: areaStyle,
40767
40795
  state: state
40768
40796
  } = this.attribute,
40769
40797
  area = graphicCreator.polygon(Object.assign({
40770
40798
  points: points
40771
40799
  }, areaStyle));
40772
- area.states = merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.area), area.name = "mark-area-polygon", this._area = area, container.add(area);
40773
- const markLabel = new Tag(Object.assign(Object.assign({}, label), {
40774
- state: {
40775
- panel: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.labelBackground),
40776
- text: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.label)
40777
- }
40778
- }));
40779
- markLabel.name = "mark-area-label", this._label = markLabel, container.add(markLabel), this.setLabelPos();
40800
+ area.states = merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.area), area.name = "mark-area-polygon", this._area = area, container.add(area), this._addMarkLabels(container, "mark-area-label", MarkArea.defaultAttributes.label);
40780
40801
  }
40781
40802
  updateMarker() {
40782
40803
  const {
40783
40804
  points: points,
40784
- label: label,
40785
40805
  areaStyle: areaStyle,
40786
40806
  state: state
40787
40807
  } = this.attribute;
40788
40808
  this._area && (this._area.setAttributes(Object.assign({
40789
40809
  points: points
40790
- }, areaStyle)), this._area.states = merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.area)), this._label && this._label.setAttributes(Object.assign(Object.assign({
40791
- dx: 0,
40792
- dy: 0
40793
- }, label), {
40794
- state: {
40795
- panel: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.labelBackground),
40796
- text: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.label)
40797
- }
40798
- })), this.setLabelPos();
40810
+ }, areaStyle)), this._area.states = merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.area)), this._updateMarkLabels(MarkArea.defaultAttributes.label);
40799
40811
  }
40800
40812
  isValidPoints() {
40801
40813
  const {
@@ -40808,7 +40820,7 @@ class MarkArea extends Marker {
40808
40820
  }), validFlag;
40809
40821
  }
40810
40822
  }
40811
- MarkArea.defaultAttributes = DEFAULT_MARK_AREA_THEME;
40823
+ MarkArea.defaultAttributes = DEFAULT_MARK_AREA_THEME, mixin(MarkArea, MarkLabelMixin);
40812
40824
 
40813
40825
  loadMarkArcLineComponent();
40814
40826
  function registerMarkArcLineAnimate() {
@@ -40819,24 +40831,19 @@ class MarkArcLine extends MarkCommonLine {
40819
40831
  MarkArcLine._animate && this._animationConfig && MarkArcLine._animate(this._line, this._label, this._animationConfig, state);
40820
40832
  }
40821
40833
  constructor(attributes, options) {
40822
- super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, MarkArcLine.defaultAttributes, attributes, {
40823
- label: {
40824
- autoRotate: !0
40825
- }
40826
- })), this.name = "markArcLine";
40834
+ super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, MarkArcLine.defaultAttributes, attributes)), this.name = "markArcLine";
40827
40835
  }
40828
- getPointAttrByPosition(direction) {
40836
+ getPointAttrByPosition(direction, labelAttrs) {
40829
40837
  const {
40830
40838
  center: center,
40831
40839
  radius: radius,
40832
40840
  startAngle: startAngle,
40833
- endAngle: endAngle,
40834
- label: label
40841
+ endAngle: endAngle
40835
40842
  } = this.attribute,
40836
40843
  {
40837
40844
  refX = 0,
40838
40845
  refY = 0
40839
- } = label;
40846
+ } = labelAttrs;
40840
40847
  let angle;
40841
40848
  switch (direction) {
40842
40849
  case IMarkCommonArcLabelPosition.arcInnerStart:
@@ -40866,9 +40873,9 @@ class MarkArcLine extends MarkCommonLine {
40866
40873
  getTextStyle(position) {
40867
40874
  return DEFAULT_POLAR_MARKER_TEXT_STYLE_MAP[position];
40868
40875
  }
40869
- getRotateByAngle(angle) {
40876
+ getRotateByAngle(angle, labelAttrs) {
40870
40877
  var _a;
40871
- return angle - Math.PI / 2 + (null !== (_a = this.attribute.label.refAngle) && void 0 !== _a ? _a : 0);
40878
+ return angle - Math.PI / 2 + (null !== (_a = labelAttrs.refAngle) && void 0 !== _a ? _a : 0);
40872
40879
  }
40873
40880
  createSegment() {
40874
40881
  const {
@@ -40925,6 +40932,12 @@ class MarkArcLine extends MarkCommonLine {
40925
40932
  isValidPoints() {
40926
40933
  return !0;
40927
40934
  }
40935
+ addMarkLineLabels(container) {
40936
+ this._addMarkLabels(container, "mark-common-line-label", MarkArcLine.defaultAttributes.label);
40937
+ }
40938
+ updateMarkLineLabels() {
40939
+ this._updateMarkLabels(MarkArcLine.defaultAttributes.label);
40940
+ }
40928
40941
  }
40929
40942
  MarkArcLine.defaultAttributes = DEFAULT_MARK_ARC_LINE_THEME;
40930
40943
 
@@ -40939,29 +40952,21 @@ class MarkArcArea extends Marker {
40939
40952
  getArea() {
40940
40953
  return this._area;
40941
40954
  }
40942
- getLabel() {
40943
- return this._label;
40944
- }
40945
40955
  constructor(attributes, options) {
40946
- super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, MarkArcArea.defaultAttributes, attributes, {
40947
- label: {
40948
- autoRotate: !0
40949
- }
40950
- })), this.name = "markArcArea", this.defaultUpdateAnimation = DefaultUpdateMarkAreaAnimation, this.defaultExitAnimation = DefaultExitMarkerAnimation;
40956
+ super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, MarkArcArea.defaultAttributes, attributes)), this.name = "markArcArea", this.defaultUpdateAnimation = DefaultUpdateMarkAreaAnimation, this.defaultExitAnimation = DefaultExitMarkerAnimation;
40951
40957
  }
40952
- getPointAttrByPosition(position) {
40958
+ getPointAttrByPosition(position, labelAttrs) {
40953
40959
  const {
40954
40960
  center: center,
40955
40961
  innerRadius: innerRadius,
40956
40962
  outerRadius: outerRadius,
40957
40963
  startAngle: startAngle,
40958
- endAngle: endAngle,
40959
- label: label
40964
+ endAngle: endAngle
40960
40965
  } = this.attribute,
40961
40966
  {
40962
40967
  refX = 0,
40963
40968
  refY = 0
40964
- } = label;
40969
+ } = labelAttrs;
40965
40970
  let radius, angle;
40966
40971
  switch (position) {
40967
40972
  case IMarkCommonArcLabelPosition.center:
@@ -40996,28 +41001,25 @@ class MarkArcArea extends Marker {
40996
41001
  angle: angle
40997
41002
  };
40998
41003
  }
40999
- setLabelPos() {
41004
+ setLabelPos(labelNode, labelAttrs) {
41000
41005
  var _a;
41001
- if (this._label && this._area) {
41006
+ if (this._area) {
41002
41007
  const {
41003
- label = {}
41004
- } = this.attribute,
41005
- {
41006
41008
  position: labelPosition = "arcInnerMiddle",
41007
41009
  autoRotate: autoRotate
41008
- } = label,
41009
- labelAttr = this.getPointAttrByPosition(labelPosition);
41010
- if (this._label.setAttributes(Object.assign(Object.assign({}, labelAttr.position), {
41011
- angle: autoRotate ? labelAttr.angle - Math.PI / 2 + (null !== (_a = label.refAngle) && void 0 !== _a ? _a : 0) : 0,
41012
- textStyle: Object.assign(Object.assign({}, DEFAULT_POLAR_MARKER_TEXT_STYLE_MAP[labelPosition]), label.textStyle)
41013
- })), this.attribute.limitRect && label.confine) {
41010
+ } = labelAttrs,
41011
+ labelAttr = this.getPointAttrByPosition(labelPosition, labelAttrs);
41012
+ if (labelNode.setAttributes(Object.assign(Object.assign({}, labelAttr.position), {
41013
+ angle: autoRotate ? labelAttr.angle - Math.PI / 2 + (null !== (_a = labelAttrs.refAngle) && void 0 !== _a ? _a : 0) : 0,
41014
+ textStyle: Object.assign(Object.assign({}, DEFAULT_POLAR_MARKER_TEXT_STYLE_MAP[labelPosition]), labelAttrs.textStyle)
41015
+ })), this.attribute.limitRect && labelAttrs.confine) {
41014
41016
  const {
41015
41017
  x: x,
41016
41018
  y: y,
41017
41019
  width: width,
41018
41020
  height: height
41019
41021
  } = this.attribute.limitRect;
41020
- limitShapeInBounds(this._label, {
41022
+ limitShapeInBounds(labelNode, {
41021
41023
  x1: x,
41022
41024
  y1: y,
41023
41025
  x2: x + width,
@@ -41034,7 +41036,6 @@ class MarkArcArea extends Marker {
41034
41036
  startAngle: startAngle,
41035
41037
  endAngle: endAngle,
41036
41038
  areaStyle: areaStyle,
41037
- label: label,
41038
41039
  state: state
41039
41040
  } = this.attribute,
41040
41041
  area = graphicCreator.arc(Object.assign({
@@ -41045,14 +41046,7 @@ class MarkArcArea extends Marker {
41045
41046
  startAngle: startAngle,
41046
41047
  endAngle: endAngle
41047
41048
  }, areaStyle));
41048
- area.states = merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.area), area.name = "polar-mark-area-area", this._area = area, container.add(area);
41049
- const markLabel = new Tag(Object.assign(Object.assign({}, label), {
41050
- state: {
41051
- panel: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.labelBackground),
41052
- text: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.label)
41053
- }
41054
- }));
41055
- markLabel.name = "mark-area-label", this._label = markLabel, container.add(markLabel), this.setLabelPos();
41049
+ area.states = merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.area), area.name = "polar-mark-area-area", this._area = area, container.add(area), this._addMarkLabels(container, "mark-area-label", MarkArcArea.defaultAttributes.label);
41056
41050
  }
41057
41051
  updateMarker() {
41058
41052
  const {
@@ -41072,21 +41066,13 @@ class MarkArcArea extends Marker {
41072
41066
  outerRadius: outerRadius,
41073
41067
  startAngle: startAngle,
41074
41068
  endAngle: endAngle
41075
- }, areaStyle)), this._area.states = merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.area)), this._label && (this._label.setAttributes(Object.assign(Object.assign({
41076
- dx: 0,
41077
- dy: 0
41078
- }, label), {
41079
- state: {
41080
- panel: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.labelBackground),
41081
- text: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.label)
41082
- }
41083
- })), this.setLabelPos());
41069
+ }, areaStyle)), this._area.states = merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.area)), this._updateMarkLabels(MarkArcArea.defaultAttributes.label);
41084
41070
  }
41085
41071
  isValidPoints() {
41086
41072
  return !0;
41087
41073
  }
41088
41074
  }
41089
- MarkArcArea.defaultAttributes = DEFAULT_MARK_ARC_AREA_THEME;
41075
+ MarkArcArea.defaultAttributes = DEFAULT_MARK_ARC_AREA_THEME, mixin(MarkArcArea, MarkLabelMixin);
41090
41076
 
41091
41077
  loadMarkPointComponent();
41092
41078
  function registerMarkPointAnimate() {
@@ -42611,14 +42597,11 @@ class Slider extends AbstractComponent {
42611
42597
  x: x,
42612
42598
  y: y
42613
42599
  } = this.stage.eventPointTransform(e);
42614
- this._currentHandler = e.target, this._prePos = this._isHorizontal ? x : y;
42615
- const triggers = getEndTriggersOfDrag(),
42616
- obj = "browser" === vglobal.env ? vglobal : this.stage;
42617
- obj.addEventListener("pointermove", this._onHandlerPointerMove, {
42600
+ this._currentHandler = e.target, this._prePos = this._isHorizontal ? x : y, "browser" === vglobal.env ? (vglobal.addEventListener("pointermove", this._onHandlerPointerMove, {
42618
42601
  capture: !0
42619
- }), triggers.forEach(trigger => {
42620
- obj.addEventListener(trigger, this._onHandlerPointerUp);
42621
- });
42602
+ }), vglobal.addEventListener("pointerup", this._onHandlerPointerUp)) : (this.stage.addEventListener("pointermove", this._onHandlerPointerMove, {
42603
+ capture: !0
42604
+ }), this.stage.addEventListener("pointerup", this._onHandlerPointerUp), this.stage.addEventListener("pointerupoutside", this._onHandlerPointerUp));
42622
42605
  }, this._onHandlerPointerMove = e => {
42623
42606
  var _a, _b;
42624
42607
  e.stopPropagation(), this._isChanging = !0;
@@ -42642,28 +42625,22 @@ class Slider extends AbstractComponent {
42642
42625
  currentValue = this.calculateValueByPos(newPos);
42643
42626
  "text" === this._currentHandler.type ? this._updateHandlerText(this._currentHandler, newPos, currentValue) : this._updateHandler(this._currentHandler, newPos, currentValue), this._updateTrack(), this._prePos = currentPos, this._dispatchChangeEvent();
42644
42627
  }, this._onHandlerPointerUp = e => {
42645
- e.preventDefault(), this._isChanging = !1, this._currentHandler = null;
42646
- const triggers = getEndTriggersOfDrag(),
42647
- obj = "browser" === vglobal.env ? vglobal : this.stage;
42648
- obj.removeEventListener("pointermove", this._onHandlerPointerMove, {
42628
+ e.preventDefault(), this._isChanging = !1, this._currentHandler = null, "browser" === vglobal.env ? (vglobal.removeEventListener("pointermove", this._onHandlerPointerMove, {
42649
42629
  capture: !0
42650
- }), triggers.forEach(trigger => {
42651
- obj.removeEventListener(trigger, this._onHandlerPointerUp);
42652
- });
42630
+ }), vglobal.removeEventListener("pointerup", this._onHandlerPointerUp)) : (this.stage.removeEventListener("pointermove", this._onHandlerPointerMove, {
42631
+ capture: !0
42632
+ }), this.stage.removeEventListener("pointerup", this._onHandlerPointerUp), this.stage.removeEventListener("pointerupoutside", this._onHandlerPointerUp));
42653
42633
  }, this._onTrackPointerdown = e => {
42654
42634
  e.stopPropagation(), this._isChanging = !0;
42655
42635
  const {
42656
42636
  x: x,
42657
42637
  y: y
42658
42638
  } = this.stage.eventPointTransform(e);
42659
- this._prePos = this._isHorizontal ? x : y;
42660
- const triggers = getEndTriggersOfDrag(),
42661
- obj = "browser" === vglobal.env ? vglobal : this.stage;
42662
- obj.addEventListener("pointermove", this._onTrackPointerMove, {
42639
+ this._prePos = this._isHorizontal ? x : y, "browser" === vglobal.env ? (vglobal.addEventListener("pointermove", this._onTrackPointerMove, {
42663
42640
  capture: !0
42664
- }), triggers.forEach(trigger => {
42665
- obj.addEventListener(trigger, this._onTrackPointerUp);
42666
- });
42641
+ }), vglobal.addEventListener("pointerup", this._onTrackPointerUp)) : (this.stage.addEventListener("pointermove", this._onTrackPointerMove, {
42642
+ capture: !0
42643
+ }), this.stage.addEventListener("pointerup", this._onTrackPointerUp), this.stage.addEventListener("pointerupoutside", this._onTrackPointerUp));
42667
42644
  }, this._onTrackPointerMove = e => {
42668
42645
  e.stopPropagation(), this._isChanging = !0;
42669
42646
  const {
@@ -42706,14 +42683,11 @@ class Slider extends AbstractComponent {
42706
42683
  }
42707
42684
  this._prePos = currentPos, this._dispatchChangeEvent();
42708
42685
  }, this._onTrackPointerUp = e => {
42709
- e.preventDefault(), this._isChanging = !1;
42710
- const triggers = getEndTriggersOfDrag(),
42711
- obj = "browser" === vglobal.env ? vglobal : this.stage;
42712
- obj.removeEventListener("pointermove", this._onTrackPointerMove, {
42686
+ e.preventDefault(), this._isChanging = !1, "browser" === vglobal.env ? (vglobal.removeEventListener("pointermove", this._onTrackPointerMove, {
42713
42687
  capture: !0
42714
- }), triggers.forEach(trigger => {
42715
- obj.removeEventListener(trigger, this._onTrackPointerUp);
42716
- });
42688
+ }), vglobal.removeEventListener("pointerup", this._onTrackPointerUp)) : (this.stage.removeEventListener("pointermove", this._onTrackPointerMove, {
42689
+ capture: !0
42690
+ }), this.stage.removeEventListener("pointerup", this._onTrackPointerUp), this.stage.removeEventListener("pointerupoutside", this._onTrackPointerUp));
42717
42691
  }, this._onRailPointerDown = e => {
42718
42692
  e.stopPropagation(), this._isChanging = !0;
42719
42693
  const {
@@ -63678,7 +63652,7 @@ const registerVChartCore = () => {
63678
63652
  };
63679
63653
  registerVChartCore();
63680
63654
 
63681
- const version = "1.13.9-alpha.0";
63655
+ const version = "1.13.9-alpha.1";
63682
63656
 
63683
63657
  const addVChartProperty = (data, op) => {
63684
63658
  const context = op.beforeCall();
@@ -98049,13 +98023,14 @@ class BaseMarkLine extends BaseMarker {
98049
98023
  return 'cartesian';
98050
98024
  }
98051
98025
  _createMarkerComponent() {
98052
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
98053
- const { label = {}, startSymbol = {}, endSymbol = {} } = this._spec;
98026
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
98027
+ const { startSymbol = {}, endSymbol = {} } = this._spec;
98028
+ const label = array((_a = this._spec.label) !== null && _a !== void 0 ? _a : {});
98054
98029
  const markLineAttrs = {
98055
98030
  zIndex: this.layoutZIndex,
98056
- interactive: (_a = this._spec.interactive) !== null && _a !== void 0 ? _a : true,
98057
- hover: (_b = this._spec.interactive) !== null && _b !== void 0 ? _b : true,
98058
- select: (_c = this._spec.interactive) !== null && _c !== void 0 ? _c : true,
98031
+ interactive: (_b = this._spec.interactive) !== null && _b !== void 0 ? _b : true,
98032
+ hover: (_c = this._spec.interactive) !== null && _c !== void 0 ? _c : true,
98033
+ select: (_d = this._spec.interactive) !== null && _d !== void 0 ? _d : true,
98059
98034
  points: [
98060
98035
  { x: 0, y: 0 },
98061
98036
  { x: 0, y: 0 }
@@ -98067,17 +98042,25 @@ class BaseMarkLine extends BaseMarker {
98067
98042
  radius: 0,
98068
98043
  startAngle: 0,
98069
98044
  endAngle: 0,
98070
- lineStyle: transformStyle(transformToGraphic((_d = this._spec.line) === null || _d === void 0 ? void 0 : _d.style), this._markerData, this._markAttributeContext),
98071
- clipInRange: (_e = this._spec.clip) !== null && _e !== void 0 ? _e : false,
98072
- label: transformLabelAttributes(label, this._markerData, this._markAttributeContext),
98045
+ lineStyle: transformStyle(transformToGraphic((_e = this._spec.line) === null || _e === void 0 ? void 0 : _e.style), this._markerData, this._markAttributeContext),
98046
+ clipInRange: (_f = this._spec.clip) !== null && _f !== void 0 ? _f : false,
98047
+ label: label.map(labelItem => {
98048
+ return transformLabelAttributes(labelItem, this._markerData, this._markAttributeContext);
98049
+ }),
98073
98050
  state: {
98074
- line: transformState((_g = (_f = this._spec.line) === null || _f === void 0 ? void 0 : _f.state) !== null && _g !== void 0 ? _g : {}, this._markerData, this._markAttributeContext),
98075
- lineStartSymbol: transformState((_j = (_h = this._spec.startSymbol) === null || _h === void 0 ? void 0 : _h.state) !== null && _j !== void 0 ? _j : {}, this._markerData, this._markAttributeContext),
98076
- lineEndSymbol: transformState((_l = (_k = this._spec.endSymbol) === null || _k === void 0 ? void 0 : _k.state) !== null && _l !== void 0 ? _l : {}, this._markerData, this._markAttributeContext),
98077
- label: transformState((_p = (_o = (_m = this._spec) === null || _m === void 0 ? void 0 : _m.label) === null || _o === void 0 ? void 0 : _o.state) !== null && _p !== void 0 ? _p : {}, this._markerData, this._markAttributeContext),
98078
- labelBackground: transformState((_t = (_s = (_r = (_q = this._spec) === null || _q === void 0 ? void 0 : _q.label) === null || _r === void 0 ? void 0 : _r.labelBackground) === null || _s === void 0 ? void 0 : _s.state) !== null && _t !== void 0 ? _t : {}, this._markerData, this._markAttributeContext)
98051
+ line: transformState((_h = (_g = this._spec.line) === null || _g === void 0 ? void 0 : _g.state) !== null && _h !== void 0 ? _h : {}, this._markerData, this._markAttributeContext),
98052
+ lineStartSymbol: transformState((_k = (_j = this._spec.startSymbol) === null || _j === void 0 ? void 0 : _j.state) !== null && _k !== void 0 ? _k : {}, this._markerData, this._markAttributeContext),
98053
+ lineEndSymbol: transformState((_m = (_l = this._spec.endSymbol) === null || _l === void 0 ? void 0 : _l.state) !== null && _m !== void 0 ? _m : {}, this._markerData, this._markAttributeContext),
98054
+ label: label.map(labelItem => {
98055
+ var _a;
98056
+ return transformState((_a = labelItem.state) !== null && _a !== void 0 ? _a : {}, this._markerData, this._markAttributeContext);
98057
+ }),
98058
+ labelBackground: label.map(labelItem => {
98059
+ var _a, _b;
98060
+ return transformState((_b = (_a = labelItem.labelBackground) === null || _a === void 0 ? void 0 : _a.state) !== null && _b !== void 0 ? _b : {}, this._markerData, this._markAttributeContext);
98061
+ })
98079
98062
  },
98080
- animation: (_u = this._spec.animation) !== null && _u !== void 0 ? _u : false,
98063
+ animation: (_o = this._spec.animation) !== null && _o !== void 0 ? _o : false,
98081
98064
  animationEnter: this._spec.animationEnter,
98082
98065
  animationExit: this._spec.animationExit,
98083
98066
  animationUpdate: this._spec.animationUpdate
@@ -98102,7 +98085,7 @@ class BaseMarkLine extends BaseMarker {
98102
98085
  return markLine;
98103
98086
  }
98104
98087
  _getUpdateMarkerAttrs() {
98105
- var _a, _b, _c, _d;
98088
+ var _a, _b;
98106
98089
  const spec = this._spec;
98107
98090
  const data = this._markerData;
98108
98091
  const startRelativeSeries = this._startRelativeSeries;
@@ -98112,7 +98095,7 @@ class BaseMarkLine extends BaseMarker {
98112
98095
  const seriesData = relativeSeries.getViewData().latestData;
98113
98096
  const dataPoints = data.latestData[0] && data.latestData[0].latestData ? data.latestData[0].latestData : data.latestData;
98114
98097
  let limitRect;
98115
- if (spec.clip || ((_a = spec.label) === null || _a === void 0 ? void 0 : _a.confine)) {
98098
+ if (spec.clip || array(spec.label).some(labelCfg => labelCfg === null || labelCfg === void 0 ? void 0 : labelCfg.confine)) {
98116
98099
  const { minX, maxX, minY, maxY } = computeClipRange([
98117
98100
  startRelativeSeries.getRegion(),
98118
98101
  endRelativeSeries.getRegion(),
@@ -98125,10 +98108,13 @@ class BaseMarkLine extends BaseMarker {
98125
98108
  height: maxY - minY
98126
98109
  };
98127
98110
  }
98128
- const markerComponentAttr = (_c = (_b = this._markerComponent) === null || _b === void 0 ? void 0 : _b.attribute) !== null && _c !== void 0 ? _c : {};
98129
- const labelAttrs = Object.assign(Object.assign({}, markerComponentAttr.label), { text: this._spec.label.formatMethod
98130
- ? this._spec.label.formatMethod(dataPoints, seriesData)
98131
- : (_d = markerComponentAttr.label) === null || _d === void 0 ? void 0 : _d.text });
98111
+ const markerComponentAttr = (_b = (_a = this._markerComponent) === null || _a === void 0 ? void 0 : _a.attribute) !== null && _b !== void 0 ? _b : {};
98112
+ const prevLabelAttrs = array(markerComponentAttr.label);
98113
+ const specLabels = array(this._spec.label);
98114
+ const labelAttrs = prevLabelAttrs.map((prevLabel, index) => {
98115
+ const specLabel = specLabels[index] || {};
98116
+ return Object.assign(Object.assign({}, prevLabel), { text: specLabel.formatMethod ? specLabel.formatMethod(dataPoints, seriesData) : prevLabel === null || prevLabel === void 0 ? void 0 : prevLabel.text });
98117
+ });
98132
98118
  return Object.assign(Object.assign({}, pointsAttr), { label: labelAttrs, limitRect, dx: this._layoutOffsetX, dy: this._layoutOffsetY });
98133
98119
  }
98134
98120
  _markerLayout() {
@@ -98230,7 +98216,7 @@ class CartesianMarkLine extends BaseMarkLine {
98230
98216
  return { points };
98231
98217
  }
98232
98218
  _markerLayout() {
98233
- var _a, _b, _c, _d, _e, _f, _g, _h;
98219
+ var _a, _b, _c, _d, _e;
98234
98220
  const updateAttrs = this._getUpdateMarkerAttrs();
98235
98221
  if (this._spec.type === 'type-step') {
98236
98222
  const startRelativeSeries = this._startRelativeSeries;
@@ -98257,7 +98243,7 @@ class CartesianMarkLine extends BaseMarkLine {
98257
98243
  else {
98258
98244
  expandDistanceValue = expandDistance;
98259
98245
  }
98260
- const { points, label, limitRect } = updateAttrs;
98246
+ const { points, limitRect } = updateAttrs;
98261
98247
  const joinPoints = getInsertPoints(points[0], points[1], connectDirection, expandDistanceValue);
98262
98248
  let labelPositionAttrs;
98263
98249
  if (multiSegment && isValid$1(mainSegmentIndex)) {
@@ -98271,20 +98257,10 @@ class CartesianMarkLine extends BaseMarkLine {
98271
98257
  else {
98272
98258
  labelPositionAttrs = Object.assign(Object.assign({ position: 'start', autoRotate: false }, getTextOffset(points[0], points[1], connectDirection, expandDistanceValue)), { refX: 0, refY: 0 });
98273
98259
  }
98274
- if (isValidNumber$1((_a = this._spec.label) === null || _a === void 0 ? void 0 : _a.refX)) {
98275
- labelPositionAttrs.refX += this._spec.label.refX;
98276
- }
98277
- if (isValidNumber$1((_b = this._spec.label) === null || _b === void 0 ? void 0 : _b.refY)) {
98278
- labelPositionAttrs.refY += this._spec.label.refY;
98279
- }
98280
- if (isValidNumber$1((_c = this._spec.label) === null || _c === void 0 ? void 0 : _c.dx)) {
98281
- labelPositionAttrs.dx = (labelPositionAttrs.dx || 0) + this._spec.label.dx;
98282
- }
98283
- if (isValidNumber$1((_d = this._spec.label) === null || _d === void 0 ? void 0 : _d.dy)) {
98284
- labelPositionAttrs.dy = (labelPositionAttrs.dy || 0) + this._spec.label.dy;
98285
- }
98286
- const markerComponentAttr = (_f = (_e = this._markerComponent) === null || _e === void 0 ? void 0 : _e.attribute) !== null && _f !== void 0 ? _f : {};
98287
- (_g = this._markerComponent) === null || _g === void 0 ? void 0 : _g.setAttributes({
98260
+ const markerComponentAttr = (_b = (_a = this._markerComponent) === null || _a === void 0 ? void 0 : _a.attribute) !== null && _b !== void 0 ? _b : {};
98261
+ const prevLabelAttrs = array(markerComponentAttr.label);
98262
+ const label = array((_c = updateAttrs.label) !== null && _c !== void 0 ? _c : {});
98263
+ (_d = this._markerComponent) === null || _d === void 0 ? void 0 : _d.setAttributes({
98288
98264
  points: multiSegment
98289
98265
  ? [
98290
98266
  [joinPoints[0], joinPoints[1]],
@@ -98292,7 +98268,22 @@ class CartesianMarkLine extends BaseMarkLine {
98292
98268
  [joinPoints[2], joinPoints[3]]
98293
98269
  ]
98294
98270
  : joinPoints,
98295
- label: Object.assign(Object.assign(Object.assign({}, label), labelPositionAttrs), { textStyle: Object.assign(Object.assign({}, markerComponentAttr.label.textStyle), { textAlign: 'center', textBaseline: 'middle' }) }),
98271
+ label: label.map((labelItem, index) => {
98272
+ var _a;
98273
+ if (isValidNumber$1(labelItem === null || labelItem === void 0 ? void 0 : labelItem.refX)) {
98274
+ labelPositionAttrs.refX += labelItem.refX;
98275
+ }
98276
+ if (isValidNumber$1(labelItem === null || labelItem === void 0 ? void 0 : labelItem.refY)) {
98277
+ labelPositionAttrs.refY += labelItem.refY;
98278
+ }
98279
+ if (isValidNumber$1(labelItem === null || labelItem === void 0 ? void 0 : labelItem.dx)) {
98280
+ labelPositionAttrs.dx = (labelPositionAttrs.dx || 0) + labelItem.dx;
98281
+ }
98282
+ if (isValidNumber$1(labelItem === null || labelItem === void 0 ? void 0 : labelItem.dy)) {
98283
+ labelPositionAttrs.dy = (labelPositionAttrs.dy || 0) + labelItem.dy;
98284
+ }
98285
+ return Object.assign(Object.assign(Object.assign({}, labelItem), labelPositionAttrs), { textStyle: Object.assign(Object.assign({}, (_a = prevLabelAttrs[index]) === null || _a === void 0 ? void 0 : _a.textStyle), { textAlign: 'center', textBaseline: 'middle' }) });
98286
+ }),
98296
98287
  limitRect,
98297
98288
  multiSegment,
98298
98289
  mainSegmentIndex,
@@ -98301,7 +98292,7 @@ class CartesianMarkLine extends BaseMarkLine {
98301
98292
  });
98302
98293
  }
98303
98294
  else {
98304
- (_h = this._markerComponent) === null || _h === void 0 ? void 0 : _h.setAttributes(updateAttrs);
98295
+ (_e = this._markerComponent) === null || _e === void 0 ? void 0 : _e.setAttributes(updateAttrs);
98305
98296
  }
98306
98297
  }
98307
98298
  _computeOptions() {
@@ -98655,8 +98646,8 @@ class BaseMarkArea extends BaseMarker {
98655
98646
  return 'cartesian';
98656
98647
  }
98657
98648
  _createMarkerComponent() {
98658
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
98659
- const label = (_a = this._spec.label) !== null && _a !== void 0 ? _a : {};
98649
+ var _a, _b, _c, _d, _e, _f, _g, _h;
98650
+ const label = array((_a = this._spec.label) !== null && _a !== void 0 ? _a : {});
98660
98651
  const markAreaAttrs = {
98661
98652
  zIndex: this.layoutZIndex,
98662
98653
  interactive: (_b = this._spec.interactive) !== null && _b !== void 0 ? _b : true,
@@ -98678,13 +98669,20 @@ class BaseMarkArea extends BaseMarker {
98678
98669
  endAngle: 0,
98679
98670
  areaStyle: transformStyle(transformToGraphic((_e = this._spec.area) === null || _e === void 0 ? void 0 : _e.style), this._markerData, this._markAttributeContext),
98680
98671
  clipInRange: (_f = this._spec.clip) !== null && _f !== void 0 ? _f : false,
98681
- label: transformLabelAttributes(label, this._markerData, this._markAttributeContext),
98672
+ label: label.map((labelItem) => {
98673
+ return transformLabelAttributes(labelItem, this._markerData, this._markAttributeContext);
98674
+ }),
98682
98675
  state: {
98683
98676
  area: transformState((_g = this._spec.area) === null || _g === void 0 ? void 0 : _g.state, this._markerData, this._markAttributeContext),
98684
- label: transformState((_h = this._spec.label) === null || _h === void 0 ? void 0 : _h.state, this._markerData, this._markAttributeContext),
98685
- labelBackground: transformState((_l = (_k = (_j = this._spec) === null || _j === void 0 ? void 0 : _j.label) === null || _k === void 0 ? void 0 : _k.labelBackground) === null || _l === void 0 ? void 0 : _l.state, this._markerData, this._markAttributeContext)
98677
+ label: label.map((labelItem) => {
98678
+ return transformState(labelItem.state, this._markerData, this._markAttributeContext);
98679
+ }),
98680
+ labelBackground: label.map((labelItem) => {
98681
+ var _a;
98682
+ return transformState((_a = labelItem.labelBackground) === null || _a === void 0 ? void 0 : _a.state, this._markerData, this._markAttributeContext);
98683
+ })
98686
98684
  },
98687
- animation: (_m = this._spec.animation) !== null && _m !== void 0 ? _m : false,
98685
+ animation: (_h = this._spec.animation) !== null && _h !== void 0 ? _h : false,
98688
98686
  animationEnter: this._spec.animationEnter,
98689
98687
  animationExit: this._spec.animationExit,
98690
98688
  animationUpdate: this._spec.animationUpdate
@@ -98693,7 +98691,7 @@ class BaseMarkArea extends BaseMarker {
98693
98691
  return markArea;
98694
98692
  }
98695
98693
  _markerLayout() {
98696
- var _a, _b, _c, _d;
98694
+ var _a;
98697
98695
  const spec = this._spec;
98698
98696
  const data = this._markerData;
98699
98697
  const startRelativeSeries = this._startRelativeSeries;
@@ -98707,7 +98705,7 @@ class BaseMarkArea extends BaseMarker {
98707
98705
  : data.latestData
98708
98706
  : seriesData;
98709
98707
  let limitRect;
98710
- if (spec.clip || ((_a = spec.label) === null || _a === void 0 ? void 0 : _a.confine)) {
98708
+ if (spec.clip || array(spec.label).some(labelCfg => labelCfg === null || labelCfg === void 0 ? void 0 : labelCfg.confine)) {
98711
98709
  const { minX, maxX, minY, maxY } = computeClipRange([
98712
98710
  startRelativeSeries.getRegion(),
98713
98711
  endRelativeSeries.getRegion(),
@@ -98721,10 +98719,15 @@ class BaseMarkArea extends BaseMarker {
98721
98719
  };
98722
98720
  }
98723
98721
  if (this._markerComponent) {
98724
- this._markerComponent.setAttributes(Object.assign(Object.assign({}, pointsAttr), { label: Object.assign(Object.assign({}, (_b = this._markerComponent.attribute) === null || _b === void 0 ? void 0 : _b.label), { text: this._spec.label.formatMethod
98725
- ?
98726
- this._spec.label.formatMethod(dataPoints, seriesData)
98727
- : (_d = (_c = this._markerComponent.attribute) === null || _c === void 0 ? void 0 : _c.label) === null || _d === void 0 ? void 0 : _d.text }), limitRect, dx: this._layoutOffsetX, dy: this._layoutOffsetY }));
98722
+ const prevLabelAttrs = array((_a = this._markerComponent.attribute) === null || _a === void 0 ? void 0 : _a.label);
98723
+ const specLabels = array(this._spec.label);
98724
+ this._markerComponent.setAttributes(Object.assign(Object.assign({}, pointsAttr), { label: prevLabelAttrs.map((prevLabel, index) => {
98725
+ const specLabel = specLabels[index] || {};
98726
+ return Object.assign(Object.assign({}, prevLabel), { text: specLabel.formatMethod
98727
+ ?
98728
+ specLabel.formatMethod(dataPoints, seriesData)
98729
+ : prevLabel === null || prevLabel === void 0 ? void 0 : prevLabel.text });
98730
+ }), limitRect, dx: this._layoutOffsetX, dy: this._layoutOffsetY }));
98728
98731
  }
98729
98732
  }
98730
98733
  _initDataView() {