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

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 +2 -2
  2. package/build/index.es.js +351 -343
  3. package/build/index.js +351 -343
  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 +17 -27
  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 +3 -4
  9. package/cjs/component/marker/mark-area/interface/theme.js.map +1 -1
  10. package/cjs/component/marker/mark-line/base-mark-line.js +20 -31
  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 +16 -20
  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 +3 -4
  15. package/cjs/component/marker/mark-line/interface/theme.js.map +1 -1
  16. package/cjs/constant/funnel.js +1 -2
  17. package/cjs/constant/sunburst.js +2 -1
  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 +1 -2
  22. package/cjs/core/vchart.js +2 -1
  23. package/esm/component/marker/mark-area/base-mark-area.js +16 -27
  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 +3 -4
  26. package/esm/component/marker/mark-area/interface/theme.js.map +1 -1
  27. package/esm/component/marker/mark-line/base-mark-line.js +19 -30
  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 +16 -20
  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 +3 -4
  32. package/esm/component/marker/mark-line/interface/theme.js.map +1 -1
  33. package/esm/constant/funnel.js +1 -2
  34. package/esm/constant/sunburst.js +2 -1
  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 +1 -2
  39. package/esm/core/vchart.js +2 -1
  40. package/package.json +15 -15
package/build/index.es.js CHANGED
@@ -31425,6 +31425,10 @@ 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", "pointercancel"] : ["pointerup", "pointerleave", "pointerupoutside"];
31430
+ }
31431
+
31428
31432
  const delayMap$3 = {
31429
31433
  debounce: debounce,
31430
31434
  throttle: throttle
@@ -31457,6 +31461,7 @@ let ScrollBar$1 = class ScrollBar extends AbstractComponent {
31457
31461
  }
31458
31462
  this.setScrollRange([currentScrollValue - (range[1] - range[0]) / 2, currentScrollValue + (range[1] - range[0]) / 2], !1), this.stage && !this.stage.autoRender && this.stage.renderNextFrame();
31459
31463
  }, this._onSliderPointerDown = e => {
31464
+ this._clearDragEvents();
31460
31465
  const {
31461
31466
  stopSliderDownPropagation = !0
31462
31467
  } = this.attribute;
@@ -31471,11 +31476,15 @@ let ScrollBar$1 = class ScrollBar extends AbstractComponent {
31471
31476
  this._prePos = "horizontal" === direction ? x : y, this._dispatchEvent(SCROLLBAR_START_EVENT, {
31472
31477
  pos: this._prePos,
31473
31478
  event: e
31474
- }), "browser" === vglobal.env ? (vglobal.addEventListener("pointermove", this._onSliderPointerMoveWithDelay, {
31475
- capture: !0
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));
31479
+ });
31480
+ const triggers = getEndTriggersOfDrag(),
31481
+ obj = "browser" === vglobal.env ? vglobal : this.stage;
31482
+ obj.addEventListener("pointermove", this._onSliderPointerMoveWithDelay, {
31483
+ capture: !0,
31484
+ passive: !0
31485
+ }), triggers.forEach(trigger => {
31486
+ obj.addEventListener(trigger, this._onSliderPointerUp);
31487
+ });
31479
31488
  }, this._computeScrollValue = e => {
31480
31489
  const {
31481
31490
  direction: direction
@@ -31493,6 +31502,7 @@ let ScrollBar$1 = class ScrollBar extends AbstractComponent {
31493
31502
  } = this.getSliderRenderBounds();
31494
31503
  return "vertical" === direction ? (currentPos = y, delta = currentPos - this._prePos, currentScrollValue = delta / height) : (currentPos = x, delta = currentPos - this._prePos, currentScrollValue = delta / width), [currentPos, currentScrollValue];
31495
31504
  }, this._onSliderPointerMove = e => {
31505
+ e.preventDefault();
31496
31506
  const {
31497
31507
  stopSliderMovePropagation = !0
31498
31508
  } = this.attribute;
@@ -31501,7 +31511,6 @@ let ScrollBar$1 = class ScrollBar extends AbstractComponent {
31501
31511
  [currentPos, currentScrollValue] = this._computeScrollValue(e);
31502
31512
  this.setScrollRange([preScrollRange[0] + currentScrollValue, preScrollRange[1] + currentScrollValue], !0), this._prePos = currentPos;
31503
31513
  }, this._onSliderPointerMoveWithDelay = 0 === this.attribute.delayTime ? this._onSliderPointerMove : delayMap$3[this.attribute.delayType](this._onSliderPointerMove, this.attribute.delayTime), this._onSliderPointerUp = e => {
31504
- e.preventDefault();
31505
31514
  const {
31506
31515
  range: preRange,
31507
31516
  limitRange = [0, 1]
@@ -31512,11 +31521,7 @@ let ScrollBar$1 = class ScrollBar extends AbstractComponent {
31512
31521
  this._dispatchEvent(SCROLLBAR_END_EVENT$1, {
31513
31522
  pre: preRange,
31514
31523
  value: clampRange$1(range, limitRange[0], limitRange[1])
31515
- }), "browser" === vglobal.env ? (vglobal.removeEventListener("pointermove", this._onSliderPointerMoveWithDelay, {
31516
- capture: !0
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));
31524
+ }), this._clearDragEvents();
31520
31525
  };
31521
31526
  }
31522
31527
  setScrollRange(range) {
@@ -31665,6 +31670,16 @@ let ScrollBar$1 = class ScrollBar extends AbstractComponent {
31665
31670
  sliderSize = this._sliderSize;
31666
31671
  return "horizontal" === direction ? clampRange$1([x1 + min * width, x1 + max * width], x1, width - sliderSize) : clampRange$1([y1 + min * height, y1 + max * height], y1, height - sliderSize);
31667
31672
  }
31673
+ _clearDragEvents() {
31674
+ const triggers = getEndTriggersOfDrag(),
31675
+ obj = "browser" === vglobal.env ? vglobal : this.stage;
31676
+ obj.removeEventListener("pointermove", this._onSliderPointerMoveWithDelay, {
31677
+ capture: !0,
31678
+ passive: !1
31679
+ }), triggers.forEach(trigger => {
31680
+ obj.removeEventListener(trigger, this._onSliderPointerUp);
31681
+ });
31682
+ }
31668
31683
  _reset() {
31669
31684
  this._sliderRenderBounds = null, this._sliderLimitRange = null;
31670
31685
  }
@@ -39013,14 +39028,20 @@ let DataZoom$1 = class DataZoom extends AbstractComponent {
39013
39028
  }, this.state = {
39014
39029
  start: 0,
39015
39030
  end: 1
39016
- }, this._statePointToData = state => state, this._onHandlerPointerDown = (e, tag) => {
39017
- e.stopPropagation(), "start" === tag ? (this._activeTag = DataZoomActiveTag.startHandler, this._activeItem = this._startHandlerMask) : "end" === tag ? (this._activeTag = DataZoomActiveTag.endHandler, this._activeItem = this._endHandlerMask) : "middleRect" === tag ? (this._activeTag = DataZoomActiveTag.middleHandler, this._activeItem = this._middleHandlerRect) : "middleSymbol" === tag ? (this._activeTag = DataZoomActiveTag.middleHandler, this._activeItem = this._middleHandlerSymbol) : "background" === tag && (this._activeTag = DataZoomActiveTag.background, this._activeItem = this._background), this._activeState = !0, this._activeCache.startPos = this.eventPosToStagePos(e), this._activeCache.lastPos = this.eventPosToStagePos(e), "browser" === vglobal.env && (vglobal.addEventListener("pointermove", this._onHandlerPointerMove, {
39018
- capture: !0
39019
- }), vglobal.addEventListener("pointerup", this._onHandlerPointerUp)), this.addEventListener("pointermove", this._onHandlerPointerMove, {
39020
- capture: !0
39031
+ }, this._statePointToData = state => state, this._handleTouchMove = e => {
39032
+ this._activeState && e.preventDefault();
39033
+ }, this._onHandlerPointerDown = (e, tag) => {
39034
+ this._clearDragEvents(), "start" === tag ? (this._activeTag = DataZoomActiveTag.startHandler, this._activeItem = this._startHandlerMask) : "end" === tag ? (this._activeTag = DataZoomActiveTag.endHandler, this._activeItem = this._endHandlerMask) : "middleRect" === tag ? (this._activeTag = DataZoomActiveTag.middleHandler, this._activeItem = this._middleHandlerRect) : "middleSymbol" === tag ? (this._activeTag = DataZoomActiveTag.middleHandler, this._activeItem = this._middleHandlerSymbol) : "background" === tag && (this._activeTag = DataZoomActiveTag.background, this._activeItem = this._background), this._activeState = !0, this._activeCache.startPos = this.eventPosToStagePos(e), this._activeCache.lastPos = this.eventPosToStagePos(e);
39035
+ const evtTarget = "browser" === vglobal.env ? vglobal : this.stage,
39036
+ triggers = getEndTriggersOfDrag();
39037
+ evtTarget.addEventListener("pointermove", this._onHandlerPointerMove, {
39038
+ capture: !0,
39039
+ passive: !1
39040
+ }), triggers.forEach(trigger => {
39041
+ evtTarget.addEventListener(trigger, this._onHandlerPointerUp);
39021
39042
  });
39022
39043
  }, this._pointerMove = e => {
39023
- e.stopPropagation();
39044
+ e.preventDefault();
39024
39045
  const {
39025
39046
  start: startAttr,
39026
39047
  end: endAttr,
@@ -39037,13 +39058,12 @@ let DataZoom$1 = class DataZoom extends AbstractComponent {
39037
39058
  start: start,
39038
39059
  end: end
39039
39060
  } = this.state;
39040
- this._activeState && (this._activeTag === DataZoomActiveTag.middleHandler ? this.moveZoomWithMiddle((this.state.start + this.state.end) / 2 + dis) : this._activeTag === DataZoomActiveTag.startHandler ? start + dis > end ? (start = end, end = start + dis, this._activeTag = DataZoomActiveTag.endHandler) : start += dis : this._activeTag === DataZoomActiveTag.endHandler && (end + dis < start ? (end = start, start = end + dis, this._activeTag = DataZoomActiveTag.startHandler) : end += dis), this._activeCache.lastPos = pos, brushSelect && this.renderDragMask()), start = Math.min(Math.max(start, 0), 1), end = Math.min(Math.max(end, 0), 1), startAttr === start && endAttr === end || (this.setStateAttr(start, end, !0), realTime && this._dispatchEvent("change", {
39061
+ this._activeState && (this._activeTag === DataZoomActiveTag.middleHandler ? this.moveZoomWithMiddle((this.state.start + this.state.end) / 2 + dis) : this._activeTag === DataZoomActiveTag.startHandler ? start + dis > end ? (start = end, end = start + dis, this._activeTag = DataZoomActiveTag.endHandler) : start += dis : this._activeTag === DataZoomActiveTag.endHandler && (end + dis < start ? (end = start, start = end + dis, this._activeTag = DataZoomActiveTag.startHandler) : end += dis), brushSelect && this.renderDragMask()), start = Math.min(Math.max(start, 0), 1), end = Math.min(Math.max(end, 0), 1), startAttr === start && endAttr === end || (this._activeCache.lastPos = pos, this.setStateAttr(start, end, !0), realTime && this._dispatchEvent("change", {
39041
39062
  start: start,
39042
39063
  end: end,
39043
39064
  tag: this._activeTag
39044
39065
  }));
39045
39066
  }, this._onHandlerPointerMove = 0 === this.attribute.delayTime ? this._pointerMove : delayMap$2[this.attribute.delayType](this._pointerMove, this.attribute.delayTime), this._onHandlerPointerUp = e => {
39046
- e.preventDefault();
39047
39067
  const {
39048
39068
  start: start,
39049
39069
  end: end,
@@ -39058,11 +39078,7 @@ let DataZoom$1 = class DataZoom extends AbstractComponent {
39058
39078
  start: this.state.start,
39059
39079
  end: this.state.end,
39060
39080
  tag: this._activeTag
39061
- }), "browser" === vglobal.env && (vglobal.removeEventListener("pointermove", this._onHandlerPointerMove, {
39062
- capture: !0
39063
- }), vglobal.removeEventListener("pointerup", this._onHandlerPointerUp)), this.removeEventListener("pointermove", this._onHandlerPointerMove, {
39064
- capture: !0
39065
- }), this.removeEventListener("pointerup", this._onHandlerPointerUp);
39081
+ }), this._clearDragEvents();
39066
39082
  };
39067
39083
  const {
39068
39084
  position: position,
@@ -39081,7 +39097,9 @@ let DataZoom$1 = class DataZoom extends AbstractComponent {
39081
39097
  } = this.attribute;
39082
39098
  this._startHandlerMask && this._startHandlerMask.addEventListener("pointerdown", e => this._onHandlerPointerDown(e, "start")), this._endHandlerMask && this._endHandlerMask.addEventListener("pointerdown", e => this._onHandlerPointerDown(e, "end")), this._middleHandlerSymbol && this._middleHandlerSymbol.addEventListener("pointerdown", e => this._onHandlerPointerDown(e, "middleSymbol")), this._middleHandlerRect && this._middleHandlerRect.addEventListener("pointerdown", e => this._onHandlerPointerDown(e, "middleRect"));
39083
39099
  const selectedTag = brushSelect ? "background" : "middleRect";
39084
- this._selectedBackground && this._selectedBackground.addEventListener("pointerdown", e => this._onHandlerPointerDown(e, selectedTag)), brushSelect && this._background && this._background.addEventListener("pointerdown", e => this._onHandlerPointerDown(e, "background")), brushSelect && this._previewGroup && this._previewGroup.addEventListener("pointerdown", e => this._onHandlerPointerDown(e, "background")), this._selectedPreviewGroup && this._selectedPreviewGroup.addEventListener("pointerdown", e => this._onHandlerPointerDown(e, selectedTag)), this.addEventListener("pointerup", this._onHandlerPointerUp), this.addEventListener("pointerupoutside", this._onHandlerPointerUp), "auto" === showDetail && (this.addEventListener("pointerenter", this._onHandlerPointerEnter), this.addEventListener("pointerleave", this._onHandlerPointerLeave));
39100
+ this._selectedBackground && this._selectedBackground.addEventListener("pointerdown", e => this._onHandlerPointerDown(e, selectedTag)), brushSelect && this._background && this._background.addEventListener("pointerdown", e => this._onHandlerPointerDown(e, "background")), brushSelect && this._previewGroup && this._previewGroup.addEventListener("pointerdown", e => this._onHandlerPointerDown(e, "background")), this._selectedPreviewGroup && this._selectedPreviewGroup.addEventListener("pointerdown", e => this._onHandlerPointerDown(e, selectedTag)), "auto" === showDetail && (this.addEventListener("pointerenter", this._onHandlerPointerEnter), this.addEventListener("pointerleave", this._onHandlerPointerLeave)), ("browser" === vglobal.env ? vglobal : this.stage).addEventListener("touchmove", this._handleTouchMove, {
39101
+ passive: !1
39102
+ });
39085
39103
  }
39086
39104
  dragMaskSize() {
39087
39105
  const {
@@ -39112,11 +39130,21 @@ let DataZoom$1 = class DataZoom extends AbstractComponent {
39112
39130
  y: 0
39113
39131
  };
39114
39132
  }
39133
+ _clearDragEvents() {
39134
+ const evtTarget = "browser" === vglobal.env ? vglobal : this.stage,
39135
+ triggers = getEndTriggersOfDrag();
39136
+ evtTarget.removeEventListener("pointermove", this._onHandlerPointerMove, {
39137
+ capture: !0,
39138
+ passive: !1
39139
+ }), triggers.forEach(trigger => {
39140
+ evtTarget.removeEventListener(trigger, this._onHandlerPointerUp);
39141
+ });
39142
+ }
39115
39143
  _onHandlerPointerEnter(e) {
39116
- e.stopPropagation(), this._showText = !0, this.renderText();
39144
+ this._showText = !0, this.renderText();
39117
39145
  }
39118
39146
  _onHandlerPointerLeave(e) {
39119
- e.stopPropagation(), this._showText = !1, this.renderText();
39147
+ this._showText = !1, this.renderText();
39120
39148
  }
39121
39149
  backgroundDragZoom(startPos, endPos) {
39122
39150
  const {
@@ -39655,6 +39683,11 @@ let DataZoom$1 = class DataZoom extends AbstractComponent {
39655
39683
  setStatePointToData(callback) {
39656
39684
  isFunction$1(callback) && (this._statePointToData = callback);
39657
39685
  }
39686
+ release(all) {
39687
+ super.release(all), ("browser" === vglobal.env ? vglobal : this.stage).addEventListener("touchmove", this._handleTouchMove, {
39688
+ passive: !1
39689
+ }), this._clearDragEvents();
39690
+ }
39658
39691
  };
39659
39692
  DataZoom$1.defaultAttributes = DEFAULT_DATA_ZOOM_ATTRIBUTES;
39660
39693
 
@@ -39824,26 +39857,17 @@ function commonLineClipIn(line, label, duration, delay, easing) {
39824
39857
  l.animate().wait(delay + startSymbolDuration + index * stepDuration).to({
39825
39858
  clipRange: 1
39826
39859
  }, stepDuration, 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
- });
39860
+ }), 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);
39831
39861
  }
39832
39862
 
39833
39863
  function commonLineFadeIn(line, label, duration, delay, easing) {
39834
- segmentFadeIn(line, delay, duration, easing), array(label).forEach(labelNode => {
39835
- tagFadeIn(labelNode, delay, duration, easing);
39836
- });
39864
+ segmentFadeIn(line, delay, duration, easing), tagFadeIn(label, delay, duration, easing);
39837
39865
  }
39838
39866
  function areaFadeIn(area, label, duration, delay, easing) {
39839
- graphicFadeIn(area, delay, duration, easing), array(label).forEach(labelNode => {
39840
- tagFadeIn(labelNode, delay, duration, easing);
39841
- });
39867
+ graphicFadeIn(area, delay, duration, easing), tagFadeIn(label, delay, duration, easing);
39842
39868
  }
39843
39869
  function arcAreaFadeIn(area, label, duration, delay, easing) {
39844
- graphicFadeIn(area, delay, duration, easing), array(label).forEach(labelNode => {
39845
- tagFadeIn(labelNode, delay, duration, easing);
39846
- });
39870
+ graphicFadeIn(area, delay, duration, easing), tagFadeIn(label, delay, duration, easing);
39847
39871
  }
39848
39872
  function pointFadeIn(itemLine, decorativeLine, item, duration, delay, easing) {
39849
39873
  var _a;
@@ -39851,19 +39875,13 @@ function pointFadeIn(itemLine, decorativeLine, item, duration, delay, easing) {
39851
39875
  }
39852
39876
 
39853
39877
  function commonLineFadeOut(line, label, duration, delay, easing) {
39854
- segmentFadeOut(line, delay, duration, easing), array(label).forEach(labelNode => {
39855
- tagFadeOut(labelNode, delay, duration, easing);
39856
- });
39878
+ segmentFadeOut(line, delay, duration, easing), tagFadeOut(label, delay, duration, easing);
39857
39879
  }
39858
39880
  function areaFadeOut(area, label, duration, delay, easing) {
39859
- graphicFadeOut(area, delay, duration, easing), array(label).forEach(labelNode => {
39860
- tagFadeOut(labelNode, delay, duration, easing);
39861
- });
39881
+ graphicFadeOut(area, delay, duration, easing), tagFadeOut(label, delay, duration, easing);
39862
39882
  }
39863
39883
  function arcAreaFadeOut(area, label, duration, delay, easing) {
39864
- graphicFadeOut(area, delay, duration, easing), array(label).forEach(labelNode => {
39865
- tagFadeOut(labelNode, delay, duration, easing);
39866
- });
39884
+ graphicFadeOut(area, delay, duration, easing), tagFadeOut(label, delay, duration, easing);
39867
39885
  }
39868
39886
  function pointFadeOut(itemLine, decorativeLine, item, duration, delay, easing) {
39869
39887
  var _a;
@@ -40035,57 +40053,6 @@ const DefaultExitMarkerAnimation = {
40035
40053
  delay: 0
40036
40054
  };
40037
40055
 
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
-
40089
40056
  class MarkCommonLine extends Marker {
40090
40057
  constructor() {
40091
40058
  super(...arguments), this.name = "markCommonLine", this.defaultUpdateAnimation = DefaultUpdateMarkLineAnimation, this.defaultExitAnimation = DefaultExitMarkerAnimation;
@@ -40093,20 +40060,24 @@ class MarkCommonLine extends Marker {
40093
40060
  getLine() {
40094
40061
  return this._line;
40095
40062
  }
40096
- setLabelPos(labelNode, labelAttrs) {
40063
+ getLabel() {
40064
+ return this._label;
40065
+ }
40066
+ setLabelPos() {
40097
40067
  const {
40068
+ label = {},
40098
40069
  limitRect: limitRect
40099
40070
  } = this.attribute,
40100
40071
  {
40101
40072
  position: position,
40102
40073
  confine: confine,
40103
40074
  autoRotate: autoRotate
40104
- } = labelAttrs,
40105
- labelPoint = this.getPointAttrByPosition(position, labelAttrs),
40075
+ } = label,
40076
+ labelPoint = this.getPointAttrByPosition(position),
40106
40077
  labelAngle = position.toString().toLocaleLowerCase().includes("start") ? this._line.getStartAngle() || 0 : this._line.getEndAngle() || 0;
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)
40078
+ if (this._label.setAttributes(Object.assign(Object.assign({}, labelPoint.position), {
40079
+ angle: autoRotate ? this.getRotateByAngle(labelPoint.angle) : 0,
40080
+ textStyle: Object.assign(Object.assign({}, this.getTextStyle(position, labelAngle, autoRotate)), label.textStyle)
40110
40081
  })), limitRect && confine) {
40111
40082
  const {
40112
40083
  x: x,
@@ -40114,7 +40085,7 @@ class MarkCommonLine extends Marker {
40114
40085
  width: width,
40115
40086
  height: height
40116
40087
  } = limitRect;
40117
- limitShapeInBounds(labelNode, {
40088
+ limitShapeInBounds(this._label, {
40118
40089
  x1: x,
40119
40090
  y1: y,
40120
40091
  x2: x + width,
@@ -40123,14 +40094,36 @@ class MarkCommonLine extends Marker {
40123
40094
  }
40124
40095
  }
40125
40096
  initMarker(container) {
40126
- const line = this.createSegment();
40127
- line.name = "mark-common-line-line", this._line = line, container.add(line), this.addMarkLineLabels(container);
40097
+ const {
40098
+ label: label,
40099
+ state: state
40100
+ } = this.attribute,
40101
+ line = this.createSegment();
40102
+ line.name = "mark-common-line-line", this._line = line, container.add(line);
40103
+ const markLabel = new Tag(Object.assign(Object.assign({}, label), {
40104
+ state: {
40105
+ panel: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.labelBackground),
40106
+ text: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.label)
40107
+ }
40108
+ }));
40109
+ markLabel.name = "mark-common-line-label", this._label = markLabel, container.add(markLabel), this.setLabelPos();
40128
40110
  }
40129
40111
  updateMarker() {
40130
- this.setLineAttributes(), this.updateMarkLineLabels();
40112
+ const {
40113
+ label: label,
40114
+ state: state
40115
+ } = this.attribute;
40116
+ this.setLineAttributes(), this._label && (this._label.setAttributes(Object.assign(Object.assign({
40117
+ dx: 0,
40118
+ dy: 0
40119
+ }, label), {
40120
+ state: {
40121
+ panel: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.labelBackground),
40122
+ text: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.label)
40123
+ }
40124
+ })), this.setLabelPos());
40131
40125
  }
40132
40126
  }
40133
- mixin(MarkCommonLine, MarkLabelMixin);
40134
40127
 
40135
40128
  const FUZZY_EQUAL_DELTA = .001;
40136
40129
  const DEFAULT_MARK_LINE_THEME = {
@@ -40319,7 +40312,6 @@ const DEFAULT_MARK_ARC_LINE_THEME = {
40319
40312
  lineWidth: 0
40320
40313
  },
40321
40314
  label: {
40322
- autoRotate: !0,
40323
40315
  position: IMarkCommonArcLabelPosition.arcOuterMiddle,
40324
40316
  refX: 0,
40325
40317
  refY: 0,
@@ -40374,7 +40366,6 @@ const DEFAULT_MARK_AREA_THEME = {
40374
40366
  const DEFAULT_MARK_ARC_AREA_THEME = {
40375
40367
  interactive: !0,
40376
40368
  label: {
40377
- autoRotate: !0,
40378
40369
  position: IMarkCommonArcLabelPosition.arcOuterMiddle,
40379
40370
  textStyle: {
40380
40371
  fill: "#fff",
@@ -40630,12 +40621,15 @@ class MarkLine extends MarkCommonLine {
40630
40621
  constructor(attributes, options) {
40631
40622
  super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, MarkLine.defaultAttributes, attributes)), this.name = "markLine";
40632
40623
  }
40633
- getPointAttrByPosition(position, labelAttrs) {
40624
+ getPointAttrByPosition(position) {
40634
40625
  var _a;
40635
40626
  const {
40627
+ label = {}
40628
+ } = this.attribute,
40629
+ {
40636
40630
  refX = 0,
40637
40631
  refY = 0
40638
- } = labelAttrs,
40632
+ } = label,
40639
40633
  points = this._line.getMainSegmentPoints(),
40640
40634
  lineEndAngle = null !== (_a = this._line.getEndAngle()) && void 0 !== _a ? _a : 0,
40641
40635
  labelAngle = (lineEndAngle),
@@ -40661,9 +40655,9 @@ class MarkLine extends MarkCommonLine {
40661
40655
  angle: labelAngle
40662
40656
  };
40663
40657
  }
40664
- getRotateByAngle(angle, labelAttrs) {
40658
+ getRotateByAngle(angle) {
40665
40659
  var _a;
40666
- return (isPostiveXAxis(angle) ? angle : angle - Math.PI) + (null !== (_a = labelAttrs.refAngle) && void 0 !== _a ? _a : 0);
40660
+ return (isPostiveXAxis(angle) ? angle : angle - Math.PI) + (null !== (_a = this.attribute.label.refAngle) && void 0 !== _a ? _a : 0);
40667
40661
  }
40668
40662
  getTextStyle(position, labelAngle, autoRotate) {
40669
40663
  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];
@@ -40729,12 +40723,6 @@ class MarkLine extends MarkCommonLine {
40729
40723
  });else if (!isValidNumber$1(point.x) || !isValidNumber$1(point.y)) return void (validFlag = !1);
40730
40724
  }), validFlag;
40731
40725
  }
40732
- addMarkLineLabels(container) {
40733
- this._addMarkLabels(container, "mark-common-line-label", MarkLine.defaultAttributes.label);
40734
- }
40735
- updateMarkLineLabels() {
40736
- this._updateMarkLabels(MarkLine.defaultAttributes.label);
40737
- }
40738
40726
  }
40739
40727
  MarkLine.defaultAttributes = DEFAULT_MARK_LINE_THEME;
40740
40728
 
@@ -40749,6 +40737,9 @@ class MarkArea extends Marker {
40749
40737
  getArea() {
40750
40738
  return this._area;
40751
40739
  }
40740
+ getLabel() {
40741
+ return this._label;
40742
+ }
40752
40743
  constructor(attributes, options) {
40753
40744
  super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, MarkArea.defaultAttributes, attributes)), this.name = "markArea", this.defaultUpdateAnimation = DefaultUpdateMarkAreaAnimation, this.defaultExitAnimation = DefaultExitMarkerAnimation;
40754
40745
  }
@@ -40765,21 +40756,24 @@ class MarkArea extends Marker {
40765
40756
  };
40766
40757
  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;
40767
40758
  }
40768
- setLabelPos(labelNode, labelAttrs) {
40759
+ setLabelPos() {
40769
40760
  var _a;
40770
- if (this._area) {
40771
- const labelPosition = null !== (_a = labelAttrs.position) && void 0 !== _a ? _a : "middle",
40761
+ if (this._label && this._area) {
40762
+ const {
40763
+ label = {}
40764
+ } = this.attribute,
40765
+ labelPosition = null !== (_a = label.position) && void 0 !== _a ? _a : "middle",
40772
40766
  labelPoint = this.getPointAttrByPosition(labelPosition);
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) {
40767
+ if (this._label.setAttributes(Object.assign(Object.assign({}, labelPoint), {
40768
+ textStyle: Object.assign(Object.assign({}, DEFAULT_CARTESIAN_MARK_AREA_TEXT_STYLE_MAP[labelPosition]), label.textStyle)
40769
+ })), this.attribute.limitRect && label.confine) {
40776
40770
  const {
40777
40771
  x: x,
40778
40772
  y: y,
40779
40773
  width: width,
40780
40774
  height: height
40781
40775
  } = this.attribute.limitRect;
40782
- limitShapeInBounds(labelNode, {
40776
+ limitShapeInBounds(this._label, {
40783
40777
  x1: x,
40784
40778
  y1: y,
40785
40779
  x2: x + width,
@@ -40791,23 +40785,40 @@ class MarkArea extends Marker {
40791
40785
  initMarker(container) {
40792
40786
  const {
40793
40787
  points: points,
40788
+ label: label,
40794
40789
  areaStyle: areaStyle,
40795
40790
  state: state
40796
40791
  } = this.attribute,
40797
40792
  area = graphicCreator.polygon(Object.assign({
40798
40793
  points: points
40799
40794
  }, areaStyle));
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);
40795
+ area.states = merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.area), area.name = "mark-area-polygon", this._area = area, container.add(area);
40796
+ const markLabel = new Tag(Object.assign(Object.assign({}, label), {
40797
+ state: {
40798
+ panel: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.labelBackground),
40799
+ text: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.label)
40800
+ }
40801
+ }));
40802
+ markLabel.name = "mark-area-label", this._label = markLabel, container.add(markLabel), this.setLabelPos();
40801
40803
  }
40802
40804
  updateMarker() {
40803
40805
  const {
40804
40806
  points: points,
40807
+ label: label,
40805
40808
  areaStyle: areaStyle,
40806
40809
  state: state
40807
40810
  } = this.attribute;
40808
40811
  this._area && (this._area.setAttributes(Object.assign({
40809
40812
  points: points
40810
- }, areaStyle)), this._area.states = merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.area)), this._updateMarkLabels(MarkArea.defaultAttributes.label);
40813
+ }, areaStyle)), this._area.states = merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.area)), this._label && this._label.setAttributes(Object.assign(Object.assign({
40814
+ dx: 0,
40815
+ dy: 0
40816
+ }, label), {
40817
+ state: {
40818
+ panel: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.labelBackground),
40819
+ text: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.label)
40820
+ }
40821
+ })), this.setLabelPos();
40811
40822
  }
40812
40823
  isValidPoints() {
40813
40824
  const {
@@ -40820,7 +40831,7 @@ class MarkArea extends Marker {
40820
40831
  }), validFlag;
40821
40832
  }
40822
40833
  }
40823
- MarkArea.defaultAttributes = DEFAULT_MARK_AREA_THEME, mixin(MarkArea, MarkLabelMixin);
40834
+ MarkArea.defaultAttributes = DEFAULT_MARK_AREA_THEME;
40824
40835
 
40825
40836
  loadMarkArcLineComponent();
40826
40837
  function registerMarkArcLineAnimate() {
@@ -40831,19 +40842,24 @@ class MarkArcLine extends MarkCommonLine {
40831
40842
  MarkArcLine._animate && this._animationConfig && MarkArcLine._animate(this._line, this._label, this._animationConfig, state);
40832
40843
  }
40833
40844
  constructor(attributes, options) {
40834
- super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, MarkArcLine.defaultAttributes, attributes)), this.name = "markArcLine";
40845
+ super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, MarkArcLine.defaultAttributes, attributes, {
40846
+ label: {
40847
+ autoRotate: !0
40848
+ }
40849
+ })), this.name = "markArcLine";
40835
40850
  }
40836
- getPointAttrByPosition(direction, labelAttrs) {
40851
+ getPointAttrByPosition(direction) {
40837
40852
  const {
40838
40853
  center: center,
40839
40854
  radius: radius,
40840
40855
  startAngle: startAngle,
40841
- endAngle: endAngle
40856
+ endAngle: endAngle,
40857
+ label: label
40842
40858
  } = this.attribute,
40843
40859
  {
40844
40860
  refX = 0,
40845
40861
  refY = 0
40846
- } = labelAttrs;
40862
+ } = label;
40847
40863
  let angle;
40848
40864
  switch (direction) {
40849
40865
  case IMarkCommonArcLabelPosition.arcInnerStart:
@@ -40873,9 +40889,9 @@ class MarkArcLine extends MarkCommonLine {
40873
40889
  getTextStyle(position) {
40874
40890
  return DEFAULT_POLAR_MARKER_TEXT_STYLE_MAP[position];
40875
40891
  }
40876
- getRotateByAngle(angle, labelAttrs) {
40892
+ getRotateByAngle(angle) {
40877
40893
  var _a;
40878
- return angle - Math.PI / 2 + (null !== (_a = labelAttrs.refAngle) && void 0 !== _a ? _a : 0);
40894
+ return angle - Math.PI / 2 + (null !== (_a = this.attribute.label.refAngle) && void 0 !== _a ? _a : 0);
40879
40895
  }
40880
40896
  createSegment() {
40881
40897
  const {
@@ -40932,12 +40948,6 @@ class MarkArcLine extends MarkCommonLine {
40932
40948
  isValidPoints() {
40933
40949
  return !0;
40934
40950
  }
40935
- addMarkLineLabels(container) {
40936
- this._addMarkLabels(container, "mark-common-line-label", MarkArcLine.defaultAttributes.label);
40937
- }
40938
- updateMarkLineLabels() {
40939
- this._updateMarkLabels(MarkArcLine.defaultAttributes.label);
40940
- }
40941
40951
  }
40942
40952
  MarkArcLine.defaultAttributes = DEFAULT_MARK_ARC_LINE_THEME;
40943
40953
 
@@ -40952,21 +40962,29 @@ class MarkArcArea extends Marker {
40952
40962
  getArea() {
40953
40963
  return this._area;
40954
40964
  }
40965
+ getLabel() {
40966
+ return this._label;
40967
+ }
40955
40968
  constructor(attributes, options) {
40956
- super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, MarkArcArea.defaultAttributes, attributes)), this.name = "markArcArea", this.defaultUpdateAnimation = DefaultUpdateMarkAreaAnimation, this.defaultExitAnimation = DefaultExitMarkerAnimation;
40969
+ super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, MarkArcArea.defaultAttributes, attributes, {
40970
+ label: {
40971
+ autoRotate: !0
40972
+ }
40973
+ })), this.name = "markArcArea", this.defaultUpdateAnimation = DefaultUpdateMarkAreaAnimation, this.defaultExitAnimation = DefaultExitMarkerAnimation;
40957
40974
  }
40958
- getPointAttrByPosition(position, labelAttrs) {
40975
+ getPointAttrByPosition(position) {
40959
40976
  const {
40960
40977
  center: center,
40961
40978
  innerRadius: innerRadius,
40962
40979
  outerRadius: outerRadius,
40963
40980
  startAngle: startAngle,
40964
- endAngle: endAngle
40981
+ endAngle: endAngle,
40982
+ label: label
40965
40983
  } = this.attribute,
40966
40984
  {
40967
40985
  refX = 0,
40968
40986
  refY = 0
40969
- } = labelAttrs;
40987
+ } = label;
40970
40988
  let radius, angle;
40971
40989
  switch (position) {
40972
40990
  case IMarkCommonArcLabelPosition.center:
@@ -41001,25 +41019,28 @@ class MarkArcArea extends Marker {
41001
41019
  angle: angle
41002
41020
  };
41003
41021
  }
41004
- setLabelPos(labelNode, labelAttrs) {
41022
+ setLabelPos() {
41005
41023
  var _a;
41006
- if (this._area) {
41024
+ if (this._label && this._area) {
41007
41025
  const {
41026
+ label = {}
41027
+ } = this.attribute,
41028
+ {
41008
41029
  position: labelPosition = "arcInnerMiddle",
41009
41030
  autoRotate: autoRotate
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) {
41031
+ } = label,
41032
+ labelAttr = this.getPointAttrByPosition(labelPosition);
41033
+ if (this._label.setAttributes(Object.assign(Object.assign({}, labelAttr.position), {
41034
+ angle: autoRotate ? labelAttr.angle - Math.PI / 2 + (null !== (_a = label.refAngle) && void 0 !== _a ? _a : 0) : 0,
41035
+ textStyle: Object.assign(Object.assign({}, DEFAULT_POLAR_MARKER_TEXT_STYLE_MAP[labelPosition]), label.textStyle)
41036
+ })), this.attribute.limitRect && label.confine) {
41016
41037
  const {
41017
41038
  x: x,
41018
41039
  y: y,
41019
41040
  width: width,
41020
41041
  height: height
41021
41042
  } = this.attribute.limitRect;
41022
- limitShapeInBounds(labelNode, {
41043
+ limitShapeInBounds(this._label, {
41023
41044
  x1: x,
41024
41045
  y1: y,
41025
41046
  x2: x + width,
@@ -41036,6 +41057,7 @@ class MarkArcArea extends Marker {
41036
41057
  startAngle: startAngle,
41037
41058
  endAngle: endAngle,
41038
41059
  areaStyle: areaStyle,
41060
+ label: label,
41039
41061
  state: state
41040
41062
  } = this.attribute,
41041
41063
  area = graphicCreator.arc(Object.assign({
@@ -41046,7 +41068,14 @@ class MarkArcArea extends Marker {
41046
41068
  startAngle: startAngle,
41047
41069
  endAngle: endAngle
41048
41070
  }, areaStyle));
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);
41071
+ 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);
41072
+ const markLabel = new Tag(Object.assign(Object.assign({}, label), {
41073
+ state: {
41074
+ panel: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.labelBackground),
41075
+ text: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.label)
41076
+ }
41077
+ }));
41078
+ markLabel.name = "mark-area-label", this._label = markLabel, container.add(markLabel), this.setLabelPos();
41050
41079
  }
41051
41080
  updateMarker() {
41052
41081
  const {
@@ -41066,13 +41095,21 @@ class MarkArcArea extends Marker {
41066
41095
  outerRadius: outerRadius,
41067
41096
  startAngle: startAngle,
41068
41097
  endAngle: endAngle
41069
- }, areaStyle)), this._area.states = merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.area)), this._updateMarkLabels(MarkArcArea.defaultAttributes.label);
41098
+ }, areaStyle)), this._area.states = merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.area)), this._label && (this._label.setAttributes(Object.assign(Object.assign({
41099
+ dx: 0,
41100
+ dy: 0
41101
+ }, label), {
41102
+ state: {
41103
+ panel: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.labelBackground),
41104
+ text: merge$1({}, DEFAULT_STATES$2, null == state ? void 0 : state.label)
41105
+ }
41106
+ })), this.setLabelPos());
41070
41107
  }
41071
41108
  isValidPoints() {
41072
41109
  return !0;
41073
41110
  }
41074
41111
  }
41075
- MarkArcArea.defaultAttributes = DEFAULT_MARK_ARC_AREA_THEME, mixin(MarkArcArea, MarkLabelMixin);
41112
+ MarkArcArea.defaultAttributes = DEFAULT_MARK_ARC_AREA_THEME;
41076
41113
 
41077
41114
  loadMarkPointComponent();
41078
41115
  function registerMarkPointAnimate() {
@@ -42592,19 +42629,23 @@ class Slider extends AbstractComponent {
42592
42629
  } = this.attribute;
42593
42630
  tooltip && tooltip.alwaysShow || (this._tooltipState = null, this._tooltipShape && this._tooltipShape.setAttribute("visible", !1), this._tooltipText && this._tooltipText.setAttribute("visible", !1), this._dispatchTooltipEvent("sliderTooltipHide"));
42594
42631
  }, this._onHandlerPointerdown = e => {
42595
- e.stopPropagation(), this._isChanging = !0;
42632
+ this._clearAllDragEvents(), this._isChanging = !0;
42596
42633
  const {
42597
42634
  x: x,
42598
42635
  y: y
42599
42636
  } = this.stage.eventPointTransform(e);
42600
- this._currentHandler = e.target, this._prePos = this._isHorizontal ? x : y, "browser" === vglobal.env ? (vglobal.addEventListener("pointermove", this._onHandlerPointerMove, {
42601
- capture: !0
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));
42637
+ this._currentHandler = e.target, this._prePos = this._isHorizontal ? x : y;
42638
+ const triggers = getEndTriggersOfDrag(),
42639
+ obj = "browser" === vglobal.env ? vglobal : this.stage;
42640
+ obj.addEventListener("pointermove", this._onHandlerPointerMove, {
42641
+ capture: !0,
42642
+ passive: !1
42643
+ }), triggers.forEach(trigger => {
42644
+ obj.addEventListener(trigger, this._onHandlerPointerUp);
42645
+ });
42605
42646
  }, this._onHandlerPointerMove = e => {
42606
42647
  var _a, _b;
42607
- e.stopPropagation(), this._isChanging = !0;
42648
+ e.preventDefault(), this._isChanging = !0;
42608
42649
  const {
42609
42650
  railWidth: railWidth,
42610
42651
  railHeight: railHeight,
@@ -42625,24 +42666,26 @@ class Slider extends AbstractComponent {
42625
42666
  currentValue = this.calculateValueByPos(newPos);
42626
42667
  "text" === this._currentHandler.type ? this._updateHandlerText(this._currentHandler, newPos, currentValue) : this._updateHandler(this._currentHandler, newPos, currentValue), this._updateTrack(), this._prePos = currentPos, this._dispatchChangeEvent();
42627
42668
  }, this._onHandlerPointerUp = e => {
42628
- e.preventDefault(), this._isChanging = !1, this._currentHandler = null, "browser" === vglobal.env ? (vglobal.removeEventListener("pointermove", this._onHandlerPointerMove, {
42629
- capture: !0
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));
42669
+ this._isChanging = !1, this._currentHandler = null, this._clearAllDragEvents();
42670
+ }, this._handleTouchMove = e => {
42671
+ this._isChanging && e.preventDefault();
42633
42672
  }, this._onTrackPointerdown = e => {
42634
- e.stopPropagation(), this._isChanging = !0;
42673
+ this._clearAllDragEvents(), this._isChanging = !0;
42635
42674
  const {
42636
42675
  x: x,
42637
42676
  y: y
42638
42677
  } = this.stage.eventPointTransform(e);
42639
- this._prePos = this._isHorizontal ? x : y, "browser" === vglobal.env ? (vglobal.addEventListener("pointermove", this._onTrackPointerMove, {
42640
- capture: !0
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));
42678
+ this._prePos = this._isHorizontal ? x : y;
42679
+ const triggers = getEndTriggersOfDrag(),
42680
+ obj = "browser" === vglobal.env ? vglobal : this.stage;
42681
+ obj.addEventListener("pointermove", this._onTrackPointerMove, {
42682
+ capture: !0,
42683
+ passive: !1
42684
+ }), triggers.forEach(trigger => {
42685
+ obj.addEventListener(trigger, this._onTrackPointerUp);
42686
+ });
42644
42687
  }, this._onTrackPointerMove = e => {
42645
- e.stopPropagation(), this._isChanging = !0;
42688
+ e.preventDefault(), this._isChanging = !0;
42646
42689
  const {
42647
42690
  railWidth: railWidth,
42648
42691
  railHeight: railHeight,
@@ -42683,13 +42726,9 @@ class Slider extends AbstractComponent {
42683
42726
  }
42684
42727
  this._prePos = currentPos, this._dispatchChangeEvent();
42685
42728
  }, this._onTrackPointerUp = e => {
42686
- e.preventDefault(), this._isChanging = !1, "browser" === vglobal.env ? (vglobal.removeEventListener("pointermove", this._onTrackPointerMove, {
42687
- capture: !0
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));
42729
+ this._isChanging = !1, this._clearAllDragEvents();
42691
42730
  }, this._onRailPointerDown = e => {
42692
- e.stopPropagation(), this._isChanging = !0;
42731
+ this._clearAllDragEvents(), this._isChanging = !0;
42693
42732
  const {
42694
42733
  railWidth: railWidth,
42695
42734
  railHeight: railHeight,
@@ -43010,11 +43049,28 @@ class Slider extends AbstractComponent {
43010
43049
  slidable: slidable,
43011
43050
  range: range
43012
43051
  } = this.attribute;
43013
- slidable && (this._startHandler && this._startHandler.addEventListener("pointerdown", this._onHandlerPointerdown), this._startHandlerText && this._startHandlerText.addEventListener("pointerdown", this._onHandlerPointerdown), this._endHandler && this._endHandler.addEventListener("pointerdown", this._onHandlerPointerdown), this._endHandlerText && this._endHandlerText.addEventListener("pointerdown", this._onHandlerPointerdown), isObject$2(range) && range.draggableTrack && this._track.addEventListener("pointerdown", this._onTrackPointerdown), this._railContainer.addEventListener("pointerdown", this._onRailPointerDown));
43052
+ slidable && (this._startHandler && this._startHandler.addEventListener("pointerdown", this._onHandlerPointerdown), this._startHandlerText && this._startHandlerText.addEventListener("pointerdown", this._onHandlerPointerdown), this._endHandler && this._endHandler.addEventListener("pointerdown", this._onHandlerPointerdown), this._endHandlerText && this._endHandlerText.addEventListener("pointerdown", this._onHandlerPointerdown), isObject$2(range) && range.draggableTrack && this._track.addEventListener("pointerdown", this._onTrackPointerdown), this._railContainer.addEventListener("pointerdown", this._onRailPointerDown), ("browser" === vglobal.env ? vglobal : this.stage).addEventListener("touchmove", this._handleTouchMove, {
43053
+ passive: !1
43054
+ }));
43014
43055
  }
43015
43056
  _bindTooltipEvents() {
43016
43057
  this.attribute.disableTriggerEvent || (this._mainContainer.addEventListener("pointerenter", this._onTooltipShow), this._mainContainer.addEventListener("pointermove", this._onTooltipUpdate), this._mainContainer.addEventListener("pointerleave", this._onTooltipHide));
43017
43058
  }
43059
+ _clearAllDragEvents() {
43060
+ const triggers = getEndTriggersOfDrag(),
43061
+ obj = "browser" === vglobal.env ? vglobal : this.stage;
43062
+ obj.removeEventListener("pointermove", this._onHandlerPointerMove, {
43063
+ capture: !0,
43064
+ passive: !1
43065
+ }), triggers.forEach(trigger => {
43066
+ obj.removeEventListener(trigger, this._onHandlerPointerUp);
43067
+ }), obj.removeEventListener("pointermove", this._onTrackPointerMove, {
43068
+ capture: !0,
43069
+ passive: !1
43070
+ }), triggers.forEach(trigger => {
43071
+ obj.removeEventListener(trigger, this._onTrackPointerUp);
43072
+ });
43073
+ }
43018
43074
  _updateTrack() {
43019
43075
  const {
43020
43076
  inverse: inverse,
@@ -43113,6 +43169,11 @@ class Slider extends AbstractComponent {
43113
43169
  endHandler: endHandler
43114
43170
  };
43115
43171
  }
43172
+ release(all) {
43173
+ super.release(all), ("browser" === vglobal.env ? vglobal : this.stage).addEventListener("touchmove", this._handleTouchMove, {
43174
+ passive: !1
43175
+ }), this._clearAllDragEvents();
43176
+ }
43116
43177
  }
43117
43178
  Slider.defaultAttributes = {
43118
43179
  slidable: !0,
@@ -44394,7 +44455,7 @@ var IOperateType;
44394
44455
  const DEFAULT_BRUSH_ATTRIBUTES = {
44395
44456
  trigger: "pointerdown",
44396
44457
  updateTrigger: "pointermove",
44397
- endTrigger: "pointerup",
44458
+ endTrigger: ["pointerup", "pointerleave"],
44398
44459
  resetTrigger: "pointerupoutside",
44399
44460
  hasMask: !0,
44400
44461
  brushMode: "single",
@@ -44432,41 +44493,22 @@ let Brush$1 = class Brush extends AbstractComponent {
44432
44493
  super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, Brush.defaultAttributes, attributes)), this.name = "brush", this._activeDrawState = !1, this._cacheDrawPoints = [], this._isDrawedBeforeEnd = !1, this._isDownBeforeUpOutside = !1, this._activeMoveState = !1, this._operatingMaskMoveDx = 0, this._operatingMaskMoveDy = 0, this._operatingMaskMoveRangeX = [-1 / 0, 1 / 0], this._operatingMaskMoveRangeY = [-1 / 0, 1 / 0], this._brushMaskAABBBoundsDict = {}, this._onBrushStart = e => {
44433
44494
  var _a;
44434
44495
  if (this._outOfInteractiveRange(e)) return void (this._isDownBeforeUpOutside = !0);
44435
- e.stopPropagation();
44496
+ this._isDownBeforeUpOutside = !1, e.stopPropagation();
44436
44497
  const brushMoved = null === (_a = this.attribute.brushMoved) || void 0 === _a || _a;
44437
44498
  this._activeMoveState = brushMoved && this._isPosInBrushMask(e), this._activeDrawState = !this._activeMoveState, this._activeDrawState && this._initDraw(e), this._activeMoveState && this._initMove(e);
44438
44499
  }, this._onBrushing = e => {
44439
44500
  this._outOfInteractiveRange(e) || ((this._activeDrawState || this._activeMoveState) && e.stopPropagation(), this._activeDrawState && this._drawing(e), this._activeMoveState && this._moving(e));
44440
44501
  }, this._onBrushingWithDelay = 0 === this.attribute.delayTime ? this._onBrushing : delayMap$1[this.attribute.delayType](this._onBrushing, this.attribute.delayTime), this._onBrushEnd = e => {
44441
44502
  var _a;
44503
+ if (this._isDownBeforeUpOutside) return this._isEmptyMask() || (this._clearMask(), this._dispatchBrushEvent(IOperateType.brushClear, e)), void (this._isDownBeforeUpOutside = !1);
44442
44504
  if (!this._activeDrawState && !this._activeMoveState) return;
44443
44505
  e.preventDefault();
44444
44506
  const {
44445
44507
  removeOnClick = !0
44446
44508
  } = this.attribute;
44447
- this._activeDrawState && !this._isDrawedBeforeEnd && removeOnClick ? ((null === (_a = this._operatingMask) || void 0 === _a ? void 0 : _a._AABBBounds.empty()) && this._dispatchEvent(IOperateType.brushClear, {
44448
- operateMask: this._operatingMask,
44449
- operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
44450
- event: e
44451
- }), this._container.incrementalClearChild(), this._brushMaskAABBBoundsDict = {}) : (this._activeDrawState && this._dispatchEvent(IOperateType.drawEnd, {
44452
- operateMask: this._operatingMask,
44453
- operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
44454
- event: e
44455
- }), this._activeMoveState && this._dispatchEvent(IOperateType.moveEnd, {
44456
- operateMask: this._operatingMask,
44457
- operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
44458
- event: e
44459
- })), this._activeDrawState = !1, this._activeMoveState = !1, this._isDrawedBeforeEnd = !1, this._operatingMask && this._operatingMask.setAttribute("pickable", !1);
44509
+ this._activeDrawState && !this._isDrawedBeforeEnd && removeOnClick ? (null === (_a = this._operatingMask) || void 0 === _a ? void 0 : _a._AABBBounds.empty()) ? this._isEmptyMask() || (this._clearMask(), this._dispatchBrushEvent(IOperateType.brushClear, e)) : (delete this._brushMaskAABBBoundsDict[this._operatingMask.name], this._container.setAttributes({}), this._container.removeChild(this._operatingMask), this._isEmptyMask() ? this._dispatchBrushEvent(IOperateType.drawEnd, e) : this._dispatchBrushEvent(IOperateType.brushClear, e)) : (this._activeDrawState && this._dispatchBrushEvent(IOperateType.drawEnd, e), this._activeMoveState && this._dispatchBrushEvent(IOperateType.moveEnd, e)), this._activeDrawState = !1, this._activeMoveState = !1, this._isDrawedBeforeEnd = !1, this._operatingMask && this._operatingMask.setAttribute("pickable", !1);
44460
44510
  }, this._onBrushClear = e => {
44461
- e.preventDefault();
44462
- const {
44463
- removeOnClick = !0
44464
- } = this.attribute;
44465
- this._isDownBeforeUpOutside && removeOnClick && (this._dispatchEvent(IOperateType.brushClear, {
44466
- operateMask: this._operatingMask,
44467
- operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
44468
- event: e
44469
- }), this._container.incrementalClearChild(), this._brushMaskAABBBoundsDict = {}), this._activeDrawState = !1, this._activeMoveState = !1, this._isDrawedBeforeEnd = !1, this._isDownBeforeUpOutside = !1, this._operatingMask && this._operatingMask.setAttribute("pickable", !1);
44511
+ e.preventDefault(), this._isEmptyMask() || (this._clearMask(), this._dispatchBrushEvent(IOperateType.brushClear, e)), this._activeDrawState = !1, this._activeMoveState = !1, this._isDrawedBeforeEnd = !1, this._isDownBeforeUpOutside = !1;
44470
44512
  };
44471
44513
  }
44472
44514
  _bindBrushEvents() {
@@ -44477,35 +44519,14 @@ let Brush$1 = class Brush extends AbstractComponent {
44477
44519
  endTrigger = DEFAULT_BRUSH_ATTRIBUTES.endTrigger,
44478
44520
  resetTrigger = DEFAULT_BRUSH_ATTRIBUTES.resetTrigger
44479
44521
  } = this.attribute;
44480
- array(trigger).forEach(t => vglobal.addEventListener(t, this._onBrushStart)), array(updateTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushingWithDelay)), array(endTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushEnd)), array(resetTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushClear));
44481
- }
44482
- _isPosInBrushMask(e) {
44483
- const pos = this.eventPosToStagePos(e),
44484
- brushMasks = this._container.getChildren();
44485
- for (let i = 0; i < brushMasks.length; i++) {
44486
- const {
44487
- points = [],
44488
- dx = 0,
44489
- dy = 0
44490
- } = brushMasks[i].attribute,
44491
- pointsConsiderOffset = points.map(point => ({
44492
- x: point.x + dx,
44493
- y: point.y + dy
44494
- }));
44495
- if (polygonContainPoint(pointsConsiderOffset, pos.x, pos.y)) return this._operatingMask = brushMasks[i], !0;
44496
- }
44497
- return !1;
44522
+ array(trigger).forEach(t => this.stage.addEventListener(t, this._onBrushStart)), array(updateTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushingWithDelay)), array(endTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushEnd)), array(resetTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushClear));
44498
44523
  }
44499
44524
  _initDraw(e) {
44500
44525
  const {
44501
44526
  brushMode: brushMode
44502
44527
  } = this.attribute,
44503
44528
  pos = this.eventPosToStagePos(e);
44504
- this._cacheDrawPoints = [pos], this._isDrawedBeforeEnd = !1, "single" === brushMode && (this._brushMaskAABBBoundsDict = {}, this._container.incrementalClearChild()), this._addBrushMask(), this._dispatchEvent(IOperateType.drawStart, {
44505
- operateMask: this._operatingMask,
44506
- operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
44507
- event: e
44508
- });
44529
+ this._cacheDrawPoints = [pos], this._isDrawedBeforeEnd = !1, "single" === brushMode && this._clearMask(), this._addBrushMask(), this._dispatchBrushEvent(IOperateType.drawStart, e);
44509
44530
  }
44510
44531
  _initMove(e) {
44511
44532
  var _a, _b;
@@ -44529,11 +44550,7 @@ let Brush$1 = class Brush extends AbstractComponent {
44529
44550
  maxMoveStepX = maxX - x2,
44530
44551
  minMoveStepY = minY - y1,
44531
44552
  maxMoveStepY = maxY - y2;
44532
- this._operatingMaskMoveRangeX = [minMoveStepX, maxMoveStepX], this._operatingMaskMoveRangeY = [minMoveStepY, maxMoveStepY], this._operatingMask.setAttribute("pickable", !0), this._dispatchEvent(IOperateType.moveStart, {
44533
- operateMask: this._operatingMask,
44534
- operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
44535
- event: e
44536
- });
44553
+ this._operatingMaskMoveRangeX = [minMoveStepX, maxMoveStepX], this._operatingMaskMoveRangeY = [minMoveStepY, maxMoveStepY], this._operatingMask.setAttribute("pickable", !0), this._dispatchBrushEvent(IOperateType.moveStart, e);
44537
44554
  }
44538
44555
  _drawing(e) {
44539
44556
  var _a, _b;
@@ -44556,11 +44573,7 @@ let Brush$1 = class Brush extends AbstractComponent {
44556
44573
  y1 = 0,
44557
44574
  y2 = 0
44558
44575
  } = null === (_b = this._operatingMask) || void 0 === _b ? void 0 : _b._AABBBounds;
44559
- this._isDrawedBeforeEnd = !this._operatingMask._AABBBounds.empty() && !!(Math.abs(x2 - x1) > sizeThreshold || Math.abs(y1 - y2) > sizeThreshold), this._isDrawedBeforeEnd && (this._brushMaskAABBBoundsDict[this._operatingMask.name] = this._operatingMask.AABBBounds, this._dispatchEvent(IOperateType.drawing, {
44560
- operateMask: this._operatingMask,
44561
- operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
44562
- event: e
44563
- }));
44576
+ this._isDrawedBeforeEnd = !this._operatingMask._AABBBounds.empty() && !!(Math.abs(x2 - x1) > sizeThreshold || Math.abs(y1 - y2) > sizeThreshold), this._isDrawedBeforeEnd && (this._brushMaskAABBBoundsDict[this._operatingMask.name] = this._operatingMask.AABBBounds), this._dispatchBrushEvent(IOperateType.drawing, e);
44564
44577
  }
44565
44578
  _moving(e) {
44566
44579
  const startPos = this._cacheMovePoint,
@@ -44573,11 +44586,21 @@ let Brush$1 = class Brush extends AbstractComponent {
44573
44586
  this._operatingMask.setAttributes({
44574
44587
  dx: moveX,
44575
44588
  dy: moveY
44576
- }), this._brushMaskAABBBoundsDict[this._operatingMask.name] = this._operatingMask.AABBBounds, this._dispatchEvent(IOperateType.moving, {
44577
- operateMask: this._operatingMask,
44578
- operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
44579
- event: e
44580
- });
44589
+ }), this._brushMaskAABBBoundsDict[this._operatingMask.name] = this._operatingMask.AABBBounds, this._dispatchBrushEvent(IOperateType.moving, e);
44590
+ }
44591
+ render() {
44592
+ this.releaseBrushEvents(), this._bindBrushEvents();
44593
+ const group = this.createOrUpdateChild("brush-container", {}, "group");
44594
+ this._container = group;
44595
+ }
44596
+ releaseBrushEvents() {
44597
+ const {
44598
+ trigger = DEFAULT_BRUSH_ATTRIBUTES.trigger,
44599
+ updateTrigger = DEFAULT_BRUSH_ATTRIBUTES.updateTrigger,
44600
+ endTrigger = DEFAULT_BRUSH_ATTRIBUTES.endTrigger,
44601
+ resetTrigger = DEFAULT_BRUSH_ATTRIBUTES.resetTrigger
44602
+ } = this.attribute;
44603
+ array(trigger).forEach(t => this.stage.removeEventListener(t, this._onBrushStart)), array(updateTrigger).forEach(t => this.stage.removeEventListener(t, this._onBrushingWithDelay)), array(endTrigger).forEach(t => this.stage.removeEventListener(t, this._onBrushEnd)), array(resetTrigger).forEach(t => this.stage.removeEventListener(t, this._onBrushClear));
44581
44604
  }
44582
44605
  _computeMaskPoints() {
44583
44606
  const {
@@ -44635,6 +44658,23 @@ let Brush$1 = class Brush extends AbstractComponent {
44635
44658
  }));
44636
44659
  brushMask.name = `brush-${Date.now()}`, this._operatingMask = brushMask, this._container.add(brushMask), this._brushMaskAABBBoundsDict[brushMask.name] = brushMask.AABBBounds;
44637
44660
  }
44661
+ _isPosInBrushMask(e) {
44662
+ const pos = this.eventPosToStagePos(e),
44663
+ brushMasks = this._container.getChildren();
44664
+ for (let i = 0; i < brushMasks.length; i++) {
44665
+ const {
44666
+ points = [],
44667
+ dx = 0,
44668
+ dy = 0
44669
+ } = brushMasks[i].attribute,
44670
+ pointsConsiderOffset = points.map(point => ({
44671
+ x: point.x + dx,
44672
+ y: point.y + dy
44673
+ }));
44674
+ if (polygonContainPoint(pointsConsiderOffset, pos.x, pos.y)) return this._operatingMask = brushMasks[i], !0;
44675
+ }
44676
+ return !1;
44677
+ }
44638
44678
  _outOfInteractiveRange(e) {
44639
44679
  const {
44640
44680
  interactiveRange: interactiveRange
@@ -44651,21 +44691,18 @@ let Brush$1 = class Brush extends AbstractComponent {
44651
44691
  eventPosToStagePos(e) {
44652
44692
  return this.stage.eventPointTransform(e);
44653
44693
  }
44654
- render() {
44655
- this._bindBrushEvents();
44656
- const group = this.createOrUpdateChild("brush-container", {}, "group");
44657
- this._container = group;
44694
+ _dispatchBrushEvent(operateType, e) {
44695
+ this._dispatchEvent(operateType, {
44696
+ operateMask: this._operatingMask,
44697
+ operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
44698
+ event: e
44699
+ });
44658
44700
  }
44659
- releaseBrushEvents() {
44660
- const {
44661
- delayType = "throttle",
44662
- delayTime = 0,
44663
- trigger = DEFAULT_BRUSH_ATTRIBUTES.trigger,
44664
- updateTrigger = DEFAULT_BRUSH_ATTRIBUTES.updateTrigger,
44665
- endTrigger = DEFAULT_BRUSH_ATTRIBUTES.endTrigger,
44666
- resetTrigger = DEFAULT_BRUSH_ATTRIBUTES.resetTrigger
44667
- } = this.attribute;
44668
- array(trigger).forEach(t => vglobal.removeEventListener(t, this._onBrushStart)), array(updateTrigger).forEach(t => this.stage.removeEventListener(t, this._onBrushingWithDelay)), array(endTrigger).forEach(t => this.stage.removeEventListener(t, this._onBrushEnd)), array(resetTrigger).forEach(t => this.stage.removeEventListener(t, this._onBrushClear));
44701
+ _clearMask() {
44702
+ this._brushMaskAABBBoundsDict = {}, this._container.incrementalClearChild(), this._operatingMask = null;
44703
+ }
44704
+ _isEmptyMask() {
44705
+ return isEmpty(this._brushMaskAABBBoundsDict) || Object.keys(this._brushMaskAABBBoundsDict).every(key => this._brushMaskAABBBoundsDict[key].empty());
44669
44706
  }
44670
44707
  };
44671
44708
  Brush$1.defaultAttributes = DEFAULT_BRUSH_ATTRIBUTES;
@@ -63652,7 +63689,7 @@ const registerVChartCore = () => {
63652
63689
  };
63653
63690
  registerVChartCore();
63654
63691
 
63655
- const version = "1.13.9-alpha.1";
63692
+ const version = "1.13.9-alpha.10";
63656
63693
 
63657
63694
  const addVChartProperty = (data, op) => {
63658
63695
  const context = op.beforeCall();
@@ -98023,14 +98060,13 @@ class BaseMarkLine extends BaseMarker {
98023
98060
  return 'cartesian';
98024
98061
  }
98025
98062
  _createMarkerComponent() {
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 : {});
98063
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
98064
+ const { label = {}, startSymbol = {}, endSymbol = {} } = this._spec;
98029
98065
  const markLineAttrs = {
98030
98066
  zIndex: this.layoutZIndex,
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,
98067
+ interactive: (_a = this._spec.interactive) !== null && _a !== void 0 ? _a : true,
98068
+ hover: (_b = this._spec.interactive) !== null && _b !== void 0 ? _b : true,
98069
+ select: (_c = this._spec.interactive) !== null && _c !== void 0 ? _c : true,
98034
98070
  points: [
98035
98071
  { x: 0, y: 0 },
98036
98072
  { x: 0, y: 0 }
@@ -98042,25 +98078,17 @@ class BaseMarkLine extends BaseMarker {
98042
98078
  radius: 0,
98043
98079
  startAngle: 0,
98044
98080
  endAngle: 0,
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
- }),
98081
+ lineStyle: transformStyle(transformToGraphic((_d = this._spec.line) === null || _d === void 0 ? void 0 : _d.style), this._markerData, this._markAttributeContext),
98082
+ clipInRange: (_e = this._spec.clip) !== null && _e !== void 0 ? _e : false,
98083
+ label: transformLabelAttributes(label, this._markerData, this._markAttributeContext),
98050
98084
  state: {
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
- })
98085
+ line: transformState((_g = (_f = this._spec.line) === null || _f === void 0 ? void 0 : _f.state) !== null && _g !== void 0 ? _g : {}, this._markerData, this._markAttributeContext),
98086
+ lineStartSymbol: transformState((_j = (_h = this._spec.startSymbol) === null || _h === void 0 ? void 0 : _h.state) !== null && _j !== void 0 ? _j : {}, this._markerData, this._markAttributeContext),
98087
+ lineEndSymbol: transformState((_l = (_k = this._spec.endSymbol) === null || _k === void 0 ? void 0 : _k.state) !== null && _l !== void 0 ? _l : {}, this._markerData, this._markAttributeContext),
98088
+ 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),
98089
+ 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)
98062
98090
  },
98063
- animation: (_o = this._spec.animation) !== null && _o !== void 0 ? _o : false,
98091
+ animation: (_u = this._spec.animation) !== null && _u !== void 0 ? _u : false,
98064
98092
  animationEnter: this._spec.animationEnter,
98065
98093
  animationExit: this._spec.animationExit,
98066
98094
  animationUpdate: this._spec.animationUpdate
@@ -98085,7 +98113,7 @@ class BaseMarkLine extends BaseMarker {
98085
98113
  return markLine;
98086
98114
  }
98087
98115
  _getUpdateMarkerAttrs() {
98088
- var _a, _b;
98116
+ var _a, _b, _c, _d;
98089
98117
  const spec = this._spec;
98090
98118
  const data = this._markerData;
98091
98119
  const startRelativeSeries = this._startRelativeSeries;
@@ -98095,7 +98123,7 @@ class BaseMarkLine extends BaseMarker {
98095
98123
  const seriesData = relativeSeries.getViewData().latestData;
98096
98124
  const dataPoints = data.latestData[0] && data.latestData[0].latestData ? data.latestData[0].latestData : data.latestData;
98097
98125
  let limitRect;
98098
- if (spec.clip || array(spec.label).some(labelCfg => labelCfg === null || labelCfg === void 0 ? void 0 : labelCfg.confine)) {
98126
+ if (spec.clip || ((_a = spec.label) === null || _a === void 0 ? void 0 : _a.confine)) {
98099
98127
  const { minX, maxX, minY, maxY } = computeClipRange([
98100
98128
  startRelativeSeries.getRegion(),
98101
98129
  endRelativeSeries.getRegion(),
@@ -98108,13 +98136,10 @@ class BaseMarkLine extends BaseMarker {
98108
98136
  height: maxY - minY
98109
98137
  };
98110
98138
  }
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
- });
98139
+ const markerComponentAttr = (_c = (_b = this._markerComponent) === null || _b === void 0 ? void 0 : _b.attribute) !== null && _c !== void 0 ? _c : {};
98140
+ const labelAttrs = Object.assign(Object.assign({}, markerComponentAttr.label), { text: this._spec.label.formatMethod
98141
+ ? this._spec.label.formatMethod(dataPoints, seriesData)
98142
+ : (_d = markerComponentAttr.label) === null || _d === void 0 ? void 0 : _d.text });
98118
98143
  return Object.assign(Object.assign({}, pointsAttr), { label: labelAttrs, limitRect, dx: this._layoutOffsetX, dy: this._layoutOffsetY });
98119
98144
  }
98120
98145
  _markerLayout() {
@@ -98216,7 +98241,7 @@ class CartesianMarkLine extends BaseMarkLine {
98216
98241
  return { points };
98217
98242
  }
98218
98243
  _markerLayout() {
98219
- var _a, _b, _c, _d, _e;
98244
+ var _a, _b, _c, _d, _e, _f, _g, _h;
98220
98245
  const updateAttrs = this._getUpdateMarkerAttrs();
98221
98246
  if (this._spec.type === 'type-step') {
98222
98247
  const startRelativeSeries = this._startRelativeSeries;
@@ -98243,7 +98268,7 @@ class CartesianMarkLine extends BaseMarkLine {
98243
98268
  else {
98244
98269
  expandDistanceValue = expandDistance;
98245
98270
  }
98246
- const { points, limitRect } = updateAttrs;
98271
+ const { points, label, limitRect } = updateAttrs;
98247
98272
  const joinPoints = getInsertPoints(points[0], points[1], connectDirection, expandDistanceValue);
98248
98273
  let labelPositionAttrs;
98249
98274
  if (multiSegment && isValid$1(mainSegmentIndex)) {
@@ -98257,10 +98282,20 @@ class CartesianMarkLine extends BaseMarkLine {
98257
98282
  else {
98258
98283
  labelPositionAttrs = Object.assign(Object.assign({ position: 'start', autoRotate: false }, getTextOffset(points[0], points[1], connectDirection, expandDistanceValue)), { refX: 0, refY: 0 });
98259
98284
  }
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({
98285
+ if (isValidNumber$1((_a = this._spec.label) === null || _a === void 0 ? void 0 : _a.refX)) {
98286
+ labelPositionAttrs.refX += this._spec.label.refX;
98287
+ }
98288
+ if (isValidNumber$1((_b = this._spec.label) === null || _b === void 0 ? void 0 : _b.refY)) {
98289
+ labelPositionAttrs.refY += this._spec.label.refY;
98290
+ }
98291
+ if (isValidNumber$1((_c = this._spec.label) === null || _c === void 0 ? void 0 : _c.dx)) {
98292
+ labelPositionAttrs.dx = (labelPositionAttrs.dx || 0) + this._spec.label.dx;
98293
+ }
98294
+ if (isValidNumber$1((_d = this._spec.label) === null || _d === void 0 ? void 0 : _d.dy)) {
98295
+ labelPositionAttrs.dy = (labelPositionAttrs.dy || 0) + this._spec.label.dy;
98296
+ }
98297
+ const markerComponentAttr = (_f = (_e = this._markerComponent) === null || _e === void 0 ? void 0 : _e.attribute) !== null && _f !== void 0 ? _f : {};
98298
+ (_g = this._markerComponent) === null || _g === void 0 ? void 0 : _g.setAttributes({
98264
98299
  points: multiSegment
98265
98300
  ? [
98266
98301
  [joinPoints[0], joinPoints[1]],
@@ -98268,22 +98303,7 @@ class CartesianMarkLine extends BaseMarkLine {
98268
98303
  [joinPoints[2], joinPoints[3]]
98269
98304
  ]
98270
98305
  : joinPoints,
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
- }),
98306
+ label: Object.assign(Object.assign(Object.assign({}, label), labelPositionAttrs), { textStyle: Object.assign(Object.assign({}, markerComponentAttr.label.textStyle), { textAlign: 'center', textBaseline: 'middle' }) }),
98287
98307
  limitRect,
98288
98308
  multiSegment,
98289
98309
  mainSegmentIndex,
@@ -98292,7 +98312,7 @@ class CartesianMarkLine extends BaseMarkLine {
98292
98312
  });
98293
98313
  }
98294
98314
  else {
98295
- (_e = this._markerComponent) === null || _e === void 0 ? void 0 : _e.setAttributes(updateAttrs);
98315
+ (_h = this._markerComponent) === null || _h === void 0 ? void 0 : _h.setAttributes(updateAttrs);
98296
98316
  }
98297
98317
  }
98298
98318
  _computeOptions() {
@@ -98646,8 +98666,8 @@ class BaseMarkArea extends BaseMarker {
98646
98666
  return 'cartesian';
98647
98667
  }
98648
98668
  _createMarkerComponent() {
98649
- var _a, _b, _c, _d, _e, _f, _g, _h;
98650
- const label = array((_a = this._spec.label) !== null && _a !== void 0 ? _a : {});
98669
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
98670
+ const label = (_a = this._spec.label) !== null && _a !== void 0 ? _a : {};
98651
98671
  const markAreaAttrs = {
98652
98672
  zIndex: this.layoutZIndex,
98653
98673
  interactive: (_b = this._spec.interactive) !== null && _b !== void 0 ? _b : true,
@@ -98669,20 +98689,13 @@ class BaseMarkArea extends BaseMarker {
98669
98689
  endAngle: 0,
98670
98690
  areaStyle: transformStyle(transformToGraphic((_e = this._spec.area) === null || _e === void 0 ? void 0 : _e.style), this._markerData, this._markAttributeContext),
98671
98691
  clipInRange: (_f = this._spec.clip) !== null && _f !== void 0 ? _f : false,
98672
- label: label.map((labelItem) => {
98673
- return transformLabelAttributes(labelItem, this._markerData, this._markAttributeContext);
98674
- }),
98692
+ label: transformLabelAttributes(label, this._markerData, this._markAttributeContext),
98675
98693
  state: {
98676
98694
  area: transformState((_g = this._spec.area) === null || _g === void 0 ? void 0 : _g.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
- })
98695
+ label: transformState((_h = this._spec.label) === null || _h === void 0 ? void 0 : _h.state, this._markerData, this._markAttributeContext),
98696
+ 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)
98684
98697
  },
98685
- animation: (_h = this._spec.animation) !== null && _h !== void 0 ? _h : false,
98698
+ animation: (_m = this._spec.animation) !== null && _m !== void 0 ? _m : false,
98686
98699
  animationEnter: this._spec.animationEnter,
98687
98700
  animationExit: this._spec.animationExit,
98688
98701
  animationUpdate: this._spec.animationUpdate
@@ -98691,7 +98704,7 @@ class BaseMarkArea extends BaseMarker {
98691
98704
  return markArea;
98692
98705
  }
98693
98706
  _markerLayout() {
98694
- var _a;
98707
+ var _a, _b, _c, _d;
98695
98708
  const spec = this._spec;
98696
98709
  const data = this._markerData;
98697
98710
  const startRelativeSeries = this._startRelativeSeries;
@@ -98705,7 +98718,7 @@ class BaseMarkArea extends BaseMarker {
98705
98718
  : data.latestData
98706
98719
  : seriesData;
98707
98720
  let limitRect;
98708
- if (spec.clip || array(spec.label).some(labelCfg => labelCfg === null || labelCfg === void 0 ? void 0 : labelCfg.confine)) {
98721
+ if (spec.clip || ((_a = spec.label) === null || _a === void 0 ? void 0 : _a.confine)) {
98709
98722
  const { minX, maxX, minY, maxY } = computeClipRange([
98710
98723
  startRelativeSeries.getRegion(),
98711
98724
  endRelativeSeries.getRegion(),
@@ -98719,15 +98732,10 @@ class BaseMarkArea extends BaseMarker {
98719
98732
  };
98720
98733
  }
98721
98734
  if (this._markerComponent) {
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 }));
98735
+ 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
98736
+ ?
98737
+ this._spec.label.formatMethod(dataPoints, seriesData)
98738
+ : (_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 }));
98731
98739
  }
98732
98740
  }
98733
98741
  _initDataView() {