@visactor/vchart 1.7.1-alpha.0 → 1.7.2

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 (217) hide show
  1. package/build/es5/index.js +1 -1
  2. package/build/index.js +285 -171
  3. package/build/index.min.js +1 -1
  4. package/build/tsconfig.tsbuildinfo +1 -1
  5. package/cjs/chart/base-chart.d.ts +2 -5
  6. package/cjs/chart/base-chart.js +10 -52
  7. package/cjs/chart/base-chart.js.map +1 -1
  8. package/cjs/chart/index.js +1 -2
  9. package/cjs/chart/interface/chart.d.ts +10 -4
  10. package/cjs/chart/interface/chart.js.map +1 -1
  11. package/cjs/chart/interface/common.d.ts +1 -1
  12. package/cjs/chart/interface/common.js.map +1 -1
  13. package/cjs/chart/sequence/sequence.js +1 -2
  14. package/cjs/chart/sequence/sequence.js.map +1 -1
  15. package/cjs/compile/compiler.js +2 -1
  16. package/cjs/compile/mark/compilable-mark.js +6 -9
  17. package/cjs/compile/mark/compilable-mark.js.map +1 -1
  18. package/cjs/component/axis/base-axis.d.ts +2 -1
  19. package/cjs/component/axis/base-axis.js +5 -1
  20. package/cjs/component/axis/base-axis.js.map +1 -1
  21. package/cjs/component/axis/cartesian/axis.d.ts +1 -1
  22. package/cjs/component/axis/cartesian/axis.js +2 -3
  23. package/cjs/component/axis/cartesian/axis.js.map +1 -1
  24. package/cjs/component/base/base-component.d.ts +2 -7
  25. package/cjs/component/base/base-component.js +4 -4
  26. package/cjs/component/base/base-component.js.map +1 -1
  27. package/cjs/component/brush/brush.d.ts +1 -1
  28. package/cjs/component/brush/brush.js +1 -1
  29. package/cjs/component/brush/brush.js.map +1 -1
  30. package/cjs/component/crosshair/cartesian.d.ts +1 -1
  31. package/cjs/component/crosshair/cartesian.js +1 -1
  32. package/cjs/component/crosshair/cartesian.js.map +1 -1
  33. package/cjs/component/crosshair/polar.d.ts +1 -1
  34. package/cjs/component/crosshair/polar.js +1 -1
  35. package/cjs/component/crosshair/polar.js.map +1 -1
  36. package/cjs/component/custom-mark/custom-mark.d.ts +1 -1
  37. package/cjs/component/custom-mark/custom-mark.js +1 -1
  38. package/cjs/component/custom-mark/custom-mark.js.map +1 -1
  39. package/cjs/component/data-zoom/data-filter-base-component.d.ts +1 -1
  40. package/cjs/component/data-zoom/data-filter-base-component.js +1 -1
  41. package/cjs/component/data-zoom/data-filter-base-component.js.map +1 -1
  42. package/cjs/component/data-zoom/data-zoom/data-zoom.d.ts +1 -1
  43. package/cjs/component/data-zoom/data-zoom/data-zoom.js +1 -1
  44. package/cjs/component/data-zoom/data-zoom/data-zoom.js.map +1 -1
  45. package/cjs/component/data-zoom/scroll-bar/scroll-bar.d.ts +1 -1
  46. package/cjs/component/data-zoom/scroll-bar/scroll-bar.js +1 -1
  47. package/cjs/component/data-zoom/scroll-bar/scroll-bar.js.map +1 -1
  48. package/cjs/component/geo/geo-coordinate.d.ts +1 -1
  49. package/cjs/component/geo/geo-coordinate.js +1 -1
  50. package/cjs/component/geo/geo-coordinate.js.map +1 -1
  51. package/cjs/component/indicator/indicator.d.ts +1 -1
  52. package/cjs/component/indicator/indicator.js +1 -1
  53. package/cjs/component/indicator/indicator.js.map +1 -1
  54. package/cjs/component/label/base-label.d.ts +1 -1
  55. package/cjs/component/label/base-label.js +1 -1
  56. package/cjs/component/label/base-label.js.map +1 -1
  57. package/cjs/component/label/label.d.ts +1 -0
  58. package/cjs/component/label/label.js +7 -0
  59. package/cjs/component/label/label.js.map +1 -1
  60. package/cjs/component/label/totalLabel.d.ts +1 -0
  61. package/cjs/component/label/totalLabel.js +7 -0
  62. package/cjs/component/label/totalLabel.js.map +1 -1
  63. package/cjs/component/legend/base-legend.d.ts +1 -1
  64. package/cjs/component/legend/base-legend.js +1 -1
  65. package/cjs/component/legend/base-legend.js.map +1 -1
  66. package/cjs/component/map-label/component.d.ts +1 -1
  67. package/cjs/component/map-label/component.js +2 -2
  68. package/cjs/component/map-label/component.js.map +1 -1
  69. package/cjs/component/marker/base-marker.d.ts +1 -1
  70. package/cjs/component/marker/base-marker.js +1 -1
  71. package/cjs/component/marker/base-marker.js.map +1 -1
  72. package/cjs/component/player/player.d.ts +1 -1
  73. package/cjs/component/player/player.js +1 -1
  74. package/cjs/component/player/player.js.map +1 -1
  75. package/cjs/component/title/title.d.ts +1 -1
  76. package/cjs/component/title/title.js +1 -1
  77. package/cjs/component/title/title.js.map +1 -1
  78. package/cjs/component/tooltip/handler/base.d.ts +15 -1
  79. package/cjs/component/tooltip/handler/base.js +84 -7
  80. package/cjs/component/tooltip/handler/base.js.map +1 -1
  81. package/cjs/component/tooltip/tooltip.d.ts +1 -1
  82. package/cjs/component/tooltip/tooltip.js +6 -5
  83. package/cjs/component/tooltip/tooltip.js.map +1 -1
  84. package/cjs/core/index.d.ts +1 -1
  85. package/cjs/core/index.js +1 -1
  86. package/cjs/core/index.js.map +1 -1
  87. package/cjs/core/vchart.js +4 -4
  88. package/cjs/core/vchart.js.map +1 -1
  89. package/cjs/mark/base/base-mark.js +2 -5
  90. package/cjs/mark/base/base-mark.js.map +1 -1
  91. package/cjs/model/base-model.d.ts +1 -1
  92. package/cjs/model/base-model.js +2 -34
  93. package/cjs/model/base-model.js.map +1 -1
  94. package/cjs/model/interface.d.ts +3 -2
  95. package/cjs/model/interface.js.map +1 -1
  96. package/cjs/series/base/base-series.js +14 -10
  97. package/cjs/series/base/base-series.js.map +1 -1
  98. package/cjs/series/gauge/gauge-pointer.d.ts +2 -1
  99. package/cjs/series/gauge/gauge-pointer.js +16 -9
  100. package/cjs/series/gauge/gauge-pointer.js.map +1 -1
  101. package/cjs/series/gauge/gauge.js +13 -1
  102. package/cjs/series/gauge/gauge.js.map +1 -1
  103. package/cjs/series/gauge/interface.d.ts +2 -0
  104. package/cjs/series/gauge/interface.js.map +1 -1
  105. package/cjs/series/pie/pie.d.ts +1 -0
  106. package/cjs/series/pie/pie.js +12 -0
  107. package/cjs/series/pie/pie.js.map +1 -1
  108. package/cjs/util/space.d.ts +1 -0
  109. package/cjs/util/space.js +10 -3
  110. package/cjs/util/space.js.map +1 -1
  111. package/esm/chart/base-chart.d.ts +2 -5
  112. package/esm/chart/base-chart.js +10 -52
  113. package/esm/chart/base-chart.js.map +1 -1
  114. package/esm/chart/index.js +1 -2
  115. package/esm/chart/interface/chart.d.ts +10 -4
  116. package/esm/chart/interface/chart.js.map +1 -1
  117. package/esm/chart/interface/common.d.ts +1 -1
  118. package/esm/chart/interface/common.js.map +1 -1
  119. package/esm/chart/sequence/sequence.js +1 -2
  120. package/esm/chart/sequence/sequence.js.map +1 -1
  121. package/esm/compile/compiler.js +2 -1
  122. package/esm/compile/mark/compilable-mark.js +6 -10
  123. package/esm/compile/mark/compilable-mark.js.map +1 -1
  124. package/esm/component/axis/base-axis.d.ts +2 -1
  125. package/esm/component/axis/base-axis.js +5 -1
  126. package/esm/component/axis/base-axis.js.map +1 -1
  127. package/esm/component/axis/cartesian/axis.d.ts +1 -1
  128. package/esm/component/axis/cartesian/axis.js +2 -3
  129. package/esm/component/axis/cartesian/axis.js.map +1 -1
  130. package/esm/component/base/base-component.d.ts +2 -7
  131. package/esm/component/base/base-component.js +4 -4
  132. package/esm/component/base/base-component.js.map +1 -1
  133. package/esm/component/brush/brush.d.ts +1 -1
  134. package/esm/component/brush/brush.js +1 -1
  135. package/esm/component/brush/brush.js.map +1 -1
  136. package/esm/component/crosshair/cartesian.d.ts +1 -1
  137. package/esm/component/crosshair/cartesian.js +1 -1
  138. package/esm/component/crosshair/cartesian.js.map +1 -1
  139. package/esm/component/crosshair/polar.d.ts +1 -1
  140. package/esm/component/crosshair/polar.js +1 -1
  141. package/esm/component/crosshair/polar.js.map +1 -1
  142. package/esm/component/custom-mark/custom-mark.d.ts +1 -1
  143. package/esm/component/custom-mark/custom-mark.js +1 -1
  144. package/esm/component/custom-mark/custom-mark.js.map +1 -1
  145. package/esm/component/data-zoom/data-filter-base-component.d.ts +1 -1
  146. package/esm/component/data-zoom/data-filter-base-component.js +1 -1
  147. package/esm/component/data-zoom/data-filter-base-component.js.map +1 -1
  148. package/esm/component/data-zoom/data-zoom/data-zoom.d.ts +1 -1
  149. package/esm/component/data-zoom/data-zoom/data-zoom.js +1 -1
  150. package/esm/component/data-zoom/data-zoom/data-zoom.js.map +1 -1
  151. package/esm/component/data-zoom/scroll-bar/scroll-bar.d.ts +1 -1
  152. package/esm/component/data-zoom/scroll-bar/scroll-bar.js +1 -1
  153. package/esm/component/data-zoom/scroll-bar/scroll-bar.js.map +1 -1
  154. package/esm/component/geo/geo-coordinate.d.ts +1 -1
  155. package/esm/component/geo/geo-coordinate.js +1 -1
  156. package/esm/component/geo/geo-coordinate.js.map +1 -1
  157. package/esm/component/indicator/indicator.d.ts +1 -1
  158. package/esm/component/indicator/indicator.js +1 -1
  159. package/esm/component/indicator/indicator.js.map +1 -1
  160. package/esm/component/label/base-label.d.ts +1 -1
  161. package/esm/component/label/base-label.js +1 -1
  162. package/esm/component/label/base-label.js.map +1 -1
  163. package/esm/component/label/label.d.ts +1 -0
  164. package/esm/component/label/label.js +7 -0
  165. package/esm/component/label/label.js.map +1 -1
  166. package/esm/component/label/totalLabel.d.ts +1 -0
  167. package/esm/component/label/totalLabel.js +7 -0
  168. package/esm/component/label/totalLabel.js.map +1 -1
  169. package/esm/component/legend/base-legend.d.ts +1 -1
  170. package/esm/component/legend/base-legend.js +1 -1
  171. package/esm/component/legend/base-legend.js.map +1 -1
  172. package/esm/component/map-label/component.d.ts +1 -1
  173. package/esm/component/map-label/component.js +2 -2
  174. package/esm/component/map-label/component.js.map +1 -1
  175. package/esm/component/marker/base-marker.d.ts +1 -1
  176. package/esm/component/marker/base-marker.js +1 -1
  177. package/esm/component/marker/base-marker.js.map +1 -1
  178. package/esm/component/player/player.d.ts +1 -1
  179. package/esm/component/player/player.js +1 -1
  180. package/esm/component/player/player.js.map +1 -1
  181. package/esm/component/title/title.d.ts +1 -1
  182. package/esm/component/title/title.js +1 -1
  183. package/esm/component/title/title.js.map +1 -1
  184. package/esm/component/tooltip/handler/base.d.ts +15 -1
  185. package/esm/component/tooltip/handler/base.js +83 -6
  186. package/esm/component/tooltip/handler/base.js.map +1 -1
  187. package/esm/component/tooltip/tooltip.d.ts +1 -1
  188. package/esm/component/tooltip/tooltip.js +5 -5
  189. package/esm/component/tooltip/tooltip.js.map +1 -1
  190. package/esm/core/index.d.ts +1 -1
  191. package/esm/core/index.js +1 -1
  192. package/esm/core/index.js.map +1 -1
  193. package/esm/core/vchart.js +4 -4
  194. package/esm/core/vchart.js.map +1 -1
  195. package/esm/mark/base/base-mark.js +1 -4
  196. package/esm/mark/base/base-mark.js.map +1 -1
  197. package/esm/model/base-model.d.ts +1 -1
  198. package/esm/model/base-model.js +2 -34
  199. package/esm/model/base-model.js.map +1 -1
  200. package/esm/model/interface.d.ts +3 -2
  201. package/esm/model/interface.js.map +1 -1
  202. package/esm/series/base/base-series.js +14 -10
  203. package/esm/series/base/base-series.js.map +1 -1
  204. package/esm/series/gauge/gauge-pointer.d.ts +2 -1
  205. package/esm/series/gauge/gauge-pointer.js +16 -9
  206. package/esm/series/gauge/gauge-pointer.js.map +1 -1
  207. package/esm/series/gauge/gauge.js +13 -1
  208. package/esm/series/gauge/gauge.js.map +1 -1
  209. package/esm/series/gauge/interface.d.ts +2 -0
  210. package/esm/series/gauge/interface.js.map +1 -1
  211. package/esm/series/pie/pie.d.ts +1 -0
  212. package/esm/series/pie/pie.js +12 -0
  213. package/esm/series/pie/pie.js.map +1 -1
  214. package/esm/util/space.d.ts +1 -0
  215. package/esm/util/space.js +7 -0
  216. package/esm/util/space.js.map +1 -1
  217. package/package.json +11 -11
package/build/index.js CHANGED
@@ -27528,6 +27528,20 @@
27528
27528
  const { x: x0, y: y0 } = point;
27529
27529
  return x0 < x + width && y0 < y + height && y0 > y && x0 > x;
27530
27530
  }
27531
+ function isPointInTriangle(point, v1, v2, v3) {
27532
+ const { x: x0, y: y0 } = point;
27533
+ const { x: x1, y: y1 } = v1;
27534
+ const { x: x2, y: y2 } = v2;
27535
+ const { x: x3, y: y3 } = v3;
27536
+ const divisor = (y2 - y3) * (x1 - x3) + (x3 - x2) * (y1 - y3);
27537
+ if (!divisor) {
27538
+ return false;
27539
+ }
27540
+ const a = ((y2 - y3) * (x0 - x3) + (x3 - x2) * (y0 - y3)) / divisor;
27541
+ const b = ((y3 - y1) * (x0 - x3) + (x1 - x3) * (y0 - y3)) / divisor;
27542
+ const c = 1 - a - b;
27543
+ return a >= 0 && a <= 1 && b >= 0 && b <= 1 && c >= 0 && c <= 1;
27544
+ }
27531
27545
  function isPercent(v) {
27532
27546
  if (!isString$1(v)) {
27533
27547
  return false;
@@ -28767,30 +28781,6 @@
28767
28781
  }), graphicAttributes[name] = storedAttrs, storedAttrs;
28768
28782
  }
28769
28783
  const transformsByType = {
28770
- [GrammarMarkType.largeRects]: [{
28771
- channels: ["x", "y", "y1", "x1", "width", "height"],
28772
- transform: (graphicAttributes, nextAttrs, storedAttrs) => {
28773
- graphicAttributes.x = 0, graphicAttributes.y = 0;
28774
- }
28775
- }],
28776
- [GrammarMarkType.largeSymbols]: [{
28777
- channels: ["x", "y", "size"],
28778
- transform: (graphicAttributes, nextAttrs, storedAttrs) => {
28779
- graphicAttributes.x = 0, graphicAttributes.y = 0;
28780
- }
28781
- }],
28782
- [GrammarMarkType.area]: [{
28783
- channels: ["x", "y", "x1", "y1"],
28784
- transform: (graphicAttributes, nextAttrs, storedAttrs) => {
28785
- graphicAttributes.x = 0, graphicAttributes.y = 0, graphicAttributes.x1 = 0, graphicAttributes.y1 = 0;
28786
- }
28787
- }],
28788
- [GrammarMarkType.line]: [{
28789
- channels: ["x", "y", "defined"],
28790
- transform: (graphicAttributes, nextAttrs, storedAttrs) => {
28791
- graphicAttributes.x = 0, graphicAttributes.y = 0;
28792
- }
28793
- }],
28794
28784
  [GrammarMarkType.rect]: [{
28795
28785
  channels: ["x", "y", "x1", "y1", "width", "height"],
28796
28786
  transform: (graphicAttributes, nextAttrs, storedAttrs) => {
@@ -28921,13 +28911,19 @@
28921
28911
  startIndex: index
28922
28912
  }));
28923
28913
  }), segments.length >= 2 ? segments.map(entry => {
28924
- const res = transformAttributes(GrammarMarkType.line, entry.attrs, element);
28914
+ const res = transformAttributes(GrammarMarkType.line, parseCollectionMarkAttributes(entry.attrs), element);
28925
28915
  return res.points = points.slice(entry.startIndex, isNil$1(entry.endIndex) ? points.length : entry.endIndex), res;
28926
28916
  }) : null;
28927
28917
  }
28928
28918
  function getLinePointsFromSegments(segments) {
28929
28919
  return segments ? segments.reduce((points, segment) => points.concat(segment.points), []) : null;
28930
28920
  }
28921
+ function parseCollectionMarkAttributes(itemNextAttrs) {
28922
+ const result = {};
28923
+ return itemNextAttrs ? (Object.keys(itemNextAttrs).forEach(key => {
28924
+ "x" !== key && "y" !== key && "x1" !== key && "y1" !== key && "defined" !== key && "size" !== key && "width" !== key && "height" !== key && "context" !== key && (result[key] = itemNextAttrs[key]);
28925
+ }), result) : result;
28926
+ }
28931
28927
 
28932
28928
  let Element$1 = class Element {
28933
28929
  constructor(mark) {
@@ -29094,7 +29090,7 @@
29094
29090
  enableSegments = this.mark.getSpec().enableSegments,
29095
29091
  itemNextAttrs = items.map(item => item.nextAttrs),
29096
29092
  isProgressive = this.mark.isProgressive();
29097
- if (nextAttrs = Object.assign({}, nextAttrs), delete nextAttrs.x, delete nextAttrs.y, markType === GrammarMarkType.line || markType === GrammarMarkType.area) {
29093
+ if (nextAttrs = parseCollectionMarkAttributes(nextAttrs), markType === GrammarMarkType.line || markType === GrammarMarkType.area) {
29098
29094
  const linePoints = getLinePoints(items, !0, lastPoints, markType === GrammarMarkType.area);
29099
29095
  if (enableSegments && !isProgressive) {
29100
29096
  const points = linePoints && 0 !== linePoints.length ? linePoints : getLinePointsFromSegments(lastSegments),
@@ -44807,7 +44803,7 @@
44807
44803
  }
44808
44804
  const groupMark = isString$1(spec.group) ? this.view.getMarkById(spec.group) : spec.group;
44809
44805
  return this.attach(groupMark), this.join(null === (_a = spec.from) || void 0 === _a ? void 0 : _a.data, spec.key, spec.sort, spec.groupBy, spec.groupSort), this.coordinate(spec.coordinate), this.state(spec.state, this.spec.stateSort), Object.keys(null !== (_b = this.spec.encode) && void 0 !== _b ? _b : {}).forEach(state => {
44810
- this.encodeState(state, {});
44806
+ this.encodeState(state, {}, !0);
44811
44807
  }), Object.keys(null !== (_c = spec.encode) && void 0 !== _c ? _c : {}).forEach(state => {
44812
44808
  this.encodeState(state, spec.encode[state]);
44813
44809
  }), this.animation(spec.animation), this.animationState(spec.animationState), this.morph(spec.morph, spec.morphKey, spec.morphElementKey), this.layout(spec.layout), this.configure(spec), this.transform(spec.transform), this.parseAddition(spec), this.spec = spec, this.markType = spec.type, this.commit(), this;
@@ -44880,15 +44876,20 @@
44880
44876
  state(state, stateSort) {
44881
44877
  return this.spec.stateSort = stateSort, this.setFunctionSpec(state, "state");
44882
44878
  }
44883
- encode(channel, value) {
44884
- return this.encodeState(DiffState.update, channel, value);
44879
+ encode(channel, value, clear) {
44880
+ return this.encodeState(DiffState.update, channel, value, clear);
44885
44881
  }
44886
- encodeState(state, channel, value) {
44882
+ encodeState(state, channel, value, clear) {
44887
44883
  if (state === DiffState.enter && (this._isReentered = !0), this.spec.encode[state]) {
44888
44884
  const lastEncoder = this.spec.encode[state];
44889
- isFunctionType(lastEncoder) ? this.detach(parseEncodeType(lastEncoder, this.view)) : isString$1(channel) ? this.detach(parseEncodeType(this.spec.encode[state][channel], this.view)) : Object.keys(channel).forEach(c => {
44890
- this.detach(parseEncodeType(this.spec.encode[state][c], this.view));
44891
- });
44885
+ if (isFunctionType(lastEncoder)) this.detach(parseEncodeType(lastEncoder, this.view));else {
44886
+ const isSingleChannel = isString$1(channel);
44887
+ isSingleChannel && clear || !isSingleChannel && value ? (Object.keys(lastEncoder).forEach(c => {
44888
+ this.detach(parseEncodeType(lastEncoder[c], this.view));
44889
+ }), this.spec.encode[state] = {}) : isSingleChannel ? this.detach(parseEncodeType(lastEncoder[channel], this.view)) : Object.keys(channel).forEach(c => {
44890
+ this.detach(parseEncodeType(lastEncoder[c], this.view));
44891
+ });
44892
+ }
44892
44893
  } else this.spec.encode[state] = {};
44893
44894
  return isString$1(channel) ? (this.spec.encode[state][channel] = value, this.attach(parseEncodeType(value, this.view))) : isFunctionType(channel) ? (this.spec.encode[state] = channel, this.attach(parseEncodeType(channel, this.view))) : (Object.assign(this.spec.encode[state], channel), channel && Object.values(channel).forEach(channelEncoder => {
44894
44895
  this.attach(parseEncodeType(channelEncoder, this.view));
@@ -54860,19 +54861,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
54860
54861
  _prepareSpecBeforeMergingTheme(obj) {
54861
54862
  return obj;
54862
54863
  }
54863
- setCurrentTheme(noRender) {
54864
- return __awaiter$h(this, void 0, void 0, function* () {
54865
- const modifyConfig = () => {
54866
- this.reInit(this._getTheme());
54867
- return { change: true, reMake: false };
54868
- };
54869
- if (noRender) {
54870
- modifyConfig();
54871
- }
54872
- else {
54873
- yield this._option.globalInstance.updateCustomConfigAndRerender(modifyConfig);
54874
- }
54875
- });
54864
+ setCurrentTheme() {
54865
+ this.reInit(this._getTheme());
54876
54866
  }
54877
54867
  updateLayoutAttribute() {
54878
54868
  }
@@ -56519,9 +56509,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
56519
56509
  }
56520
56510
  }
56521
56511
 
56522
- const keptInUpdateAttribute = {
56523
- defined: true
56524
- };
56525
56512
  class CompilableMark extends GrammarItem {
56526
56513
  getSkipTheme() {
56527
56514
  return this._skipTheme;
@@ -56742,10 +56729,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
56742
56729
  if (!this._product) {
56743
56730
  return;
56744
56731
  }
56745
- const { enterStyles } = this._separateStyle();
56746
- if (enterStyles) {
56747
- this._product.encodeState('group', enterStyles);
56748
- }
56732
+ const { enterStyles, updateStyles } = this._separateStyle();
56733
+ this._product.encodeState('group', enterStyles, true);
56734
+ this._product.encode(updateStyles, true);
56749
56735
  }
56750
56736
  _separateStyle() {
56751
56737
  const _a = this.stateStyle, _b = STATE_VALUE_ENUM.STATE_NORMAL, normalStyle = _a[_b]; __rest$8(_a, [typeof _b === "symbol" ? _b : _b + ""]);
@@ -56755,10 +56741,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
56755
56741
  if (this._unCompileChannel[key]) {
56756
56742
  return;
56757
56743
  }
56758
- if (keptInUpdateAttribute[key]) {
56759
- updateStyles[key] = normalStyle[key].style;
56760
- }
56761
- else if (this._option.noSeparateStyle || isStateAttrChangeable(key, normalStyle, this.getFacet())) {
56744
+ if (this._option.noSeparateStyle || isStateAttrChangeable(key, normalStyle, this.getFacet())) {
56762
56745
  updateStyles[key] = {
56763
56746
  callback: this.compileCommonAttributeCallback(key, 'normal'),
56764
56747
  dependency: [this.stateKeyToSignalName('markUpdateRank')]
@@ -56773,10 +56756,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
56773
56756
  compileEncode() {
56774
56757
  const _a = this.stateStyle, _b = STATE_VALUE_ENUM.STATE_NORMAL; _a[_b]; const temp = __rest$8(_a, [typeof _b === "symbol" ? _b : _b + ""]);
56775
56758
  const { enterStyles, updateStyles } = this._separateStyle();
56776
- this._product.encode(updateStyles);
56777
- if (!isEmpty(enterStyles)) {
56778
- this._product.encodeState('group', enterStyles);
56779
- }
56759
+ this._product.encode(updateStyles, true);
56760
+ this._product.encodeState('group', enterStyles, true);
56780
56761
  Object.keys(temp).forEach(state => {
56781
56762
  const styles = {};
56782
56763
  Object.keys(temp[state]).forEach(key => {
@@ -56788,7 +56769,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
56788
56769
  dependency: [this.stateKeyToSignalName('markUpdateRank')]
56789
56770
  };
56790
56771
  });
56791
- this._product.encodeState(state, styles);
56772
+ this._product.encodeState(state, styles, true);
56792
56773
  });
56793
56774
  if (this._skipBeforeLayouted) {
56794
56775
  this._product.layout({
@@ -57129,6 +57110,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
57129
57110
  if (stateStyle.referer) {
57130
57111
  return stateStyle.referer._computeAttribute(key, state);
57131
57112
  }
57113
+ if (typeof stateStyle.style === 'function') {
57114
+ return (datum, opt) => stateStyle.style(datum, this._attributeContext, opt, this.getDataView());
57115
+ }
57132
57116
  if (GradientType.includes(stateStyle.style.gradient)) {
57133
57117
  return this._computeGradientAttr(stateStyle.style);
57134
57118
  }
@@ -57139,10 +57123,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
57139
57123
  return (datum, opt) => stateStyle.style.scale.scale(datum[stateStyle.style.field]);
57140
57124
  }
57141
57125
  return (datum, opt) => {
57142
- var _a;
57143
- if (typeof stateStyle.style === 'function') {
57144
- return (_a = stateStyle.style) === null || _a === void 0 ? void 0 : _a.call(stateStyle, datum, this._attributeContext, opt, this.getDataView());
57145
- }
57146
57126
  return stateStyle.style;
57147
57127
  };
57148
57128
  }
@@ -58061,7 +58041,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
58061
58041
  }
58062
58042
  const reSize = this._shouldChartResize(lastSpec);
58063
58043
  (_c = (_b = this._compiler) === null || _b === void 0 ? void 0 : _b.getVGrammarView()) === null || _c === void 0 ? void 0 : _c.updateLayoutTag();
58064
- return mergeUpdateResult(this._chart.updateSpec(spec, morphConfig), {
58044
+ return mergeUpdateResult(this._chart.updateSpec(spec), {
58065
58045
  change: reSize,
58066
58046
  reMake: false,
58067
58047
  reCompile: false,
@@ -58093,7 +58073,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
58093
58073
  }
58094
58074
  const reSize = this._shouldChartResize(lastSpec);
58095
58075
  (_d = (_c = this._compiler) === null || _c === void 0 ? void 0 : _c.getVGrammarView()) === null || _d === void 0 ? void 0 : _d.updateLayoutTag();
58096
- return mergeUpdateResult(this._chart.updateSpec(spec, morphConfig), {
58076
+ return mergeUpdateResult(this._chart.updateSpec(spec), {
58097
58077
  change: reSize,
58098
58078
  reMake: false,
58099
58079
  reCompile: false,
@@ -58307,7 +58287,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
58307
58287
  yield this.updateCustomConfigAndRerender(() => {
58308
58288
  var _a;
58309
58289
  this._updateCurrentTheme(name);
58310
- (_a = this._chart) === null || _a === void 0 ? void 0 : _a.setCurrentTheme(true);
58290
+ (_a = this._chart) === null || _a === void 0 ? void 0 : _a.setCurrentTheme();
58311
58291
  return { change: true, reMake: false };
58312
58292
  });
58313
58293
  return this;
@@ -58320,7 +58300,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
58320
58300
  this.updateCustomConfigAndRerenderSync(() => {
58321
58301
  var _a;
58322
58302
  this._updateCurrentTheme(name);
58323
- (_a = this._chart) === null || _a === void 0 ? void 0 : _a.setCurrentTheme(true);
58303
+ (_a = this._chart) === null || _a === void 0 ? void 0 : _a.setCurrentTheme();
58324
58304
  return { change: true, reMake: false };
58325
58305
  });
58326
58306
  return this;
@@ -58630,7 +58610,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
58630
58610
  };
58631
58611
  registerVChartCore();
58632
58612
 
58633
- const version = "1.7.1-alpha.0";
58613
+ const version = "1.7.2";
58634
58614
 
58635
58615
  class ChartData {
58636
58616
  get dataList() {
@@ -59224,7 +59204,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
59224
59204
  this._event = new Event$1(option.eventDispatcher, option.mode);
59225
59205
  this._dataSet = option.dataSet;
59226
59206
  this._chartData = new ChartData(this._dataSet, (_b = this._option) === null || _b === void 0 ? void 0 : _b.onError);
59227
- this._modelOption = Object.assign(Object.assign({}, option), { mode: this._option.mode, map: this._idMap, getChartLayoutRect: () => this._layoutRect, getChartViewRect: () => this._viewRect, getChart: () => this, globalScale: this._globalScale, onError: (_c = this._option) === null || _c === void 0 ? void 0 : _c.onError });
59207
+ this._modelOption = Object.assign(Object.assign({}, option), { mode: this._option.mode, map: this._idMap, getChartLayoutRect: () => this._layoutRect, getChartViewRect: () => this._viewRect, getChart: () => this, globalScale: this._globalScale, onError: (_c = this._option) === null || _c === void 0 ? void 0 : _c.onError, getSeriesData: this._chartData.getSeriesData.bind(this._chartData) });
59228
59208
  this._spec = spec;
59229
59209
  }
59230
59210
  created() {
@@ -59302,11 +59282,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
59302
59282
  });
59303
59283
  }
59304
59284
  _createSeries(seriesSpec) {
59305
- seriesSpec.forEach((_spec, index) => {
59306
- const spec = Object.assign({}, _spec);
59307
- if (!spec.data) {
59308
- spec.data = this._chartData.getSeriesData(spec.dataId, spec.dataIndex);
59309
- }
59285
+ seriesSpec.forEach((spec, index) => {
59310
59286
  if (this._option.animation === false) {
59311
59287
  spec.animation = false;
59312
59288
  }
@@ -59323,7 +59299,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
59323
59299
  if (!region) {
59324
59300
  return;
59325
59301
  }
59326
- const series = Factory.createSeries(spec.type, spec, Object.assign(Object.assign({}, this._modelOption), { region, specIndex: index, globalScale: this._globalScale, getSeriesData: this._chartData.getSeriesData.bind(this._chartData), sourceDataList: this._chartData.dataList }));
59302
+ const series = Factory.createSeries(spec.type, spec, Object.assign(Object.assign({}, this._modelOption), { region, specIndex: index, globalScale: this._globalScale, sourceDataList: this._chartData.dataList }));
59327
59303
  if (series) {
59328
59304
  series.created();
59329
59305
  this._series.push(series);
@@ -59602,7 +59578,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
59602
59578
  this._globalScale.getScale('color').range(colorSpec.range);
59603
59579
  }
59604
59580
  }
59605
- updateSpec(spec, morphConfig) {
59581
+ updateSpec(spec) {
59606
59582
  const result = {
59607
59583
  change: false,
59608
59584
  reMake: false,
@@ -59610,7 +59586,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
59610
59586
  reSize: false,
59611
59587
  reCompile: false
59612
59588
  };
59613
- this.setLayoutTag(true, morphConfig);
59589
+ this.setLayoutTag(true, null, false);
59614
59590
  if (spec.type !== this.type) {
59615
59591
  result.reMake = true;
59616
59592
  return result;
@@ -59771,29 +59747,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
59771
59747
  this._layoutRect.y = this.padding.top;
59772
59748
  this._event.emit(exports.ChartEvent.layoutRectUpdate, {});
59773
59749
  }
59774
- setCurrentTheme(reInit = true) {
59750
+ setCurrentTheme() {
59775
59751
  this.updateChartConfig({ change: true, reMake: false }, this._spec);
59776
- this.setLayoutTag(true);
59752
+ this.setLayoutTag(true, null, false);
59777
59753
  this.transformSpec(this._spec);
59778
59754
  this.updateGlobalScaleTheme();
59779
- this.setRegionTheme(reInit);
59780
- this.setComponentTheme(reInit);
59781
- this.setSeriesTheme(reInit);
59782
- }
59783
- setRegionTheme(reInit = true) {
59784
- this._regions.forEach((r) => __awaiter$h(this, void 0, void 0, function* () {
59785
- yield r.setCurrentTheme(reInit);
59786
- }));
59787
- }
59788
- setComponentTheme(reInit = true) {
59789
- this._components.forEach((c) => __awaiter$h(this, void 0, void 0, function* () {
59790
- yield c.setCurrentTheme(reInit);
59791
- }));
59792
- }
59793
- setSeriesTheme(reInit = true) {
59794
- this._series.forEach((s) => __awaiter$h(this, void 0, void 0, function* () {
59795
- yield s.setCurrentTheme(reInit);
59796
- }));
59755
+ this._regions.forEach(r => r.setCurrentTheme());
59756
+ this._components.forEach(c => c.setCurrentTheme());
59757
+ this._series.forEach(s => s.setCurrentTheme());
59797
59758
  }
59798
59759
  clear() {
59799
59760
  this.getAllModels().forEach(i => { var _a; return (_a = i.clear) === null || _a === void 0 ? void 0 : _a.call(i); });
@@ -61091,13 +61052,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
61091
61052
  }
61092
61053
  }
61093
61054
  initData() {
61094
- var _a, _b, _c, _d;
61095
- if (this._spec.data) {
61096
- this._rawData = dataToDataView(this._spec.data, this._dataSet, this._option.sourceDataList, {
61097
- onError: (_a = this._option) === null || _a === void 0 ? void 0 : _a.onError
61055
+ var _a, _b, _c, _d, _e;
61056
+ const d = (_a = this._spec.data) !== null && _a !== void 0 ? _a : this._option.getSeriesData(this._spec.dataId, this._spec.dataIndex);
61057
+ if (d) {
61058
+ this._rawData = dataToDataView(d, this._dataSet, this._option.sourceDataList, {
61059
+ onError: (_b = this._option) === null || _b === void 0 ? void 0 : _b.onError
61098
61060
  });
61099
61061
  }
61100
- (_b = this._rawData) === null || _b === void 0 ? void 0 : _b.target.addListener('change', this.rawDataUpdate.bind(this));
61062
+ (_c = this._rawData) === null || _c === void 0 ? void 0 : _c.target.addListener('change', this.rawDataUpdate.bind(this));
61101
61063
  this._addDataIndexAndKey();
61102
61064
  if (this._rawData) {
61103
61065
  if (this._stack) {
@@ -61113,9 +61075,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
61113
61075
  this._viewDataFilter.target.removeListener('change', viewData.reRunAllTransform);
61114
61076
  }
61115
61077
  }
61116
- if (this._invalidType === 'zero' && ((_c = this._rawData) === null || _c === void 0 ? void 0 : _c.dataSet)) {
61078
+ if (this._invalidType === 'zero' && ((_d = this._rawData) === null || _d === void 0 ? void 0 : _d.dataSet)) {
61117
61079
  registerDataSetInstanceTransform(this._rawData.dataSet, 'invalidTravel', invalidTravel);
61118
- (_d = this._rawData) === null || _d === void 0 ? void 0 : _d.transform({
61080
+ (_e = this._rawData) === null || _e === void 0 ? void 0 : _e.transform({
61119
61081
  type: 'invalidTravel',
61120
61082
  options: {
61121
61083
  config: () => {
@@ -61361,7 +61323,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
61361
61323
  });
61362
61324
  }
61363
61325
  else if (!parentMark && (!isNil$1(spec.dataId) || !isNil$1(spec.dataIndex))) {
61364
- const dataView = this._option.getSeriesData(spec.id, spec.dataIndex);
61326
+ const dataView = this._option.getSeriesData(spec.dataId, spec.dataIndex);
61365
61327
  if (dataView === this._rawData) {
61366
61328
  mark.setDataView(this.getViewData(), this.getViewDataProductId());
61367
61329
  }
@@ -61562,12 +61524,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
61562
61524
  }
61563
61525
  reInit(theme, lastSpec) {
61564
61526
  super.reInit(theme);
61565
- this.initMarkStyle();
61566
- this.getMarksWithoutRoot().forEach(mark => {
61567
- if (lastSpec && isEqual$1(lastSpec[mark.name], this._spec[mark.name])) {
61568
- return;
61569
- }
61527
+ const marks = !lastSpec
61528
+ ? this.getMarksWithoutRoot()
61529
+ : this.getMarksWithoutRoot().filter(mark => !isEqual$1(lastSpec[mark.name], this._spec[mark.name]));
61530
+ marks.forEach(mark => {
61570
61531
  this._spec[mark.name] && this.initMarkStyleWithSpec(mark, this._spec[mark.name]);
61532
+ });
61533
+ this.initMarkStyle();
61534
+ marks.forEach(mark => {
61571
61535
  mark.updateStaticEncode();
61572
61536
  mark.updateLayoutState(true);
61573
61537
  });
@@ -64784,10 +64748,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
64784
64748
  chart: (_b = (_a = this._option) === null || _a === void 0 ? void 0 : _a.globalInstance) === null || _b === void 0 ? void 0 : _b.getChart()
64785
64749
  }, 'model');
64786
64750
  };
64787
- this.getGraphicBounds = () => {
64788
- var _a, _b, _c;
64789
- return (_c = (_b = (_a = this.getVRenderComponents()) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.AABBBounds) !== null && _c !== void 0 ? _c : super.getGraphicBounds();
64790
- };
64791
64751
  if (this._option.animation) {
64792
64752
  this.animate = new AnimateManager({
64793
64753
  getCompiler: options.getCompiler
@@ -64800,6 +64760,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
64800
64760
  this._regions = (_a = this._regions) !== null && _a !== void 0 ? _a : this._option.getRegionsInIndex();
64801
64761
  this._layout && (this._layout.layoutBindRegionID = this._regions.map(x => x.id));
64802
64762
  }
64763
+ getVRenderComponents() {
64764
+ return this._getNeedClearVRenderComponents();
64765
+ }
64803
64766
  callPlugin(cb) {
64804
64767
  if (this.pluginService) {
64805
64768
  this.pluginService.getAll().forEach(plugin => cb(plugin));
@@ -64848,7 +64811,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
64848
64811
  }
64849
64812
  clear() {
64850
64813
  var _a;
64851
- const components = this.getVRenderComponents();
64814
+ const components = this._getNeedClearVRenderComponents();
64852
64815
  if (components && components.length) {
64853
64816
  components.forEach(c => {
64854
64817
  var _a;
@@ -65449,7 +65412,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
65449
65412
  }
65450
65413
  changeRegions(regions) {
65451
65414
  }
65452
- getVRenderComponents() {
65415
+ _getNeedClearVRenderComponents() {
65453
65416
  return [];
65454
65417
  }
65455
65418
  collectFeatures() {
@@ -66324,6 +66287,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
66324
66287
  y: (_d = (_c = this._spec) === null || _c === void 0 ? void 0 : _c.centerY) !== null && _d !== void 0 ? _d : this._region.getLayoutRect().height / 2
66325
66288
  };
66326
66289
  }
66290
+ _buildMarkAttributeContext() {
66291
+ super._buildMarkAttributeContext();
66292
+ this._markAttributeContext.getCenter = () => {
66293
+ return {
66294
+ x: () => { var _a, _b; return (_b = (_a = this._center) === null || _a === void 0 ? void 0 : _a.x) !== null && _b !== void 0 ? _b : this._region.getLayoutRect().width / 2; },
66295
+ y: () => { var _a, _b; return (_b = (_a = this._center) === null || _a === void 0 ? void 0 : _a.y) !== null && _b !== void 0 ? _b : this._region.getLayoutRect().height / 2; }
66296
+ };
66297
+ };
66298
+ }
66327
66299
  setAttrFromSpec() {
66328
66300
  var _a, _b, _c, _d, _e, _f, _g;
66329
66301
  super.setAttrFromSpec();
@@ -68539,9 +68511,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
68539
68511
  }
68540
68512
  _createSeries(seriesSpec) {
68541
68513
  seriesSpec.forEach((spec, index) => {
68542
- if (!spec.data) {
68543
- spec.data = this._chartData.getSeriesData(spec.dataId, spec.dataIndex);
68544
- }
68545
68514
  if (spec.type === exports.SeriesTypeEnum.link) {
68546
68515
  spec.dotSeriesSpec = this._spec.series[spec.dotSeriesIndex];
68547
68516
  }
@@ -69227,20 +69196,20 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
69227
69196
  const pointerSpec = this._spec.pointer;
69228
69197
  if (pointerMark) {
69229
69198
  this.setMarkStyle(pointerMark, {
69230
- x: () => {
69199
+ x: (datum) => {
69231
69200
  var _a, _b;
69232
- const { x } = this.angleAxisHelper.center();
69201
+ const { x } = this._getPointerAnchor(datum, pointerSpec);
69233
69202
  const dx = this._getPointerWidth() * ((_b = (_a = pointerSpec === null || pointerSpec === void 0 ? void 0 : pointerSpec.center) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : 0);
69234
69203
  return x - dx;
69235
69204
  },
69236
69205
  y: (datum) => {
69237
69206
  var _a, _b;
69238
- const { y } = this.angleAxisHelper.center();
69207
+ const { y } = this._getPointerAnchor(datum, pointerSpec);
69239
69208
  const dy = this._getPointerHeight(datum) * ((_b = (_a = pointerSpec === null || pointerSpec === void 0 ? void 0 : pointerSpec.center) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : 0);
69240
69209
  return y - dy;
69241
69210
  },
69242
- anchor: () => {
69243
- const { x, y } = this.angleAxisHelper.center();
69211
+ anchor: (datum) => {
69212
+ const { x, y } = this._getPointerAnchor(datum, pointerSpec);
69244
69213
  return [x, y];
69245
69214
  },
69246
69215
  fill: this.getColorAttribute(),
@@ -69267,6 +69236,16 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
69267
69236
  super.initTooltip();
69268
69237
  this._pointerMark && this._tooltipHelper.activeTriggerSet.mark.add(this._pointerMark);
69269
69238
  }
69239
+ _getPointerAnchor(datum, markSpec) {
69240
+ var _a;
69241
+ if ((_a = markSpec.isOnCenter) !== null && _a !== void 0 ? _a : true) {
69242
+ return this.angleAxisHelper.center();
69243
+ }
69244
+ return this.radiusAxisHelper.coordToPoint({
69245
+ radius: this._innerRadius * this._computeLayoutRadius(),
69246
+ angle: this.angleAxisHelper.dataToPosition([datum[this._angleField[0]]])
69247
+ });
69248
+ }
69270
69249
  _getPointerWidth() {
69271
69250
  return this._spec.pointer.width * this._computeLayoutRadius();
69272
69251
  }
@@ -69304,8 +69283,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
69304
69283
  const pinBackgroundSpec = this._spec.pinBackground;
69305
69284
  if (pinBackgroundMark) {
69306
69285
  this.setMarkStyle(pinBackgroundMark, {
69307
- x: () => this.angleAxisHelper.center().x,
69308
- y: () => this.angleAxisHelper.center().y,
69286
+ x: (datum) => this._getPointerAnchor(datum, pinBackgroundSpec).x,
69287
+ y: (datum) => this._getPointerAnchor(datum, pinBackgroundSpec).y,
69309
69288
  scaleX: () => pinBackgroundSpec.width * this._computeLayoutRadius(),
69310
69289
  scaleY: () => pinBackgroundSpec.height * this._computeLayoutRadius(),
69311
69290
  fill: this.getColorAttribute(),
@@ -69318,8 +69297,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
69318
69297
  const pinSpec = this._spec.pin;
69319
69298
  if (pinMark) {
69320
69299
  this.setMarkStyle(pinMark, {
69321
- x: () => this.angleAxisHelper.center().x,
69322
- y: () => this.angleAxisHelper.center().y,
69300
+ x: (datum) => this._getPointerAnchor(datum, pinSpec).x,
69301
+ y: (datum) => this._getPointerAnchor(datum, pinSpec).y,
69323
69302
  scaleX: () => pinSpec.width * this._computeLayoutRadius(),
69324
69303
  scaleY: () => pinSpec.height * this._computeLayoutRadius(),
69325
69304
  fill: this.getColorAttribute(),
@@ -69389,7 +69368,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
69389
69368
  initMark() {
69390
69369
  super.initMark();
69391
69370
  this._trackMark = this._createMark(GaugeSeries.mark.track, {
69392
- parent: this._arcGroupMark
69371
+ parent: this._arcGroupMark,
69372
+ dataView: false
69393
69373
  });
69394
69374
  this._segmentMark = this._createMark(GaugeSeries.mark.segment, {
69395
69375
  parent: this._arcGroupMark,
@@ -69429,6 +69409,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
69429
69409
  this._segmentMark && this._tooltipHelper.activeTriggerSet.mark.add(this._segmentMark);
69430
69410
  }
69431
69411
  initTrackMarkStyle() {
69412
+ var _a;
69432
69413
  const trackMark = this._trackMark;
69433
69414
  if (trackMark) {
69434
69415
  this.setMarkStyle(trackMark, {
@@ -69436,6 +69417,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
69436
69417
  y: () => this.angleAxisHelper.center().y,
69437
69418
  startAngle: this._startAngle,
69438
69419
  endAngle: this._endAngle,
69420
+ innerRadius: () => { var _a; return this._computeLayoutRadius() * ((_a = this._spec.innerRadius) !== null && _a !== void 0 ? _a : 0); },
69421
+ outerRadius: () => { var _a, _b; return this._computeLayoutRadius() * ((_b = (_a = this._spec.radius) !== null && _a !== void 0 ? _a : this._spec.outerRadius) !== null && _b !== void 0 ? _b : 1); },
69422
+ cap: (_a = this._spec.roundCap) !== null && _a !== void 0 ? _a : false,
69423
+ boundsMode: 'imprecise',
69439
69424
  cornerRadius: this._spec.cornerRadius,
69440
69425
  zIndex: 100
69441
69426
  });
@@ -77593,10 +77578,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
77593
77578
  nodeMap: nodeMap
77594
77579
  };
77595
77580
  }
77596
- computeNodeLinks(data) {
77597
- if (!("links" in data)) return this._isHierarchic = !0, this.computeHierarchicNodeLinks(data.nodes);
77598
- let nodes = [];
77599
- const links = [],
77581
+ computeSourceTargetNodeLinks(data) {
77582
+ const nodes = [],
77583
+ links = [],
77600
77584
  nodeMap = {};
77601
77585
  data.nodes && data.nodes.forEach((node, index) => {
77602
77586
  const nodeElement = {
@@ -77611,7 +77595,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
77611
77595
  nodeMap[nodeElement.key] = nodeElement, nodes.push(nodeElement);
77612
77596
  });
77613
77597
  const invalidLinks = [];
77614
- if (data.links.forEach((link, index) => {
77598
+ return data.links.forEach((link, index) => {
77615
77599
  if (isNil$1(link.source) || isNil$1(link.target)) return;
77616
77600
  if (data.nodes && (!nodeMap[link.source] || !nodeMap[link.target])) return;
77617
77601
  data.nodes || nodeMap[link.source] || (nodeMap[link.source] = {
@@ -77642,11 +77626,22 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
77642
77626
  }), this.options.divideNodeValueToLink && invalidLinks.length && invalidLinks.forEach(link => {
77643
77627
  const values = [calcDivideValue(nodeMap[link.source]), calcDivideValue(nodeMap[link.target], !0)].filter(entry => !isNil$1(entry));
77644
77628
  values.length && (link.value = minInArray(values));
77645
- }), this.options.linkSortBy) for (let i = 0, len = nodes.length; i < len; i++) nodes[i].sourceLinks.sort(this.options.linkSortBy), nodes[i].targetLinks.sort(this.options.linkSortBy);
77629
+ }), {
77630
+ nodeMap: nodeMap,
77631
+ nodes: nodes,
77632
+ links: links
77633
+ };
77634
+ }
77635
+ computeNodeLinks(data) {
77636
+ let res;
77637
+ "links" in data ? res = this.computeSourceTargetNodeLinks(data) : (this._isHierarchic = !0, res = this.computeHierarchicNodeLinks(data.nodes));
77638
+ let nodes = res.nodes;
77639
+ const links = res.links;
77640
+ if (this.options.linkSortBy) for (let i = 0, len = nodes.length; i < len; i++) nodes[i].sourceLinks.sort(this.options.linkSortBy), nodes[i].targetLinks.sort(this.options.linkSortBy);
77646
77641
  return this.options.dropIsolatedNode && (nodes = nodes.filter(node => node.targetLinks.length || node.sourceLinks.length)), {
77647
77642
  nodes: nodes,
77648
77643
  links: links,
77649
- nodeMap: nodeMap
77644
+ nodeMap: res.nodeMap
77650
77645
  };
77651
77646
  }
77652
77647
  computeNodeValues(nodes) {
@@ -80522,9 +80517,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
80522
80517
  this._tick = undefined;
80523
80518
  this._visible = (_a = spec.visible) !== null && _a !== void 0 ? _a : true;
80524
80519
  }
80525
- getVRenderComponents() {
80520
+ _getNeedClearVRenderComponents() {
80526
80521
  return [];
80527
80522
  }
80523
+ getVRenderComponents() {
80524
+ var _a, _b;
80525
+ return array((_b = (_a = this._axisMark) === null || _a === void 0 ? void 0 : _a.getProduct()) === null || _b === void 0 ? void 0 : _b.getGroupGraphicItem());
80526
+ }
80528
80527
  created() {
80529
80528
  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
80530
80529
  super.created();
@@ -81278,10 +81277,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
81278
81277
  const axisComponent = product.getGroupGraphicItem();
81279
81278
  const spec = mergeSpec(Object.assign({}, this.getLayoutStartPoint()), this._axisStyle, attrs, { line: { visible: false } });
81280
81279
  const updateBounds = axisComponent.getBoundsWithoutRender(spec);
81280
+ hasBounds = true;
81281
+ this._latestBounds = updateBounds;
81281
81282
  if (isFinite(updateBounds.width())) {
81282
81283
  result = this._appendAxisUnit(updateBounds, isX);
81283
- hasBounds = true;
81284
- this._latestBounds = updateBounds;
81285
81284
  }
81286
81285
  }
81287
81286
  if (!hasBounds) {
@@ -81524,7 +81523,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
81524
81523
  }
81525
81524
  return bounds;
81526
81525
  }
81527
- getVRenderComponents() {
81526
+ _getNeedClearVRenderComponents() {
81528
81527
  return this._unitText ? [this._unitText] : [];
81529
81528
  }
81530
81529
  }
@@ -82893,7 +82892,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
82893
82892
  (_b = (_a = this.effect).onSelectedDataChange) === null || _b === void 0 ? void 0 : _b.call(_a);
82894
82893
  this.event.emit(exports.ChartEvent.legendSelectedDataChange, { model: this });
82895
82894
  }
82896
- getVRenderComponents() {
82895
+ _getNeedClearVRenderComponents() {
82897
82896
  return [this._legendComponent];
82898
82897
  }
82899
82898
  clear() {
@@ -84031,8 +84030,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
84031
84030
  let changePositionOnly = !!params.changePositionOnly;
84032
84031
  if (!params.changePositionOnly || ((_a = this._cacheActualTooltip) === null || _a === void 0 ? void 0 : _a.activeType) !== activeType) {
84033
84032
  changePositionOnly = false;
84034
- this._cacheViewSpec = undefined;
84035
- this._cacheActualTooltip = undefined;
84033
+ this._clearCacheOfContent();
84036
84034
  }
84037
84035
  if (changePositionOnly && this._cacheViewSpec && this._cacheActualTooltip) {
84038
84036
  return this.changeTooltipPosition(changePositionOnly, data, params);
@@ -84046,8 +84044,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
84046
84044
  return TooltipResult.failed;
84047
84045
  }
84048
84046
  if (!visible) {
84049
- this._cacheViewSpec = undefined;
84050
- this._cacheActualTooltip = undefined;
84047
+ this._clearAllCache();
84051
84048
  if (tooltipSpec.handler) {
84052
84049
  return (_c = (_b = (_a = tooltipSpec.handler).hideTooltip) === null || _b === void 0 ? void 0 : _b.call(_a, params)) !== null && _c !== void 0 ? _c : TooltipResult.success;
84053
84050
  }
@@ -84101,6 +84098,21 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
84101
84098
  if (!spec || !actualTooltip) {
84102
84099
  return TooltipResult.failed;
84103
84100
  }
84101
+ if (spec.enterable) {
84102
+ if (!this._isPointerEscaped && this._isPointerMovingToTooltip(params)) {
84103
+ if (!this._isTooltipPaused) {
84104
+ this._isTooltipPaused = true;
84105
+ this._cachePointerTimer = setTimeout(() => {
84106
+ this._isPointerEscaped = true;
84107
+ }, 300);
84108
+ }
84109
+ return TooltipResult.success;
84110
+ }
84111
+ this._isTooltipPaused = false;
84112
+ this._isPointerEscaped = false;
84113
+ clearTimeout(this._cachePointerTimer);
84114
+ this._cachePointerPosition = this._getPointerPositionRelativeToTooltipParent(params);
84115
+ }
84104
84116
  const activeType = actualTooltip.activeType;
84105
84117
  if (spec.handler) {
84106
84118
  return (_c = (_b = (_a = spec.handler).showTooltip) === null || _b === void 0 ? void 0 : _b.call(_a, activeType, data, params)) !== null && _c !== void 0 ? _c : TooltipResult.success;
@@ -84141,6 +84153,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
84141
84153
  const { offsetX, offsetY } = this._option;
84142
84154
  const tooltipSpec = this._cacheViewSpec;
84143
84155
  if (!tooltipSpec) {
84156
+ this._cacheTooltipPosition = undefined;
84144
84157
  return invalidPosition;
84145
84158
  }
84146
84159
  const { activeType, data } = actualTooltip;
@@ -84407,7 +84420,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
84407
84420
  detectTopLast();
84408
84421
  break;
84409
84422
  }
84410
- return { x, y };
84423
+ const result = { x, y };
84424
+ this._cacheTooltipPosition = result;
84425
+ this._cacheTooltipSize = { width: tooltipBoxWidth, height: tooltipBoxHeight };
84426
+ return result;
84411
84427
  };
84412
84428
  this._component = component;
84413
84429
  this._chartOption = component.getOption();
@@ -84422,8 +84438,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
84422
84438
  }
84423
84439
  release() {
84424
84440
  var _a, _b, _c;
84425
- this._cacheViewSpec = undefined;
84426
- this._cacheActualTooltip = undefined;
84441
+ this._clearAllCache();
84427
84442
  const spec = (_a = this._component.getSpec()) !== null && _a !== void 0 ? _a : {};
84428
84443
  if (spec.handler) {
84429
84444
  (_c = (_b = spec.handler).release) === null || _c === void 0 ? void 0 : _c.call(_b);
@@ -84432,6 +84447,23 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
84432
84447
  this._removeTooltip();
84433
84448
  this._isReleased = true;
84434
84449
  }
84450
+ _clearAllCache() {
84451
+ this._clearCacheOfContent();
84452
+ this._clearCacheOfPosition();
84453
+ }
84454
+ _clearCacheOfContent() {
84455
+ this._cacheViewSpec = undefined;
84456
+ this._cacheActualTooltip = undefined;
84457
+ }
84458
+ _clearCacheOfPosition() {
84459
+ this._isTooltipPaused = false;
84460
+ this._isPointerEscaped = false;
84461
+ clearTimeout(this._cachePointerTimer);
84462
+ this._cachePointerTimer = -1;
84463
+ this._cachePointerPosition = undefined;
84464
+ this._cacheTooltipPosition = undefined;
84465
+ this._cacheTooltipSize = undefined;
84466
+ }
84435
84467
  _throttle(callback) {
84436
84468
  const tooltipSpec = this._component.getSpec();
84437
84469
  let wait;
@@ -84464,6 +84496,68 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
84464
84496
  height: (_f = (_e = this._attributes) === null || _e === void 0 ? void 0 : _e.panel) === null || _f === void 0 ? void 0 : _f.height
84465
84497
  };
84466
84498
  }
84499
+ _getPointerPositionRelativeToTooltipParent(params) {
84500
+ var _a, _b;
84501
+ let { canvasX: x, canvasY: y } = params.event;
84502
+ const invalidPosition = {
84503
+ x: Infinity,
84504
+ y: Infinity
84505
+ };
84506
+ const tooltipSpec = this._cacheViewSpec;
84507
+ const isCanvas = tooltipSpec.renderMode === 'canvas';
84508
+ const tooltipParentElement = this._getParentElement(tooltipSpec);
84509
+ let relativePosOffset = { x: 0, y: 0 };
84510
+ let tooltipParentElementRect = { x: 0, y: 0 };
84511
+ let chartElementScale = 1;
84512
+ let tooltipParentElementScale = 1;
84513
+ if (isTrueBrowser(this._env) && !tooltipSpec.confine) {
84514
+ if (!isCanvas) {
84515
+ tooltipParentElementRect = (_a = tooltipParentElement === null || tooltipParentElement === void 0 ? void 0 : tooltipParentElement.getBoundingClientRect()) !== null && _a !== void 0 ? _a : invalidPosition;
84516
+ const chartElement = ((_b = this._compiler.getCanvas()) !== null && _b !== void 0 ? _b : this._chartContainer);
84517
+ const chartElementRect = chartElement === null || chartElement === void 0 ? void 0 : chartElement.getBoundingClientRect();
84518
+ relativePosOffset = {
84519
+ x: chartElementRect.x - tooltipParentElementRect.x,
84520
+ y: chartElementRect.y - tooltipParentElementRect.y
84521
+ };
84522
+ chartElementScale = getScale(chartElement, chartElementRect);
84523
+ tooltipParentElementScale = getScale(tooltipParentElement, tooltipParentElementRect);
84524
+ }
84525
+ }
84526
+ x *= chartElementScale;
84527
+ y *= chartElementScale;
84528
+ if (isTrueBrowser(this._env)) {
84529
+ x += relativePosOffset.x;
84530
+ y += relativePosOffset.y;
84531
+ }
84532
+ x /= tooltipParentElementScale;
84533
+ y /= tooltipParentElementScale;
84534
+ return { x, y };
84535
+ }
84536
+ _isPointerMovingToTooltip(params) {
84537
+ if (!this._cacheTooltipPosition || !this._cacheTooltipSize || !this._cachePointerPosition) {
84538
+ return false;
84539
+ }
84540
+ const { width: tooltipWidth, height: tooltipHeight } = this._cacheTooltipSize;
84541
+ const { x: tooltipX = 0, y: tooltipY } = this._cacheTooltipPosition;
84542
+ const pos = this._getPointerPositionRelativeToTooltipParent(params);
84543
+ if (isPointInRect(pos, {
84544
+ x: tooltipX,
84545
+ y: tooltipY,
84546
+ width: tooltipWidth,
84547
+ height: tooltipHeight
84548
+ })) {
84549
+ return true;
84550
+ }
84551
+ const a = { x: tooltipX, y: tooltipY };
84552
+ const b = { x: a.x + tooltipWidth, y: a.y };
84553
+ const c = { x: a.x, y: a.y + tooltipHeight };
84554
+ const d = { x: b.x, y: c.y };
84555
+ const oldPos = this._cachePointerPosition;
84556
+ return (isPointInTriangle(pos, oldPos, a, b) ||
84557
+ isPointInTriangle(pos, oldPos, c, d) ||
84558
+ isPointInTriangle(pos, oldPos, a, d) ||
84559
+ isPointInTriangle(pos, oldPos, b, c));
84560
+ }
84467
84561
  _getParentElement(spec) {
84468
84562
  return spec.parentElement;
84469
84563
  }
@@ -86049,7 +86143,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
86049
86143
  }
86050
86144
  changeRegions(regions) {
86051
86145
  }
86052
- getVRenderComponents() {
86146
+ _getNeedClearVRenderComponents() {
86053
86147
  return [];
86054
86148
  }
86055
86149
  _registerEvent() {
@@ -86239,19 +86333,19 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
86239
86333
  var _a, _b;
86240
86334
  if (this._spec.enterable && this._spec.renderMode === 'html') {
86241
86335
  const { event } = params;
86242
- let target;
86336
+ let newTarget;
86243
86337
  if (isValid$1(event.nativeEvent)) {
86244
86338
  const nativeEvent = event.nativeEvent;
86245
- target = nativeEvent.target;
86339
+ newTarget = nativeEvent.relatedTarget;
86246
86340
  if (nativeEvent.composedPath && nativeEvent.composedPath().length > 0) {
86247
- target = nativeEvent.composedPath()[0];
86341
+ newTarget = nativeEvent.composedPath()[0];
86248
86342
  }
86249
86343
  }
86250
86344
  else {
86251
- target = event.target;
86345
+ newTarget = event.relatedTarget;
86252
86346
  }
86253
86347
  const container = (_b = (_a = this.tooltipHandler) === null || _a === void 0 ? void 0 : _a.getTooltipContainer) === null || _b === void 0 ? void 0 : _b.call(_a);
86254
- if (isValid$1(container) && isValid$1(target) && hasParentElement(target, container)) {
86348
+ if (isValid$1(container) && isValid$1(newTarget) && hasParentElement(newTarget, container)) {
86255
86349
  return true;
86256
86350
  }
86257
86351
  }
@@ -87042,7 +87136,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
87042
87136
  }
87043
87137
  limitTagInBounds(label, this._getLimitBounds());
87044
87138
  }
87045
- getVRenderComponents() {
87139
+ _getNeedClearVRenderComponents() {
87046
87140
  return [
87047
87141
  this._xCrosshair,
87048
87142
  this._xTopLabel,
@@ -87402,7 +87496,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
87402
87496
  }
87403
87497
  limitTagInBounds(label, this._getLimitBounds());
87404
87498
  }
87405
- getVRenderComponents() {
87499
+ _getNeedClearVRenderComponents() {
87406
87500
  return [
87407
87501
  this._radiusCrosshair,
87408
87502
  this._radiusLabelCrosshair,
@@ -88105,7 +88199,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
88105
88199
  this._cacheVisibility = isShown;
88106
88200
  return isShown;
88107
88201
  }
88108
- getVRenderComponents() {
88202
+ _getNeedClearVRenderComponents() {
88109
88203
  return [this._component];
88110
88204
  }
88111
88205
  }
@@ -88422,7 +88516,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
88422
88516
  }
88423
88517
  };
88424
88518
  }
88425
- getVRenderComponents() {
88519
+ _getNeedClearVRenderComponents() {
88426
88520
  return [this._component];
88427
88521
  }
88428
88522
  }
@@ -88567,7 +88661,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
88567
88661
  }
88568
88662
  return attrs;
88569
88663
  }
88570
- getVRenderComponents() {
88664
+ _getNeedClearVRenderComponents() {
88571
88665
  return [this._component];
88572
88666
  }
88573
88667
  }
@@ -88767,7 +88861,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
88767
88861
  isRelativeModel(model) {
88768
88862
  return eachSeries(this._regions, s => model === s) || this._regions.includes(model);
88769
88863
  }
88770
- getVRenderComponents() {
88864
+ _getNeedClearVRenderComponents() {
88771
88865
  return [this._indicatorComponent];
88772
88866
  }
88773
88867
  clear() {
@@ -89160,7 +89254,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
89160
89254
  (_a = this._option) === null || _a === void 0 ? void 0 : _a.onError('need at least one series');
89161
89255
  return null;
89162
89256
  }
89163
- getVRenderComponents() {
89257
+ _getNeedClearVRenderComponents() {
89164
89258
  return [this._markerComponent];
89165
89259
  }
89166
89260
  onLayoutStart(layoutRect, chartViewRect, ctx) {
@@ -89618,7 +89712,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
89618
89712
  this._cacheAttrs = attrs;
89619
89713
  return this._titleComponent;
89620
89714
  }
89621
- getVRenderComponents() {
89715
+ _getNeedClearVRenderComponents() {
89622
89716
  return [this._titleComponent];
89623
89717
  }
89624
89718
  clear() {
@@ -90020,7 +90114,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
90020
90114
  }
90021
90115
  onRender(ctx) {
90022
90116
  }
90023
- getVRenderComponents() {
90117
+ _getNeedClearVRenderComponents() {
90024
90118
  return [this._playerComponent];
90025
90119
  }
90026
90120
  _computeLayoutRect(rect, width, height) {
@@ -90132,7 +90226,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
90132
90226
  }
90133
90227
  changeRegions(regions) {
90134
90228
  }
90135
- getVRenderComponents() {
90229
+ _getNeedClearVRenderComponents() {
90136
90230
  return [];
90137
90231
  }
90138
90232
  }
@@ -90393,6 +90487,16 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
90393
90487
  });
90394
90488
  });
90395
90489
  }
90490
+ getVRenderComponents() {
90491
+ const labels = [];
90492
+ this._labelComponentMap.forEach((info, component) => {
90493
+ const graphicItem = component.getProduct().getGroupGraphicItem();
90494
+ if (graphicItem) {
90495
+ labels.push(graphicItem);
90496
+ }
90497
+ });
90498
+ return labels;
90499
+ }
90396
90500
  }
90397
90501
  Label.type = ComponentTypeEnum.label;
90398
90502
  const registerLabel = () => {
@@ -90502,6 +90606,16 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
90502
90606
  });
90503
90607
  });
90504
90608
  }
90609
+ getVRenderComponents() {
90610
+ const labels = [];
90611
+ this.getMarks().forEach(m => {
90612
+ const graphicItem = m.getProduct().getGroupGraphicItem();
90613
+ if (graphicItem) {
90614
+ labels.push(graphicItem);
90615
+ }
90616
+ });
90617
+ return labels;
90618
+ }
90505
90619
  }
90506
90620
  TotalLabel.type = ComponentTypeEnum.totalLabel;
90507
90621
  function totalLabelPosition(series, type) {
@@ -91002,7 +91116,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
91002
91116
  }
91003
91117
  changeRegions(regions) {
91004
91118
  }
91005
- getVRenderComponents() {
91119
+ _getNeedClearVRenderComponents() {
91006
91120
  return this._brushComponents;
91007
91121
  }
91008
91122
  _compareSpec() {
@@ -91140,7 +91254,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
91140
91254
  }
91141
91255
  changeRegions(regions) {
91142
91256
  }
91143
- getVRenderComponents() {
91257
+ _getNeedClearVRenderComponents() {
91144
91258
  return [];
91145
91259
  }
91146
91260
  onRender(ctx) {
@@ -91666,8 +91780,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
91666
91780
  }
91667
91781
  changeRegions() {
91668
91782
  }
91669
- getVRenderComponents() {
91670
- return [];
91783
+ _getNeedClearVRenderComponents() {
91784
+ return this._markerComponents;
91671
91785
  }
91672
91786
  }
91673
91787
  MapLabelComponent.type = ComponentTypeEnum.mapLabel;