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

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 (1059) hide show
  1. package/build/es5/index.js +2 -2
  2. package/build/index.js +49567 -46010
  3. package/build/index.min.js +1 -1
  4. package/build/tsconfig.tsbuildinfo +1 -1
  5. package/cjs/animation/utils.d.ts +2 -2
  6. package/cjs/animation/utils.js +2 -2
  7. package/cjs/animation/utils.js.map +1 -1
  8. package/cjs/chart/base/base-chart-transformer.js +5 -2
  9. package/cjs/chart/base/base-chart-transformer.js.map +1 -1
  10. package/cjs/chart/base/base-chart.d.ts +4 -2
  11. package/cjs/chart/base/base-chart.js +24 -11
  12. package/cjs/chart/base/base-chart.js.map +1 -1
  13. package/cjs/chart/cartesian/cartesian-transformer.js +2 -2
  14. package/cjs/chart/cartesian/cartesian-transformer.js.map +1 -1
  15. package/cjs/chart/common/common-transformer.js +3 -2
  16. package/cjs/chart/common/common-transformer.js.map +1 -1
  17. package/cjs/chart/common/interface.d.ts +2 -2
  18. package/cjs/chart/common/interface.js.map +1 -1
  19. package/cjs/chart/index.d.ts +6 -4
  20. package/cjs/chart/index.js +21 -2
  21. package/cjs/chart/index.js.map +1 -1
  22. package/cjs/chart/interface/chart.d.ts +6 -1
  23. package/cjs/chart/interface/chart.js.map +1 -1
  24. package/cjs/chart/interface/type.d.ts +2 -1
  25. package/cjs/chart/interface/type.js +1 -1
  26. package/cjs/chart/interface/type.js.map +1 -1
  27. package/cjs/chart/polar/polar-transformer.js.map +1 -1
  28. package/cjs/chart/polar/progress-like/progress-like-transformer.js +3 -3
  29. package/cjs/chart/polar/progress-like/progress-like-transformer.js.map +1 -1
  30. package/cjs/chart/radar/radar-transformer.js +3 -3
  31. package/cjs/chart/radar/radar-transformer.js.map +1 -1
  32. package/cjs/chart/range-column/range-column-transformer.js +5 -1
  33. package/cjs/chart/range-column/range-column-transformer.js.map +1 -1
  34. package/cjs/chart/rose/rose-transformer.js +2 -2
  35. package/cjs/chart/rose/rose-transformer.js.map +1 -1
  36. package/cjs/chart/sequence/sequence-transformer.js.map +1 -1
  37. package/cjs/chart/sequence/sequence.js +3 -2
  38. package/cjs/chart/sequence/sequence.js.map +1 -1
  39. package/cjs/chart/stack.js +2 -1
  40. package/cjs/chart/treemap/treemap-transformer.js.map +1 -1
  41. package/cjs/chart/util.js +4 -3
  42. package/cjs/chart/util.js.map +1 -1
  43. package/cjs/chart/venn/index.d.ts +3 -0
  44. package/cjs/chart/venn/index.js +22 -0
  45. package/cjs/chart/venn/index.js.map +1 -0
  46. package/cjs/chart/venn/interface.d.ts +6 -0
  47. package/cjs/chart/venn/interface.js +6 -0
  48. package/cjs/chart/venn/interface.js.map +1 -0
  49. package/cjs/chart/venn/venn-transformer.d.ts +7 -0
  50. package/cjs/chart/venn/venn-transformer.js +28 -0
  51. package/cjs/chart/venn/venn-transformer.js.map +1 -0
  52. package/cjs/chart/venn/venn.d.ts +14 -0
  53. package/cjs/chart/venn/venn.js +24 -0
  54. package/cjs/chart/venn/venn.js.map +1 -0
  55. package/cjs/compile/data/compilable-data.js +3 -1
  56. package/cjs/compile/data/compilable-data.js.map +1 -1
  57. package/cjs/compile/grammar-item.js +1 -2
  58. package/cjs/compile/interface/compiler.d.ts +1 -0
  59. package/cjs/compile/interface/compiler.js.map +1 -1
  60. package/cjs/compile/mark/compilable-mark.d.ts +2 -1
  61. package/cjs/compile/mark/compilable-mark.js +4 -0
  62. package/cjs/compile/mark/compilable-mark.js.map +1 -1
  63. package/cjs/compile/mark/interface.d.ts +1 -0
  64. package/cjs/compile/mark/interface.js.map +1 -1
  65. package/cjs/component/axis/base-axis.d.ts +2 -0
  66. package/cjs/component/axis/base-axis.js +13 -6
  67. package/cjs/component/axis/base-axis.js.map +1 -1
  68. package/cjs/component/axis/cartesian/axis.d.ts +1 -2
  69. package/cjs/component/axis/cartesian/axis.js +30 -38
  70. package/cjs/component/axis/cartesian/axis.js.map +1 -1
  71. package/cjs/component/axis/cartesian/interface/common.d.ts +1 -0
  72. package/cjs/component/axis/cartesian/interface/common.js.map +1 -1
  73. package/cjs/component/axis/cartesian/time-axis.js +2 -2
  74. package/cjs/component/axis/cartesian/time-axis.js.map +1 -1
  75. package/cjs/component/axis/interface/spec.d.ts +2 -0
  76. package/cjs/component/axis/interface/spec.js.map +1 -1
  77. package/cjs/component/axis/mixin/band-axis-mixin.js +2 -2
  78. package/cjs/component/axis/mixin/band-axis-mixin.js.map +1 -1
  79. package/cjs/component/axis/mixin/linear-axis-mixin.d.ts +12 -3
  80. package/cjs/component/axis/mixin/linear-axis-mixin.js +47 -15
  81. package/cjs/component/axis/mixin/linear-axis-mixin.js.map +1 -1
  82. package/cjs/component/axis/polar/axis.d.ts +0 -1
  83. package/cjs/component/axis/polar/axis.js +7 -11
  84. package/cjs/component/axis/polar/axis.js.map +1 -1
  85. package/cjs/component/axis/polar/interface/common.d.ts +1 -0
  86. package/cjs/component/axis/polar/interface/common.js.map +1 -1
  87. package/cjs/component/axis/polar/linear-axis.d.ts +5 -1
  88. package/cjs/component/axis/polar/linear-axis.js +5 -1
  89. package/cjs/component/axis/polar/linear-axis.js.map +1 -1
  90. package/cjs/component/axis/util.js +3 -3
  91. package/cjs/component/axis/util.js.map +1 -1
  92. package/cjs/component/base/base-component.d.ts +1 -0
  93. package/cjs/component/base/base-component.js +14 -6
  94. package/cjs/component/base/base-component.js.map +1 -1
  95. package/cjs/component/base/util.js +12 -12
  96. package/cjs/component/base/util.js.map +1 -1
  97. package/cjs/component/common/trigger/mobile.js +1 -2
  98. package/cjs/component/common/trigger/mobile.js.map +1 -1
  99. package/cjs/component/crosshair/base.d.ts +1 -2
  100. package/cjs/component/crosshair/base.js +4 -6
  101. package/cjs/component/crosshair/base.js.map +1 -1
  102. package/cjs/component/crosshair/cartesian.js +1 -3
  103. package/cjs/component/crosshair/cartesian.js.map +1 -1
  104. package/cjs/component/crosshair/interface/cartesian.d.ts +11 -24
  105. package/cjs/component/crosshair/interface/cartesian.js.map +1 -1
  106. package/cjs/component/crosshair/interface/polar.d.ts +7 -5
  107. package/cjs/component/crosshair/interface/polar.js.map +1 -1
  108. package/cjs/component/crosshair/polar.js +2 -5
  109. package/cjs/component/crosshair/polar.js.map +1 -1
  110. package/cjs/component/crosshair/utils/cartesian.js +14 -14
  111. package/cjs/component/crosshair/utils/cartesian.js.map +1 -1
  112. package/cjs/component/crosshair/utils/common.js +6 -5
  113. package/cjs/component/crosshair/utils/common.js.map +1 -1
  114. package/cjs/component/crosshair/utils/polar.js +17 -11
  115. package/cjs/component/crosshair/utils/polar.js.map +1 -1
  116. package/cjs/component/custom-mark/custom-mark.d.ts +11 -4
  117. package/cjs/component/custom-mark/custom-mark.js +43 -12
  118. package/cjs/component/custom-mark/custom-mark.js.map +1 -1
  119. package/cjs/component/data-zoom/data-filter-base-component.d.ts +3 -2
  120. package/cjs/component/data-zoom/data-filter-base-component.js +15 -11
  121. package/cjs/component/data-zoom/data-filter-base-component.js.map +1 -1
  122. package/cjs/component/data-zoom/data-zoom/data-zoom-transformer.js +2 -2
  123. package/cjs/component/data-zoom/data-zoom/data-zoom-transformer.js.map +1 -1
  124. package/cjs/component/data-zoom/data-zoom/data-zoom.js +3 -3
  125. package/cjs/component/data-zoom/data-zoom/data-zoom.js.map +1 -1
  126. package/cjs/component/data-zoom/interface.d.ts +1 -4
  127. package/cjs/component/data-zoom/interface.js +1 -5
  128. package/cjs/component/data-zoom/interface.js.map +1 -1
  129. package/cjs/component/data-zoom/scroll-bar/scroll-bar.js.map +1 -1
  130. package/cjs/component/data-zoom/util.js.map +1 -1
  131. package/cjs/component/geo/geo-coordinate.js +2 -2
  132. package/cjs/component/geo/geo-coordinate.js.map +1 -1
  133. package/cjs/component/index.d.ts +7 -7
  134. package/cjs/component/index.js +48 -8
  135. package/cjs/component/index.js.map +1 -1
  136. package/cjs/component/indicator/indicator.js +2 -2
  137. package/cjs/component/indicator/indicator.js.map +1 -1
  138. package/cjs/component/interface/theme.d.ts +4 -0
  139. package/cjs/component/interface/theme.js.map +1 -1
  140. package/cjs/component/interface/type.d.ts +4 -0
  141. package/cjs/component/interface/type.js +3 -1
  142. package/cjs/component/interface/type.js.map +1 -1
  143. package/cjs/component/label/label.js +4 -5
  144. package/cjs/component/label/label.js.map +1 -1
  145. package/cjs/component/label/total-label.js +10 -3
  146. package/cjs/component/label/total-label.js.map +1 -1
  147. package/cjs/component/label/util.d.ts +9 -1
  148. package/cjs/component/label/util.js +25 -9
  149. package/cjs/component/label/util.js.map +1 -1
  150. package/cjs/component/legend/base-legend.js +13 -7
  151. package/cjs/component/legend/base-legend.js.map +1 -1
  152. package/cjs/component/legend/continuous/interface.d.ts +1 -0
  153. package/cjs/component/legend/continuous/interface.js.map +1 -1
  154. package/cjs/component/legend/continuous/legend.js +4 -1
  155. package/cjs/component/legend/continuous/legend.js.map +1 -1
  156. package/cjs/component/legend/continuous/util.js +3 -3
  157. package/cjs/component/legend/continuous/util.js.map +1 -1
  158. package/cjs/component/legend/discrete/interface.d.ts +1 -0
  159. package/cjs/component/legend/discrete/interface.js.map +1 -1
  160. package/cjs/component/legend/discrete/legend.d.ts +4 -1
  161. package/cjs/component/legend/discrete/legend.js +20 -9
  162. package/cjs/component/legend/discrete/legend.js.map +1 -1
  163. package/cjs/component/legend/discrete/util.js +7 -6
  164. package/cjs/component/legend/discrete/util.js.map +1 -1
  165. package/cjs/component/legend/util.d.ts +12 -2
  166. package/cjs/component/legend/util.js +2 -2
  167. package/cjs/component/legend/util.js.map +1 -1
  168. package/cjs/component/map-label/component.js +2 -1
  169. package/cjs/component/map-label/component.js.map +1 -1
  170. package/cjs/component/marker/base-marker.d.ts +30 -44
  171. package/cjs/component/marker/base-marker.js +103 -45
  172. package/cjs/component/marker/base-marker.js.map +1 -1
  173. package/cjs/component/marker/interface.d.ts +40 -13
  174. package/cjs/component/marker/interface.js.map +1 -1
  175. package/cjs/component/marker/mark-area/base-mark-area.d.ts +18 -0
  176. package/cjs/component/marker/mark-area/base-mark-area.js +99 -0
  177. package/cjs/component/marker/mark-area/base-mark-area.js.map +1 -0
  178. package/cjs/component/marker/mark-area/cartesian-mark-area.d.ts +19 -0
  179. package/cjs/component/marker/mark-area/cartesian-mark-area.js +85 -0
  180. package/cjs/component/marker/mark-area/cartesian-mark-area.js.map +1 -0
  181. package/cjs/component/marker/mark-area/index.d.ts +2 -1
  182. package/cjs/component/marker/mark-area/index.js +2 -1
  183. package/cjs/component/marker/mark-area/index.js.map +1 -1
  184. package/cjs/component/marker/mark-area/interface/spec.d.ts +16 -1
  185. package/cjs/component/marker/mark-area/interface/spec.js.map +1 -1
  186. package/cjs/component/marker/mark-area/interface/theme.d.ts +5 -7
  187. package/cjs/component/marker/mark-area/interface/theme.js.map +1 -1
  188. package/cjs/component/marker/mark-area/polar-mark-area.d.ts +25 -0
  189. package/cjs/component/marker/mark-area/polar-mark-area.js +104 -0
  190. package/cjs/component/marker/mark-area/polar-mark-area.js.map +1 -0
  191. package/cjs/component/marker/mark-line/base-mark-line.d.ts +18 -0
  192. package/cjs/component/marker/mark-line/base-mark-line.js +116 -0
  193. package/cjs/component/marker/mark-line/base-mark-line.js.map +1 -0
  194. package/cjs/component/marker/mark-line/cartesian-mark-line.d.ts +20 -0
  195. package/cjs/component/marker/mark-line/cartesian-mark-line.js +185 -0
  196. package/cjs/component/marker/mark-line/cartesian-mark-line.js.map +1 -0
  197. package/cjs/component/marker/mark-line/index.d.ts +2 -1
  198. package/cjs/component/marker/mark-line/index.js +2 -1
  199. package/cjs/component/marker/mark-line/index.js.map +1 -1
  200. package/cjs/component/marker/mark-line/interface/spec.d.ts +26 -2
  201. package/cjs/component/marker/mark-line/interface/spec.js.map +1 -1
  202. package/cjs/component/marker/mark-line/interface/theme.d.ts +5 -7
  203. package/cjs/component/marker/mark-line/interface/theme.js.map +1 -1
  204. package/cjs/component/marker/mark-line/polar-mark-line.d.ts +23 -0
  205. package/cjs/component/marker/mark-line/polar-mark-line.js +110 -0
  206. package/cjs/component/marker/mark-line/polar-mark-line.js.map +1 -0
  207. package/cjs/component/marker/mark-point/{mark-point.d.ts → base-mark-point.d.ts} +5 -9
  208. package/cjs/component/marker/mark-point/base-mark-point.js +128 -0
  209. package/cjs/component/marker/mark-point/base-mark-point.js.map +1 -0
  210. package/cjs/component/marker/mark-point/cartesian-mark-point.d.ts +16 -0
  211. package/cjs/component/marker/mark-point/cartesian-mark-point.js +50 -0
  212. package/cjs/component/marker/mark-point/cartesian-mark-point.js.map +1 -0
  213. package/cjs/component/marker/mark-point/geo-mark-point.d.ts +14 -0
  214. package/cjs/component/marker/mark-point/geo-mark-point.js +39 -0
  215. package/cjs/component/marker/mark-point/geo-mark-point.js.map +1 -0
  216. package/cjs/component/marker/mark-point/index.d.ts +3 -1
  217. package/cjs/component/marker/mark-point/index.js +2 -1
  218. package/cjs/component/marker/mark-point/index.js.map +1 -1
  219. package/cjs/component/marker/mark-point/interface/spec.d.ts +9 -1
  220. package/cjs/component/marker/mark-point/interface/spec.js.map +1 -1
  221. package/cjs/component/marker/mark-point/interface/theme.d.ts +11 -16
  222. package/cjs/component/marker/mark-point/interface/theme.js.map +1 -1
  223. package/cjs/component/marker/mark-point/polar-mark-point.d.ts +18 -0
  224. package/cjs/component/marker/mark-point/polar-mark-point.js +47 -0
  225. package/cjs/component/marker/mark-point/polar-mark-point.js.map +1 -0
  226. package/cjs/component/marker/utils.d.ts +40 -5
  227. package/cjs/component/marker/utils.js +148 -13
  228. package/cjs/component/marker/utils.js.map +1 -1
  229. package/cjs/component/player/player.d.ts +2 -1
  230. package/cjs/component/player/player.js +16 -9
  231. package/cjs/component/player/player.js.map +1 -1
  232. package/cjs/component/player/utils/transform.js +3 -2
  233. package/cjs/component/player/utils/transform.js.map +1 -1
  234. package/cjs/component/tooltip/tooltip-transformer.js +3 -2
  235. package/cjs/component/tooltip/tooltip-transformer.js.map +1 -1
  236. package/cjs/component/tooltip/tooltip.d.ts +1 -1
  237. package/cjs/component/tooltip/tooltip.js +13 -11
  238. package/cjs/component/tooltip/tooltip.js.map +1 -1
  239. package/cjs/component/tooltip/utils/compose.js +3 -3
  240. package/cjs/component/tooltip/utils/compose.js.map +1 -1
  241. package/cjs/component/tooltip/utils/get-spec.js +2 -2
  242. package/cjs/component/tooltip/utils/get-spec.js.map +1 -1
  243. package/cjs/component/tooltip/utils/index.d.ts +1 -0
  244. package/cjs/component/tooltip/utils/index.js +1 -1
  245. package/cjs/component/tooltip/utils/index.js.map +1 -1
  246. package/cjs/{plugin/components/tooltip-handler → component/tooltip}/utils/pattern.d.ts +3 -3
  247. package/cjs/component/tooltip/utils/pattern.js.map +1 -0
  248. package/cjs/component/tooltip/utils/show-tooltip.d.ts +20 -3
  249. package/cjs/component/tooltip/utils/show-tooltip.js +107 -93
  250. package/cjs/component/tooltip/utils/show-tooltip.js.map +1 -1
  251. package/cjs/core/factory.d.ts +1 -1
  252. package/cjs/core/factory.js +0 -1
  253. package/cjs/core/factory.js.map +1 -1
  254. package/cjs/core/index.d.ts +1 -1
  255. package/cjs/core/index.js +1 -1
  256. package/cjs/core/index.js.map +1 -1
  257. package/cjs/core/interface.d.ts +5 -1
  258. package/cjs/core/interface.js.map +1 -1
  259. package/cjs/core/vchart.d.ts +2 -2
  260. package/cjs/core/vchart.js +47 -24
  261. package/cjs/core/vchart.js.map +1 -1
  262. package/cjs/data/transforms/aggregation.d.ts +12 -7
  263. package/cjs/data/transforms/aggregation.js +16 -1
  264. package/cjs/data/transforms/aggregation.js.map +1 -1
  265. package/cjs/data/transforms/invalid-travel.d.ts +1 -1
  266. package/cjs/data/transforms/invalid-travel.js +4 -2
  267. package/cjs/data/transforms/invalid-travel.js.map +1 -1
  268. package/cjs/data/transforms/legend-data/continuous/continuous.js +3 -2
  269. package/cjs/data/transforms/legend-data/continuous/continuous.js.map +1 -1
  270. package/cjs/data/transforms/legend-data/discrete/discrete.js +2 -2
  271. package/cjs/data/transforms/legend-data/discrete/discrete.js.map +1 -1
  272. package/cjs/data/transforms/legend-data/discrete/interface.d.ts +2 -0
  273. package/cjs/data/transforms/legend-data/discrete/interface.js.map +1 -1
  274. package/cjs/data/transforms/pie.js +3 -2
  275. package/cjs/data/transforms/pie.js.map +1 -1
  276. package/cjs/data/transforms/waterfall.js +4 -2
  277. package/cjs/data/transforms/waterfall.js.map +1 -1
  278. package/cjs/event/event-dispatcher.js +8 -1
  279. package/cjs/event/event-dispatcher.js.map +1 -1
  280. package/cjs/event/interface.d.ts +2 -0
  281. package/cjs/event/interface.js.map +1 -1
  282. package/cjs/index-lark.js +1 -1
  283. package/cjs/index-lark.js.map +1 -1
  284. package/cjs/index-wx.js +1 -1
  285. package/cjs/index-wx.js.map +1 -1
  286. package/cjs/layout/base-layout.js +6 -5
  287. package/cjs/layout/base-layout.js.map +1 -1
  288. package/cjs/layout/grid-layout/grid-layout.d.ts +1 -1
  289. package/cjs/layout/grid-layout/grid-layout.js +4 -4
  290. package/cjs/layout/grid-layout/grid-layout.js.map +1 -1
  291. package/cjs/layout/layout-item.js +1 -1
  292. package/cjs/layout/layout-item.js.map +1 -1
  293. package/cjs/mark/base/base-mark.js +2 -2
  294. package/cjs/mark/base/base-mark.js.map +1 -1
  295. package/cjs/mark/index.d.ts +20 -20
  296. package/cjs/mark/index.js +95 -22
  297. package/cjs/mark/index.js.map +1 -1
  298. package/cjs/model/base-model-transformer.js +2 -2
  299. package/cjs/model/base-model-transformer.js.map +1 -1
  300. package/cjs/model/base-model.js +1 -1
  301. package/cjs/model/base-model.js.map +1 -1
  302. package/cjs/model/interface.d.ts +1 -0
  303. package/cjs/model/interface.js.map +1 -1
  304. package/cjs/model/layout-model.js +3 -2
  305. package/cjs/model/layout-model.js.map +1 -1
  306. package/cjs/plugin/base/base-plugin-service.d.ts +2 -0
  307. package/cjs/plugin/base/base-plugin-service.js +11 -1
  308. package/cjs/plugin/base/base-plugin-service.js.map +1 -1
  309. package/cjs/plugin/base/interface.d.ts +3 -0
  310. package/cjs/plugin/base/interface.js.map +1 -1
  311. package/cjs/plugin/chart/media-query/media-query.js +4 -4
  312. package/cjs/plugin/chart/media-query/media-query.js.map +1 -1
  313. package/cjs/plugin/chart/media-query/util/action.js +4 -3
  314. package/cjs/plugin/chart/media-query/util/action.js.map +1 -1
  315. package/cjs/plugin/components/axis-sync/zero-align-transform.js +4 -4
  316. package/cjs/plugin/components/axis-sync/zero-align-transform.js.map +1 -1
  317. package/cjs/plugin/components/tooltip-handler/base.d.ts +1 -1
  318. package/cjs/plugin/components/tooltip-handler/base.js +3 -3
  319. package/cjs/plugin/components/tooltip-handler/base.js.map +1 -1
  320. package/cjs/plugin/components/tooltip-handler/dom/dom-tooltip-handler.js.map +1 -1
  321. package/cjs/plugin/components/tooltip-handler/dom/model/content-column-model.js +5 -5
  322. package/cjs/plugin/components/tooltip-handler/dom/model/content-column-model.js.map +1 -1
  323. package/cjs/plugin/components/tooltip-handler/dom/model/content-model.js +2 -2
  324. package/cjs/plugin/components/tooltip-handler/dom/model/content-model.js.map +1 -1
  325. package/cjs/plugin/components/tooltip-handler/dom/model/title-model.js +2 -2
  326. package/cjs/plugin/components/tooltip-handler/dom/model/title-model.js.map +1 -1
  327. package/cjs/plugin/components/tooltip-handler/dom/model/tooltip-model.js +2 -2
  328. package/cjs/plugin/components/tooltip-handler/dom/model/tooltip-model.js.map +1 -1
  329. package/cjs/plugin/components/tooltip-handler/dom/utils/style.js +4 -4
  330. package/cjs/plugin/components/tooltip-handler/dom/utils/style.js.map +1 -1
  331. package/cjs/plugin/components/tooltip-handler/utils/attribute.js +4 -4
  332. package/cjs/plugin/components/tooltip-handler/utils/attribute.js.map +1 -1
  333. package/cjs/plugin/components/tooltip-handler/utils/index.d.ts +0 -1
  334. package/cjs/plugin/components/tooltip-handler/utils/index.js +2 -2
  335. package/cjs/plugin/components/tooltip-handler/utils/index.js.map +1 -1
  336. package/cjs/region/interface.d.ts +2 -0
  337. package/cjs/region/interface.js.map +1 -1
  338. package/cjs/region/region.d.ts +1 -0
  339. package/cjs/region/region.js +5 -1
  340. package/cjs/region/region.js.map +1 -1
  341. package/cjs/series/area/area-transformer.js +6 -5
  342. package/cjs/series/area/area-transformer.js.map +1 -1
  343. package/cjs/series/area/area.js +3 -2
  344. package/cjs/series/area/area.js.map +1 -1
  345. package/cjs/series/bar/bar-3d.js +2 -1
  346. package/cjs/series/bar/bar-3d.js.map +1 -1
  347. package/cjs/series/bar/bar.js +3 -2
  348. package/cjs/series/bar/bar.js.map +1 -1
  349. package/cjs/series/base/base-series-transformer.js +4 -4
  350. package/cjs/series/base/base-series-transformer.js.map +1 -1
  351. package/cjs/series/base/base-series.d.ts +9 -17
  352. package/cjs/series/base/base-series.js +45 -27
  353. package/cjs/series/base/base-series.js.map +1 -1
  354. package/cjs/series/base/tooltip-helper.d.ts +8 -5
  355. package/cjs/series/base/tooltip-helper.js +31 -23
  356. package/cjs/series/base/tooltip-helper.js.map +1 -1
  357. package/cjs/series/box-plot/box-plot.js +2 -1
  358. package/cjs/series/box-plot/box-plot.js.map +1 -1
  359. package/cjs/series/box-plot/tooltip-helper.d.ts +1 -1
  360. package/cjs/series/box-plot/tooltip-helper.js +21 -21
  361. package/cjs/series/box-plot/tooltip-helper.js.map +1 -1
  362. package/cjs/series/cartesian/cartesian.d.ts +1 -1
  363. package/cjs/series/cartesian/cartesian.js +14 -4
  364. package/cjs/series/cartesian/cartesian.js.map +1 -1
  365. package/cjs/series/circle-packing/tooltip-helper.d.ts +1 -1
  366. package/cjs/series/circle-packing/tooltip-helper.js +1 -1
  367. package/cjs/series/circle-packing/tooltip-helper.js.map +1 -1
  368. package/cjs/series/dot/dot.js +2 -2
  369. package/cjs/series/dot/dot.js.map +1 -1
  370. package/cjs/series/dot/tooltip-helper.js +12 -12
  371. package/cjs/series/dot/tooltip-helper.js.map +1 -1
  372. package/cjs/series/funnel/funnel.js +8 -4
  373. package/cjs/series/funnel/funnel.js.map +1 -1
  374. package/cjs/series/funnel/tooltip-helper.d.ts +3 -3
  375. package/cjs/series/funnel/tooltip-helper.js +3 -3
  376. package/cjs/series/funnel/tooltip-helper.js.map +1 -1
  377. package/cjs/series/gauge/gauge-pointer.js +4 -3
  378. package/cjs/series/gauge/gauge-pointer.js.map +1 -1
  379. package/cjs/series/gauge/gauge.js +3 -3
  380. package/cjs/series/gauge/gauge.js.map +1 -1
  381. package/cjs/series/geo/geo.d.ts +1 -0
  382. package/cjs/series/geo/geo.js +4 -2
  383. package/cjs/series/geo/geo.js.map +1 -1
  384. package/cjs/series/heatmap/heatmap.js +2 -1
  385. package/cjs/series/heatmap/heatmap.js.map +1 -1
  386. package/cjs/series/index.d.ts +7 -3
  387. package/cjs/series/index.js +30 -2
  388. package/cjs/series/index.js.map +1 -1
  389. package/cjs/series/interface/common.d.ts +3 -2
  390. package/cjs/series/interface/common.js.map +1 -1
  391. package/cjs/series/interface/series.d.ts +7 -0
  392. package/cjs/series/interface/series.js.map +1 -1
  393. package/cjs/series/interface/theme.d.ts +2 -0
  394. package/cjs/series/interface/theme.js +3 -2
  395. package/cjs/series/interface/theme.js.map +1 -1
  396. package/cjs/series/interface/tooltip-helper.d.ts +8 -5
  397. package/cjs/series/interface/tooltip-helper.js.map +1 -1
  398. package/cjs/series/interface/type.d.ts +6 -2
  399. package/cjs/series/interface/type.js +3 -2
  400. package/cjs/series/interface/type.js.map +1 -1
  401. package/cjs/series/line/line.js +3 -2
  402. package/cjs/series/line/line.js.map +1 -1
  403. package/cjs/series/link/link.js +3 -2
  404. package/cjs/series/link/link.js.map +1 -1
  405. package/cjs/series/link/tooltip-helper.js +8 -8
  406. package/cjs/series/link/tooltip-helper.js.map +1 -1
  407. package/cjs/series/liquid/tooltip-helper.js +2 -2
  408. package/cjs/series/liquid/tooltip-helper.js.map +1 -1
  409. package/cjs/series/map/geo-source.d.ts +3 -1
  410. package/cjs/series/map/geo-source.js +6 -1
  411. package/cjs/series/map/geo-source.js.map +1 -1
  412. package/cjs/series/map/tooltip-helper.d.ts +1 -1
  413. package/cjs/series/map/tooltip-helper.js +1 -1
  414. package/cjs/series/map/tooltip-helper.js.map +1 -1
  415. package/cjs/series/mixin/line-mixin.js +2 -2
  416. package/cjs/series/mixin/line-mixin.js.map +1 -1
  417. package/cjs/series/pie/pie-transformer.js +4 -4
  418. package/cjs/series/pie/pie-transformer.js.map +1 -1
  419. package/cjs/series/polar/polar.d.ts +2 -2
  420. package/cjs/series/polar/polar.js +17 -6
  421. package/cjs/series/polar/polar.js.map +1 -1
  422. package/cjs/series/progress/circular/circular.js +4 -2
  423. package/cjs/series/progress/circular/circular.js.map +1 -1
  424. package/cjs/series/radar/radar.js +5 -4
  425. package/cjs/series/radar/radar.js.map +1 -1
  426. package/cjs/series/range-area/range-area.d.ts +0 -2
  427. package/cjs/series/range-area/range-area.js +3 -6
  428. package/cjs/series/range-area/range-area.js.map +1 -1
  429. package/cjs/series/range-area/tooltip-helper.js +10 -10
  430. package/cjs/series/range-area/tooltip-helper.js.map +1 -1
  431. package/cjs/series/range-column/3d/range-column-3d.js +3 -2
  432. package/cjs/series/range-column/3d/range-column-3d.js.map +1 -1
  433. package/cjs/series/range-column/range-column.js +3 -2
  434. package/cjs/series/range-column/range-column.js.map +1 -1
  435. package/cjs/series/range-column/tooltip-helper.js +5 -5
  436. package/cjs/series/range-column/tooltip-helper.js.map +1 -1
  437. package/cjs/series/rose/rose.js +3 -2
  438. package/cjs/series/rose/rose.js.map +1 -1
  439. package/cjs/series/sankey/sankey.d.ts +2 -1
  440. package/cjs/series/sankey/sankey.js +51 -118
  441. package/cjs/series/sankey/sankey.js.map +1 -1
  442. package/cjs/series/sankey/tooltip-helper.js +9 -9
  443. package/cjs/series/sankey/tooltip-helper.js.map +1 -1
  444. package/cjs/series/scatter/scatter.js +2 -1
  445. package/cjs/series/scatter/scatter.js.map +1 -1
  446. package/cjs/series/sunburst/tooltip-helper.d.ts +1 -1
  447. package/cjs/series/sunburst/tooltip-helper.js +1 -1
  448. package/cjs/series/sunburst/tooltip-helper.js.map +1 -1
  449. package/cjs/series/treemap/tooltip-helper.d.ts +1 -1
  450. package/cjs/series/treemap/tooltip-helper.js +1 -1
  451. package/cjs/series/treemap/tooltip-helper.js.map +1 -1
  452. package/cjs/series/util/stack.js +29 -15
  453. package/cjs/series/util/stack.js.map +1 -1
  454. package/cjs/series/venn/animation.d.ts +6 -0
  455. package/cjs/series/venn/animation.js +76 -0
  456. package/cjs/series/venn/animation.js.map +1 -0
  457. package/cjs/series/venn/constant.d.ts +2 -0
  458. package/cjs/series/venn/constant.js +23 -0
  459. package/cjs/series/venn/constant.js.map +1 -0
  460. package/cjs/series/venn/interface.d.ts +21 -0
  461. package/cjs/series/venn/interface.js +6 -0
  462. package/cjs/series/venn/interface.js.map +1 -0
  463. package/cjs/series/venn/tooltip-helper.d.ts +5 -0
  464. package/cjs/series/venn/tooltip-helper.js +17 -0
  465. package/cjs/series/venn/tooltip-helper.js.map +1 -0
  466. package/cjs/series/venn/util.d.ts +1 -0
  467. package/cjs/series/venn/util.js +11 -0
  468. package/cjs/series/venn/util.js.map +1 -0
  469. package/cjs/series/venn/venn-transform.d.ts +6 -0
  470. package/cjs/series/venn/venn-transform.js +16 -0
  471. package/cjs/series/venn/venn-transform.js.map +1 -0
  472. package/cjs/series/venn/venn.d.ts +63 -0
  473. package/cjs/series/venn/venn.js +219 -0
  474. package/cjs/series/venn/venn.js.map +1 -0
  475. package/cjs/series/waterfall/interface.d.ts +6 -1
  476. package/cjs/series/waterfall/interface.js.map +1 -1
  477. package/cjs/series/waterfall/waterfall.d.ts +9 -0
  478. package/cjs/series/waterfall/waterfall.js +23 -4
  479. package/cjs/series/waterfall/waterfall.js.map +1 -1
  480. package/cjs/series/word-cloud/base.d.ts +2 -0
  481. package/cjs/series/word-cloud/base.js +11 -16
  482. package/cjs/series/word-cloud/base.js.map +1 -1
  483. package/cjs/theme/builtin/common/component/index.js +4 -0
  484. package/cjs/theme/builtin/common/component/index.js.map +1 -1
  485. package/cjs/theme/builtin/common/series/index.js +3 -2
  486. package/cjs/theme/builtin/common/series/index.js.map +1 -1
  487. package/cjs/theme/builtin/common/series/venn.d.ts +2 -0
  488. package/cjs/theme/builtin/common/series/venn.js +60 -0
  489. package/cjs/theme/builtin/common/series/venn.js.map +1 -0
  490. package/cjs/typings/spec/chart.d.ts +2 -0
  491. package/cjs/typings/spec/chart.js.map +1 -1
  492. package/cjs/typings/spec/common.d.ts +5 -2
  493. package/cjs/typings/spec/common.js.map +1 -1
  494. package/cjs/typings/tooltip/tooltip.d.ts +1 -0
  495. package/cjs/typings/tooltip/tooltip.js.map +1 -1
  496. package/cjs/util/data.d.ts +21 -4
  497. package/cjs/util/data.js +42 -14
  498. package/cjs/util/data.js.map +1 -1
  499. package/cjs/util/index.d.ts +1 -0
  500. package/cjs/util/index.js +4 -4
  501. package/cjs/util/index.js.map +1 -1
  502. package/cjs/util/math.d.ts +1 -1
  503. package/cjs/util/math.js +2 -3
  504. package/cjs/util/math.js.map +1 -1
  505. package/cjs/util/spec/index.d.ts +0 -5
  506. package/cjs/util/spec/index.js +1 -4
  507. package/cjs/util/spec/index.js.map +1 -1
  508. package/cjs/util/spec/transform.js.map +1 -1
  509. package/cjs/util/theme/merge-theme.js +3 -3
  510. package/cjs/util/theme/merge-theme.js.map +1 -1
  511. package/cjs/vchart-all.js +2 -2
  512. package/cjs/vchart-all.js.map +1 -1
  513. package/esm/animation/utils.d.ts +2 -2
  514. package/esm/animation/utils.js +1 -1
  515. package/esm/animation/utils.js.map +1 -1
  516. package/esm/chart/base/base-chart-transformer.js +5 -1
  517. package/esm/chart/base/base-chart-transformer.js.map +1 -1
  518. package/esm/chart/base/base-chart.d.ts +4 -2
  519. package/esm/chart/base/base-chart.js +24 -11
  520. package/esm/chart/base/base-chart.js.map +1 -1
  521. package/esm/chart/cartesian/cartesian-transformer.js +3 -1
  522. package/esm/chart/cartesian/cartesian-transformer.js.map +1 -1
  523. package/esm/chart/common/common-transformer.js +3 -1
  524. package/esm/chart/common/common-transformer.js.map +1 -1
  525. package/esm/chart/common/interface.d.ts +2 -2
  526. package/esm/chart/common/interface.js.map +1 -1
  527. package/esm/chart/index.d.ts +6 -4
  528. package/esm/chart/index.js +5 -3
  529. package/esm/chart/index.js.map +1 -1
  530. package/esm/chart/interface/chart.d.ts +6 -1
  531. package/esm/chart/interface/chart.js.map +1 -1
  532. package/esm/chart/interface/type.d.ts +2 -1
  533. package/esm/chart/interface/type.js +1 -1
  534. package/esm/chart/interface/type.js.map +1 -1
  535. package/esm/chart/polar/polar-transformer.js.map +1 -1
  536. package/esm/chart/polar/progress-like/progress-like-transformer.js +1 -1
  537. package/esm/chart/polar/progress-like/progress-like-transformer.js.map +1 -1
  538. package/esm/chart/radar/radar-transformer.js +3 -1
  539. package/esm/chart/radar/radar-transformer.js.map +1 -1
  540. package/esm/chart/range-column/range-column-transformer.js +5 -1
  541. package/esm/chart/range-column/range-column-transformer.js.map +1 -1
  542. package/esm/chart/rose/rose-transformer.js +1 -1
  543. package/esm/chart/rose/rose-transformer.js.map +1 -1
  544. package/esm/chart/sequence/sequence-transformer.js.map +1 -1
  545. package/esm/chart/sequence/sequence.js +4 -1
  546. package/esm/chart/sequence/sequence.js.map +1 -1
  547. package/esm/chart/stack.js +2 -1
  548. package/esm/chart/treemap/treemap-transformer.js.map +1 -1
  549. package/esm/chart/util.js +5 -2
  550. package/esm/chart/util.js.map +1 -1
  551. package/esm/chart/venn/index.d.ts +3 -0
  552. package/esm/chart/venn/index.js +6 -0
  553. package/esm/chart/venn/index.js.map +1 -0
  554. package/esm/chart/venn/interface.d.ts +6 -0
  555. package/esm/chart/venn/interface.js +2 -0
  556. package/esm/chart/venn/interface.js.map +1 -0
  557. package/esm/chart/venn/venn-transformer.d.ts +7 -0
  558. package/esm/chart/venn/venn-transformer.js +20 -0
  559. package/esm/chart/venn/venn-transformer.js.map +1 -0
  560. package/esm/chart/venn/venn.d.ts +14 -0
  561. package/esm/chart/venn/venn.js +24 -0
  562. package/esm/chart/venn/venn.js.map +1 -0
  563. package/esm/compile/data/compilable-data.js +3 -1
  564. package/esm/compile/data/compilable-data.js.map +1 -1
  565. package/esm/compile/grammar-item.js +1 -2
  566. package/esm/compile/interface/compiler.d.ts +1 -0
  567. package/esm/compile/interface/compiler.js.map +1 -1
  568. package/esm/compile/mark/compilable-mark.d.ts +2 -1
  569. package/esm/compile/mark/compilable-mark.js +4 -0
  570. package/esm/compile/mark/compilable-mark.js.map +1 -1
  571. package/esm/compile/mark/interface.d.ts +1 -0
  572. package/esm/compile/mark/interface.js.map +1 -1
  573. package/esm/component/axis/base-axis.d.ts +2 -0
  574. package/esm/component/axis/base-axis.js +8 -1
  575. package/esm/component/axis/base-axis.js.map +1 -1
  576. package/esm/component/axis/cartesian/axis.d.ts +1 -2
  577. package/esm/component/axis/cartesian/axis.js +30 -36
  578. package/esm/component/axis/cartesian/axis.js.map +1 -1
  579. package/esm/component/axis/cartesian/interface/common.d.ts +1 -0
  580. package/esm/component/axis/cartesian/interface/common.js.map +1 -1
  581. package/esm/component/axis/cartesian/time-axis.js +2 -2
  582. package/esm/component/axis/cartesian/time-axis.js.map +1 -1
  583. package/esm/component/axis/interface/spec.d.ts +2 -0
  584. package/esm/component/axis/interface/spec.js.map +1 -1
  585. package/esm/component/axis/mixin/band-axis-mixin.js +2 -2
  586. package/esm/component/axis/mixin/band-axis-mixin.js.map +1 -1
  587. package/esm/component/axis/mixin/linear-axis-mixin.d.ts +12 -3
  588. package/esm/component/axis/mixin/linear-axis-mixin.js +39 -11
  589. package/esm/component/axis/mixin/linear-axis-mixin.js.map +1 -1
  590. package/esm/component/axis/polar/axis.d.ts +0 -1
  591. package/esm/component/axis/polar/axis.js +7 -11
  592. package/esm/component/axis/polar/axis.js.map +1 -1
  593. package/esm/component/axis/polar/interface/common.d.ts +1 -0
  594. package/esm/component/axis/polar/interface/common.js.map +1 -1
  595. package/esm/component/axis/polar/linear-axis.d.ts +5 -1
  596. package/esm/component/axis/polar/linear-axis.js +5 -1
  597. package/esm/component/axis/polar/linear-axis.js.map +1 -1
  598. package/esm/component/axis/util.js +1 -1
  599. package/esm/component/axis/util.js.map +1 -1
  600. package/esm/component/base/base-component.d.ts +1 -0
  601. package/esm/component/base/base-component.js +14 -6
  602. package/esm/component/base/base-component.js.map +1 -1
  603. package/esm/component/base/util.js +2 -2
  604. package/esm/component/base/util.js.map +1 -1
  605. package/esm/component/common/trigger/mobile.js +1 -2
  606. package/esm/component/common/trigger/mobile.js.map +1 -1
  607. package/esm/component/crosshair/base.d.ts +1 -2
  608. package/esm/component/crosshair/base.js +4 -6
  609. package/esm/component/crosshair/base.js.map +1 -1
  610. package/esm/component/crosshair/cartesian.js +3 -5
  611. package/esm/component/crosshair/cartesian.js.map +1 -1
  612. package/esm/component/crosshair/interface/cartesian.d.ts +11 -24
  613. package/esm/component/crosshair/interface/cartesian.js.map +1 -1
  614. package/esm/component/crosshair/interface/polar.d.ts +7 -5
  615. package/esm/component/crosshair/interface/polar.js.map +1 -1
  616. package/esm/component/crosshair/polar.js +4 -7
  617. package/esm/component/crosshair/polar.js.map +1 -1
  618. package/esm/component/crosshair/utils/cartesian.js +14 -14
  619. package/esm/component/crosshair/utils/cartesian.js.map +1 -1
  620. package/esm/component/crosshair/utils/common.js +2 -2
  621. package/esm/component/crosshair/utils/common.js.map +1 -1
  622. package/esm/component/crosshair/utils/polar.js +15 -9
  623. package/esm/component/crosshair/utils/polar.js.map +1 -1
  624. package/esm/component/custom-mark/custom-mark.d.ts +11 -4
  625. package/esm/component/custom-mark/custom-mark.js +43 -14
  626. package/esm/component/custom-mark/custom-mark.js.map +1 -1
  627. package/esm/component/data-zoom/data-filter-base-component.d.ts +3 -2
  628. package/esm/component/data-zoom/data-filter-base-component.js +15 -11
  629. package/esm/component/data-zoom/data-filter-base-component.js.map +1 -1
  630. package/esm/component/data-zoom/data-zoom/data-zoom-transformer.js +3 -1
  631. package/esm/component/data-zoom/data-zoom/data-zoom-transformer.js.map +1 -1
  632. package/esm/component/data-zoom/data-zoom/data-zoom.js +1 -1
  633. package/esm/component/data-zoom/data-zoom/data-zoom.js.map +1 -1
  634. package/esm/component/data-zoom/interface.d.ts +1 -4
  635. package/esm/component/data-zoom/interface.js +1 -5
  636. package/esm/component/data-zoom/interface.js.map +1 -1
  637. package/esm/component/data-zoom/scroll-bar/scroll-bar.js.map +1 -1
  638. package/esm/component/data-zoom/util.js.map +1 -1
  639. package/esm/component/geo/geo-coordinate.js +1 -1
  640. package/esm/component/geo/geo-coordinate.js.map +1 -1
  641. package/esm/component/index.d.ts +7 -7
  642. package/esm/component/index.js +5 -5
  643. package/esm/component/index.js.map +1 -1
  644. package/esm/component/indicator/indicator.js +1 -1
  645. package/esm/component/indicator/indicator.js.map +1 -1
  646. package/esm/component/interface/theme.d.ts +4 -0
  647. package/esm/component/interface/theme.js.map +1 -1
  648. package/esm/component/interface/type.d.ts +4 -0
  649. package/esm/component/interface/type.js +3 -1
  650. package/esm/component/interface/type.js.map +1 -1
  651. package/esm/component/label/label.js +3 -4
  652. package/esm/component/label/label.js.map +1 -1
  653. package/esm/component/label/total-label.js +9 -2
  654. package/esm/component/label/total-label.js.map +1 -1
  655. package/esm/component/label/util.d.ts +9 -1
  656. package/esm/component/label/util.js +21 -6
  657. package/esm/component/label/util.js.map +1 -1
  658. package/esm/component/legend/base-legend.js +9 -4
  659. package/esm/component/legend/base-legend.js.map +1 -1
  660. package/esm/component/legend/continuous/interface.d.ts +1 -0
  661. package/esm/component/legend/continuous/interface.js.map +1 -1
  662. package/esm/component/legend/continuous/legend.js +5 -2
  663. package/esm/component/legend/continuous/legend.js.map +1 -1
  664. package/esm/component/legend/continuous/util.js +1 -1
  665. package/esm/component/legend/continuous/util.js.map +1 -1
  666. package/esm/component/legend/discrete/interface.d.ts +1 -0
  667. package/esm/component/legend/discrete/interface.js.map +1 -1
  668. package/esm/component/legend/discrete/legend.d.ts +4 -1
  669. package/esm/component/legend/discrete/legend.js +20 -9
  670. package/esm/component/legend/discrete/legend.js.map +1 -1
  671. package/esm/component/legend/discrete/util.js +4 -4
  672. package/esm/component/legend/discrete/util.js.map +1 -1
  673. package/esm/component/legend/util.d.ts +12 -2
  674. package/esm/component/legend/util.js +1 -1
  675. package/esm/component/legend/util.js.map +1 -1
  676. package/esm/component/map-label/component.js +2 -1
  677. package/esm/component/map-label/component.js.map +1 -1
  678. package/esm/component/marker/base-marker.d.ts +30 -44
  679. package/esm/component/marker/base-marker.js +101 -42
  680. package/esm/component/marker/base-marker.js.map +1 -1
  681. package/esm/component/marker/interface.d.ts +40 -13
  682. package/esm/component/marker/interface.js.map +1 -1
  683. package/esm/component/marker/mark-area/base-mark-area.d.ts +18 -0
  684. package/esm/component/marker/mark-area/base-mark-area.js +105 -0
  685. package/esm/component/marker/mark-area/base-mark-area.js.map +1 -0
  686. package/esm/component/marker/mark-area/cartesian-mark-area.d.ts +19 -0
  687. package/esm/component/marker/mark-area/cartesian-mark-area.js +82 -0
  688. package/esm/component/marker/mark-area/cartesian-mark-area.js.map +1 -0
  689. package/esm/component/marker/mark-area/index.d.ts +2 -1
  690. package/esm/component/marker/mark-area/index.js +3 -1
  691. package/esm/component/marker/mark-area/index.js.map +1 -1
  692. package/esm/component/marker/mark-area/interface/spec.d.ts +16 -1
  693. package/esm/component/marker/mark-area/interface/spec.js.map +1 -1
  694. package/esm/component/marker/mark-area/interface/theme.d.ts +5 -7
  695. package/esm/component/marker/mark-area/interface/theme.js.map +1 -1
  696. package/esm/component/marker/mark-area/polar-mark-area.d.ts +25 -0
  697. package/esm/component/marker/mark-area/polar-mark-area.js +102 -0
  698. package/esm/component/marker/mark-area/polar-mark-area.js.map +1 -0
  699. package/esm/component/marker/mark-line/base-mark-line.d.ts +18 -0
  700. package/esm/component/marker/mark-line/base-mark-line.js +124 -0
  701. package/esm/component/marker/mark-line/base-mark-line.js.map +1 -0
  702. package/esm/component/marker/mark-line/cartesian-mark-line.d.ts +20 -0
  703. package/esm/component/marker/mark-line/cartesian-mark-line.js +185 -0
  704. package/esm/component/marker/mark-line/cartesian-mark-line.js.map +1 -0
  705. package/esm/component/marker/mark-line/index.d.ts +2 -1
  706. package/esm/component/marker/mark-line/index.js +3 -1
  707. package/esm/component/marker/mark-line/index.js.map +1 -1
  708. package/esm/component/marker/mark-line/interface/spec.d.ts +26 -2
  709. package/esm/component/marker/mark-line/interface/spec.js.map +1 -1
  710. package/esm/component/marker/mark-line/interface/theme.d.ts +5 -7
  711. package/esm/component/marker/mark-line/interface/theme.js.map +1 -1
  712. package/esm/component/marker/mark-line/polar-mark-line.d.ts +23 -0
  713. package/esm/component/marker/mark-line/polar-mark-line.js +108 -0
  714. package/esm/component/marker/mark-line/polar-mark-line.js.map +1 -0
  715. package/esm/component/marker/mark-point/{mark-point.d.ts → base-mark-point.d.ts} +5 -9
  716. package/esm/component/marker/mark-point/base-mark-point.js +139 -0
  717. package/esm/component/marker/mark-point/base-mark-point.js.map +1 -0
  718. package/esm/component/marker/mark-point/cartesian-mark-point.d.ts +16 -0
  719. package/esm/component/marker/mark-point/cartesian-mark-point.js +47 -0
  720. package/esm/component/marker/mark-point/cartesian-mark-point.js.map +1 -0
  721. package/esm/component/marker/mark-point/geo-mark-point.d.ts +14 -0
  722. package/esm/component/marker/mark-point/geo-mark-point.js +38 -0
  723. package/esm/component/marker/mark-point/geo-mark-point.js.map +1 -0
  724. package/esm/component/marker/mark-point/index.d.ts +3 -1
  725. package/esm/component/marker/mark-point/index.js +5 -1
  726. package/esm/component/marker/mark-point/index.js.map +1 -1
  727. package/esm/component/marker/mark-point/interface/spec.d.ts +9 -1
  728. package/esm/component/marker/mark-point/interface/spec.js.map +1 -1
  729. package/esm/component/marker/mark-point/interface/theme.d.ts +11 -16
  730. package/esm/component/marker/mark-point/interface/theme.js.map +1 -1
  731. package/esm/component/marker/mark-point/polar-mark-point.d.ts +18 -0
  732. package/esm/component/marker/mark-point/polar-mark-point.js +47 -0
  733. package/esm/component/marker/mark-point/polar-mark-point.js.map +1 -0
  734. package/esm/component/marker/utils.d.ts +40 -5
  735. package/esm/component/marker/utils.js +137 -8
  736. package/esm/component/marker/utils.js.map +1 -1
  737. package/esm/component/player/player.d.ts +2 -1
  738. package/esm/component/player/player.js +16 -9
  739. package/esm/component/player/player.js.map +1 -1
  740. package/esm/component/player/utils/transform.js +3 -2
  741. package/esm/component/player/utils/transform.js.map +1 -1
  742. package/esm/component/tooltip/tooltip-transformer.js +3 -1
  743. package/esm/component/tooltip/tooltip-transformer.js.map +1 -1
  744. package/esm/component/tooltip/tooltip.d.ts +1 -1
  745. package/esm/component/tooltip/tooltip.js +13 -11
  746. package/esm/component/tooltip/tooltip.js.map +1 -1
  747. package/esm/component/tooltip/utils/compose.js +3 -3
  748. package/esm/component/tooltip/utils/compose.js.map +1 -1
  749. package/esm/component/tooltip/utils/get-spec.js +2 -2
  750. package/esm/component/tooltip/utils/get-spec.js.map +1 -1
  751. package/esm/component/tooltip/utils/index.d.ts +1 -0
  752. package/esm/component/tooltip/utils/index.js +2 -0
  753. package/esm/component/tooltip/utils/index.js.map +1 -1
  754. package/esm/{plugin/components/tooltip-handler → component/tooltip}/utils/pattern.d.ts +3 -3
  755. package/esm/component/tooltip/utils/pattern.js.map +1 -0
  756. package/esm/component/tooltip/utils/show-tooltip.d.ts +20 -3
  757. package/esm/component/tooltip/utils/show-tooltip.js +99 -87
  758. package/esm/component/tooltip/utils/show-tooltip.js.map +1 -1
  759. package/esm/core/factory.d.ts +1 -1
  760. package/esm/core/factory.js +1 -2
  761. package/esm/core/factory.js.map +1 -1
  762. package/esm/core/index.d.ts +1 -1
  763. package/esm/core/index.js +1 -1
  764. package/esm/core/index.js.map +1 -1
  765. package/esm/core/interface.d.ts +5 -1
  766. package/esm/core/interface.js.map +1 -1
  767. package/esm/core/vchart.d.ts +2 -2
  768. package/esm/core/vchart.js +42 -21
  769. package/esm/core/vchart.js.map +1 -1
  770. package/esm/data/transforms/aggregation.d.ts +12 -7
  771. package/esm/data/transforms/aggregation.js +16 -1
  772. package/esm/data/transforms/aggregation.js.map +1 -1
  773. package/esm/data/transforms/invalid-travel.d.ts +1 -1
  774. package/esm/data/transforms/invalid-travel.js +4 -2
  775. package/esm/data/transforms/invalid-travel.js.map +1 -1
  776. package/esm/data/transforms/legend-data/continuous/continuous.js +2 -2
  777. package/esm/data/transforms/legend-data/continuous/continuous.js.map +1 -1
  778. package/esm/data/transforms/legend-data/discrete/discrete.js +2 -2
  779. package/esm/data/transforms/legend-data/discrete/discrete.js.map +1 -1
  780. package/esm/data/transforms/legend-data/discrete/interface.d.ts +2 -0
  781. package/esm/data/transforms/legend-data/discrete/interface.js.map +1 -1
  782. package/esm/data/transforms/pie.js +2 -1
  783. package/esm/data/transforms/pie.js.map +1 -1
  784. package/esm/data/transforms/waterfall.js +5 -1
  785. package/esm/data/transforms/waterfall.js.map +1 -1
  786. package/esm/event/event-dispatcher.js +8 -1
  787. package/esm/event/event-dispatcher.js.map +1 -1
  788. package/esm/event/interface.d.ts +2 -0
  789. package/esm/event/interface.js.map +1 -1
  790. package/esm/index-lark.js +4 -4
  791. package/esm/index-lark.js.map +1 -1
  792. package/esm/index-wx.js +4 -4
  793. package/esm/index-wx.js.map +1 -1
  794. package/esm/layout/base-layout.js +6 -5
  795. package/esm/layout/base-layout.js.map +1 -1
  796. package/esm/layout/grid-layout/grid-layout.d.ts +1 -1
  797. package/esm/layout/grid-layout/grid-layout.js +4 -4
  798. package/esm/layout/grid-layout/grid-layout.js.map +1 -1
  799. package/esm/layout/layout-item.js +1 -1
  800. package/esm/layout/layout-item.js.map +1 -1
  801. package/esm/mark/base/base-mark.js +1 -1
  802. package/esm/mark/base/base-mark.js.map +1 -1
  803. package/esm/mark/index.d.ts +20 -20
  804. package/esm/mark/index.js +25 -20
  805. package/esm/mark/index.js.map +1 -1
  806. package/esm/model/base-model-transformer.js +3 -1
  807. package/esm/model/base-model-transformer.js.map +1 -1
  808. package/esm/model/base-model.js +1 -1
  809. package/esm/model/base-model.js.map +1 -1
  810. package/esm/model/interface.d.ts +1 -0
  811. package/esm/model/interface.js.map +1 -1
  812. package/esm/model/layout-model.js +3 -2
  813. package/esm/model/layout-model.js.map +1 -1
  814. package/esm/plugin/base/base-plugin-service.d.ts +2 -0
  815. package/esm/plugin/base/base-plugin-service.js +11 -1
  816. package/esm/plugin/base/base-plugin-service.js.map +1 -1
  817. package/esm/plugin/base/interface.d.ts +3 -0
  818. package/esm/plugin/base/interface.js.map +1 -1
  819. package/esm/plugin/chart/media-query/media-query.js +3 -1
  820. package/esm/plugin/chart/media-query/media-query.js.map +1 -1
  821. package/esm/plugin/chart/media-query/util/action.js +2 -2
  822. package/esm/plugin/chart/media-query/util/action.js.map +1 -1
  823. package/esm/plugin/components/axis-sync/zero-align-transform.js +3 -5
  824. package/esm/plugin/components/axis-sync/zero-align-transform.js.map +1 -1
  825. package/esm/plugin/components/tooltip-handler/base.d.ts +1 -1
  826. package/esm/plugin/components/tooltip-handler/base.js +3 -3
  827. package/esm/plugin/components/tooltip-handler/base.js.map +1 -1
  828. package/esm/plugin/components/tooltip-handler/dom/dom-tooltip-handler.js.map +1 -1
  829. package/esm/plugin/components/tooltip-handler/dom/model/content-column-model.js +1 -1
  830. package/esm/plugin/components/tooltip-handler/dom/model/content-column-model.js.map +1 -1
  831. package/esm/plugin/components/tooltip-handler/dom/model/content-model.js +1 -1
  832. package/esm/plugin/components/tooltip-handler/dom/model/content-model.js.map +1 -1
  833. package/esm/plugin/components/tooltip-handler/dom/model/title-model.js +1 -1
  834. package/esm/plugin/components/tooltip-handler/dom/model/title-model.js.map +1 -1
  835. package/esm/plugin/components/tooltip-handler/dom/model/tooltip-model.js +1 -1
  836. package/esm/plugin/components/tooltip-handler/dom/model/tooltip-model.js.map +1 -1
  837. package/esm/plugin/components/tooltip-handler/dom/utils/style.js +1 -1
  838. package/esm/plugin/components/tooltip-handler/dom/utils/style.js.map +1 -1
  839. package/esm/plugin/components/tooltip-handler/utils/attribute.js +1 -1
  840. package/esm/plugin/components/tooltip-handler/utils/attribute.js.map +1 -1
  841. package/esm/plugin/components/tooltip-handler/utils/index.d.ts +0 -1
  842. package/esm/plugin/components/tooltip-handler/utils/index.js +0 -2
  843. package/esm/plugin/components/tooltip-handler/utils/index.js.map +1 -1
  844. package/esm/region/interface.d.ts +2 -0
  845. package/esm/region/interface.js.map +1 -1
  846. package/esm/region/region.d.ts +1 -0
  847. package/esm/region/region.js +5 -1
  848. package/esm/region/region.js.map +1 -1
  849. package/esm/series/area/area-transformer.js +1 -1
  850. package/esm/series/area/area-transformer.js.map +1 -1
  851. package/esm/series/area/area.js +4 -1
  852. package/esm/series/area/area.js.map +1 -1
  853. package/esm/series/bar/bar-3d.js +4 -1
  854. package/esm/series/bar/bar-3d.js.map +1 -1
  855. package/esm/series/bar/bar.js +4 -1
  856. package/esm/series/bar/bar.js.map +1 -1
  857. package/esm/series/base/base-series-transformer.js +3 -1
  858. package/esm/series/base/base-series-transformer.js.map +1 -1
  859. package/esm/series/base/base-series.d.ts +9 -17
  860. package/esm/series/base/base-series.js +41 -23
  861. package/esm/series/base/base-series.js.map +1 -1
  862. package/esm/series/base/tooltip-helper.d.ts +8 -5
  863. package/esm/series/base/tooltip-helper.js +31 -23
  864. package/esm/series/base/tooltip-helper.js.map +1 -1
  865. package/esm/series/box-plot/box-plot.js +4 -1
  866. package/esm/series/box-plot/box-plot.js.map +1 -1
  867. package/esm/series/box-plot/tooltip-helper.d.ts +1 -1
  868. package/esm/series/box-plot/tooltip-helper.js +21 -21
  869. package/esm/series/box-plot/tooltip-helper.js.map +1 -1
  870. package/esm/series/cartesian/cartesian.d.ts +1 -1
  871. package/esm/series/cartesian/cartesian.js +15 -4
  872. package/esm/series/cartesian/cartesian.js.map +1 -1
  873. package/esm/series/circle-packing/tooltip-helper.d.ts +1 -1
  874. package/esm/series/circle-packing/tooltip-helper.js +1 -1
  875. package/esm/series/circle-packing/tooltip-helper.js.map +1 -1
  876. package/esm/series/dot/dot.js +1 -1
  877. package/esm/series/dot/dot.js.map +1 -1
  878. package/esm/series/dot/tooltip-helper.js +12 -12
  879. package/esm/series/dot/tooltip-helper.js.map +1 -1
  880. package/esm/series/funnel/funnel.js +8 -4
  881. package/esm/series/funnel/funnel.js.map +1 -1
  882. package/esm/series/funnel/tooltip-helper.d.ts +3 -3
  883. package/esm/series/funnel/tooltip-helper.js +3 -3
  884. package/esm/series/funnel/tooltip-helper.js.map +1 -1
  885. package/esm/series/gauge/gauge-pointer.js +4 -1
  886. package/esm/series/gauge/gauge-pointer.js.map +1 -1
  887. package/esm/series/gauge/gauge.js +4 -1
  888. package/esm/series/gauge/gauge.js.map +1 -1
  889. package/esm/series/geo/geo.d.ts +1 -0
  890. package/esm/series/geo/geo.js +4 -2
  891. package/esm/series/geo/geo.js.map +1 -1
  892. package/esm/series/heatmap/heatmap.js +4 -1
  893. package/esm/series/heatmap/heatmap.js.map +1 -1
  894. package/esm/series/index.d.ts +7 -3
  895. package/esm/series/index.js +6 -2
  896. package/esm/series/index.js.map +1 -1
  897. package/esm/series/interface/common.d.ts +3 -2
  898. package/esm/series/interface/common.js.map +1 -1
  899. package/esm/series/interface/series.d.ts +7 -0
  900. package/esm/series/interface/series.js.map +1 -1
  901. package/esm/series/interface/theme.d.ts +2 -0
  902. package/esm/series/interface/theme.js +4 -1
  903. package/esm/series/interface/theme.js.map +1 -1
  904. package/esm/series/interface/tooltip-helper.d.ts +8 -5
  905. package/esm/series/interface/tooltip-helper.js.map +1 -1
  906. package/esm/series/interface/type.d.ts +6 -2
  907. package/esm/series/interface/type.js +3 -2
  908. package/esm/series/interface/type.js.map +1 -1
  909. package/esm/series/line/line.js +4 -1
  910. package/esm/series/line/line.js.map +1 -1
  911. package/esm/series/link/link.js +4 -1
  912. package/esm/series/link/link.js.map +1 -1
  913. package/esm/series/link/tooltip-helper.js +8 -8
  914. package/esm/series/link/tooltip-helper.js.map +1 -1
  915. package/esm/series/liquid/tooltip-helper.js +2 -2
  916. package/esm/series/liquid/tooltip-helper.js.map +1 -1
  917. package/esm/series/map/geo-source.d.ts +3 -1
  918. package/esm/series/map/geo-source.js +7 -2
  919. package/esm/series/map/geo-source.js.map +1 -1
  920. package/esm/series/map/tooltip-helper.d.ts +1 -1
  921. package/esm/series/map/tooltip-helper.js +1 -1
  922. package/esm/series/map/tooltip-helper.js.map +1 -1
  923. package/esm/series/mixin/line-mixin.js +1 -1
  924. package/esm/series/mixin/line-mixin.js.map +1 -1
  925. package/esm/series/pie/pie-transformer.js +1 -1
  926. package/esm/series/pie/pie-transformer.js.map +1 -1
  927. package/esm/series/polar/polar.d.ts +2 -2
  928. package/esm/series/polar/polar.js +18 -6
  929. package/esm/series/polar/polar.js.map +1 -1
  930. package/esm/series/progress/circular/circular.js +5 -2
  931. package/esm/series/progress/circular/circular.js.map +1 -1
  932. package/esm/series/radar/radar.js +5 -2
  933. package/esm/series/radar/radar.js.map +1 -1
  934. package/esm/series/range-area/range-area.d.ts +0 -2
  935. package/esm/series/range-area/range-area.js +3 -5
  936. package/esm/series/range-area/range-area.js.map +1 -1
  937. package/esm/series/range-area/tooltip-helper.js +10 -10
  938. package/esm/series/range-area/tooltip-helper.js.map +1 -1
  939. package/esm/series/range-column/3d/range-column-3d.js +4 -1
  940. package/esm/series/range-column/3d/range-column-3d.js.map +1 -1
  941. package/esm/series/range-column/range-column.js +3 -1
  942. package/esm/series/range-column/range-column.js.map +1 -1
  943. package/esm/series/range-column/tooltip-helper.js +5 -5
  944. package/esm/series/range-column/tooltip-helper.js.map +1 -1
  945. package/esm/series/rose/rose.js +4 -1
  946. package/esm/series/rose/rose.js.map +1 -1
  947. package/esm/series/sankey/sankey.d.ts +2 -1
  948. package/esm/series/sankey/sankey.js +52 -119
  949. package/esm/series/sankey/sankey.js.map +1 -1
  950. package/esm/series/sankey/tooltip-helper.js +9 -9
  951. package/esm/series/sankey/tooltip-helper.js.map +1 -1
  952. package/esm/series/scatter/scatter.js +4 -1
  953. package/esm/series/scatter/scatter.js.map +1 -1
  954. package/esm/series/sunburst/tooltip-helper.d.ts +1 -1
  955. package/esm/series/sunburst/tooltip-helper.js +1 -1
  956. package/esm/series/sunburst/tooltip-helper.js.map +1 -1
  957. package/esm/series/treemap/tooltip-helper.d.ts +1 -1
  958. package/esm/series/treemap/tooltip-helper.js +1 -1
  959. package/esm/series/treemap/tooltip-helper.js.map +1 -1
  960. package/esm/series/util/stack.js +28 -15
  961. package/esm/series/util/stack.js.map +1 -1
  962. package/esm/series/venn/animation.d.ts +6 -0
  963. package/esm/series/venn/animation.js +68 -0
  964. package/esm/series/venn/animation.js.map +1 -0
  965. package/esm/series/venn/constant.d.ts +2 -0
  966. package/esm/series/venn/constant.js +17 -0
  967. package/esm/series/venn/constant.js.map +1 -0
  968. package/esm/series/venn/interface.d.ts +21 -0
  969. package/esm/series/venn/interface.js +2 -0
  970. package/esm/series/venn/interface.js.map +1 -0
  971. package/esm/series/venn/tooltip-helper.d.ts +5 -0
  972. package/esm/series/venn/tooltip-helper.js +11 -0
  973. package/esm/series/venn/tooltip-helper.js.map +1 -0
  974. package/esm/series/venn/util.d.ts +1 -0
  975. package/esm/series/venn/util.js +4 -0
  976. package/esm/series/venn/util.js.map +1 -0
  977. package/esm/series/venn/venn-transform.d.ts +6 -0
  978. package/esm/series/venn/venn-transform.js +8 -0
  979. package/esm/series/venn/venn-transform.js.map +1 -0
  980. package/esm/series/venn/venn.d.ts +63 -0
  981. package/esm/series/venn/venn.js +237 -0
  982. package/esm/series/venn/venn.js.map +1 -0
  983. package/esm/series/waterfall/interface.d.ts +6 -1
  984. package/esm/series/waterfall/interface.js.map +1 -1
  985. package/esm/series/waterfall/waterfall.d.ts +9 -0
  986. package/esm/series/waterfall/waterfall.js +24 -3
  987. package/esm/series/waterfall/waterfall.js.map +1 -1
  988. package/esm/series/word-cloud/base.d.ts +2 -0
  989. package/esm/series/word-cloud/base.js +12 -17
  990. package/esm/series/word-cloud/base.js.map +1 -1
  991. package/esm/theme/builtin/common/component/index.js +4 -0
  992. package/esm/theme/builtin/common/component/index.js.map +1 -1
  993. package/esm/theme/builtin/common/series/index.js +4 -1
  994. package/esm/theme/builtin/common/series/index.js.map +1 -1
  995. package/esm/theme/builtin/common/series/venn.d.ts +2 -0
  996. package/esm/theme/builtin/common/series/venn.js +56 -0
  997. package/esm/theme/builtin/common/series/venn.js.map +1 -0
  998. package/esm/typings/spec/chart.d.ts +2 -0
  999. package/esm/typings/spec/chart.js.map +1 -1
  1000. package/esm/typings/spec/common.d.ts +5 -2
  1001. package/esm/typings/spec/common.js.map +1 -1
  1002. package/esm/typings/tooltip/tooltip.d.ts +1 -0
  1003. package/esm/typings/tooltip/tooltip.js.map +1 -1
  1004. package/esm/util/data.d.ts +21 -4
  1005. package/esm/util/data.js +39 -10
  1006. package/esm/util/data.js.map +1 -1
  1007. package/esm/util/index.d.ts +1 -0
  1008. package/esm/util/index.js +2 -0
  1009. package/esm/util/index.js.map +1 -1
  1010. package/esm/util/math.d.ts +1 -1
  1011. package/esm/util/math.js +2 -3
  1012. package/esm/util/math.js.map +1 -1
  1013. package/esm/util/spec/index.d.ts +0 -5
  1014. package/esm/util/spec/index.js +0 -10
  1015. package/esm/util/spec/index.js.map +1 -1
  1016. package/esm/util/spec/transform.js.map +1 -1
  1017. package/esm/util/theme/merge-theme.js +1 -1
  1018. package/esm/util/theme/merge-theme.js.map +1 -1
  1019. package/esm/vchart-all.js +6 -4
  1020. package/esm/vchart-all.js.map +1 -1
  1021. package/package.json +16 -15
  1022. package/cjs/component/marker/mark-area/mark-area.d.ts +0 -21
  1023. package/cjs/component/marker/mark-area/mark-area.js +0 -128
  1024. package/cjs/component/marker/mark-area/mark-area.js.map +0 -1
  1025. package/cjs/component/marker/mark-line/mark-line.d.ts +0 -22
  1026. package/cjs/component/marker/mark-line/mark-line.js +0 -198
  1027. package/cjs/component/marker/mark-line/mark-line.js.map +0 -1
  1028. package/cjs/component/marker/mark-point/mark-point.js +0 -138
  1029. package/cjs/component/marker/mark-point/mark-point.js.map +0 -1
  1030. package/cjs/plugin/components/tooltip-handler/utils/pattern.js.map +0 -1
  1031. package/cjs/util/spec/clone-deep.d.ts +0 -1
  1032. package/cjs/util/spec/clone-deep.js +0 -27
  1033. package/cjs/util/spec/clone-deep.js.map +0 -1
  1034. package/cjs/util/spec/common.d.ts +0 -3
  1035. package/cjs/util/spec/common.js +0 -23
  1036. package/cjs/util/spec/common.js.map +0 -1
  1037. package/cjs/util/spec/merge-spec.d.ts +0 -5
  1038. package/cjs/util/spec/merge-spec.js +0 -69
  1039. package/cjs/util/spec/merge-spec.js.map +0 -1
  1040. package/esm/component/marker/mark-area/mark-area.d.ts +0 -21
  1041. package/esm/component/marker/mark-area/mark-area.js +0 -134
  1042. package/esm/component/marker/mark-area/mark-area.js.map +0 -1
  1043. package/esm/component/marker/mark-line/mark-line.d.ts +0 -22
  1044. package/esm/component/marker/mark-line/mark-line.js +0 -213
  1045. package/esm/component/marker/mark-line/mark-line.js.map +0 -1
  1046. package/esm/component/marker/mark-point/mark-point.js +0 -147
  1047. package/esm/component/marker/mark-point/mark-point.js.map +0 -1
  1048. package/esm/plugin/components/tooltip-handler/utils/pattern.js.map +0 -1
  1049. package/esm/util/spec/clone-deep.d.ts +0 -1
  1050. package/esm/util/spec/clone-deep.js +0 -20
  1051. package/esm/util/spec/clone-deep.js.map +0 -1
  1052. package/esm/util/spec/common.d.ts +0 -3
  1053. package/esm/util/spec/common.js +0 -15
  1054. package/esm/util/spec/common.js.map +0 -1
  1055. package/esm/util/spec/merge-spec.d.ts +0 -5
  1056. package/esm/util/spec/merge-spec.js +0 -57
  1057. package/esm/util/spec/merge-spec.js.map +0 -1
  1058. /package/cjs/{plugin/components/tooltip-handler → component/tooltip}/utils/pattern.js +0 -0
  1059. /package/esm/{plugin/components/tooltip-handler → component/tooltip}/utils/pattern.js +0 -0
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/series/cartesian/cartesian.ts"],"names":[],"mappings":"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","file":"cartesian.js","sourcesContent":["import type { ICartesianSeries } from '../interface';\nimport { BaseSeries } from '../base/base-series';\nimport type { IPoint } from '../../typings/coordinate';\nimport type { IBaseScale } from '@visactor/vscale';\nimport {\n STACK_FIELD_END,\n STACK_FIELD_END_PERCENT,\n STACK_FIELD_END_OffsetSilhouette,\n STACK_FIELD_START,\n STACK_FIELD_START_PERCENT,\n STACK_FIELD_START_OffsetSilhouette,\n PREFIX,\n ChartEvent\n} from '../../constant';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport type { DirectionType } from '../../typings/space';\n// eslint-disable-next-line no-duplicate-imports\nimport { Direction } from '../../typings/space';\nimport type { Datum, StringOrNumber } from '../../typings';\nimport { couldBeValidNumber } from '../../util/type';\nimport { array, isValid } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous } from '@visactor/vscale';\nimport type { StatisticOperations } from '../../data/transforms/dimension-statistics';\nimport type { ICartesianSeriesSpec } from './interface';\nimport { sortDataInAxisHelper } from '../util/utils';\nimport type { IAxisLocationCfg } from '../../component/axis';\n\nexport abstract class CartesianSeries<T extends ICartesianSeriesSpec = ICartesianSeriesSpec>\n extends BaseSeries<T>\n implements ICartesianSeries\n{\n readonly coordinate: 'cartesian' = 'cartesian';\n protected _bandPosition = 0.5;\n protected _scaleConfig: IAxisLocationCfg = {\n bandPosition: this._bandPosition\n };\n protected _buildScaleConfig() {\n this._scaleConfig = {\n bandPosition: this._bandPosition\n };\n }\n\n protected _fieldX!: string[];\n get fieldX() {\n return this._fieldX;\n }\n setFieldX(f: string | string[]) {\n this._fieldX = array(f);\n }\n\n protected _fieldY!: string[];\n get fieldY() {\n return this._fieldY;\n }\n setFieldY(f: string | string[]) {\n this._fieldY = array(f);\n }\n\n protected _fieldZ?: string[];\n get fieldZ(): string[] | undefined {\n return this._fieldZ;\n }\n setFieldZ(f?: string | string[]) {\n this._fieldZ = f && array(f);\n }\n\n protected _fieldX2!: string;\n get fieldX2() {\n return this._fieldX2;\n }\n setFieldX2(f: string) {\n this._fieldX2 = f;\n }\n\n protected _fieldY2!: string;\n get fieldY2() {\n return this._fieldY2;\n }\n setFieldY2(f: string) {\n this._fieldY2 = f;\n }\n\n protected _specXField: string[];\n protected _specYField: string[];\n\n protected _direction: DirectionType = Direction.vertical;\n get direction() {\n return this._direction;\n }\n\n protected _scaleX!: IBaseScale;\n get scaleX() {\n return this._scaleX;\n }\n setScaleX(s: IBaseScale) {\n this._scaleX = s;\n }\n\n protected _scaleY!: IBaseScale;\n get scaleY() {\n return this._scaleY;\n }\n setScaleY(s: IBaseScale) {\n this._scaleY = s;\n }\n\n protected _scaleZ?: IBaseScale;\n get scaleZ() {\n return this._scaleZ;\n }\n setScaleZ(s: IBaseScale) {\n this._scaleZ = s;\n }\n\n _xAxisHelper!: IAxisHelper;\n getXAxisHelper() {\n return this._xAxisHelper;\n }\n setXAxisHelper(h: IAxisHelper) {\n this._xAxisHelper = h;\n this.onXAxisHelperUpdate();\n }\n\n _yAxisHelper!: IAxisHelper;\n getYAxisHelper() {\n return this._yAxisHelper;\n }\n setYAxisHelper(h: IAxisHelper) {\n this._yAxisHelper = h;\n this.onYAxisHelperUpdate();\n }\n\n _zAxisHelper?: IAxisHelper;\n getZAxisHelper() {\n return this._zAxisHelper;\n }\n setZAxisHelper(h: IAxisHelper) {\n this._zAxisHelper = h;\n this.onYAxisHelperUpdate();\n }\n\n protected _sortDataByAxis: boolean = false;\n get sortDataByAxis() {\n return this._sortDataByAxis;\n }\n\n getStatisticFields() {\n const fields: { key: string; operations: StatisticOperations }[] = [];\n const axes = [\n {\n axisHelper: this.getXAxisHelper(),\n fields: this._fieldX2 ? [...this._fieldX, this._fieldX2] : this._fieldX\n },\n {\n axisHelper: this.getYAxisHelper(),\n fields: this._fieldY2 ? [...this._fieldY, this._fieldY2] : this._fieldY\n },\n {\n axisHelper: this.getZAxisHelper(),\n fields: this._fieldZ\n }\n ];\n\n axes.forEach(axisOption => {\n if (axisOption.axisHelper && axisOption.axisHelper.getScale && axisOption.fields) {\n axisOption.fields.forEach(f => {\n const result: { key: string; operations: Array<'max' | 'min' | 'values'>; filter?: (fv: any) => boolean } = {\n key: f,\n operations: []\n };\n const scale = axisOption.axisHelper.getScale(0);\n if (isContinuous(scale.type)) {\n result.operations = ['max', 'min'];\n\n if (scale.type === 'log') {\n result.filter = (fv: any) => fv > 0;\n }\n } else {\n result.operations = ['values'];\n }\n fields.push(result);\n });\n }\n });\n\n if (this.getStack()) {\n fields.push({\n key: this.getStackValueField(),\n operations: ['allValid']\n });\n }\n return fields;\n }\n\n getGroupFields() {\n return this.direction === 'vertical' ? this._fieldX : this._fieldY;\n }\n\n getStackGroupFields(): string[] {\n return this.getGroupFields();\n }\n\n getStackValue() {\n const axisId = (\n this.direction === Direction.horizontal ? this.getXAxisHelper() : this.getYAxisHelper()\n )?.getAxisId();\n return this._spec.stackValue ?? `${PREFIX}_series_${this.type}_${axisId}`;\n }\n\n getStackValueField() {\n // TODO: hack\n if (this.direction === Direction.horizontal) {\n return array(this._spec.xField)[0];\n }\n return array(this._spec.yField)[0];\n }\n\n setValueFieldToStack(): void {\n if (this.direction === Direction.horizontal) {\n this.setFieldX(STACK_FIELD_END);\n this.setFieldX2(STACK_FIELD_START);\n } else {\n this.setFieldY(STACK_FIELD_END);\n this.setFieldY2(STACK_FIELD_START);\n }\n }\n\n setValueFieldToPercent(): void {\n if (this.direction === Direction.horizontal) {\n this.setFieldX(STACK_FIELD_END_PERCENT);\n this.setFieldX2(STACK_FIELD_START_PERCENT);\n } else {\n this.setFieldY(STACK_FIELD_END_PERCENT);\n this.setFieldY2(STACK_FIELD_START_PERCENT);\n }\n }\n\n setValueFieldToStackOffsetSilhouette(): void {\n if (this.direction === Direction.horizontal) {\n this.setFieldX(STACK_FIELD_END_OffsetSilhouette);\n this.setFieldX2(STACK_FIELD_START_OffsetSilhouette);\n } else {\n this.setFieldY(STACK_FIELD_END_OffsetSilhouette);\n this.setFieldY2(STACK_FIELD_START_OffsetSilhouette);\n }\n }\n\n onXAxisHelperUpdate(): void {\n this.onMarkPositionUpdate();\n }\n\n onYAxisHelperUpdate(): void {\n this.onMarkPositionUpdate();\n }\n\n onZAxisHelperUpdate(): void {\n this.onMarkPositionUpdate();\n }\n\n setAttrFromSpec() {\n super.setAttrFromSpec();\n this.setFieldX(this._spec.xField);\n this.setFieldY(this._spec.yField);\n this.setFieldZ(this._spec.zField);\n this._specXField = array(this._spec.xField);\n this._specYField = array(this._spec.yField);\n if (isValid(this._spec.direction)) {\n this._direction = this._spec.direction;\n }\n\n this.setFieldX2(this._spec?.x2Field);\n this.setFieldY2(this._spec?.y2Field);\n\n if (this.getStack()) {\n this.setValueFieldToStack();\n }\n if (this.getPercent()) {\n this.setValueFieldToPercent();\n }\n if (this.getStackOffsetSilhouette()) {\n this.setValueFieldToStackOffsetSilhouette();\n }\n\n if (isValid(this._spec.sortDataByAxis)) {\n this._sortDataByAxis = this._spec.sortDataByAxis === true;\n }\n }\n\n dataToPosition(datum: Datum, checkInViewData?: boolean): IPoint | null {\n if (!datum) {\n return null;\n }\n if (checkInViewData && !this.isDatumInViewData(datum)) {\n return null;\n }\n return {\n x: this.dataToPositionX(datum),\n y: this.dataToPositionY(datum)\n } as IPoint;\n }\n\n protected _buildMarkAttributeContext() {\n super._buildMarkAttributeContext();\n // position\n this._markAttributeContext.valueToX = this.valueToPositionX.bind(this);\n this._markAttributeContext.valueToY = this.valueToPositionY.bind(this);\n this._markAttributeContext.xBandwidth = (depth: number = 0) => this.getXAxisHelper().getBandwidth?.(depth) ?? 0;\n this._markAttributeContext.yBandwidth = (depth: number = 0) => this.getYAxisHelper().getBandwidth?.(depth) ?? 0;\n this._markAttributeContext.valueToPosition = this.valueToPosition.bind(this);\n }\n\n valueToPosition(xValue: StringOrNumber | StringOrNumber[], yValue: StringOrNumber | StringOrNumber[]) {\n return {\n x: this.valueToPositionX(xValue),\n y: this.valueToPositionY(yValue)\n };\n }\n\n protected _axisPosition(helper: IAxisHelper, value: StringOrNumber | StringOrNumber[], datum?: any) {\n this._scaleConfig.datum = datum;\n if (helper.isContinuous) {\n return helper.valueToPosition(value, this._scaleConfig);\n }\n return helper.dataToPosition(array(value), this._scaleConfig);\n }\n\n valueToPositionX(value: StringOrNumber | StringOrNumber[], datum?: any) {\n return this._axisPosition(this._xAxisHelper, value, datum);\n }\n valueToPositionY(value: StringOrNumber | StringOrNumber[], datum?: any) {\n return this._axisPosition(this._yAxisHelper, value, datum);\n }\n\n protected _dataToPosition(\n datum: Datum,\n axisHelper: IAxisHelper,\n field: string[],\n scaleDepth: number | undefined,\n getEncoder: () => (datum: Datum) => number,\n setEncoder: (encoder: (datum: Datum) => number) => void\n ): number {\n const encoder = getEncoder();\n if (encoder) {\n return encoder(datum);\n }\n\n if (!axisHelper) {\n setEncoder((datum: Datum) => Number.NaN);\n return Number.NaN;\n }\n const fields = (axisHelper.getFields ? axisHelper.getFields() : field).slice(0, scaleDepth);\n if (!fields || fields.length === 0) {\n setEncoder((datum: Datum) => null);\n return null;\n }\n\n if (axisHelper.isContinuous) {\n setEncoder((datum: Datum) => {\n this._scaleConfig.datum = datum;\n return axisHelper.valueToPosition(this.getDatumPositionValue(datum, fields[0]), this._scaleConfig);\n });\n } else {\n setEncoder((datum: Datum) => {\n this._scaleConfig.datum = datum;\n return axisHelper.dataToPosition(array(this.getDatumPositionValues(datum, fields)), this._scaleConfig);\n });\n }\n\n return getEncoder()(datum);\n }\n\n protected _positionXEncoder?: (datum: Datum) => number;\n protected _getPositionXEncoder = () => this._positionXEncoder?.bind(this);\n protected _setPositionXEncoder = (encoder: (datum: Datum) => number) => {\n this._positionXEncoder = encoder.bind(this);\n };\n\n dataToPositionX(datum: Datum): number {\n return this._dataToPosition(\n datum,\n this._xAxisHelper,\n this.fieldX,\n undefined,\n this._getPositionXEncoder,\n this._setPositionXEncoder\n );\n }\n\n protected _positionYEncoder?: (datum: Datum) => number;\n protected _getPositionYEncoder = () => this._positionYEncoder?.bind(this);\n protected _setPositionYEncoder = (encoder: (datum: Datum) => number) => {\n this._positionYEncoder = encoder.bind(this);\n };\n\n dataToPositionY(datum: Datum): number {\n return this._dataToPosition(\n datum,\n this._yAxisHelper,\n this.fieldY,\n undefined,\n this._getPositionYEncoder,\n this._setPositionYEncoder\n );\n }\n\n dataToPositionZ(datum: Datum): number {\n if (!this._zAxisHelper) {\n return Number.NaN;\n }\n const { dataToPosition } = this._zAxisHelper;\n\n return dataToPosition(this.getDatumPositionValues(datum, this._fieldZ), {\n bandPosition: this._bandPosition\n });\n }\n\n dataToPositionX1(datum: Datum): number {\n if (!this._xAxisHelper) {\n return Number.NaN;\n }\n return this._fieldX2 && this._fieldX2 in datum\n ? this.valueToPositionX(this.getDatumPositionValues(datum, this._fieldX2))\n : this.valueToPositionX(0);\n }\n\n dataToPositionY1(datum: Datum): number {\n if (!this._yAxisHelper) {\n return Number.NaN;\n }\n return this._fieldY2 && this._fieldY2 in datum\n ? this.valueToPositionY(this.getDatumPositionValues(datum, this._fieldY2))\n : this.valueToPositionY(0);\n }\n\n positionToData(p: IPoint): IPoint | null {\n if (!p) {\n return null;\n }\n return {\n x: this.positionToDataX(p.x),\n y: this.positionToDataY(p.y)\n };\n }\n\n positionToDataX(xPos: number): any | null {\n if (!this._scaleX) {\n return null;\n }\n return this._scaleX.invert(xPos);\n }\n\n positionToDataY(yPos: number): any | null {\n if (!this._scaleY) {\n return null;\n }\n return this._scaleY.invert(yPos);\n }\n\n getRegionRectLeft(): number {\n if (!this._xAxisHelper) {\n return Number.NaN;\n }\n const { getScale } = this._xAxisHelper;\n return getScale(0).range()[0];\n }\n\n getRegionRectRight(): number {\n if (!this._xAxisHelper) {\n return Number.NaN;\n }\n const { getScale } = this._xAxisHelper;\n return getScale(0).range()[1];\n }\n\n afterInitMark(): void {\n super.afterInitMark();\n this.setFieldX(this._fieldX);\n this.setFieldY(this._fieldY);\n this._buildScaleConfig();\n }\n\n getDimensionField(): string[] {\n if (this._direction === Direction.horizontal) {\n return this._specYField;\n }\n return this._specXField;\n }\n\n getDimensionContinuousField(): string[] {\n if (this._direction === Direction.horizontal) {\n return [this.fieldY[0], this.fieldY2];\n }\n return [this.fieldX[0], this.fieldX2];\n }\n\n getMeasureField(): string[] {\n if (this._direction === Direction.horizontal) {\n return this._specXField;\n }\n return this._specYField;\n }\n\n protected initEvent() {\n super.initEvent();\n // 通过轴事件来进行排序。轴的domain数据变化在系列的统计数据完成后\n if (this.sortDataByAxis) {\n this.event.on(\n ChartEvent.scaleDomainUpdate,\n {\n filter: param =>\n param.model.id ===\n (this._direction === Direction.horizontal ? this._yAxisHelper : this._xAxisHelper)?.getAxisId()\n },\n () => {\n // 只能排序,不能修改数据,此时已经在数据流的统计流程之后\n this._sortDataInAxisDomain();\n }\n );\n }\n }\n\n _sortDataInAxisDomain() {\n if (this.getViewData()?.latestData?.length) {\n sortDataInAxisHelper(\n this._direction === Direction.horizontal ? this._yAxisHelper : this._xAxisHelper,\n this._direction === Direction.horizontal ? this._fieldY[0] : this._fieldX[0],\n this.getViewData().latestData\n );\n this._data?.updateData(true);\n }\n }\n\n protected _getInvalidDefined(datum: Datum) {\n if (this._xAxisHelper && this._xAxisHelper.isContinuous) {\n if (!couldBeValidNumber(datum[this._specXField[0]])) {\n return false;\n }\n }\n if (this._yAxisHelper && this._yAxisHelper.isContinuous) {\n if (!couldBeValidNumber(datum[this._specYField[0]])) {\n return false;\n }\n }\n return true;\n }\n\n reInit(spec: T) {\n if (this._positionXEncoder) {\n this._positionXEncoder = null;\n }\n if (this._positionYEncoder) {\n this._positionYEncoder = null;\n }\n\n super.reInit(spec);\n }\n}\n"]}
1
+ {"version":3,"sources":["../src/series/cartesian/cartesian.ts"],"names":[],"mappings":";;;AACA,qDAAiD;AAGjD,6CASwB;AAOxB,6CAAkD;AAElD,6CAAgD;AAGhD,yCAAqD;AAIrD,yDAAmE;AAEnE,MAAsB,eACpB,SAAQ,wBAAa;IADvB;;QAIW,eAAU,GAAgB,WAAW,CAAC;QACrC,kBAAa,GAAG,GAAG,CAAC;QACpB,iBAAY,GAAqB;YACzC,YAAY,EAAE,IAAI,CAAC,aAAa;SACjC,CAAC;QAkDQ,eAAU,cAAqC;QAwD/C,oBAAe,GAAY,KAAK,CAAC;QAuOjC,yBAAoB,GAAG,GAAG,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,iBAAiB,0CAAE,IAAI,CAAC,IAAI,CAAC,CAAA,EAAA,CAAC;QAChE,yBAAoB,GAAG,CAAC,OAAiC,EAAE,EAAE;YACrE,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9C,CAAC,CAAC;QAcQ,yBAAoB,GAAG,GAAG,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,iBAAiB,0CAAE,IAAI,CAAC,IAAI,CAAC,CAAA,EAAA,CAAC;QAChE,yBAAoB,GAAG,CAAC,OAAiC,EAAE,EAAE;YACrE,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9C,CAAC,CAAC;IAkLJ,CAAC;IAthBW,iBAAiB;QACzB,IAAI,CAAC,YAAY,GAAG;YAClB,YAAY,EAAE,IAAI,CAAC,aAAa;SACjC,CAAC;IACJ,CAAC;IAGD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACD,SAAS,CAAC,CAAoB;QAC5B,IAAI,CAAC,OAAO,GAAG,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAGD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACD,SAAS,CAAC,CAAoB;QAC5B,IAAI,CAAC,OAAO,GAAG,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAGD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACD,SAAS,CAAC,CAAqB;QAC7B,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC;IAC/B,CAAC;IAGD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IACD,UAAU,CAAC,CAAS;QAClB,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;IACpB,CAAC;IAGD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IACD,UAAU,CAAC,CAAS;QAClB,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;IACpB,CAAC;IAMD,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAGD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACD,SAAS,CAAC,CAAa;QACrB,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;IACnB,CAAC;IAGD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACD,SAAS,CAAC,CAAa;QACrB,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;IACnB,CAAC;IAGD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACD,SAAS,CAAC,CAAa;QACrB,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;IACnB,CAAC;IAGD,cAAc;QACZ,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IACD,cAAc,CAAC,CAAc;QAC3B,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;QACtB,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC7B,CAAC;IAGD,cAAc;QACZ,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IACD,cAAc,CAAC,CAAc;QAC3B,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;QACtB,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC7B,CAAC;IAGD,cAAc;QACZ,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IACD,cAAc,CAAC,CAAc;QAC3B,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;QACtB,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC7B,CAAC;IAGD,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED,kBAAkB;QAChB,MAAM,MAAM,GAAuD,EAAE,CAAC;QACtE,MAAM,IAAI,GAAG;YACX;gBACE,UAAU,EAAE,IAAI,CAAC,cAAc,EAAE;gBACjC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO;aACxE;YACD;gBACE,UAAU,EAAE,IAAI,CAAC,cAAc,EAAE;gBACjC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO;aACxE;YACD;gBACE,UAAU,EAAE,IAAI,CAAC,cAAc,EAAE;gBACjC,MAAM,EAAE,IAAI,CAAC,OAAO;aACrB;SACF,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACxB,IAAI,UAAU,CAAC,UAAU,IAAI,UAAU,CAAC,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,MAAM,EAAE;gBAChF,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;oBAC5B,MAAM,MAAM,GAAgG;wBAC1G,GAAG,EAAE,CAAC;wBACN,UAAU,EAAE,EAAE;qBACf,CAAC;oBACF,MAAM,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;oBAChD,IAAI,IAAA,qBAAY,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE;wBAC5B,MAAM,CAAC,UAAU,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;wBAEnC,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE;4BACxB,MAAM,CAAC,MAAM,GAAG,CAAC,EAAO,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;yBACrC;qBACF;yBAAM;wBACL,MAAM,CAAC,UAAU,GAAG,CAAC,QAAQ,CAAC,CAAC;qBAChC;oBACD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACtB,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;YACnB,MAAM,CAAC,IAAI,CAAC;gBACV,GAAG,EAAE,IAAI,CAAC,kBAAkB,EAAE;gBAC9B,UAAU,EAAE,CAAC,UAAU,CAAC;aACzB,CAAC,CAAC;SACJ;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;IACrE,CAAC;IAED,mBAAmB;QACjB,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;IAC/B,CAAC;IAED,aAAa;;QACX,MAAM,MAAM,GAAG,MAAA,CACb,IAAI,CAAC,SAAS,iBAAyB,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,CACxF,0CAAE,SAAS,EAAE,CAAC;QACf,OAAO,MAAA,IAAI,CAAC,KAAK,CAAC,UAAU,mCAAI,GAAG,iBAAM,WAAW,IAAI,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC;IAC5E,CAAC;IAED,kBAAkB;QAEhB,IAAI,IAAI,CAAC,SAAS,iBAAyB,EAAE;YAC3C,OAAO,IAAA,cAAK,EAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;SACpC;QACD,OAAO,IAAA,cAAK,EAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,oBAAoB;QAClB,IAAI,IAAI,CAAC,SAAS,iBAAyB,EAAE;YAC3C,IAAI,CAAC,SAAS,CAAC,0BAAe,CAAC,CAAC;YAChC,IAAI,CAAC,UAAU,CAAC,4BAAiB,CAAC,CAAC;SACpC;aAAM;YACL,IAAI,CAAC,SAAS,CAAC,0BAAe,CAAC,CAAC;YAChC,IAAI,CAAC,UAAU,CAAC,4BAAiB,CAAC,CAAC;SACpC;IACH,CAAC;IAED,sBAAsB;QACpB,IAAI,IAAI,CAAC,SAAS,iBAAyB,EAAE;YAC3C,IAAI,CAAC,SAAS,CAAC,kCAAuB,CAAC,CAAC;YACxC,IAAI,CAAC,UAAU,CAAC,oCAAyB,CAAC,CAAC;SAC5C;aAAM;YACL,IAAI,CAAC,SAAS,CAAC,kCAAuB,CAAC,CAAC;YACxC,IAAI,CAAC,UAAU,CAAC,oCAAyB,CAAC,CAAC;SAC5C;IACH,CAAC;IAED,oCAAoC;QAClC,IAAI,IAAI,CAAC,SAAS,iBAAyB,EAAE;YAC3C,IAAI,CAAC,SAAS,CAAC,2CAAgC,CAAC,CAAC;YACjD,IAAI,CAAC,UAAU,CAAC,6CAAkC,CAAC,CAAC;SACrD;aAAM;YACL,IAAI,CAAC,SAAS,CAAC,2CAAgC,CAAC,CAAC;YACjD,IAAI,CAAC,UAAU,CAAC,6CAAkC,CAAC,CAAC;SACrD;IACH,CAAC;IAED,mBAAmB;QACjB,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;IAED,mBAAmB;QACjB,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;IAED,mBAAmB;QACjB,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;IAED,eAAe;;QACb,KAAK,CAAC,eAAe,EAAE,CAAC;QACxB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAClC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAClC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAClC,IAAI,CAAC,WAAW,GAAG,IAAA,cAAK,EAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,WAAW,GAAG,IAAA,cAAK,EAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,IAAA,gBAAO,EAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;YACjC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;SACxC;QAED,IAAI,CAAC,UAAU,CAAC,MAAA,IAAI,CAAC,KAAK,0CAAE,OAAO,CAAC,CAAC;QACrC,IAAI,CAAC,UAAU,CAAC,MAAA,IAAI,CAAC,KAAK,0CAAE,OAAO,CAAC,CAAC;QAErC,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;YACnB,IAAI,CAAC,oBAAoB,EAAE,CAAC;SAC7B;QACD,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE;YACrB,IAAI,CAAC,sBAAsB,EAAE,CAAC;SAC/B;QACD,IAAI,IAAI,CAAC,wBAAwB,EAAE,EAAE;YACnC,IAAI,CAAC,oCAAoC,EAAE,CAAC;SAC7C;QAED,IAAI,IAAA,gBAAO,EAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE;YACtC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,KAAK,IAAI,CAAC;SAC3D;IACH,CAAC;IAED,cAAc,CAAC,KAAY,EAAE,eAAyB;QACpD,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,IAAI,CAAC;SACb;QACD,IAAI,eAAe,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE;YACrD,OAAO,IAAI,CAAC;SACb;QACD,OAAO;YACL,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;YAC9B,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;SACrB,CAAC;IACd,CAAC;IAES,0BAA0B;QAClC,KAAK,CAAC,0BAA0B,EAAE,CAAC;QAEnC,IAAI,CAAC,qBAAqB,CAAC,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvE,IAAI,CAAC,qBAAqB,CAAC,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvE,IAAI,CAAC,qBAAqB,CAAC,UAAU,GAAG,CAAC,QAAgB,CAAC,EAAE,EAAE,mBAAC,OAAA,MAAA,MAAA,MAAA,IAAI,CAAC,cAAc,EAAE,EAAC,YAAY,mDAAG,KAAK,CAAC,mCAAI,CAAC,CAAA,EAAA,CAAC;QAChH,IAAI,CAAC,qBAAqB,CAAC,UAAU,GAAG,CAAC,QAAgB,CAAC,EAAE,EAAE,mBAAC,OAAA,MAAA,MAAA,MAAA,IAAI,CAAC,cAAc,EAAE,EAAC,YAAY,mDAAG,KAAK,CAAC,mCAAI,CAAC,CAAA,EAAA,CAAC;QAChH,IAAI,CAAC,qBAAqB,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/E,CAAC;IAED,eAAe,CAAC,MAAyC,EAAE,MAAyC;QAClG,OAAO;YACL,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;YAChC,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;SACjC,CAAC;IACJ,CAAC;IAES,aAAa,CAAC,MAAmB,EAAE,KAAwC,EAAE,KAAW;QAChG,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,KAAK,CAAC;QAChC,IAAI,MAAM,CAAC,YAAY,EAAE;YACvB,OAAO,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;SACzD;QACD,OAAO,MAAM,CAAC,cAAc,CAAC,IAAA,cAAK,EAAC,KAAK,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAChE,CAAC;IAED,gBAAgB,CAAC,KAAwC,EAAE,KAAW;QACpE,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;IACD,gBAAgB,CAAC,KAAwC,EAAE,KAAW;QACpE,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;IAES,eAAe,CACvB,KAAY,EACZ,UAAuB,EACvB,KAAe,EACf,UAA8B,EAC9B,UAA0C,EAC1C,UAAuD;QAEvD,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;QAC7B,IAAI,OAAO,EAAE;YACX,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC;SACvB;QAED,IAAI,CAAC,UAAU,EAAE;YACf,UAAU,CAAC,CAAC,KAAY,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACzC,OAAO,MAAM,CAAC,GAAG,CAAC;SACnB;QACD,MAAM,MAAM,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;QAC5F,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YAClC,UAAU,CAAC,CAAC,KAAY,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC;SACb;QAED,IAAI,UAAU,CAAC,YAAY,EAAE;YAC3B,UAAU,CAAC,CAAC,KAAY,EAAE,EAAE;gBAC1B,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,KAAK,CAAC;gBAChC,OAAO,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YACrG,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,UAAU,CAAC,CAAC,KAAY,EAAE,EAAE;gBAC1B,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,KAAK,CAAC;gBAChC,OAAO,UAAU,CAAC,cAAc,CAAC,IAAA,cAAK,EAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YACzG,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAQD,eAAe,CAAC,KAAY;QAC1B,OAAO,IAAI,CAAC,eAAe,CACzB,KAAK,EACL,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,MAAM,EACX,SAAS,EACT,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,oBAAoB,CAC1B,CAAC;IACJ,CAAC;IAQD,eAAe,CAAC,KAAY;QAC1B,OAAO,IAAI,CAAC,eAAe,CACzB,KAAK,EACL,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,MAAM,EACX,SAAS,EACT,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,oBAAoB,CAC1B,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,KAAY;QAC1B,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,OAAO,MAAM,CAAC,GAAG,CAAC;SACnB;QACD,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QAE7C,OAAO,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;YACtE,YAAY,EAAE,IAAI,CAAC,aAAa;SACjC,CAAC,CAAC;IACL,CAAC;IAED,gBAAgB,CAAC,KAAY;QAC3B,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,OAAO,MAAM,CAAC,GAAG,CAAC;SACnB;QACD,OAAO,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,IAAI,KAAK;YAC5C,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1E,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC;IAED,gBAAgB,CAAC,KAAY;QAC3B,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,OAAO,MAAM,CAAC,GAAG,CAAC;SACnB;QACD,OAAO,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,IAAI,KAAK;YAC5C,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1E,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC;IAED,cAAc,CAAC,CAAS;QACtB,IAAI,CAAC,CAAC,EAAE;YACN,OAAO,IAAI,CAAC;SACb;QACD,OAAO;YACL,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5B,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;SAC7B,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,IAAY;QAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,OAAO,IAAI,CAAC;SACb;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,eAAe,CAAC,IAAY;QAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,OAAO,IAAI,CAAC;SACb;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,iBAAiB;QACf,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,OAAO,MAAM,CAAC,GAAG,CAAC;SACnB;QACD,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC;IAED,kBAAkB;QAChB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,OAAO,MAAM,CAAC,GAAG,CAAC;SACnB;QACD,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC;IAED,aAAa;QACX,KAAK,CAAC,aAAa,EAAE,CAAC;QACtB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAED,iBAAiB;QACf,IAAI,IAAI,CAAC,UAAU,iBAAyB,EAAE;YAC5C,OAAO,IAAI,CAAC,WAAW,CAAC;SACzB;QACD,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,2BAA2B;QACzB,IAAI,IAAI,CAAC,UAAU,iBAAyB,EAAE;YAC5C,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;SACvC;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,eAAe;QACb,IAAI,IAAI,CAAC,UAAU,iBAAyB,EAAE;YAC5C,OAAO,IAAI,CAAC,WAAW,CAAC;SACzB;QACD,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAES,SAAS;QACjB,KAAK,CAAC,SAAS,EAAE,CAAC;QAElB,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,IAAI,CAAC,KAAK,CAAC,EAAE,CACX,qBAAU,CAAC,iBAAiB,EAC5B;gBACE,MAAM,EAAE,KAAK,CAAC,EAAE;;oBACd,OAAA,KAAK,CAAC,KAAK,CAAC,EAAE;yBACd,MAAA,CAAC,IAAI,CAAC,UAAU,iBAAyB,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,0CAAE,SAAS,EAAE,CAAA,CAAA;iBAAA;aAClG,EACD,GAAG,EAAE;gBAEH,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC/B,CAAC,CACF,CAAC;SACH;IACH,CAAC;IAED,qBAAqB;;QACnB,IAAI,MAAA,MAAA,IAAI,CAAC,WAAW,EAAE,0CAAE,UAAU,0CAAE,MAAM,EAAE;YAC1C,IAAA,4BAAoB,EAClB,IAAI,CAAC,UAAU,iBAAyB,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,EAChF,IAAI,CAAC,UAAU,iBAAyB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAC5E,IAAI,CAAC,WAAW,EAAE,CAAC,UAAU,CAC9B,CAAC;YACF,MAAA,IAAI,CAAC,KAAK,0CAAE,UAAU,CAAC,IAAI,CAAC,CAAC;SAC9B;IACH,CAAC;IAES,qBAAqB;QAC7B,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,IACE,IAAI,CAAC,YAAY;YACjB,IAAI,CAAC,YAAY,CAAC,YAAY;YAC9B,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,KAAK,wBAAiB,CAAC,aAAa,EACnE;YACA,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;YAC/F,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAClB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACjB,CAAC,CAAC,CAAC;SACJ;QAED,IACE,IAAI,CAAC,YAAY;YACjB,IAAI,CAAC,YAAY,CAAC,YAAY;YAC9B,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,KAAK,wBAAiB,CAAC,aAAa,EACnE;YACA,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;YAE/F,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAClB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACjB,CAAC,CAAC,CAAC;SACJ;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,IAAO;QACZ,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;SAC/B;QACD,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;SAC/B;QAED,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;CACF;AA/hBD,0CA+hBC","file":"cartesian.js","sourcesContent":["import type { ICartesianSeries } from '../interface';\nimport { BaseSeries } from '../base/base-series';\nimport type { IPoint } from '../../typings/coordinate';\nimport type { IBaseScale } from '@visactor/vscale';\nimport {\n STACK_FIELD_END,\n STACK_FIELD_END_PERCENT,\n STACK_FIELD_END_OffsetSilhouette,\n STACK_FIELD_START,\n STACK_FIELD_START_PERCENT,\n STACK_FIELD_START_OffsetSilhouette,\n PREFIX,\n ChartEvent\n} from '../../constant';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport type { DirectionType } from '../../typings/space';\n// eslint-disable-next-line no-duplicate-imports\nimport { Direction } from '../../typings/space';\nimport type { Datum, StringOrNumber } from '../../typings';\nimport { couldBeValidNumber } from '../../util/type';\nimport { array, isValid } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous } from '@visactor/vscale';\nimport type { StatisticOperations } from '../../data/transforms/dimension-statistics';\nimport type { ICartesianSeriesSpec } from './interface';\nimport { sortDataInAxisHelper } from '../util/utils';\nimport type { IAxisLocationCfg } from '../../component/axis';\nimport { registerDataSetInstanceTransform } from '../../data/register';\nimport { invalidTravel } from '../../data/transforms/invalid-travel';\nimport { ComponentTypeEnum } from '../../component/interface/type';\n\nexport abstract class CartesianSeries<T extends ICartesianSeriesSpec = ICartesianSeriesSpec>\n extends BaseSeries<T>\n implements ICartesianSeries\n{\n readonly coordinate: 'cartesian' = 'cartesian';\n protected _bandPosition = 0.5;\n protected _scaleConfig: IAxisLocationCfg = {\n bandPosition: this._bandPosition\n };\n protected _buildScaleConfig() {\n this._scaleConfig = {\n bandPosition: this._bandPosition\n };\n }\n\n protected _fieldX!: string[];\n get fieldX() {\n return this._fieldX;\n }\n setFieldX(f: string | string[]) {\n this._fieldX = array(f);\n }\n\n protected _fieldY!: string[];\n get fieldY() {\n return this._fieldY;\n }\n setFieldY(f: string | string[]) {\n this._fieldY = array(f);\n }\n\n protected _fieldZ?: string[];\n get fieldZ(): string[] | undefined {\n return this._fieldZ;\n }\n setFieldZ(f?: string | string[]) {\n this._fieldZ = f && array(f);\n }\n\n protected _fieldX2!: string;\n get fieldX2() {\n return this._fieldX2;\n }\n setFieldX2(f: string) {\n this._fieldX2 = f;\n }\n\n protected _fieldY2!: string;\n get fieldY2() {\n return this._fieldY2;\n }\n setFieldY2(f: string) {\n this._fieldY2 = f;\n }\n\n protected _specXField: string[];\n protected _specYField: string[];\n\n protected _direction: DirectionType = Direction.vertical;\n get direction() {\n return this._direction;\n }\n\n protected _scaleX!: IBaseScale;\n get scaleX() {\n return this._scaleX;\n }\n setScaleX(s: IBaseScale) {\n this._scaleX = s;\n }\n\n protected _scaleY!: IBaseScale;\n get scaleY() {\n return this._scaleY;\n }\n setScaleY(s: IBaseScale) {\n this._scaleY = s;\n }\n\n protected _scaleZ?: IBaseScale;\n get scaleZ() {\n return this._scaleZ;\n }\n setScaleZ(s: IBaseScale) {\n this._scaleZ = s;\n }\n\n _xAxisHelper!: IAxisHelper;\n getXAxisHelper() {\n return this._xAxisHelper;\n }\n setXAxisHelper(h: IAxisHelper) {\n this._xAxisHelper = h;\n this.onXAxisHelperUpdate();\n }\n\n _yAxisHelper!: IAxisHelper;\n getYAxisHelper() {\n return this._yAxisHelper;\n }\n setYAxisHelper(h: IAxisHelper) {\n this._yAxisHelper = h;\n this.onYAxisHelperUpdate();\n }\n\n _zAxisHelper?: IAxisHelper;\n getZAxisHelper() {\n return this._zAxisHelper;\n }\n setZAxisHelper(h: IAxisHelper) {\n this._zAxisHelper = h;\n this.onYAxisHelperUpdate();\n }\n\n protected _sortDataByAxis: boolean = false;\n get sortDataByAxis() {\n return this._sortDataByAxis;\n }\n\n getStatisticFields() {\n const fields: { key: string; operations: StatisticOperations }[] = [];\n const axes = [\n {\n axisHelper: this.getXAxisHelper(),\n fields: this._fieldX2 ? [...this._fieldX, this._fieldX2] : this._fieldX\n },\n {\n axisHelper: this.getYAxisHelper(),\n fields: this._fieldY2 ? [...this._fieldY, this._fieldY2] : this._fieldY\n },\n {\n axisHelper: this.getZAxisHelper(),\n fields: this._fieldZ\n }\n ];\n\n axes.forEach(axisOption => {\n if (axisOption.axisHelper && axisOption.axisHelper.getScale && axisOption.fields) {\n axisOption.fields.forEach(f => {\n const result: { key: string; operations: Array<'max' | 'min' | 'values'>; filter?: (fv: any) => boolean } = {\n key: f,\n operations: []\n };\n const scale = axisOption.axisHelper.getScale(0);\n if (isContinuous(scale.type)) {\n result.operations = ['max', 'min'];\n\n if (scale.type === 'log') {\n result.filter = (fv: any) => fv > 0;\n }\n } else {\n result.operations = ['values'];\n }\n fields.push(result);\n });\n }\n });\n\n if (this.getStack()) {\n fields.push({\n key: this.getStackValueField(),\n operations: ['allValid']\n });\n }\n return fields;\n }\n\n getGroupFields() {\n return this.direction === 'vertical' ? this._fieldX : this._fieldY;\n }\n\n getStackGroupFields(): string[] {\n return this.getGroupFields();\n }\n\n getStackValue() {\n const axisId = (\n this.direction === Direction.horizontal ? this.getXAxisHelper() : this.getYAxisHelper()\n )?.getAxisId();\n return this._spec.stackValue ?? `${PREFIX}_series_${this.type}_${axisId}`;\n }\n\n getStackValueField() {\n // TODO: hack\n if (this.direction === Direction.horizontal) {\n return array(this._spec.xField)[0];\n }\n return array(this._spec.yField)[0];\n }\n\n setValueFieldToStack(): void {\n if (this.direction === Direction.horizontal) {\n this.setFieldX(STACK_FIELD_END);\n this.setFieldX2(STACK_FIELD_START);\n } else {\n this.setFieldY(STACK_FIELD_END);\n this.setFieldY2(STACK_FIELD_START);\n }\n }\n\n setValueFieldToPercent(): void {\n if (this.direction === Direction.horizontal) {\n this.setFieldX(STACK_FIELD_END_PERCENT);\n this.setFieldX2(STACK_FIELD_START_PERCENT);\n } else {\n this.setFieldY(STACK_FIELD_END_PERCENT);\n this.setFieldY2(STACK_FIELD_START_PERCENT);\n }\n }\n\n setValueFieldToStackOffsetSilhouette(): void {\n if (this.direction === Direction.horizontal) {\n this.setFieldX(STACK_FIELD_END_OffsetSilhouette);\n this.setFieldX2(STACK_FIELD_START_OffsetSilhouette);\n } else {\n this.setFieldY(STACK_FIELD_END_OffsetSilhouette);\n this.setFieldY2(STACK_FIELD_START_OffsetSilhouette);\n }\n }\n\n onXAxisHelperUpdate(): void {\n this.onMarkPositionUpdate();\n }\n\n onYAxisHelperUpdate(): void {\n this.onMarkPositionUpdate();\n }\n\n onZAxisHelperUpdate(): void {\n this.onMarkPositionUpdate();\n }\n\n setAttrFromSpec() {\n super.setAttrFromSpec();\n this.setFieldX(this._spec.xField);\n this.setFieldY(this._spec.yField);\n this.setFieldZ(this._spec.zField);\n this._specXField = array(this._spec.xField);\n this._specYField = array(this._spec.yField);\n if (isValid(this._spec.direction)) {\n this._direction = this._spec.direction;\n }\n\n this.setFieldX2(this._spec?.x2Field);\n this.setFieldY2(this._spec?.y2Field);\n\n if (this.getStack()) {\n this.setValueFieldToStack();\n }\n if (this.getPercent()) {\n this.setValueFieldToPercent();\n }\n if (this.getStackOffsetSilhouette()) {\n this.setValueFieldToStackOffsetSilhouette();\n }\n\n if (isValid(this._spec.sortDataByAxis)) {\n this._sortDataByAxis = this._spec.sortDataByAxis === true;\n }\n }\n\n dataToPosition(datum: Datum, checkInViewData?: boolean): IPoint | null {\n if (!datum) {\n return null;\n }\n if (checkInViewData && !this.isDatumInViewData(datum)) {\n return null;\n }\n return {\n x: this.dataToPositionX(datum),\n y: this.dataToPositionY(datum)\n } as IPoint;\n }\n\n protected _buildMarkAttributeContext() {\n super._buildMarkAttributeContext();\n // position\n this._markAttributeContext.valueToX = this.valueToPositionX.bind(this);\n this._markAttributeContext.valueToY = this.valueToPositionY.bind(this);\n this._markAttributeContext.xBandwidth = (depth: number = 0) => this.getXAxisHelper().getBandwidth?.(depth) ?? 0;\n this._markAttributeContext.yBandwidth = (depth: number = 0) => this.getYAxisHelper().getBandwidth?.(depth) ?? 0;\n this._markAttributeContext.valueToPosition = this.valueToPosition.bind(this);\n }\n\n valueToPosition(xValue: StringOrNumber | StringOrNumber[], yValue: StringOrNumber | StringOrNumber[]) {\n return {\n x: this.valueToPositionX(xValue),\n y: this.valueToPositionY(yValue)\n };\n }\n\n protected _axisPosition(helper: IAxisHelper, value: StringOrNumber | StringOrNumber[], datum?: any) {\n this._scaleConfig.datum = datum;\n if (helper.isContinuous) {\n return helper.valueToPosition(value, this._scaleConfig);\n }\n return helper.dataToPosition(array(value), this._scaleConfig);\n }\n\n valueToPositionX(value: StringOrNumber | StringOrNumber[], datum?: any) {\n return this._axisPosition(this._xAxisHelper, value, datum);\n }\n valueToPositionY(value: StringOrNumber | StringOrNumber[], datum?: any) {\n return this._axisPosition(this._yAxisHelper, value, datum);\n }\n\n protected _dataToPosition(\n datum: Datum,\n axisHelper: IAxisHelper,\n field: string[],\n scaleDepth: number | undefined,\n getEncoder: () => (datum: Datum) => number,\n setEncoder: (encoder: (datum: Datum) => number) => void\n ): number {\n const encoder = getEncoder();\n if (encoder) {\n return encoder(datum);\n }\n\n if (!axisHelper) {\n setEncoder((datum: Datum) => Number.NaN);\n return Number.NaN;\n }\n const fields = (axisHelper.getFields ? axisHelper.getFields() : field).slice(0, scaleDepth);\n if (!fields || fields.length === 0) {\n setEncoder((datum: Datum) => null);\n return null;\n }\n\n if (axisHelper.isContinuous) {\n setEncoder((datum: Datum) => {\n this._scaleConfig.datum = datum;\n return axisHelper.valueToPosition(this.getDatumPositionValue(datum, fields[0]), this._scaleConfig);\n });\n } else {\n setEncoder((datum: Datum) => {\n this._scaleConfig.datum = datum;\n return axisHelper.dataToPosition(array(this.getDatumPositionValues(datum, fields)), this._scaleConfig);\n });\n }\n\n return getEncoder()(datum);\n }\n\n protected _positionXEncoder?: (datum: Datum) => number;\n protected _getPositionXEncoder = () => this._positionXEncoder?.bind(this);\n protected _setPositionXEncoder = (encoder: (datum: Datum) => number) => {\n this._positionXEncoder = encoder.bind(this);\n };\n\n dataToPositionX(datum: Datum): number {\n return this._dataToPosition(\n datum,\n this._xAxisHelper,\n this.fieldX,\n undefined,\n this._getPositionXEncoder,\n this._setPositionXEncoder\n );\n }\n\n protected _positionYEncoder?: (datum: Datum) => number;\n protected _getPositionYEncoder = () => this._positionYEncoder?.bind(this);\n protected _setPositionYEncoder = (encoder: (datum: Datum) => number) => {\n this._positionYEncoder = encoder.bind(this);\n };\n\n dataToPositionY(datum: Datum): number {\n return this._dataToPosition(\n datum,\n this._yAxisHelper,\n this.fieldY,\n undefined,\n this._getPositionYEncoder,\n this._setPositionYEncoder\n );\n }\n\n dataToPositionZ(datum: Datum): number {\n if (!this._zAxisHelper) {\n return Number.NaN;\n }\n const { dataToPosition } = this._zAxisHelper;\n\n return dataToPosition(this.getDatumPositionValues(datum, this._fieldZ), {\n bandPosition: this._bandPosition\n });\n }\n\n dataToPositionX1(datum: Datum): number {\n if (!this._xAxisHelper) {\n return Number.NaN;\n }\n return this._fieldX2 && this._fieldX2 in datum\n ? this.valueToPositionX(this.getDatumPositionValues(datum, this._fieldX2))\n : this.valueToPositionX(0);\n }\n\n dataToPositionY1(datum: Datum): number {\n if (!this._yAxisHelper) {\n return Number.NaN;\n }\n return this._fieldY2 && this._fieldY2 in datum\n ? this.valueToPositionY(this.getDatumPositionValues(datum, this._fieldY2))\n : this.valueToPositionY(0);\n }\n\n positionToData(p: IPoint): IPoint | null {\n if (!p) {\n return null;\n }\n return {\n x: this.positionToDataX(p.x),\n y: this.positionToDataY(p.y)\n };\n }\n\n positionToDataX(xPos: number): any | null {\n if (!this._scaleX) {\n return null;\n }\n return this._scaleX.invert(xPos);\n }\n\n positionToDataY(yPos: number): any | null {\n if (!this._scaleY) {\n return null;\n }\n return this._scaleY.invert(yPos);\n }\n\n getRegionRectLeft(): number {\n if (!this._xAxisHelper) {\n return Number.NaN;\n }\n const { getScale } = this._xAxisHelper;\n return getScale(0).range()[0];\n }\n\n getRegionRectRight(): number {\n if (!this._xAxisHelper) {\n return Number.NaN;\n }\n const { getScale } = this._xAxisHelper;\n return getScale(0).range()[1];\n }\n\n afterInitMark(): void {\n super.afterInitMark();\n this.setFieldX(this._fieldX);\n this.setFieldY(this._fieldY);\n this._buildScaleConfig();\n }\n\n getDimensionField(): string[] {\n if (this._direction === Direction.horizontal) {\n return this._specYField;\n }\n return this._specXField;\n }\n\n getDimensionContinuousField(): string[] {\n if (this._direction === Direction.horizontal) {\n return [this.fieldY[0], this.fieldY2];\n }\n return [this.fieldX[0], this.fieldX2];\n }\n\n getMeasureField(): string[] {\n if (this._direction === Direction.horizontal) {\n return this._specXField;\n }\n return this._specYField;\n }\n\n protected initEvent() {\n super.initEvent();\n // 通过轴事件来进行排序。轴的domain数据变化在系列的统计数据完成后\n if (this.sortDataByAxis) {\n this.event.on(\n ChartEvent.scaleDomainUpdate,\n {\n filter: param =>\n param.model.id ===\n (this._direction === Direction.horizontal ? this._yAxisHelper : this._xAxisHelper)?.getAxisId()\n },\n () => {\n // 只能排序,不能修改数据,此时已经在数据流的统计流程之后\n this._sortDataInAxisDomain();\n }\n );\n }\n }\n\n _sortDataInAxisDomain() {\n if (this.getViewData()?.latestData?.length) {\n sortDataInAxisHelper(\n this._direction === Direction.horizontal ? this._yAxisHelper : this._xAxisHelper,\n this._direction === Direction.horizontal ? this._fieldY[0] : this._fieldX[0],\n this.getViewData().latestData\n );\n this._data?.updateData(true);\n }\n }\n\n protected getInvalidCheckFields() {\n const fields: string[] = [];\n\n if (\n this._xAxisHelper &&\n this._xAxisHelper.isContinuous &&\n this._xAxisHelper.getAxisType() !== ComponentTypeEnum.geoCoordinate\n ) {\n const xFields = this._xAxisHelper.getFields ? this._xAxisHelper.getFields() : this._specXField;\n xFields.forEach(f => {\n fields.push(f);\n });\n }\n\n if (\n this._yAxisHelper &&\n this._yAxisHelper.isContinuous &&\n this._yAxisHelper.getAxisType() !== ComponentTypeEnum.geoCoordinate\n ) {\n const yFields = this._yAxisHelper.getFields ? this._yAxisHelper.getFields() : this._specYField;\n\n yFields.forEach(f => {\n fields.push(f);\n });\n }\n return fields;\n }\n\n reInit(spec: T) {\n if (this._positionXEncoder) {\n this._positionXEncoder = null;\n }\n if (this._positionYEncoder) {\n this._positionYEncoder = null;\n }\n\n super.reInit(spec);\n }\n}\n"]}
@@ -1,5 +1,5 @@
1
1
  import type { Datum } from '../../typings';
2
2
  import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
3
3
  export declare class CirclePackingTooltipHelper extends BaseSeriesTooltipHelper {
4
- contentKeyCallback: (datum: Datum) => any;
4
+ markTooltipKeyCallback: (datum: Datum) => any;
5
5
  }
@@ -8,7 +8,7 @@ const tooltip_helper_1 = require("../base/tooltip-helper");
8
8
 
9
9
  class CirclePackingTooltipHelper extends tooltip_helper_1.BaseSeriesTooltipHelper {
10
10
  constructor() {
11
- super(...arguments), this.contentKeyCallback = datum => null == datum ? void 0 : datum[this.series.getDimensionField()[0]];
11
+ super(...arguments), this.markTooltipKeyCallback = datum => null == datum ? void 0 : datum[this.series.getDimensionField()[0]];
12
12
  }
13
13
  }
14
14
 
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/series/circle-packing/tooltip-helper.ts"],"names":[],"mappings":";;;AACA,2DAAiE;AAEjE,MAAa,0BAA2B,SAAQ,wCAAuB;IAAvE;;QACE,uBAAkB,GAAG,CAAC,KAAY,EAAE,EAAE;YACpC,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,CAAC,CAAC;IACJ,CAAC;CAAA;AAJD,gEAIC","file":"tooltip-helper.js","sourcesContent":["import type { Datum } from '../../typings';\nimport { BaseSeriesTooltipHelper } from '../base/tooltip-helper';\n\nexport class CirclePackingTooltipHelper extends BaseSeriesTooltipHelper {\n contentKeyCallback = (datum: Datum) => {\n return datum?.[this.series.getDimensionField()[0]];\n };\n}\n"]}
1
+ {"version":3,"sources":["../src/series/circle-packing/tooltip-helper.ts"],"names":[],"mappings":";;;AACA,2DAAiE;AAEjE,MAAa,0BAA2B,SAAQ,wCAAuB;IAAvE;;QACE,2BAAsB,GAAG,CAAC,KAAY,EAAE,EAAE;YACxC,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,CAAC,CAAC;IACJ,CAAC;CAAA;AAJD,gEAIC","file":"tooltip-helper.js","sourcesContent":["import type { Datum } from '../../typings';\nimport { BaseSeriesTooltipHelper } from '../base/tooltip-helper';\n\nexport class CirclePackingTooltipHelper extends BaseSeriesTooltipHelper {\n markTooltipKeyCallback = (datum: Datum) => {\n return datum?.[this.series.getDimensionField()[0]];\n };\n}\n"]}
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: !0
5
5
  }), exports.registerDotSeries = exports.DotSeries = void 0;
6
6
 
7
- const index_1 = require("../../constant/index"), cartesian_1 = require("../cartesian/cartesian"), merge_spec_1 = require("../../util/spec/merge-spec"), vutils_1 = require("@visactor/vutils"), type_1 = require("../interface/type"), vdataset_1 = require("@visactor/vdataset"), register_1 = require("../../data/register"), tooltip_helper_1 = require("./tooltip-helper"), copy_data_view_1 = require("../../data/transforms/copy-data-view"), obj_flat_1 = require("../../data/transforms/obj-flat"), config_1 = require("./config"), color_ordinal_scale_1 = require("../../scale/color-ordinal-scale"), symbol_1 = require("../../mark/symbol"), text_1 = require("../../mark/text"), rule_1 = require("../../mark/rule"), rect_1 = require("../../mark/rect"), constant_1 = require("./constant"), factory_1 = require("../../core/factory"), initialize_1 = require("../../data/initialize");
7
+ const index_1 = require("../../constant/index"), cartesian_1 = require("../cartesian/cartesian"), vutils_extension_1 = require("@visactor/vutils-extension"), vutils_1 = require("@visactor/vutils"), type_1 = require("../interface/type"), vdataset_1 = require("@visactor/vdataset"), register_1 = require("../../data/register"), tooltip_helper_1 = require("./tooltip-helper"), copy_data_view_1 = require("../../data/transforms/copy-data-view"), obj_flat_1 = require("../../data/transforms/obj-flat"), config_1 = require("./config"), color_ordinal_scale_1 = require("../../scale/color-ordinal-scale"), symbol_1 = require("../../mark/symbol"), text_1 = require("../../mark/text"), rule_1 = require("../../mark/rule"), rect_1 = require("../../mark/rect"), constant_1 = require("./constant"), factory_1 = require("../../core/factory"), initialize_1 = require("../../data/initialize");
8
8
 
9
9
  class DotSeries extends cartesian_1.CartesianSeries {
10
10
  constructor() {
@@ -72,7 +72,7 @@ class DotSeries extends cartesian_1.CartesianSeries {
72
72
  super.setAttrFromSpec(), this.setSeriesGroupField(this._spec.seriesGroupField),
73
73
  this.setTitleField(this._spec.titleField), this.setSubTitleField(this._spec.subTitleField),
74
74
  this.setDotTypeField(this._spec.dotTypeField), this.setHighLightSeriesGroup(this._spec.highLightSeriesGroup),
75
- this.setGridBackground((0, merge_spec_1.mergeSpec)(config_1.DEFAULT_GRID_BACKGROUND, (null === (_a = this._spec.grid) || void 0 === _a ? void 0 : _a.background) || {}));
75
+ this.setGridBackground((0, vutils_extension_1.mergeSpec)(config_1.DEFAULT_GRID_BACKGROUND, (null === (_a = this._spec.grid) || void 0 === _a ? void 0 : _a.background) || {}));
76
76
  }
77
77
  initMark() {
78
78
  this._clipMark = this._createMark(DotSeries.mark.group), this._containerMark = this._createMark(DotSeries.mark.group, {
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/series/dot/dot.ts"],"names":[],"mappings":";;;AACA,gDAAiF;AACjF,sDAAyD;AAEzD,2DAAuD;AACvD,6CAA2C;AAM3C,4CAAmD;AACnD,iDAAoD;AACpD,kDAAsG;AAGtG,qDAA0D;AAI1D,yEAAoE;AACpE,6DAAyD;AACzD,qCAAmD;AACnD,yEAAoE;AAEpE,8CAAmE;AACnE,0CAA6D;AAC7D,0CAA6D;AAC7D,0CAA6D;AAC7D,yCAA2C;AAC3C,gDAA6C;AAC7C,sDAAuD;AAEvD,MAAa,SAAqD,SAAQ,2BAAkB;IAA5F;;QAEE,SAAI,GAAG,qBAAc,CAAC,GAAG,CAAC;IAwc5B,CAAC;IAhcC,mBAAmB;QACjB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IACD,mBAAmB,CAAC,KAAa;QAC/B,IAAI,IAAA,gBAAO,EAAC,KAAK,CAAC,EAAE;YAClB,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;SAChC;IACH,CAAC;IAGD,aAAa;QACX,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IACD,aAAa,CAAC,KAAa;QACzB,IAAI,IAAA,gBAAO,EAAC,KAAK,CAAC,EAAE;YAClB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;SAC1B;IACH,CAAC;IAGD,gBAAgB;QACd,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IACD,gBAAgB,CAAC,KAAa;QAC5B,IAAI,IAAA,gBAAO,EAAC,KAAK,CAAC,EAAE;YAClB,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;SAC7B;IACH,CAAC;IAGD,eAAe;QACb,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IACD,eAAe,CAAC,KAAa;QAC3B,IAAI,IAAA,gBAAO,EAAC,KAAK,CAAC,EAAE;YAClB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;SAC5B;IACH,CAAC;IAGD,uBAAuB;QACrB,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACpC,CAAC;IACD,uBAAuB,CAAC,KAAa;QACnC,IAAI,IAAA,gBAAO,EAAC,KAAK,CAAC,EAAE;YAClB,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAC;SACpC;IACH,CAAC;IAGD,iBAAiB,CAAC,cAA6B;QAC7C,IAAI,IAAA,gBAAO,EAAC,cAAc,CAAC,EAAE;YAC3B,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;SACvC;IACH,CAAC;IAKD,QAAQ;;QACN,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjB,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAGtG,IAAA,2CAAgC,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,kBAAO,CAAC,CAAC;QAC3E,IAAA,2CAAgC,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,EAAE,6BAAY,CAAC,CAAC;QACrF,IAAA,wCAA6B,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,yBAAc,CAAC,CAAC;QAEhF,MAAA,IAAI,CAAC,WAAW,EAAE,0CAAE,SAAS,CAC3B;YACE,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,MAAM;YACf,KAAK,EAAE,2BAAc,CAAC,UAAU;SACjC,EACD,KAAK,CACN,CAAC;IACJ,CAAC;IAKD,cAAc,CAAC,KAAa;QAC1B,IAAI,IAAA,gBAAO,EAAC,KAAK,CAAC,EAAE;YAClB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,IAAI,CAAC,cAAc,CAAC,gBAAsC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACtE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAED,kBAAkB;QAChB,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,2BAA2B,EAAE,CAIlG,CAAC;IACN,CAAC;IAKD,eAAe;;QACb,KAAK,CAAC,eAAe,EAAE,CAAC;QACxB,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACtD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC1C,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAChD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC9C,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC9D,IAAI,CAAC,iBAAiB,CAAC,IAAA,sBAAS,EAAC,gCAAuB,EAAE,CAAA,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,0CAAE,UAAU,KAAI,EAAE,CAAC,CAAC,CAAC;IAChG,CAAC;IAUD,QAAQ;QACN,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAe,CAAC;QAEtE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE;YAC3D,MAAM,EAAE,IAAI,CAAC,SAAS;YACtB,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE;SAC5B,CAAe,CAAC;QAEjB,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE;YACzE,MAAM,EAAE,IAAI,CAAC,cAAc;YAC3B,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE;SAC5B,CAAc,CAAC;QAEhB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE;YACrD,MAAM,EAAE,IAAI,CAAC,cAAc;YAC3B,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE;SAC5B,CAAc,CAAC;QAEhB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE;YACnD,kBAAkB,EAAE,KAAK;YACzB,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,IAAI,CAAC,cAAc;SAC5B,CAAgB,CAAC;QAElB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE;YACvD,MAAM,EAAE,IAAI,CAAC,cAAc;YAC3B,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE;SAC5B,CAAc,CAAC;QAEhB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC7D,MAAM,EAAE,IAAI,CAAC,cAAc;YAC3B,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE;SAC5B,CAAc,CAAC;QAEhB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE;YACzD,MAAM,EAAE,IAAI,CAAC,cAAc;YAC3B,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE;SAC5B,CAAgB,CAAC;IACpB,CAAC;IAED,aAAa;QACX,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,QAAQ,EAAE;YACZ,IAAI,CAAC,YAAY,CACf,QAAQ,EACR;gBACE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB;gBAChC,CAAC,EAAE,CAAC;gBAEJ,KAAK,EAAE,KAAK;gBACZ,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU;gBAC7B,IAAI,EAAE,IAAI;aACX,EACD,QAAQ,EACR,sBAAc,CAAC,MAAM,CACtB,CAAC;YACF,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;SAChC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC;QAC1C,IAAI,aAAa,EAAE;YACjB,IAAI,CAAC,YAAY,CACf,aAAa,EACb;gBACE,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,iBAAiB;aAChC,EACD,QAAQ,EACR,sBAAc,CAAC,MAAM,CACtB,CAAC;YACF,aAAa,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;SACrC;QAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,mBAAmB,CAAC;QACpD,IAAI,kBAAkB,EAAE;YACtB,IAAI,CAAC,YAAY,CACf,kBAAkB,EAClB;gBACE,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;gBACpC,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;gBACtC,CAAC,EAAE,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC;gBAChD,EAAE,EAAE,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,IAAI,CAAC;gBAClD,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI;gBAC/B,WAAW,EAAE,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAyB;aACjF,EACD,QAAQ,EACR,sBAAc,CAAC,MAAM,CACtB,CAAC;SAEH;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,QAAQ,EAAE;YACZ,IAAI,CAAC,YAAY,CACf,QAAQ,EACR;gBACE,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE;gBAChC,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;gBACpC,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;gBAClC,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;gBACtC,EAAE,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;aACpC,EACD,QAAQ,EACR,sBAAc,CAAC,MAAM,CACtB,CAAC;SAEH;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,YAAY,CACf,OAAO,EACP;gBACE,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;gBAClC,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;gBAClC,IAAI,EAAE,IAAI,CAAC,oBAAoB,EAAE;gBACjC,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;aAC3C,EACD,QAAQ,EACR,sBAAc,CAAC,MAAM,CACtB,CAAC;SACH;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,SAAS,EAAE;YACb,IAAI,CAAC,YAAY,CACf,SAAS,EACT;gBACE,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE;gBAC9B,IAAI,EAAE,CAAC,KAAU,EAAE,EAAE;oBACnB,OAAO,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;gBACrC,CAAC;gBACD,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;gBACpC,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;aACnC,EACD,QAAQ,EACR,sBAAc,CAAC,MAAM,CACtB,CAAC;SAEH;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,IAAI,YAAY,EAAE;YAChB,IAAI,CAAC,YAAY,CACf,YAAY,EACZ;gBACE,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE;gBAC9B,IAAI,EAAE,CAAC,KAAU,EAAE,EAAE;oBACnB,OAAO,KAAK,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;gBACxC,CAAC;gBACD,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;gBACpC,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;aACnC,EACD,QAAQ,EACR,sBAAc,CAAC,MAAM,CACtB,CAAC;SAEH;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,UAAU,EAAE;YACd,IAAI,CAAC,YAAY,CACf,UAAU,EACV;gBACE,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;gBACpC,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;gBAClC,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE;aAC/B,EACD,QAAQ,EACR,sBAAc,CAAC,MAAM,CACtB,CAAC;SAEH;IACH,CAAC;IAED,6BAA6B,CAAC,KAAY;QACxC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,OAAO,MAAM,CAAC,GAAG,CAAC;SACnB;QACD,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QAE3D,OAAO,CACL,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;YAC/D,YAAY,EAAE,IAAI,CAAC,aAAa;SACjC,CAAC;YACF,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CACpB,CAAC;IACJ,CAAC;IAED,8BAA8B,CAAC,KAAY;QACzC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,OAAO,MAAM,CAAC,GAAG,CAAC;SACnB;QACD,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QAE3D,OAAO,CACL,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;YAC/D,YAAY,EAAE,IAAI,CAAC,aAAa;SACjC,CAAC;YACF,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CACpB,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,KAAY;;QACxB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,OAAO,MAAM,CAAC,GAAG,CAAC;SACnB;QACD,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QAEvD,IACE,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;YAC/D,YAAY,EAAE,IAAI,CAAC,aAAa;SACjC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC3B,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;gBAC/D,YAAY,EAAE,IAAI,CAAC,aAAa;aACjC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAC3B;YACA,OAAO,CAAC,CAAC;SACV;QACD,OAAO,MAAA,MAAA,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,GAAG,0CAAE,KAAK,0CAAE,WAAW,mCAAI,CAAC,CAAC;IACnD,CAAC;IAED,2BAA2B,CAAC,KAAY;QACtC,IAAI,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC,qBAAqB,EAAE;YAChE,OAAO,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC;SACzC;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAED,WAAW,CAAC,GAAQ;;QAClB,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACvB,MAAM,aAAa,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,iBAAiB,mCAAI,CAAC,CAAC;QACzD,IAAI,CAAC,YAAY,CACf,IAAI,CAAC,SAAS,EACd;YACE,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,KAAK,GAAG,aAAa;SAClD,EACD,QAAQ,EACR,sBAAc,CAAC,MAAM,CACtB,CAAC;IACJ,CAAC;IAMD,qBAAqB;;QACnB,OAAO,IAAI,CAAC,iBAAiB;YAC3B,CAAC,CAAC,MAAA,IAAI,CAAC,qBAAqB,EAAE,0CAAE,UAAU,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM;YACzE,CAAC,CAAC,IAAI,CAAC,YAAY;gBACnB,CAAC,CAAC,MAAA,IAAI,CAAC,qBAAqB,EAAE,0CAAE,UAAU,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM;gBACpE,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;IAMD,iBAAiB;;QACf,OAAO;YACL,KAAK,EAAE,MAAA,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,mCAAI,IAAI,CAAC,qBAAqB,EAAE;YACjF,KAAK,EAAE,MAAA,MAAA,IAAI,CAAC,iBAAiB,mCAAI,IAAI,CAAC,YAAY,mCAAI,iCAAyB;SAChF,CAAC;IACJ,CAAC;IAMS,gBAAgB;;QACxB,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa;YACpC,CAAC,CAAC,MAAA,IAAI,CAAC,qBAAqB,EAAE,0CAAE,UAAU,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM;YACrE,CAAC,CAAC,IAAI,CAAC,iBAAiB;gBACxB,CAAC,CAAC,MAAA,IAAI,CAAC,qBAAqB,EAAE,0CAAE,UAAU,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM;gBACzE,CAAC,CAAC,IAAI,CAAC,YAAY;oBACnB,CAAC,CAAC,MAAA,IAAI,CAAC,qBAAqB,EAAE,0CAAE,UAAU,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM;oBACpE,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACzC,OAAO,IAAI,uCAAiB,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACvE,CAAC;IAMD,oBAAoB;;QAClB,OAAO;YACL,KAAK,EAAE,MAAA,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,mCAAI,IAAI,CAAC,gBAAgB,EAAE;YAC5E,KAAK,EAAE,MAAA,MAAA,MAAA,IAAI,CAAC,aAAa,mCAAI,IAAI,CAAC,iBAAiB,mCAAI,IAAI,CAAC,YAAY,mCAAI,iCAAyB;SACtG,CAAC;IACJ,CAAC;IAES,WAAW;QACnB,IAAI,CAAC,cAAc,GAAG,IAAI,uCAAsB,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChF,CAAC;IAKD,aAAa,CAAC,GAAyB;QACrC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAES,wBAAwB,CAAC,KAAc;QAC/C,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAChB,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE;gBACtB,IAAI,CAAC,wBAAwB,CAAE,CAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;aAC7D;iBAAM;gBACL,CAAC,CAAC,iBAAiB,EAAE,CAAC;aACvB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,UAAU;;QACR,OAAO,MAAA,IAAI,CAAC,QAAQ,0CAAE,OAAO,EAAE,CAAC;IAClC,CAAC;IAES,aAAa;QAErB,OAAO,SAAgB,CAAC;IAC1B,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC;;AAzcH,8BA0cC;AAzciB,cAAI,GAAW,qBAAc,CAAC,GAAG,CAAC;AAGlC,cAAI,GAAkB,wBAAa,CAAC;AAwc/C,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,IAAA,2BAAkB,GAAE,CAAC;IACrB,IAAA,uBAAgB,GAAE,CAAC;IACnB,IAAA,uBAAgB,GAAE,CAAC;IACnB,IAAA,uBAAgB,GAAE,CAAC;IAEnB,iBAAO,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AACpD,CAAC,CAAC;AAPW,QAAA,iBAAiB,qBAO5B","file":"dot.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { AttributeLevel, DEFAULT_DATA_SERIES_FIELD } from '../../constant/index';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport type { Maybe, Datum } from '../../typings';\nimport { mergeSpec } from '../../util/spec/merge-spec';\nimport { isValid } from '@visactor/vutils';\nimport type { ISymbolMark } from '../../mark/symbol';\nimport type { ITextMark } from '../../mark/text';\nimport type { IRuleMark } from '../../mark/rule';\nimport type { IMark } from '../../mark/interface';\nimport { MarkTypeEnum } from '../../mark/interface/type';\nimport { SeriesTypeEnum } from '../interface/type';\nimport { dataViewParser } from '@visactor/vdataset';\nimport { registerDataSetInstanceParser, registerDataSetInstanceTransform } from '../../data/register';\nimport type { IGroupMark } from '../../mark/group';\nimport type { IModelEvaluateOption } from '../../model/interface';\nimport { DotSeriesTooltipHelper } from './tooltip-helper';\nimport type { IRectMark } from '../../mark/rect';\nimport type { FunctionType, IFillMarkSpec, VisualType } from '../../typings/visual';\nimport type { IDotSeriesSpec, IDotSeriesTheme } from './interface';\nimport { copyDataView } from '../../data/transforms/copy-data-view';\nimport { objFlat } from '../../data/transforms/obj-flat';\nimport { DEFAULT_GRID_BACKGROUND } from './config';\nimport { ColorOrdinalScale } from '../../scale/color-ordinal-scale';\nimport type { SeriesMarkMap } from '../interface';\nimport { SymbolMark, registerSymbolMark } from '../../mark/symbol';\nimport { TextMark, registerTextMark } from '../../mark/text';\nimport { RuleMark, registerRuleMark } from '../../mark/rule';\nimport { RectMark, registerRectMark } from '../../mark/rect';\nimport { dotSeriesMark } from './constant';\nimport { Factory } from '../../core/factory';\nimport { TransformLevel } from '../../data/initialize';\n\nexport class DotSeries<T extends IDotSeriesSpec = IDotSeriesSpec> extends CartesianSeries<T> {\n static readonly type: string = SeriesTypeEnum.dot;\n type = SeriesTypeEnum.dot;\n\n static readonly mark: SeriesMarkMap = dotSeriesMark;\n\n private _xDimensionStatisticsDomain: any[];\n\n // csj-Q: 是否需要把这些属性写成接口?\n protected _seriesGroupField?: string;\n getSeriesGroupField() {\n return this._seriesField;\n }\n setSeriesGroupField(field: string) {\n if (isValid(field)) {\n this._seriesGroupField = field;\n }\n }\n\n protected _titleField?: string;\n getTitleField() {\n return this._titleField;\n }\n setTitleField(field: string) {\n if (isValid(field)) {\n this._titleField = field;\n }\n }\n\n protected _subTitleField?: string;\n getSubTitleField() {\n return this._subTitleField;\n }\n setSubTitleField(field: string) {\n if (isValid(field)) {\n this._subTitleField = field;\n }\n }\n\n protected _dotTypeField?: string;\n getDotTypeField() {\n return this._dotTypeField;\n }\n setDotTypeField(field: string) {\n if (isValid(field)) {\n this._dotTypeField = field;\n }\n }\n\n protected _highLightSeriesGroup?: string;\n getHighLightSeriesGroup() {\n return this._highLightSeriesGroup;\n }\n setHighLightSeriesGroup(field: string) {\n if (isValid(field)) {\n this._highLightSeriesGroup = field;\n }\n }\n\n protected _gridBackground?: IFillMarkSpec;\n setGridBackground(gridBackground: IFillMarkSpec) {\n if (isValid(gridBackground)) {\n this._gridBackground = gridBackground;\n }\n }\n\n /**\n * @override\n */\n initData(): void {\n super.initData();\n this._xDimensionStatisticsDomain = this.getRawData().latestData.map((d: Datum) => d[this._fieldY[0]]);\n\n // data to dataview\n registerDataSetInstanceTransform(this._option.dataSet, 'objFlat', objFlat);\n registerDataSetInstanceTransform(this._option.dataSet, 'copyDataView', copyDataView);\n registerDataSetInstanceParser(this._option.dataSet, 'dataview', dataViewParser);\n\n this.getViewData()?.transform(\n {\n type: 'objFlat',\n options: 'dots',\n level: TransformLevel.dotObjFlat\n },\n false\n );\n }\n\n /**\n * @override\n */\n setSeriesField(field: string) {\n if (isValid(field)) {\n this._seriesField = field;\n this.getMarksInType([MarkTypeEnum.line, MarkTypeEnum.area]).forEach(m => {\n m.setFacet(this._seriesField);\n });\n }\n }\n\n getStatisticFields() {\n return [{ key: this._fieldY[0], operations: ['values'], customize: this._xDimensionStatisticsDomain }] as {\n key: string;\n operations: Array<'max' | 'min' | 'values'>;\n customize: any[];\n }[];\n }\n\n /**\n * @override\n */\n setAttrFromSpec() {\n super.setAttrFromSpec();\n this.setSeriesGroupField(this._spec.seriesGroupField);\n this.setTitleField(this._spec.titleField);\n this.setSubTitleField(this._spec.subTitleField);\n this.setDotTypeField(this._spec.dotTypeField);\n this.setHighLightSeriesGroup(this._spec.highLightSeriesGroup);\n this.setGridBackground(mergeSpec(DEFAULT_GRID_BACKGROUND, this._spec.grid?.background || {}));\n }\n\n private _clipMark: IGroupMark;\n private _containerMark: IGroupMark;\n private _gridBackgroundMark: IRectMark;\n private _gridMark: IRuleMark;\n private _dotMark: ISymbolMark;\n private _titleMark: ITextMark;\n private _subTitleMark: ITextMark;\n private _symbolMark: ISymbolMark;\n initMark(): void {\n this._clipMark = this._createMark(DotSeries.mark.group) as IGroupMark;\n\n this._containerMark = this._createMark(DotSeries.mark.group, {\n parent: this._clipMark,\n dataView: this.getRawData()\n }) as IGroupMark;\n\n this._gridBackgroundMark = this._createMark(DotSeries.mark.gridBackground, {\n parent: this._containerMark,\n dataView: this.getRawData()\n }) as IRectMark;\n\n this._gridMark = this._createMark(DotSeries.mark.grid, {\n parent: this._containerMark,\n dataView: this.getRawData()\n }) as IRuleMark;\n\n this._dotMark = this._createMark(DotSeries.mark.dot, {\n skipBeforeLayouted: false,\n isSeriesMark: true,\n parent: this._containerMark\n }) as ISymbolMark;\n\n this._titleMark = this._createMark(DotSeries.mark.title, {\n parent: this._containerMark,\n dataView: this.getRawData()\n }) as ITextMark;\n\n this._subTitleMark = this._createMark(DotSeries.mark.subTitle, {\n parent: this._containerMark,\n dataView: this.getRawData()\n }) as ITextMark;\n\n this._symbolMark = this._createMark(DotSeries.mark.symbol, {\n parent: this._containerMark,\n dataView: this.getRawData()\n }) as ISymbolMark;\n }\n\n initMarkStyle(): void {\n const clipMark = this._clipMark;\n if (clipMark) {\n this.setMarkStyle(\n clipMark,\n {\n x: -this._spec.leftAppendPadding,\n y: 0,\n // 本应使用this.getLayoutRect().width, 但这该返回值为0。考虑到横向不需要裁剪,故先采用一个较大值\n width: 10000,\n height: this._spec.clipHeight,\n clip: true\n },\n 'normal',\n AttributeLevel.Series\n );\n clipMark.setInteractive(false);\n }\n\n const containerMark = this._containerMark;\n if (containerMark) {\n this.setMarkStyle(\n containerMark,\n {\n x: this._spec.leftAppendPadding\n },\n 'normal',\n AttributeLevel.Series\n );\n containerMark.setInteractive(false);\n }\n\n const gridBackgroundMark = this._gridBackgroundMark;\n if (gridBackgroundMark) {\n this.setMarkStyle(\n gridBackgroundMark,\n {\n x: this.getRegionRectLeft.bind(this),\n x1: this.getRegionRectRight.bind(this),\n y: this.dataToGridBackgroundPositionY.bind(this),\n y1: this.dataToGridBackgroundPositionY1.bind(this),\n fill: this._gridBackground.fill,\n fillOpacity: this.dataToGridBackgroundOpacity.bind(this) as FunctionType<number>\n },\n 'normal',\n AttributeLevel.Series\n );\n // this._tooltipHelper?.activeTriggerSet.mark.add(gridMark);\n }\n\n const gridMark = this._gridMark;\n if (gridMark) {\n this.setMarkStyle(\n gridMark,\n {\n stroke: this.getColorAttribute(),\n x: this.getRegionRectLeft.bind(this),\n y: this.dataToPositionY.bind(this),\n x1: this.getRegionRectRight.bind(this),\n y1: this.dataToPositionY.bind(this)\n },\n 'normal',\n AttributeLevel.Series\n );\n // this._tooltipHelper?.activeTriggerSet.mark.add(gridMark);\n }\n\n const dotMark = this._dotMark;\n if (dotMark) {\n this.setMarkStyle(\n dotMark,\n {\n x: this.dataToPositionX.bind(this),\n y: this.dataToPositionY.bind(this),\n fill: this.getDotColorAttribute(),\n fillOpacity: this.dataToOpacity.bind(this)\n },\n 'normal',\n AttributeLevel.Series\n );\n }\n\n const titleMark = this._titleMark;\n if (titleMark) {\n this.setMarkStyle(\n titleMark,\n {\n fill: this.getColorAttribute(),\n text: (datum: any) => {\n return datum[this.getTitleField()];\n },\n x: this.getRegionRectLeft.bind(this),\n y: this.dataToPositionY.bind(this)\n },\n 'normal',\n AttributeLevel.Series\n );\n // this._tooltipHelper?.activeTriggerSet.mark.add(titleMark);\n }\n\n const subTitleMark = this._subTitleMark;\n if (subTitleMark) {\n this.setMarkStyle(\n subTitleMark,\n {\n fill: this.getColorAttribute(),\n text: (datum: any) => {\n return datum[this.getSubTitleField()];\n },\n x: this.getRegionRectLeft.bind(this),\n y: this.dataToPositionY.bind(this)\n },\n 'normal',\n AttributeLevel.Series\n );\n // this._tooltipHelper?.activeTriggerSet.mark.add(subTitleMark);\n }\n\n const symbolMark = this._symbolMark;\n if (symbolMark) {\n this.setMarkStyle(\n symbolMark,\n {\n x: this.getRegionRectLeft.bind(this),\n y: this.dataToPositionY.bind(this),\n fill: this.getColorAttribute()\n },\n 'normal',\n AttributeLevel.Series\n );\n // this._tooltipHelper?.activeTriggerSet.mark.add(symbolMark);\n }\n }\n\n dataToGridBackgroundPositionY(datum: Datum): number {\n if (!this._yAxisHelper) {\n return Number.NaN;\n }\n const { dataToPosition, getBandwidth } = this._yAxisHelper;\n\n return (\n dataToPosition(this.getDatumPositionValues(datum, this._fieldY), {\n bandPosition: this._bandPosition\n }) -\n getBandwidth(0) / 2\n );\n }\n\n dataToGridBackgroundPositionY1(datum: Datum): number {\n if (!this._yAxisHelper) {\n return Number.NaN;\n }\n const { dataToPosition, getBandwidth } = this._yAxisHelper;\n\n return (\n dataToPosition(this.getDatumPositionValues(datum, this._fieldY), {\n bandPosition: this._bandPosition\n }) +\n getBandwidth(0) / 2\n );\n }\n\n dataToOpacity(datum: Datum): number {\n if (!this._xAxisHelper) {\n return Number.NaN;\n }\n const { dataToPosition, getScale } = this._xAxisHelper;\n\n if (\n dataToPosition(this.getDatumPositionValues(datum, this._fieldX), {\n bandPosition: this._bandPosition\n }) < getScale(0).range()[0] ||\n dataToPosition(this.getDatumPositionValues(datum, this._fieldX), {\n bandPosition: this._bandPosition\n }) > getScale(0).range()[1]\n ) {\n return 0;\n }\n return this._theme?.dot?.style?.fillOpacity ?? 1;\n }\n\n dataToGridBackgroundOpacity(datum: Datum): VisualType<number> {\n if (datum[this._seriesGroupField] === this._highLightSeriesGroup) {\n return this._gridBackground.fillOpacity;\n }\n return 0;\n }\n\n onLayoutEnd(ctx: any) {\n super.onLayoutEnd(ctx);\n const layoutOffsetX = this._spec?.leftAppendPadding ?? 0;\n this.setMarkStyle(\n this._clipMark,\n {\n width: this.getLayoutRect().width + layoutOffsetX //clip的数值只能在layoutEnd之后获得\n },\n 'normal',\n AttributeLevel.Series\n );\n }\n\n /**\n * @override\n * @description 如果用户设置了seriesGroup,则seriesGroup作为颜色映射字段\n */\n getDefaultColorDomain() {\n return this._seriesGroupField\n ? this.getViewDataStatistics()?.latestData[this._seriesGroupField].values\n : this._seriesField\n ? this.getViewDataStatistics()?.latestData[this._seriesField].values\n : [];\n }\n\n /**\n * @override\n */\n // 通用的默认颜色映射 用户设置优先级比这个高,会在setStyle中处理\n getColorAttribute() {\n return {\n scale: this._option.globalScale.getScale('color') ?? this._getDefaultColorScale(),\n field: this._seriesGroupField ?? this._seriesField ?? DEFAULT_DATA_SERIES_FIELD\n };\n }\n\n /**\n * @override\n * @description 对于dot来说,dotType优先级高于seriesGroup,作为颜色映射字段\n */\n protected getDotColorScale() {\n const colorDomain = this._dotTypeField\n ? this.getViewDataStatistics()?.latestData[this._dotTypeField].values\n : this._seriesGroupField\n ? this.getViewDataStatistics()?.latestData[this._seriesGroupField].values\n : this._seriesField\n ? this.getViewDataStatistics()?.latestData[this._seriesField].values\n : [];\n const colorRange = this._getDataScheme();\n return new ColorOrdinalScale().domain(colorDomain).range(colorRange);\n }\n\n /**\n * @override\n */\n // 通用的默认颜色映射 用户设置优先级比这个高,会在setStyle中处理\n getDotColorAttribute() {\n return {\n scale: this._option.globalScale.getScale('color') ?? this.getDotColorScale(),\n field: this._dotTypeField ?? this._seriesGroupField ?? this._seriesField ?? DEFAULT_DATA_SERIES_FIELD\n };\n }\n\n protected initTooltip() {\n this._tooltipHelper = new DotSeriesTooltipHelper(this);\n this._dotMark && this._tooltipHelper.activeTriggerSet.mark.add(this._dotMark);\n }\n\n /**\n * @description onEvaluateEnd之后可以拿到canvas element,将滚动条挂载到canvas element上\n */\n onEvaluateEnd(ctx: IModelEvaluateOption): void {\n super.onEvaluateEnd(ctx);\n }\n\n protected onMarkTreePositionUpdate(marks: IMark[]): void {\n marks.forEach(m => {\n if (m.type === 'group') {\n this.onMarkTreePositionUpdate((m as IGroupMark).getMarks());\n } else {\n m.updateLayoutState();\n }\n });\n }\n\n getDotData() {\n return this._dotMark?.getData();\n }\n\n protected _getDataIdKey() {\n // dot 系列没有动画,可以使用默认的 dataKey\n return undefined as any;\n }\n\n getStackValueField(): string {\n return null;\n }\n\n getActiveMarks(): IMark[] {\n return [this._dotMark];\n }\n}\n\nexport const registerDotSeries = () => {\n registerSymbolMark();\n registerRuleMark();\n registerRectMark();\n registerTextMark();\n\n Factory.registerSeries(DotSeries.type, DotSeries);\n};\n"]}
1
+ {"version":3,"sources":["../src/series/dot/dot.ts"],"names":[],"mappings":"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","file":"dot.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { AttributeLevel, DEFAULT_DATA_SERIES_FIELD } from '../../constant/index';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport type { Datum } from '../../typings';\nimport { mergeSpec } from '@visactor/vutils-extension';\nimport { isValid } from '@visactor/vutils';\nimport type { ISymbolMark } from '../../mark/symbol';\nimport type { ITextMark } from '../../mark/text';\nimport type { IRuleMark } from '../../mark/rule';\nimport type { IMark } from '../../mark/interface';\nimport { MarkTypeEnum } from '../../mark/interface/type';\nimport { SeriesTypeEnum } from '../interface/type';\nimport { dataViewParser } from '@visactor/vdataset';\nimport { registerDataSetInstanceParser, registerDataSetInstanceTransform } from '../../data/register';\nimport type { IGroupMark } from '../../mark/group';\nimport type { IModelEvaluateOption } from '../../model/interface';\nimport { DotSeriesTooltipHelper } from './tooltip-helper';\nimport type { IRectMark } from '../../mark/rect';\nimport type { FunctionType, IFillMarkSpec, VisualType } from '../../typings/visual';\nimport type { IDotSeriesSpec } from './interface';\nimport { copyDataView } from '../../data/transforms/copy-data-view';\nimport { objFlat } from '../../data/transforms/obj-flat';\nimport { DEFAULT_GRID_BACKGROUND } from './config';\nimport { ColorOrdinalScale } from '../../scale/color-ordinal-scale';\nimport type { SeriesMarkMap } from '../interface';\nimport { registerSymbolMark } from '../../mark/symbol';\nimport { registerTextMark } from '../../mark/text';\nimport { registerRuleMark } from '../../mark/rule';\nimport { registerRectMark } from '../../mark/rect';\nimport { dotSeriesMark } from './constant';\nimport { Factory } from '../../core/factory';\nimport { TransformLevel } from '../../data/initialize';\n\nexport class DotSeries<T extends IDotSeriesSpec = IDotSeriesSpec> extends CartesianSeries<T> {\n static readonly type: string = SeriesTypeEnum.dot;\n type = SeriesTypeEnum.dot;\n\n static readonly mark: SeriesMarkMap = dotSeriesMark;\n\n private _xDimensionStatisticsDomain: any[];\n\n // csj-Q: 是否需要把这些属性写成接口?\n protected _seriesGroupField?: string;\n getSeriesGroupField() {\n return this._seriesField;\n }\n setSeriesGroupField(field: string) {\n if (isValid(field)) {\n this._seriesGroupField = field;\n }\n }\n\n protected _titleField?: string;\n getTitleField() {\n return this._titleField;\n }\n setTitleField(field: string) {\n if (isValid(field)) {\n this._titleField = field;\n }\n }\n\n protected _subTitleField?: string;\n getSubTitleField() {\n return this._subTitleField;\n }\n setSubTitleField(field: string) {\n if (isValid(field)) {\n this._subTitleField = field;\n }\n }\n\n protected _dotTypeField?: string;\n getDotTypeField() {\n return this._dotTypeField;\n }\n setDotTypeField(field: string) {\n if (isValid(field)) {\n this._dotTypeField = field;\n }\n }\n\n protected _highLightSeriesGroup?: string;\n getHighLightSeriesGroup() {\n return this._highLightSeriesGroup;\n }\n setHighLightSeriesGroup(field: string) {\n if (isValid(field)) {\n this._highLightSeriesGroup = field;\n }\n }\n\n protected _gridBackground?: IFillMarkSpec;\n setGridBackground(gridBackground: IFillMarkSpec) {\n if (isValid(gridBackground)) {\n this._gridBackground = gridBackground;\n }\n }\n\n /**\n * @override\n */\n initData(): void {\n super.initData();\n this._xDimensionStatisticsDomain = this.getRawData().latestData.map((d: Datum) => d[this._fieldY[0]]);\n\n // data to dataview\n registerDataSetInstanceTransform(this._option.dataSet, 'objFlat', objFlat);\n registerDataSetInstanceTransform(this._option.dataSet, 'copyDataView', copyDataView);\n registerDataSetInstanceParser(this._option.dataSet, 'dataview', dataViewParser);\n\n this.getViewData()?.transform(\n {\n type: 'objFlat',\n options: 'dots',\n level: TransformLevel.dotObjFlat\n },\n false\n );\n }\n\n /**\n * @override\n */\n setSeriesField(field: string) {\n if (isValid(field)) {\n this._seriesField = field;\n this.getMarksInType([MarkTypeEnum.line, MarkTypeEnum.area]).forEach(m => {\n m.setFacet(this._seriesField);\n });\n }\n }\n\n getStatisticFields() {\n return [{ key: this._fieldY[0], operations: ['values'], customize: this._xDimensionStatisticsDomain }] as {\n key: string;\n operations: Array<'max' | 'min' | 'values'>;\n customize: any[];\n }[];\n }\n\n /**\n * @override\n */\n setAttrFromSpec() {\n super.setAttrFromSpec();\n this.setSeriesGroupField(this._spec.seriesGroupField);\n this.setTitleField(this._spec.titleField);\n this.setSubTitleField(this._spec.subTitleField);\n this.setDotTypeField(this._spec.dotTypeField);\n this.setHighLightSeriesGroup(this._spec.highLightSeriesGroup);\n this.setGridBackground(mergeSpec(DEFAULT_GRID_BACKGROUND, this._spec.grid?.background || {}));\n }\n\n private _clipMark: IGroupMark;\n private _containerMark: IGroupMark;\n private _gridBackgroundMark: IRectMark;\n private _gridMark: IRuleMark;\n private _dotMark: ISymbolMark;\n private _titleMark: ITextMark;\n private _subTitleMark: ITextMark;\n private _symbolMark: ISymbolMark;\n initMark(): void {\n this._clipMark = this._createMark(DotSeries.mark.group) as IGroupMark;\n\n this._containerMark = this._createMark(DotSeries.mark.group, {\n parent: this._clipMark,\n dataView: this.getRawData()\n }) as IGroupMark;\n\n this._gridBackgroundMark = this._createMark(DotSeries.mark.gridBackground, {\n parent: this._containerMark,\n dataView: this.getRawData()\n }) as IRectMark;\n\n this._gridMark = this._createMark(DotSeries.mark.grid, {\n parent: this._containerMark,\n dataView: this.getRawData()\n }) as IRuleMark;\n\n this._dotMark = this._createMark(DotSeries.mark.dot, {\n skipBeforeLayouted: false,\n isSeriesMark: true,\n parent: this._containerMark\n }) as ISymbolMark;\n\n this._titleMark = this._createMark(DotSeries.mark.title, {\n parent: this._containerMark,\n dataView: this.getRawData()\n }) as ITextMark;\n\n this._subTitleMark = this._createMark(DotSeries.mark.subTitle, {\n parent: this._containerMark,\n dataView: this.getRawData()\n }) as ITextMark;\n\n this._symbolMark = this._createMark(DotSeries.mark.symbol, {\n parent: this._containerMark,\n dataView: this.getRawData()\n }) as ISymbolMark;\n }\n\n initMarkStyle(): void {\n const clipMark = this._clipMark;\n if (clipMark) {\n this.setMarkStyle(\n clipMark,\n {\n x: -this._spec.leftAppendPadding,\n y: 0,\n // 本应使用this.getLayoutRect().width, 但这该返回值为0。考虑到横向不需要裁剪,故先采用一个较大值\n width: 10000,\n height: this._spec.clipHeight,\n clip: true\n },\n 'normal',\n AttributeLevel.Series\n );\n clipMark.setInteractive(false);\n }\n\n const containerMark = this._containerMark;\n if (containerMark) {\n this.setMarkStyle(\n containerMark,\n {\n x: this._spec.leftAppendPadding\n },\n 'normal',\n AttributeLevel.Series\n );\n containerMark.setInteractive(false);\n }\n\n const gridBackgroundMark = this._gridBackgroundMark;\n if (gridBackgroundMark) {\n this.setMarkStyle(\n gridBackgroundMark,\n {\n x: this.getRegionRectLeft.bind(this),\n x1: this.getRegionRectRight.bind(this),\n y: this.dataToGridBackgroundPositionY.bind(this),\n y1: this.dataToGridBackgroundPositionY1.bind(this),\n fill: this._gridBackground.fill,\n fillOpacity: this.dataToGridBackgroundOpacity.bind(this) as FunctionType<number>\n },\n 'normal',\n AttributeLevel.Series\n );\n // this._tooltipHelper?.activeTriggerSet.mark.add(gridMark);\n }\n\n const gridMark = this._gridMark;\n if (gridMark) {\n this.setMarkStyle(\n gridMark,\n {\n stroke: this.getColorAttribute(),\n x: this.getRegionRectLeft.bind(this),\n y: this.dataToPositionY.bind(this),\n x1: this.getRegionRectRight.bind(this),\n y1: this.dataToPositionY.bind(this)\n },\n 'normal',\n AttributeLevel.Series\n );\n // this._tooltipHelper?.activeTriggerSet.mark.add(gridMark);\n }\n\n const dotMark = this._dotMark;\n if (dotMark) {\n this.setMarkStyle(\n dotMark,\n {\n x: this.dataToPositionX.bind(this),\n y: this.dataToPositionY.bind(this),\n fill: this.getDotColorAttribute(),\n fillOpacity: this.dataToOpacity.bind(this)\n },\n 'normal',\n AttributeLevel.Series\n );\n }\n\n const titleMark = this._titleMark;\n if (titleMark) {\n this.setMarkStyle(\n titleMark,\n {\n fill: this.getColorAttribute(),\n text: (datum: any) => {\n return datum[this.getTitleField()];\n },\n x: this.getRegionRectLeft.bind(this),\n y: this.dataToPositionY.bind(this)\n },\n 'normal',\n AttributeLevel.Series\n );\n // this._tooltipHelper?.activeTriggerSet.mark.add(titleMark);\n }\n\n const subTitleMark = this._subTitleMark;\n if (subTitleMark) {\n this.setMarkStyle(\n subTitleMark,\n {\n fill: this.getColorAttribute(),\n text: (datum: any) => {\n return datum[this.getSubTitleField()];\n },\n x: this.getRegionRectLeft.bind(this),\n y: this.dataToPositionY.bind(this)\n },\n 'normal',\n AttributeLevel.Series\n );\n // this._tooltipHelper?.activeTriggerSet.mark.add(subTitleMark);\n }\n\n const symbolMark = this._symbolMark;\n if (symbolMark) {\n this.setMarkStyle(\n symbolMark,\n {\n x: this.getRegionRectLeft.bind(this),\n y: this.dataToPositionY.bind(this),\n fill: this.getColorAttribute()\n },\n 'normal',\n AttributeLevel.Series\n );\n // this._tooltipHelper?.activeTriggerSet.mark.add(symbolMark);\n }\n }\n\n dataToGridBackgroundPositionY(datum: Datum): number {\n if (!this._yAxisHelper) {\n return Number.NaN;\n }\n const { dataToPosition, getBandwidth } = this._yAxisHelper;\n\n return (\n dataToPosition(this.getDatumPositionValues(datum, this._fieldY), {\n bandPosition: this._bandPosition\n }) -\n getBandwidth(0) / 2\n );\n }\n\n dataToGridBackgroundPositionY1(datum: Datum): number {\n if (!this._yAxisHelper) {\n return Number.NaN;\n }\n const { dataToPosition, getBandwidth } = this._yAxisHelper;\n\n return (\n dataToPosition(this.getDatumPositionValues(datum, this._fieldY), {\n bandPosition: this._bandPosition\n }) +\n getBandwidth(0) / 2\n );\n }\n\n dataToOpacity(datum: Datum): number {\n if (!this._xAxisHelper) {\n return Number.NaN;\n }\n const { dataToPosition, getScale } = this._xAxisHelper;\n\n if (\n dataToPosition(this.getDatumPositionValues(datum, this._fieldX), {\n bandPosition: this._bandPosition\n }) < getScale(0).range()[0] ||\n dataToPosition(this.getDatumPositionValues(datum, this._fieldX), {\n bandPosition: this._bandPosition\n }) > getScale(0).range()[1]\n ) {\n return 0;\n }\n return this._theme?.dot?.style?.fillOpacity ?? 1;\n }\n\n dataToGridBackgroundOpacity(datum: Datum): VisualType<number> {\n if (datum[this._seriesGroupField] === this._highLightSeriesGroup) {\n return this._gridBackground.fillOpacity;\n }\n return 0;\n }\n\n onLayoutEnd(ctx: any) {\n super.onLayoutEnd(ctx);\n const layoutOffsetX = this._spec?.leftAppendPadding ?? 0;\n this.setMarkStyle(\n this._clipMark,\n {\n width: this.getLayoutRect().width + layoutOffsetX //clip的数值只能在layoutEnd之后获得\n },\n 'normal',\n AttributeLevel.Series\n );\n }\n\n /**\n * @override\n * @description 如果用户设置了seriesGroup,则seriesGroup作为颜色映射字段\n */\n getDefaultColorDomain() {\n return this._seriesGroupField\n ? this.getViewDataStatistics()?.latestData[this._seriesGroupField].values\n : this._seriesField\n ? this.getViewDataStatistics()?.latestData[this._seriesField].values\n : [];\n }\n\n /**\n * @override\n */\n // 通用的默认颜色映射 用户设置优先级比这个高,会在setStyle中处理\n getColorAttribute() {\n return {\n scale: this._option.globalScale.getScale('color') ?? this._getDefaultColorScale(),\n field: this._seriesGroupField ?? this._seriesField ?? DEFAULT_DATA_SERIES_FIELD\n };\n }\n\n /**\n * @override\n * @description 对于dot来说,dotType优先级高于seriesGroup,作为颜色映射字段\n */\n protected getDotColorScale() {\n const colorDomain = this._dotTypeField\n ? this.getViewDataStatistics()?.latestData[this._dotTypeField].values\n : this._seriesGroupField\n ? this.getViewDataStatistics()?.latestData[this._seriesGroupField].values\n : this._seriesField\n ? this.getViewDataStatistics()?.latestData[this._seriesField].values\n : [];\n const colorRange = this._getDataScheme();\n return new ColorOrdinalScale().domain(colorDomain).range(colorRange);\n }\n\n /**\n * @override\n */\n // 通用的默认颜色映射 用户设置优先级比这个高,会在setStyle中处理\n getDotColorAttribute() {\n return {\n scale: this._option.globalScale.getScale('color') ?? this.getDotColorScale(),\n field: this._dotTypeField ?? this._seriesGroupField ?? this._seriesField ?? DEFAULT_DATA_SERIES_FIELD\n };\n }\n\n protected initTooltip() {\n this._tooltipHelper = new DotSeriesTooltipHelper(this);\n this._dotMark && this._tooltipHelper.activeTriggerSet.mark.add(this._dotMark);\n }\n\n /**\n * @description onEvaluateEnd之后可以拿到canvas element,将滚动条挂载到canvas element上\n */\n onEvaluateEnd(ctx: IModelEvaluateOption): void {\n super.onEvaluateEnd(ctx);\n }\n\n protected onMarkTreePositionUpdate(marks: IMark[]): void {\n marks.forEach(m => {\n if (m.type === 'group') {\n this.onMarkTreePositionUpdate((m as IGroupMark).getMarks());\n } else {\n m.updateLayoutState();\n }\n });\n }\n\n getDotData() {\n return this._dotMark?.getData();\n }\n\n protected _getDataIdKey() {\n // dot 系列没有动画,可以使用默认的 dataKey\n return undefined as any;\n }\n\n getStackValueField(): string {\n return null;\n }\n\n getActiveMarks(): IMark[] {\n return [this._dotMark];\n }\n}\n\nexport const registerDotSeries = () => {\n registerSymbolMark();\n registerRuleMark();\n registerRectMark();\n registerTextMark();\n\n Factory.registerSeries(DotSeries.type, DotSeries);\n};\n"]}
@@ -16,8 +16,8 @@ class DotSeriesTooltipHelper extends tooltip_helper_1.BaseSeriesTooltipHelper {
16
16
  for (const key in element) childrenContent.push({
17
17
  shapeType: "circle",
18
18
  hasShape: flag,
19
- shapeColor: this.contentShapeColorCallback(datum[0].datum[0]),
20
- shapeStroke: this.contentShapeColorCallback(datum[0].datum[0]),
19
+ shapeColor: this.shapeColorCallback(datum[0].datum[0]),
20
+ shapeStroke: this.shapeStrokeCallback(datum[0].datum[0]),
21
21
  key: key,
22
22
  value: element[key] + ""
23
23
  }), flag = !1;
@@ -35,29 +35,29 @@ class DotSeriesTooltipHelper extends tooltip_helper_1.BaseSeriesTooltipHelper {
35
35
  content: [ {
36
36
  hasShape: !0,
37
37
  shapeType: "square",
38
- shapeColor: this.contentShapeColorCallback,
39
- shapeStroke: this.contentShapeColorCallback,
38
+ shapeColor: this.shapeColorCallback,
39
+ shapeStroke: this.shapeStrokeCallback,
40
40
  key: datum => datum.type,
41
41
  value: datum => datum.id
42
42
  }, {
43
43
  hasShape: !0,
44
44
  shapeType: "square",
45
- shapeColor: this.contentShapeColorCallback,
46
- shapeStroke: this.contentShapeColorCallback,
45
+ shapeColor: this.shapeColorCallback,
46
+ shapeStroke: this.shapeStrokeCallback,
47
47
  key: "event_time",
48
48
  value: datum => vutils_1.TimeUtil.getInstance().timeFormat("%Y%m%d", datum.event_time)
49
49
  }, {
50
50
  hasShape: !0,
51
51
  shapeType: "square",
52
- shapeColor: this.contentShapeColorCallback,
53
- shapeStroke: this.contentShapeColorCallback,
52
+ shapeColor: this.shapeColorCallback,
53
+ shapeStroke: this.shapeStrokeCallback,
54
54
  key: "action_type",
55
55
  value: datum => datum.action_type
56
56
  }, {
57
57
  shapeType: "square",
58
58
  hasShape: !0,
59
- shapeColor: this.contentShapeColorCallback,
60
- shapeStroke: this.contentShapeColorCallback,
59
+ shapeColor: this.shapeColorCallback,
60
+ shapeStroke: this.shapeStrokeCallback,
61
61
  key: "children",
62
62
  value: datum => datum.children
63
63
  } ],
@@ -68,8 +68,8 @@ class DotSeriesTooltipHelper extends tooltip_helper_1.BaseSeriesTooltipHelper {
68
68
  for (const key in element) childrenContent.push({
69
69
  shapeType: "circle",
70
70
  hasShape: flag,
71
- shapeColor: this.contentShapeColorCallback(datum[0].datum[0]),
72
- shapeStroke: this.contentShapeColorCallback(datum[0].datum[0]),
71
+ shapeColor: this.shapeColorCallback(datum[0].datum[0]),
72
+ shapeStroke: this.shapeStrokeCallback(datum[0].datum[0]),
73
73
  key: key,
74
74
  value: element[key] + ""
75
75
  }), flag = !1;
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/series/dot/tooltip-helper.ts"],"names":[],"mappings":"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","file":"tooltip-helper.js","sourcesContent":["import type { ISeriesTooltipHelper } from '../interface';\nimport { BaseSeriesTooltipHelper } from '../base/tooltip-helper';\nimport type { ITooltipLinePattern, ITooltipPattern, TooltipActiveType } from '../../typings';\nimport { isValid, TimeUtil } from '@visactor/vutils';\n\nexport class DotSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {\n updateTooltipSpec() {\n super.updateTooltipSpec();\n if (isValid(this.spec?.mark)) {\n this.spec!.mark.updateContent = (prev: any, datum: any, params: any) => {\n const childrenContent: ITooltipLinePattern[] = [];\n const childrenPrev = prev.filter((p: any) => p.key === 'children');\n childrenPrev.length > 0 &&\n childrenPrev[0].value.forEach((element: any) => {\n let flag = true;\n for (const key in element) {\n childrenContent.push({\n shapeType: 'circle',\n hasShape: flag,\n shapeColor: this.contentShapeColorCallback(datum[0].datum[0]),\n shapeStroke: this.contentShapeColorCallback(datum[0].datum[0]),\n key: key,\n value: element[key] + ''\n });\n flag = false;\n }\n });\n return prev.concat(childrenContent);\n };\n }\n }\n\n /** 获取默认的tooltip pattern */\n getDefaultTooltipPattern(activeType: TooltipActiveType): ITooltipPattern | null {\n if (activeType === 'mark') {\n return {\n visible: true,\n activeType,\n title: {\n key: 'event info',\n value: 'event info'\n },\n content: [\n {\n hasShape: true,\n shapeType: 'square',\n shapeColor: this.contentShapeColorCallback,\n shapeStroke: this.contentShapeColorCallback,\n key: (datum: any) => datum.type,\n value: (datum: any) => datum.id\n },\n {\n hasShape: true,\n shapeType: 'square',\n shapeColor: this.contentShapeColorCallback,\n shapeStroke: this.contentShapeColorCallback,\n key: 'event_time',\n value: (datum: any) => TimeUtil.getInstance().timeFormat('%Y%m%d', datum.event_time)\n },\n {\n hasShape: true,\n shapeType: 'square',\n shapeColor: this.contentShapeColorCallback,\n shapeStroke: this.contentShapeColorCallback,\n key: 'action_type',\n value: (datum: any) => datum.action_type\n },\n {\n shapeType: 'square',\n hasShape: true,\n shapeColor: this.contentShapeColorCallback,\n shapeStroke: this.contentShapeColorCallback,\n key: 'children',\n value: (datum: any) => {\n return datum.children;\n }\n }\n ],\n updateContent: (prev: any, datum: any, params: any) => {\n const childrenContent: ITooltipLinePattern[] = [];\n prev[3].value.forEach((element: any) => {\n let flag = true;\n for (const key in element) {\n childrenContent.push({\n shapeType: 'circle',\n hasShape: flag,\n shapeColor: this.contentShapeColorCallback(datum[0].datum[0]),\n shapeStroke: this.contentShapeColorCallback(datum[0].datum[0]),\n key: key,\n value: element[key] + ''\n } as ITooltipLinePattern);\n flag = false;\n }\n });\n return prev.concat(childrenContent);\n }\n };\n }\n return null;\n }\n}\n"]}
1
+ {"version":3,"sources":["../src/series/dot/tooltip-helper.ts"],"names":[],"mappings":";;;AACA,2DAAiE;AAEjE,6CAAqD;AAErD,MAAa,sBAAuB,SAAQ,wCAAuB;IACjE,iBAAiB;;QACf,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAC1B,IAAI,IAAA,gBAAO,EAAC,MAAA,IAAI,CAAC,IAAI,0CAAE,IAAI,CAAC,EAAE;YAC5B,IAAI,CAAC,IAAK,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC,IAAS,EAAE,KAAU,EAAE,MAAW,EAAE,EAAE;gBACrE,MAAM,eAAe,GAA0B,EAAE,CAAC;gBAClD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,UAAU,CAAC,CAAC;gBACnE,YAAY,CAAC,MAAM,GAAG,CAAC;oBACrB,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;wBAC7C,IAAI,IAAI,GAAG,IAAI,CAAC;wBAChB,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;4BACzB,eAAe,CAAC,IAAI,CAAC;gCACnB,SAAS,EAAE,QAAQ;gCACnB,QAAQ,EAAE,IAAI;gCACd,UAAU,EAAE,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gCACtD,WAAW,EAAE,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gCACxD,GAAG,EAAE,GAAG;gCACR,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE;6BACzB,CAAC,CAAC;4BACH,IAAI,GAAG,KAAK,CAAC;yBACd;oBACH,CAAC,CAAC,CAAC;gBACL,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACtC,CAAC,CAAC;SACH;IACH,CAAC;IAGD,wBAAwB,CAAC,UAA6B;QACpD,IAAI,UAAU,KAAK,MAAM,EAAE;YACzB,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,UAAU;gBACV,KAAK,EAAE;oBACL,GAAG,EAAE,YAAY;oBACjB,KAAK,EAAE,YAAY;iBACpB;gBACD,OAAO,EAAE;oBACP;wBACE,QAAQ,EAAE,IAAI;wBACd,SAAS,EAAE,QAAQ;wBACnB,UAAU,EAAE,IAAI,CAAC,kBAAkB;wBACnC,WAAW,EAAE,IAAI,CAAC,mBAAmB;wBACrC,GAAG,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI;wBAC/B,KAAK,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE;qBAChC;oBACD;wBACE,QAAQ,EAAE,IAAI;wBACd,SAAS,EAAE,QAAQ;wBACnB,UAAU,EAAE,IAAI,CAAC,kBAAkB;wBACnC,WAAW,EAAE,IAAI,CAAC,mBAAmB;wBACrC,GAAG,EAAE,YAAY;wBACjB,KAAK,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,iBAAQ,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC;qBACrF;oBACD;wBACE,QAAQ,EAAE,IAAI;wBACd,SAAS,EAAE,QAAQ;wBACnB,UAAU,EAAE,IAAI,CAAC,kBAAkB;wBACnC,WAAW,EAAE,IAAI,CAAC,mBAAmB;wBACrC,GAAG,EAAE,aAAa;wBAClB,KAAK,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW;qBACzC;oBACD;wBACE,SAAS,EAAE,QAAQ;wBACnB,QAAQ,EAAE,IAAI;wBACd,UAAU,EAAE,IAAI,CAAC,kBAAkB;wBACnC,WAAW,EAAE,IAAI,CAAC,mBAAmB;wBACrC,GAAG,EAAE,UAAU;wBACf,KAAK,EAAE,CAAC,KAAU,EAAE,EAAE;4BACpB,OAAO,KAAK,CAAC,QAAQ,CAAC;wBACxB,CAAC;qBACF;iBACF;gBACD,aAAa,EAAE,CAAC,IAAS,EAAE,KAAU,EAAE,MAAW,EAAE,EAAE;oBACpD,MAAM,eAAe,GAA0B,EAAE,CAAC;oBAClD,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;wBACrC,IAAI,IAAI,GAAG,IAAI,CAAC;wBAChB,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;4BACzB,eAAe,CAAC,IAAI,CAAC;gCACnB,SAAS,EAAE,QAAQ;gCACnB,QAAQ,EAAE,IAAI;gCACd,UAAU,EAAE,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gCACtD,WAAW,EAAE,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gCACxD,GAAG,EAAE,GAAG;gCACR,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE;6BACF,CAAC,CAAC;4BAC1B,IAAI,GAAG,KAAK,CAAC;yBACd;oBACH,CAAC,CAAC,CAAC;oBACH,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;gBACtC,CAAC;aACF,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA/FD,wDA+FC","file":"tooltip-helper.js","sourcesContent":["import type { ISeriesTooltipHelper } from '../interface';\nimport { BaseSeriesTooltipHelper } from '../base/tooltip-helper';\nimport type { ITooltipLinePattern, ITooltipPattern, TooltipActiveType } from '../../typings';\nimport { isValid, TimeUtil } from '@visactor/vutils';\n\nexport class DotSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {\n updateTooltipSpec() {\n super.updateTooltipSpec();\n if (isValid(this.spec?.mark)) {\n this.spec!.mark.updateContent = (prev: any, datum: any, params: any) => {\n const childrenContent: ITooltipLinePattern[] = [];\n const childrenPrev = prev.filter((p: any) => p.key === 'children');\n childrenPrev.length > 0 &&\n childrenPrev[0].value.forEach((element: any) => {\n let flag = true;\n for (const key in element) {\n childrenContent.push({\n shapeType: 'circle',\n hasShape: flag,\n shapeColor: this.shapeColorCallback(datum[0].datum[0]),\n shapeStroke: this.shapeStrokeCallback(datum[0].datum[0]),\n key: key,\n value: element[key] + ''\n });\n flag = false;\n }\n });\n return prev.concat(childrenContent);\n };\n }\n }\n\n /** 获取默认的tooltip pattern */\n getDefaultTooltipPattern(activeType: TooltipActiveType): ITooltipPattern | null {\n if (activeType === 'mark') {\n return {\n visible: true,\n activeType,\n title: {\n key: 'event info',\n value: 'event info'\n },\n content: [\n {\n hasShape: true,\n shapeType: 'square',\n shapeColor: this.shapeColorCallback,\n shapeStroke: this.shapeStrokeCallback,\n key: (datum: any) => datum.type,\n value: (datum: any) => datum.id\n },\n {\n hasShape: true,\n shapeType: 'square',\n shapeColor: this.shapeColorCallback,\n shapeStroke: this.shapeStrokeCallback,\n key: 'event_time',\n value: (datum: any) => TimeUtil.getInstance().timeFormat('%Y%m%d', datum.event_time)\n },\n {\n hasShape: true,\n shapeType: 'square',\n shapeColor: this.shapeColorCallback,\n shapeStroke: this.shapeStrokeCallback,\n key: 'action_type',\n value: (datum: any) => datum.action_type\n },\n {\n shapeType: 'square',\n hasShape: true,\n shapeColor: this.shapeColorCallback,\n shapeStroke: this.shapeStrokeCallback,\n key: 'children',\n value: (datum: any) => {\n return datum.children;\n }\n }\n ],\n updateContent: (prev: any, datum: any, params: any) => {\n const childrenContent: ITooltipLinePattern[] = [];\n prev[3].value.forEach((element: any) => {\n let flag = true;\n for (const key in element) {\n childrenContent.push({\n shapeType: 'circle',\n hasShape: flag,\n shapeColor: this.shapeColorCallback(datum[0].datum[0]),\n shapeStroke: this.shapeStrokeCallback(datum[0].datum[0]),\n key: key,\n value: element[key] + ''\n } as ITooltipLinePattern);\n flag = false;\n }\n });\n return prev.concat(childrenContent);\n }\n };\n }\n return null;\n }\n}\n"]}
@@ -95,7 +95,8 @@ class FunnelSeries extends base_series_1.BaseSeries {
95
95
  groupKey: this._seriesField,
96
96
  isSeriesMark: !0,
97
97
  customShape: null === (_b = this._spec.funnel) || void 0 === _b ? void 0 : _b.customShape,
98
- stateSort: null === (_c = this._spec.funnel) || void 0 === _c ? void 0 : _c.stateSort
98
+ stateSort: null === (_c = this._spec.funnel) || void 0 === _c ? void 0 : _c.stateSort,
99
+ noSeparateStyle: !0
99
100
  }), this._spec.isTransform && (this._funnelTransformMark = this._createMark(Object.assign(Object.assign({}, FunnelSeries.mark.transform), {
100
101
  name: this._transformMarkName,
101
102
  type: this._transformMarkType
@@ -105,17 +106,20 @@ class FunnelSeries extends base_series_1.BaseSeries {
105
106
  dataView: this._viewDataTransform.getDataView(),
106
107
  dataProductId: this._viewDataTransform.getProductId(),
107
108
  customShape: null === (_e = this._spec.transform) || void 0 === _e ? void 0 : _e.customShape,
108
- stateSort: null === (_f = this._spec.transform) || void 0 === _f ? void 0 : _f.stateSort
109
+ stateSort: null === (_f = this._spec.transform) || void 0 === _f ? void 0 : _f.stateSort,
110
+ noSeparateStyle: !0
109
111
  })), null === (_h = null === (_g = this._spec) || void 0 === _g ? void 0 : _g.outerLabel) || void 0 === _h ? void 0 : _h.visible) {
110
112
  const {line: line} = null !== (_j = this._spec.outerLabel) && void 0 !== _j ? _j : {}, {line: lineTheme} = null !== (_l = null === (_k = this._theme) || void 0 === _k ? void 0 : _k.outerLabel) && void 0 !== _l ? _l : {};
111
113
  this._funnelOuterLabelMark.label = this._createMark(FunnelSeries.mark.outerLabel, {
112
114
  themeSpec: null === (_m = this._theme) || void 0 === _m ? void 0 : _m.outerLabel,
113
115
  markSpec: this._spec.outerLabel,
114
- skipBeforeLayouted: !0
116
+ skipBeforeLayouted: !0,
117
+ noSeparateStyle: !0
115
118
  }), this._funnelOuterLabelMark.line = this._createMark(FunnelSeries.mark.outerLabelLine, {
116
119
  themeSpec: lineTheme,
117
120
  markSpec: line,
118
- depend: [ this._funnelOuterLabelMark.label ]
121
+ depend: [ this._funnelOuterLabelMark.label ],
122
+ noSeparateStyle: !0
119
123
  });
120
124
  }
121
125
  }