@visactor/vchart 1.3.0-beta.9 → 1.3.0

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 (925) hide show
  1. package/build/es5/index.js +3 -3
  2. package/build/index.js +17475 -16797
  3. package/build/index.min.js +2 -2
  4. package/build/tsconfig.tsbuildinfo +1 -1
  5. package/cjs/animation/utils.js +2 -2
  6. package/cjs/animation/utils.js.map +1 -1
  7. package/cjs/chart/area/area.js +2 -2
  8. package/cjs/chart/area/area.js.map +1 -1
  9. package/cjs/chart/bar/bar-3d.js +2 -2
  10. package/cjs/chart/bar/bar-3d.js.map +1 -1
  11. package/cjs/chart/bar/bar.js +2 -2
  12. package/cjs/chart/bar/bar.js.map +1 -1
  13. package/cjs/chart/base-chart.d.ts +1 -0
  14. package/cjs/chart/base-chart.js +14 -8
  15. package/cjs/chart/base-chart.js.map +1 -1
  16. package/cjs/chart/box-plot/box-plot.js +2 -2
  17. package/cjs/chart/box-plot/box-plot.js.map +1 -1
  18. package/cjs/chart/cartesian/cartesian.js +1 -1
  19. package/cjs/chart/cartesian/cartesian.js.map +1 -1
  20. package/cjs/chart/circle-packing/circle-packing.js +2 -2
  21. package/cjs/chart/circle-packing/circle-packing.js.map +1 -1
  22. package/cjs/chart/funnel/funnel-3d.js +2 -2
  23. package/cjs/chart/funnel/funnel-3d.js.map +1 -1
  24. package/cjs/chart/funnel/funnel.js +2 -2
  25. package/cjs/chart/funnel/funnel.js.map +1 -1
  26. package/cjs/chart/gauge/gauge.js +2 -2
  27. package/cjs/chart/gauge/gauge.js.map +1 -1
  28. package/cjs/chart/heatmap/heatmap.js +2 -2
  29. package/cjs/chart/heatmap/heatmap.js.map +1 -1
  30. package/cjs/chart/histogram/histogram-3d.js +2 -2
  31. package/cjs/chart/histogram/histogram-3d.js.map +1 -1
  32. package/cjs/chart/histogram/histogram.js +2 -2
  33. package/cjs/chart/histogram/histogram.js.map +1 -1
  34. package/cjs/chart/index.d.ts +1 -1
  35. package/cjs/chart/index.js.map +1 -1
  36. package/cjs/chart/line/line.js +2 -2
  37. package/cjs/chart/line/line.js.map +1 -1
  38. package/cjs/chart/map/map.js +2 -2
  39. package/cjs/chart/map/map.js.map +1 -1
  40. package/cjs/chart/pie/pie-3d.js +2 -2
  41. package/cjs/chart/pie/pie-3d.js.map +1 -1
  42. package/cjs/chart/pie/pie.js +2 -2
  43. package/cjs/chart/pie/pie.js.map +1 -1
  44. package/cjs/chart/polar/progress-like.js +2 -2
  45. package/cjs/chart/polar/progress-like.js.map +1 -1
  46. package/cjs/chart/polar/rose-like.js +1 -1
  47. package/cjs/chart/polar/rose-like.js.map +1 -1
  48. package/cjs/chart/progress/circular/circular.js +2 -2
  49. package/cjs/chart/progress/circular/circular.js.map +1 -1
  50. package/cjs/chart/progress/linear/linear.js +4 -4
  51. package/cjs/chart/progress/linear/linear.js.map +1 -1
  52. package/cjs/chart/radar/radar.js +4 -4
  53. package/cjs/chart/radar/radar.js.map +1 -1
  54. package/cjs/chart/range-area/range-area.js +2 -2
  55. package/cjs/chart/range-area/range-area.js.map +1 -1
  56. package/cjs/chart/range-column/range-column-3d.js +2 -2
  57. package/cjs/chart/range-column/range-column-3d.js.map +1 -1
  58. package/cjs/chart/range-column/range-column.js +2 -2
  59. package/cjs/chart/range-column/range-column.js.map +1 -1
  60. package/cjs/chart/rose/rose.js +3 -3
  61. package/cjs/chart/rose/rose.js.map +1 -1
  62. package/cjs/chart/sankey/sankey.js +2 -2
  63. package/cjs/chart/sankey/sankey.js.map +1 -1
  64. package/cjs/chart/scatter/scatter.js +2 -2
  65. package/cjs/chart/scatter/scatter.js.map +1 -1
  66. package/cjs/chart/sequence/sequence.js +2 -2
  67. package/cjs/chart/sequence/sequence.js.map +1 -1
  68. package/cjs/chart/sunburst/sunburst.js +2 -2
  69. package/cjs/chart/sunburst/sunburst.js.map +1 -1
  70. package/cjs/chart/treemap/treemap.js +2 -2
  71. package/cjs/chart/treemap/treemap.js.map +1 -1
  72. package/cjs/chart/util.js +1 -1
  73. package/cjs/chart/util.js.map +1 -1
  74. package/cjs/chart/waterfall/waterfall.js +2 -2
  75. package/cjs/chart/waterfall/waterfall.js.map +1 -1
  76. package/cjs/chart/word-cloud/word-cloud-3d.js +2 -2
  77. package/cjs/chart/word-cloud/word-cloud-3d.js.map +1 -1
  78. package/cjs/chart/word-cloud/word-cloud.js +2 -2
  79. package/cjs/chart/word-cloud/word-cloud.js.map +1 -1
  80. package/cjs/compile/compiler.d.ts +4 -0
  81. package/cjs/compile/compiler.js +4 -0
  82. package/cjs/compile/compiler.js.map +1 -1
  83. package/cjs/compile/interface/compilable-item.d.ts +1 -0
  84. package/cjs/compile/interface/compilable-item.js.map +1 -1
  85. package/cjs/component/axis/base-axis.d.ts +1 -14
  86. package/cjs/component/axis/base-axis.js +18 -29
  87. package/cjs/component/axis/base-axis.js.map +1 -1
  88. package/cjs/component/axis/cartesian/axis.d.ts +1 -1
  89. package/cjs/component/axis/cartesian/axis.js +23 -23
  90. package/cjs/component/axis/cartesian/axis.js.map +1 -1
  91. package/cjs/component/axis/cartesian/index.d.ts +1 -0
  92. package/cjs/component/axis/cartesian/index.js +2 -1
  93. package/cjs/component/axis/cartesian/index.js.map +1 -1
  94. package/cjs/component/axis/cartesian/interface/spec.d.ts +4 -1
  95. package/cjs/component/axis/cartesian/interface/spec.js.map +1 -1
  96. package/cjs/component/axis/cartesian/linear-axis.js +2 -2
  97. package/cjs/component/axis/cartesian/linear-axis.js.map +1 -1
  98. package/cjs/component/axis/cartesian/symlog-axis.d.ts +16 -0
  99. package/cjs/component/axis/cartesian/symlog-axis.js +23 -0
  100. package/cjs/component/axis/cartesian/symlog-axis.js.map +1 -0
  101. package/cjs/component/axis/cartesian/time-axis.js +2 -2
  102. package/cjs/component/axis/cartesian/time-axis.js.map +1 -1
  103. package/cjs/component/axis/interface.d.ts +4 -8
  104. package/cjs/component/axis/interface.js.map +1 -1
  105. package/cjs/component/axis/mixin/linear-axis-mixin.js +3 -3
  106. package/cjs/component/axis/mixin/linear-axis-mixin.js.map +1 -1
  107. package/cjs/component/axis/polar/axis.d.ts +1 -1
  108. package/cjs/component/axis/polar/axis.js +14 -14
  109. package/cjs/component/axis/polar/axis.js.map +1 -1
  110. package/cjs/component/axis/polar/interface/common.d.ts +1 -1
  111. package/cjs/component/axis/polar/interface/common.js.map +1 -1
  112. package/cjs/component/axis/{utils.d.ts → util.d.ts} +1 -1
  113. package/cjs/component/axis/{utils.js → util.js} +6 -6
  114. package/cjs/component/axis/util.js.map +1 -0
  115. package/cjs/component/base/base-component.d.ts +10 -2
  116. package/cjs/component/base/base-component.js +10 -5
  117. package/cjs/component/base/base-component.js.map +1 -1
  118. package/cjs/component/base/interface.d.ts +8 -0
  119. package/cjs/component/base/interface.js +6 -0
  120. package/cjs/component/base/interface.js.map +1 -0
  121. package/cjs/component/base/util.d.ts +2 -1
  122. package/cjs/component/base/util.js +21 -16
  123. package/cjs/component/base/util.js.map +1 -1
  124. package/cjs/component/brush/brush.d.ts +12 -2
  125. package/cjs/component/brush/brush.js +74 -63
  126. package/cjs/component/brush/brush.js.map +1 -1
  127. package/cjs/component/crosshair/base.d.ts +2 -2
  128. package/cjs/component/crosshair/base.js +1 -1
  129. package/cjs/component/crosshair/base.js.map +1 -1
  130. package/cjs/component/crosshair/cartesian.js +9 -9
  131. package/cjs/component/crosshair/cartesian.js.map +1 -1
  132. package/cjs/component/crosshair/interface/spec.d.ts +8 -8
  133. package/cjs/component/crosshair/interface/spec.js.map +1 -1
  134. package/cjs/component/crosshair/interface/theme.d.ts +3 -1
  135. package/cjs/component/crosshair/interface/theme.js.map +1 -1
  136. package/cjs/component/crosshair/polar.js +9 -9
  137. package/cjs/component/crosshair/polar.js.map +1 -1
  138. package/cjs/component/crosshair/util.d.ts +5 -0
  139. package/cjs/component/crosshair/util.js +41 -4
  140. package/cjs/component/crosshair/util.js.map +1 -1
  141. package/cjs/component/custom-mark/custom-mark.d.ts +1 -1
  142. package/cjs/component/custom-mark/custom-mark.js +3 -3
  143. package/cjs/component/custom-mark/custom-mark.js.map +1 -1
  144. package/cjs/component/data-zoom/data-filter-base-component.js +2 -3
  145. package/cjs/component/data-zoom/data-filter-base-component.js.map +1 -1
  146. package/cjs/component/data-zoom/data-zoom/data-zoom.js +6 -6
  147. package/cjs/component/data-zoom/data-zoom/data-zoom.js.map +1 -1
  148. package/cjs/component/data-zoom/data-zoom/interface.d.ts +2 -2
  149. package/cjs/component/data-zoom/data-zoom/interface.js.map +1 -1
  150. package/cjs/component/data-zoom/interface.d.ts +2 -5
  151. package/cjs/component/data-zoom/interface.js.map +1 -1
  152. package/cjs/component/geo/geo-coordinate.d.ts +2 -0
  153. package/cjs/component/geo/geo-coordinate.js +15 -5
  154. package/cjs/component/geo/geo-coordinate.js.map +1 -1
  155. package/cjs/component/geo/projection.d.ts +1 -0
  156. package/cjs/component/geo/projection.js +4 -0
  157. package/cjs/component/geo/projection.js.map +1 -1
  158. package/cjs/component/index.d.ts +2 -2
  159. package/cjs/component/index.js +6 -1
  160. package/cjs/component/index.js.map +1 -1
  161. package/cjs/component/indicator/indicator.d.ts +1 -0
  162. package/cjs/component/indicator/indicator.js +10 -7
  163. package/cjs/component/indicator/indicator.js.map +1 -1
  164. package/cjs/component/indicator/interface.d.ts +5 -6
  165. package/cjs/component/indicator/interface.js.map +1 -1
  166. package/cjs/component/interface/theme.d.ts +2 -2
  167. package/cjs/component/interface/theme.js.map +1 -1
  168. package/cjs/component/interface/type.d.ts +1 -0
  169. package/cjs/component/interface/type.js +12 -11
  170. package/cjs/component/interface/type.js.map +1 -1
  171. package/cjs/component/label/base-label.d.ts +0 -1
  172. package/cjs/component/label/base-label.js +0 -5
  173. package/cjs/component/label/base-label.js.map +1 -1
  174. package/cjs/component/label/interface.d.ts +2 -1
  175. package/cjs/component/label/interface.js.map +1 -1
  176. package/cjs/component/label/label.d.ts +0 -1
  177. package/cjs/component/label/label.js +1 -6
  178. package/cjs/component/label/label.js.map +1 -1
  179. package/cjs/component/label/totalLabel.js +1 -1
  180. package/cjs/component/label/totalLabel.js.map +1 -1
  181. package/cjs/component/legend/base-legend.js +4 -4
  182. package/cjs/component/legend/base-legend.js.map +1 -1
  183. package/cjs/component/legend/continuous/util.js +4 -4
  184. package/cjs/component/legend/continuous/util.js.map +1 -1
  185. package/cjs/component/legend/discrete/interface.d.ts +3 -1
  186. package/cjs/component/legend/discrete/interface.js.map +1 -1
  187. package/cjs/component/legend/discrete/legend.js +2 -2
  188. package/cjs/component/legend/discrete/legend.js.map +1 -1
  189. package/cjs/component/legend/discrete/util.js +2 -2
  190. package/cjs/component/legend/discrete/util.js.map +1 -1
  191. package/cjs/component/legend/interface.d.ts +2 -6
  192. package/cjs/component/legend/interface.js.map +1 -1
  193. package/cjs/component/legend/util.js +2 -2
  194. package/cjs/component/legend/util.js.map +1 -1
  195. package/cjs/component/marker/interface.d.ts +2 -2
  196. package/cjs/component/marker/interface.js.map +1 -1
  197. package/cjs/component/poptip/interface.d.ts +15 -0
  198. package/cjs/component/poptip/interface.js +6 -0
  199. package/cjs/component/poptip/interface.js.map +1 -0
  200. package/cjs/component/title/interface/spec.d.ts +2 -2
  201. package/cjs/component/title/interface/spec.js.map +1 -1
  202. package/cjs/component/tooltip/handler/dom/model/content-column-model.js +5 -5
  203. package/cjs/component/tooltip/handler/dom/model/content-column-model.js.map +1 -1
  204. package/cjs/component/tooltip/handler/dom/model/content-model.js +2 -2
  205. package/cjs/component/tooltip/handler/dom/model/content-model.js.map +1 -1
  206. package/cjs/component/tooltip/handler/dom/model/title-model.js +2 -2
  207. package/cjs/component/tooltip/handler/dom/model/title-model.js.map +1 -1
  208. package/cjs/component/tooltip/handler/dom/model/tooltip-model.js +2 -2
  209. package/cjs/component/tooltip/handler/dom/model/tooltip-model.js.map +1 -1
  210. package/cjs/component/tooltip/handler/dom/util.js +3 -3
  211. package/cjs/component/tooltip/handler/dom/util.js.map +1 -1
  212. package/cjs/component/tooltip/handler/utils/attribute.js +3 -3
  213. package/cjs/component/tooltip/handler/utils/attribute.js.map +1 -1
  214. package/cjs/component/tooltip/handler/utils/get-spec.js +1 -1
  215. package/cjs/component/tooltip/handler/utils/get-spec.js.map +1 -1
  216. package/cjs/component/tooltip/handler/utils/style.js +2 -2
  217. package/cjs/component/tooltip/handler/utils/style.js.map +1 -1
  218. package/cjs/component/tooltip/processor/base.js +1 -1
  219. package/cjs/component/tooltip/processor/base.js.map +1 -1
  220. package/cjs/component/tooltip/tooltip.js +1 -1
  221. package/cjs/component/tooltip/tooltip.js.map +1 -1
  222. package/cjs/core/index.d.ts +1 -1
  223. package/cjs/core/index.js +1 -1
  224. package/cjs/core/index.js.map +1 -1
  225. package/cjs/core/vchart.js +20 -17
  226. package/cjs/core/vchart.js.map +1 -1
  227. package/cjs/data/transforms/legend-data/discrete/discrete.js +4 -2
  228. package/cjs/data/transforms/legend-data/discrete/discrete.js.map +1 -1
  229. package/cjs/data/transforms/tick-data/discrete/polar-angle.js +2 -2
  230. package/cjs/data/transforms/tick-data/discrete/polar-angle.js.map +1 -1
  231. package/cjs/data/transforms/tick-data/util.js +5 -5
  232. package/cjs/data/transforms/tick-data/util.js.map +1 -1
  233. package/cjs/event/events/dimension/util/cartesian.js +2 -2
  234. package/cjs/event/events/dimension/util/cartesian.js.map +1 -1
  235. package/cjs/event/events/dimension/util/polar.js +1 -1
  236. package/cjs/event/events/dimension/util/polar.js.map +1 -1
  237. package/cjs/interaction/trigger.js +2 -2
  238. package/cjs/interaction/trigger.js.map +1 -1
  239. package/cjs/mark/base/base-mark.d.ts +1 -0
  240. package/cjs/mark/base/base-mark.js +19 -2
  241. package/cjs/mark/base/base-mark.js.map +1 -1
  242. package/cjs/mark/mark-set/index.d.ts +1 -0
  243. package/cjs/mark/mark-set/index.js.map +1 -1
  244. package/cjs/model/base-model.js +2 -2
  245. package/cjs/model/base-model.js.map +1 -1
  246. package/cjs/model/interface.d.ts +1 -1
  247. package/cjs/model/interface.js.map +1 -1
  248. package/cjs/plugin/components/index.d.ts +0 -2
  249. package/cjs/plugin/components/index.js +1 -2
  250. package/cjs/plugin/components/index.js.map +1 -1
  251. package/cjs/series/area/area.d.ts +1 -0
  252. package/cjs/series/area/area.js +4 -3
  253. package/cjs/series/area/area.js.map +1 -1
  254. package/cjs/series/bar/bar.js +9 -9
  255. package/cjs/series/bar/bar.js.map +1 -1
  256. package/cjs/series/base/base-series.d.ts +1 -0
  257. package/cjs/series/base/base-series.js +25 -8
  258. package/cjs/series/base/base-series.js.map +1 -1
  259. package/cjs/series/cartesian/cartesian.d.ts +4 -0
  260. package/cjs/series/cartesian/cartesian.js +16 -4
  261. package/cjs/series/cartesian/cartesian.js.map +1 -1
  262. package/cjs/series/cartesian/interface.d.ts +1 -0
  263. package/cjs/series/cartesian/interface.js.map +1 -1
  264. package/cjs/series/dot/dot.js +1 -1
  265. package/cjs/series/dot/dot.js.map +1 -1
  266. package/cjs/series/funnel/funnel.js +13 -3
  267. package/cjs/series/funnel/funnel.js.map +1 -1
  268. package/cjs/series/heatmap/heatmap.js +1 -1
  269. package/cjs/series/heatmap/heatmap.js.map +1 -1
  270. package/cjs/series/line/interface.d.ts +0 -2
  271. package/cjs/series/line/interface.js.map +1 -1
  272. package/cjs/series/line/line.d.ts +1 -0
  273. package/cjs/series/line/line.js +1 -1
  274. package/cjs/series/line/line.js.map +1 -1
  275. package/cjs/series/map/geo-source.js +2 -2
  276. package/cjs/series/map/geo-source.js.map +1 -1
  277. package/cjs/series/map/interface.d.ts +1 -0
  278. package/cjs/series/map/interface.js.map +1 -1
  279. package/cjs/series/map/map.js +8 -4
  280. package/cjs/series/map/map.js.map +1 -1
  281. package/cjs/series/mixin/line-mixin.d.ts +1 -1
  282. package/cjs/series/mixin/line-mixin.js +1 -1
  283. package/cjs/series/mixin/line-mixin.js.map +1 -1
  284. package/cjs/series/pie/pie.js +1 -1
  285. package/cjs/series/pie/pie.js.map +1 -1
  286. package/cjs/series/polar/interface.d.ts +1 -0
  287. package/cjs/series/polar/interface.js.map +1 -1
  288. package/cjs/series/polar/polar.d.ts +4 -0
  289. package/cjs/series/polar/polar.js +15 -3
  290. package/cjs/series/polar/polar.js.map +1 -1
  291. package/cjs/series/radar/radar.d.ts +1 -0
  292. package/cjs/series/radar/radar.js +1 -1
  293. package/cjs/series/radar/radar.js.map +1 -1
  294. package/cjs/series/range-column/range-column.js +1 -1
  295. package/cjs/series/range-column/range-column.js.map +1 -1
  296. package/cjs/series/rose/rose.js +1 -1
  297. package/cjs/series/rose/rose.js.map +1 -1
  298. package/cjs/series/sankey/interface.d.ts +3 -2
  299. package/cjs/series/sankey/interface.js.map +1 -1
  300. package/cjs/series/sankey/sankey.d.ts +5 -0
  301. package/cjs/series/sankey/sankey.js +246 -92
  302. package/cjs/series/sankey/sankey.js.map +1 -1
  303. package/cjs/series/scatter/scatter.js +1 -1
  304. package/cjs/series/scatter/scatter.js.map +1 -1
  305. package/cjs/series/util/utils.d.ts +4 -1
  306. package/cjs/series/util/utils.js +8 -6
  307. package/cjs/series/util/utils.js.map +1 -1
  308. package/cjs/theme/builtin/common/component/axis/cartesian-axis.js +4 -4
  309. package/cjs/theme/builtin/common/component/axis/cartesian-axis.js.map +1 -1
  310. package/cjs/theme/builtin/common/component/axis/common-axis.js +12 -6
  311. package/cjs/theme/builtin/common/component/axis/common-axis.js.map +1 -1
  312. package/cjs/theme/builtin/common/component/axis/polar-axis.js +1 -1
  313. package/cjs/theme/builtin/common/component/axis/polar-axis.js.map +1 -1
  314. package/cjs/theme/builtin/common/component/crosshair.js +73 -117
  315. package/cjs/theme/builtin/common/component/crosshair.js.map +1 -1
  316. package/cjs/theme/builtin/common/component/data-zoom.js +19 -7
  317. package/cjs/theme/builtin/common/component/data-zoom.js.map +1 -1
  318. package/cjs/theme/builtin/common/component/indicator.js +17 -5
  319. package/cjs/theme/builtin/common/component/indicator.js.map +1 -1
  320. package/cjs/theme/builtin/common/component/legend/color-legend.js +31 -5
  321. package/cjs/theme/builtin/common/component/legend/color-legend.js.map +1 -1
  322. package/cjs/theme/builtin/common/component/legend/continuous.js +26 -12
  323. package/cjs/theme/builtin/common/component/legend/continuous.js.map +1 -1
  324. package/cjs/theme/builtin/common/component/legend/discrete-legend.js +22 -9
  325. package/cjs/theme/builtin/common/component/legend/discrete-legend.js.map +1 -1
  326. package/cjs/theme/builtin/common/component/legend/size-legend.js +54 -15
  327. package/cjs/theme/builtin/common/component/legend/size-legend.js.map +1 -1
  328. package/cjs/theme/builtin/common/component/map-label.js +5 -5
  329. package/cjs/theme/builtin/common/component/map-label.js.map +1 -1
  330. package/cjs/theme/builtin/common/component/mark-area.js +7 -2
  331. package/cjs/theme/builtin/common/component/mark-area.js.map +1 -1
  332. package/cjs/theme/builtin/common/component/mark-line.js +7 -2
  333. package/cjs/theme/builtin/common/component/mark-line.js.map +1 -1
  334. package/cjs/theme/builtin/common/component/player.js +33 -7
  335. package/cjs/theme/builtin/common/component/player.js.map +1 -1
  336. package/cjs/theme/builtin/common/component/poptip.d.ts +2 -2
  337. package/cjs/theme/builtin/common/component/poptip.js +20 -12
  338. package/cjs/theme/builtin/common/component/poptip.js.map +1 -1
  339. package/cjs/theme/builtin/common/component/title.js +9 -5
  340. package/cjs/theme/builtin/common/component/title.js.map +1 -1
  341. package/cjs/theme/builtin/common/component/tooltip.js +13 -10
  342. package/cjs/theme/builtin/common/component/tooltip.js.map +1 -1
  343. package/cjs/theme/builtin/common/component/total-label.js +4 -4
  344. package/cjs/theme/builtin/common/component/total-label.js.map +1 -1
  345. package/cjs/theme/builtin/common/constants.js +17 -10
  346. package/cjs/theme/builtin/common/constants.js.map +1 -1
  347. package/cjs/theme/builtin/common/mark.js +8 -4
  348. package/cjs/theme/builtin/common/mark.js.map +1 -1
  349. package/cjs/theme/builtin/common/series/area.js +2 -7
  350. package/cjs/theme/builtin/common/series/area.js.map +1 -1
  351. package/cjs/theme/builtin/common/series/bar.js +2 -7
  352. package/cjs/theme/builtin/common/series/bar.js.map +1 -1
  353. package/cjs/theme/builtin/common/series/bar3d.js +1 -6
  354. package/cjs/theme/builtin/common/series/bar3d.js.map +1 -1
  355. package/cjs/theme/builtin/common/series/circle-packing.js +11 -5
  356. package/cjs/theme/builtin/common/series/circle-packing.js.map +1 -1
  357. package/cjs/theme/builtin/common/series/dot.js +11 -3
  358. package/cjs/theme/builtin/common/series/dot.js.map +1 -1
  359. package/cjs/theme/builtin/common/series/funnel.js +7 -4
  360. package/cjs/theme/builtin/common/series/funnel.js.map +1 -1
  361. package/cjs/theme/builtin/common/series/funnel3d.js +7 -4
  362. package/cjs/theme/builtin/common/series/funnel3d.js.map +1 -1
  363. package/cjs/theme/builtin/common/series/line.js +2 -7
  364. package/cjs/theme/builtin/common/series/line.js.map +1 -1
  365. package/cjs/theme/builtin/common/series/map.js +4 -2
  366. package/cjs/theme/builtin/common/series/map.js.map +1 -1
  367. package/cjs/theme/builtin/common/series/pie.js +1 -6
  368. package/cjs/theme/builtin/common/series/pie.js.map +1 -1
  369. package/cjs/theme/builtin/common/series/pie3d.js +2 -9
  370. package/cjs/theme/builtin/common/series/pie3d.js.map +1 -1
  371. package/cjs/theme/builtin/common/series/radar.js +2 -7
  372. package/cjs/theme/builtin/common/series/radar.js.map +1 -1
  373. package/cjs/theme/builtin/common/series/rangeColumn.js +2 -3
  374. package/cjs/theme/builtin/common/series/rangeColumn.js.map +1 -1
  375. package/cjs/theme/builtin/common/series/rose.js +1 -2
  376. package/cjs/theme/builtin/common/series/rose.js.map +1 -1
  377. package/cjs/theme/builtin/common/series/sankey.js +0 -1
  378. package/cjs/theme/builtin/common/series/sankey.js.map +1 -1
  379. package/cjs/theme/builtin/common/series/scatter.js +2 -7
  380. package/cjs/theme/builtin/common/series/scatter.js.map +1 -1
  381. package/cjs/theme/builtin/common/series/sunburst.js +5 -2
  382. package/cjs/theme/builtin/common/series/sunburst.js.map +1 -1
  383. package/cjs/theme/builtin/common/series/treemap.js +9 -5
  384. package/cjs/theme/builtin/common/series/treemap.js.map +1 -1
  385. package/cjs/theme/builtin/common/series/waterfall.js +5 -6
  386. package/cjs/theme/builtin/common/series/waterfall.js.map +1 -1
  387. package/cjs/theme/builtin/dark/color-scheme.js +5 -3
  388. package/cjs/theme/builtin/dark/color-scheme.js.map +1 -1
  389. package/cjs/theme/builtin/index.d.ts +0 -1
  390. package/cjs/theme/builtin/index.js +1 -2
  391. package/cjs/theme/builtin/index.js.map +1 -1
  392. package/cjs/theme/builtin/light/color-scheme.js +4 -2
  393. package/cjs/theme/builtin/light/color-scheme.js.map +1 -1
  394. package/cjs/theme/builtin/light/index.js +2 -2
  395. package/cjs/theme/builtin/light/index.js.map +1 -1
  396. package/cjs/theme/color-scheme/builtin/interface.d.ts +22 -0
  397. package/cjs/theme/color-scheme/builtin/interface.js +6 -0
  398. package/cjs/theme/color-scheme/builtin/interface.js.map +1 -0
  399. package/cjs/theme/color-scheme/interface.d.ts +3 -2
  400. package/cjs/theme/color-scheme/interface.js.map +1 -1
  401. package/cjs/theme/color-scheme/util.js +8 -2
  402. package/cjs/theme/color-scheme/util.js.map +1 -1
  403. package/cjs/theme/interface.d.ts +16 -5
  404. package/cjs/theme/interface.js.map +1 -1
  405. package/cjs/typings/spec/common.d.ts +2 -1
  406. package/cjs/typings/spec/common.js.map +1 -1
  407. package/cjs/typings/visual.d.ts +10 -20
  408. package/cjs/typings/visual.js.map +1 -1
  409. package/cjs/util/data.d.ts +0 -8
  410. package/cjs/util/data.js +2 -9
  411. package/cjs/util/data.js.map +1 -1
  412. package/cjs/util/object.d.ts +2 -4
  413. package/cjs/util/object.js +2 -18
  414. package/cjs/util/object.js.map +1 -1
  415. package/cjs/util/scale.d.ts +2 -6
  416. package/cjs/util/scale.js +1 -6
  417. package/cjs/util/scale.js.map +1 -1
  418. package/cjs/util/space.d.ts +3 -10
  419. package/cjs/util/space.js +13 -28
  420. package/cjs/util/space.js.map +1 -1
  421. package/cjs/util/spec/background.d.ts +4 -0
  422. package/cjs/util/spec/background.js +27 -0
  423. package/cjs/util/spec/background.js.map +1 -0
  424. package/cjs/util/spec/clone-deep.d.ts +1 -0
  425. package/cjs/util/spec/clone-deep.js +27 -0
  426. package/cjs/util/spec/clone-deep.js.map +1 -0
  427. package/cjs/util/spec/common.d.ts +3 -0
  428. package/cjs/util/spec/common.js +23 -0
  429. package/cjs/util/spec/common.js.map +1 -0
  430. package/cjs/util/spec/index.d.ts +7 -0
  431. package/cjs/util/spec/index.js +24 -0
  432. package/cjs/util/spec/index.js.map +1 -0
  433. package/cjs/util/spec/merge-spec.d.ts +1 -0
  434. package/cjs/util/spec/merge-spec.js +58 -0
  435. package/cjs/util/spec/merge-spec.js.map +1 -0
  436. package/cjs/util/spec/merge-theme.d.ts +3 -0
  437. package/cjs/util/spec/merge-theme.js +37 -0
  438. package/cjs/util/spec/merge-theme.js.map +1 -0
  439. package/cjs/util/spec/preprocess.d.ts +3 -0
  440. package/cjs/util/spec/preprocess.js +24 -0
  441. package/cjs/util/spec/preprocess.js.map +1 -0
  442. package/cjs/util/spec/transform.d.ts +3 -0
  443. package/cjs/util/spec/transform.js +28 -0
  444. package/cjs/util/spec/transform.js.map +1 -0
  445. package/cjs/util/text.d.ts +1 -2
  446. package/cjs/util/text.js +4 -14
  447. package/cjs/util/text.js.map +1 -1
  448. package/cjs/vchart-all.js +1 -1
  449. package/cjs/vchart-all.js.map +1 -1
  450. package/cjs/vchart-simple.js +3 -4
  451. package/cjs/vchart-simple.js.map +1 -1
  452. package/esm/animation/utils.js +3 -3
  453. package/esm/animation/utils.js.map +1 -1
  454. package/esm/chart/area/area.js +3 -3
  455. package/esm/chart/area/area.js.map +1 -1
  456. package/esm/chart/bar/bar-3d.js +2 -2
  457. package/esm/chart/bar/bar-3d.js.map +1 -1
  458. package/esm/chart/bar/bar.js +2 -2
  459. package/esm/chart/bar/bar.js.map +1 -1
  460. package/esm/chart/base-chart.d.ts +1 -0
  461. package/esm/chart/base-chart.js +14 -8
  462. package/esm/chart/base-chart.js.map +1 -1
  463. package/esm/chart/box-plot/box-plot.js +1 -1
  464. package/esm/chart/box-plot/box-plot.js.map +1 -1
  465. package/esm/chart/cartesian/cartesian.js +1 -1
  466. package/esm/chart/cartesian/cartesian.js.map +1 -1
  467. package/esm/chart/circle-packing/circle-packing.js +1 -1
  468. package/esm/chart/circle-packing/circle-packing.js.map +1 -1
  469. package/esm/chart/funnel/funnel-3d.js +1 -1
  470. package/esm/chart/funnel/funnel-3d.js.map +1 -1
  471. package/esm/chart/funnel/funnel.js +1 -1
  472. package/esm/chart/funnel/funnel.js.map +1 -1
  473. package/esm/chart/gauge/gauge.js +2 -2
  474. package/esm/chart/gauge/gauge.js.map +1 -1
  475. package/esm/chart/heatmap/heatmap.js +1 -1
  476. package/esm/chart/heatmap/heatmap.js.map +1 -1
  477. package/esm/chart/histogram/histogram-3d.js +2 -2
  478. package/esm/chart/histogram/histogram-3d.js.map +1 -1
  479. package/esm/chart/histogram/histogram.js +2 -2
  480. package/esm/chart/histogram/histogram.js.map +1 -1
  481. package/esm/chart/index.d.ts +1 -1
  482. package/esm/chart/index.js.map +1 -1
  483. package/esm/chart/line/line.js +1 -1
  484. package/esm/chart/line/line.js.map +1 -1
  485. package/esm/chart/map/map.js +2 -2
  486. package/esm/chart/map/map.js.map +1 -1
  487. package/esm/chart/pie/pie-3d.js +2 -2
  488. package/esm/chart/pie/pie-3d.js.map +1 -1
  489. package/esm/chart/pie/pie.js +2 -2
  490. package/esm/chart/pie/pie.js.map +1 -1
  491. package/esm/chart/polar/progress-like.js +1 -1
  492. package/esm/chart/polar/progress-like.js.map +1 -1
  493. package/esm/chart/polar/rose-like.js +1 -1
  494. package/esm/chart/polar/rose-like.js.map +1 -1
  495. package/esm/chart/progress/circular/circular.js +1 -1
  496. package/esm/chart/progress/circular/circular.js.map +1 -1
  497. package/esm/chart/progress/linear/linear.js +2 -2
  498. package/esm/chart/progress/linear/linear.js.map +1 -1
  499. package/esm/chart/radar/radar.js +5 -5
  500. package/esm/chart/radar/radar.js.map +1 -1
  501. package/esm/chart/range-area/range-area.js +1 -1
  502. package/esm/chart/range-area/range-area.js.map +1 -1
  503. package/esm/chart/range-column/range-column-3d.js +1 -1
  504. package/esm/chart/range-column/range-column-3d.js.map +1 -1
  505. package/esm/chart/range-column/range-column.js +1 -1
  506. package/esm/chart/range-column/range-column.js.map +1 -1
  507. package/esm/chart/rose/rose.js +4 -4
  508. package/esm/chart/rose/rose.js.map +1 -1
  509. package/esm/chart/sankey/sankey.js +1 -1
  510. package/esm/chart/sankey/sankey.js.map +1 -1
  511. package/esm/chart/scatter/scatter.js +2 -2
  512. package/esm/chart/scatter/scatter.js.map +1 -1
  513. package/esm/chart/sequence/sequence.js +4 -2
  514. package/esm/chart/sequence/sequence.js.map +1 -1
  515. package/esm/chart/sunburst/sunburst.js +1 -1
  516. package/esm/chart/sunburst/sunburst.js.map +1 -1
  517. package/esm/chart/treemap/treemap.js +1 -1
  518. package/esm/chart/treemap/treemap.js.map +1 -1
  519. package/esm/chart/util.js +2 -2
  520. package/esm/chart/util.js.map +1 -1
  521. package/esm/chart/waterfall/waterfall.js +1 -1
  522. package/esm/chart/waterfall/waterfall.js.map +1 -1
  523. package/esm/chart/word-cloud/word-cloud-3d.js +1 -1
  524. package/esm/chart/word-cloud/word-cloud-3d.js.map +1 -1
  525. package/esm/chart/word-cloud/word-cloud.js +1 -1
  526. package/esm/chart/word-cloud/word-cloud.js.map +1 -1
  527. package/esm/compile/compiler.d.ts +4 -0
  528. package/esm/compile/compiler.js +4 -0
  529. package/esm/compile/compiler.js.map +1 -1
  530. package/esm/compile/interface/compilable-item.d.ts +1 -0
  531. package/esm/compile/interface/compilable-item.js.map +1 -1
  532. package/esm/component/axis/base-axis.d.ts +1 -14
  533. package/esm/component/axis/base-axis.js +19 -30
  534. package/esm/component/axis/base-axis.js.map +1 -1
  535. package/esm/component/axis/cartesian/axis.d.ts +1 -1
  536. package/esm/component/axis/cartesian/axis.js +20 -20
  537. package/esm/component/axis/cartesian/axis.js.map +1 -1
  538. package/esm/component/axis/cartesian/index.d.ts +1 -0
  539. package/esm/component/axis/cartesian/index.js +2 -0
  540. package/esm/component/axis/cartesian/index.js.map +1 -1
  541. package/esm/component/axis/cartesian/interface/spec.d.ts +4 -1
  542. package/esm/component/axis/cartesian/interface/spec.js.map +1 -1
  543. package/esm/component/axis/cartesian/linear-axis.js +1 -3
  544. package/esm/component/axis/cartesian/linear-axis.js.map +1 -1
  545. package/esm/component/axis/cartesian/symlog-axis.d.ts +16 -0
  546. package/esm/component/axis/cartesian/symlog-axis.js +24 -0
  547. package/esm/component/axis/cartesian/symlog-axis.js.map +1 -0
  548. package/esm/component/axis/cartesian/time-axis.js +3 -3
  549. package/esm/component/axis/cartesian/time-axis.js.map +1 -1
  550. package/esm/component/axis/interface.d.ts +4 -8
  551. package/esm/component/axis/interface.js.map +1 -1
  552. package/esm/component/axis/mixin/linear-axis-mixin.js +1 -1
  553. package/esm/component/axis/mixin/linear-axis-mixin.js.map +1 -1
  554. package/esm/component/axis/polar/axis.d.ts +1 -1
  555. package/esm/component/axis/polar/axis.js +13 -13
  556. package/esm/component/axis/polar/axis.js.map +1 -1
  557. package/esm/component/axis/polar/interface/common.d.ts +1 -1
  558. package/esm/component/axis/polar/interface/common.js.map +1 -1
  559. package/esm/component/axis/{utils.d.ts → util.d.ts} +1 -1
  560. package/esm/component/axis/{utils.js → util.js} +7 -5
  561. package/esm/component/axis/util.js.map +1 -0
  562. package/esm/component/base/base-component.d.ts +10 -2
  563. package/esm/component/base/base-component.js +9 -5
  564. package/esm/component/base/base-component.js.map +1 -1
  565. package/esm/component/base/interface.d.ts +8 -0
  566. package/esm/component/base/interface.js +2 -0
  567. package/esm/component/base/interface.js.map +1 -0
  568. package/esm/component/base/util.d.ts +2 -1
  569. package/esm/component/base/util.js +14 -7
  570. package/esm/component/base/util.js.map +1 -1
  571. package/esm/component/brush/brush.d.ts +12 -2
  572. package/esm/component/brush/brush.js +74 -62
  573. package/esm/component/brush/brush.js.map +1 -1
  574. package/esm/component/crosshair/base.d.ts +2 -2
  575. package/esm/component/crosshair/base.js +1 -1
  576. package/esm/component/crosshair/base.js.map +1 -1
  577. package/esm/component/crosshair/cartesian.js +7 -7
  578. package/esm/component/crosshair/cartesian.js.map +1 -1
  579. package/esm/component/crosshair/interface/spec.d.ts +8 -8
  580. package/esm/component/crosshair/interface/spec.js.map +1 -1
  581. package/esm/component/crosshair/interface/theme.d.ts +3 -1
  582. package/esm/component/crosshair/interface/theme.js.map +1 -1
  583. package/esm/component/crosshair/polar.js +8 -8
  584. package/esm/component/crosshair/polar.js.map +1 -1
  585. package/esm/component/crosshair/util.d.ts +5 -0
  586. package/esm/component/crosshair/util.js +34 -0
  587. package/esm/component/crosshair/util.js.map +1 -1
  588. package/esm/component/custom-mark/custom-mark.d.ts +1 -1
  589. package/esm/component/custom-mark/custom-mark.js +4 -4
  590. package/esm/component/custom-mark/custom-mark.js.map +1 -1
  591. package/esm/component/data-zoom/data-filter-base-component.js +2 -3
  592. package/esm/component/data-zoom/data-filter-base-component.js.map +1 -1
  593. package/esm/component/data-zoom/data-zoom/data-zoom.js +8 -6
  594. package/esm/component/data-zoom/data-zoom/data-zoom.js.map +1 -1
  595. package/esm/component/data-zoom/data-zoom/interface.d.ts +2 -2
  596. package/esm/component/data-zoom/data-zoom/interface.js.map +1 -1
  597. package/esm/component/data-zoom/interface.d.ts +2 -5
  598. package/esm/component/data-zoom/interface.js.map +1 -1
  599. package/esm/component/geo/geo-coordinate.d.ts +2 -0
  600. package/esm/component/geo/geo-coordinate.js +16 -6
  601. package/esm/component/geo/geo-coordinate.js.map +1 -1
  602. package/esm/component/geo/projection.d.ts +1 -0
  603. package/esm/component/geo/projection.js +4 -0
  604. package/esm/component/geo/projection.js.map +1 -1
  605. package/esm/component/index.d.ts +2 -2
  606. package/esm/component/index.js +2 -2
  607. package/esm/component/index.js.map +1 -1
  608. package/esm/component/indicator/indicator.d.ts +1 -0
  609. package/esm/component/indicator/indicator.js +8 -7
  610. package/esm/component/indicator/indicator.js.map +1 -1
  611. package/esm/component/indicator/interface.d.ts +5 -6
  612. package/esm/component/indicator/interface.js.map +1 -1
  613. package/esm/component/interface/theme.d.ts +2 -2
  614. package/esm/component/interface/theme.js.map +1 -1
  615. package/esm/component/interface/type.d.ts +1 -0
  616. package/esm/component/interface/type.js +12 -11
  617. package/esm/component/interface/type.js.map +1 -1
  618. package/esm/component/label/base-label.d.ts +0 -1
  619. package/esm/component/label/base-label.js +0 -5
  620. package/esm/component/label/base-label.js.map +1 -1
  621. package/esm/component/label/interface.d.ts +2 -1
  622. package/esm/component/label/interface.js.map +1 -1
  623. package/esm/component/label/label.d.ts +0 -1
  624. package/esm/component/label/label.js +2 -7
  625. package/esm/component/label/label.js.map +1 -1
  626. package/esm/component/label/totalLabel.js +2 -2
  627. package/esm/component/label/totalLabel.js.map +1 -1
  628. package/esm/component/legend/base-legend.js +5 -5
  629. package/esm/component/legend/base-legend.js.map +1 -1
  630. package/esm/component/legend/continuous/util.js +5 -3
  631. package/esm/component/legend/continuous/util.js.map +1 -1
  632. package/esm/component/legend/discrete/interface.d.ts +3 -1
  633. package/esm/component/legend/discrete/interface.js.map +1 -1
  634. package/esm/component/legend/discrete/legend.js +2 -2
  635. package/esm/component/legend/discrete/legend.js.map +1 -1
  636. package/esm/component/legend/discrete/util.js +4 -4
  637. package/esm/component/legend/discrete/util.js.map +1 -1
  638. package/esm/component/legend/interface.d.ts +2 -6
  639. package/esm/component/legend/interface.js.map +1 -1
  640. package/esm/component/legend/util.js +4 -2
  641. package/esm/component/legend/util.js.map +1 -1
  642. package/esm/component/marker/interface.d.ts +2 -2
  643. package/esm/component/marker/interface.js.map +1 -1
  644. package/esm/component/poptip/interface.d.ts +15 -0
  645. package/esm/component/poptip/interface.js +2 -0
  646. package/esm/component/poptip/interface.js.map +1 -0
  647. package/esm/component/title/interface/spec.d.ts +2 -2
  648. package/esm/component/title/interface/spec.js.map +1 -1
  649. package/esm/component/tooltip/handler/dom/model/content-column-model.js +7 -5
  650. package/esm/component/tooltip/handler/dom/model/content-column-model.js.map +1 -1
  651. package/esm/component/tooltip/handler/dom/model/content-model.js +2 -2
  652. package/esm/component/tooltip/handler/dom/model/content-model.js.map +1 -1
  653. package/esm/component/tooltip/handler/dom/model/title-model.js +3 -3
  654. package/esm/component/tooltip/handler/dom/model/title-model.js.map +1 -1
  655. package/esm/component/tooltip/handler/dom/model/tooltip-model.js +4 -2
  656. package/esm/component/tooltip/handler/dom/model/tooltip-model.js.map +1 -1
  657. package/esm/component/tooltip/handler/dom/util.js +4 -4
  658. package/esm/component/tooltip/handler/dom/util.js.map +1 -1
  659. package/esm/component/tooltip/handler/utils/attribute.js +5 -5
  660. package/esm/component/tooltip/handler/utils/attribute.js.map +1 -1
  661. package/esm/component/tooltip/handler/utils/get-spec.js +2 -2
  662. package/esm/component/tooltip/handler/utils/get-spec.js.map +1 -1
  663. package/esm/component/tooltip/handler/utils/style.js +2 -2
  664. package/esm/component/tooltip/handler/utils/style.js.map +1 -1
  665. package/esm/component/tooltip/processor/base.js +1 -1
  666. package/esm/component/tooltip/processor/base.js.map +1 -1
  667. package/esm/component/tooltip/tooltip.js +2 -2
  668. package/esm/component/tooltip/tooltip.js.map +1 -1
  669. package/esm/core/index.d.ts +1 -1
  670. package/esm/core/index.js +1 -1
  671. package/esm/core/index.js.map +1 -1
  672. package/esm/core/vchart.js +22 -19
  673. package/esm/core/vchart.js.map +1 -1
  674. package/esm/data/transforms/legend-data/discrete/discrete.js +4 -3
  675. package/esm/data/transforms/legend-data/discrete/discrete.js.map +1 -1
  676. package/esm/data/transforms/tick-data/discrete/polar-angle.js +1 -1
  677. package/esm/data/transforms/tick-data/discrete/polar-angle.js.map +1 -1
  678. package/esm/data/transforms/tick-data/util.js +1 -1
  679. package/esm/data/transforms/tick-data/util.js.map +1 -1
  680. package/esm/event/events/dimension/util/cartesian.js +2 -2
  681. package/esm/event/events/dimension/util/cartesian.js.map +1 -1
  682. package/esm/event/events/dimension/util/polar.js +1 -1
  683. package/esm/event/events/dimension/util/polar.js.map +1 -1
  684. package/esm/interaction/trigger.js +3 -3
  685. package/esm/interaction/trigger.js.map +1 -1
  686. package/esm/mark/base/base-mark.d.ts +1 -0
  687. package/esm/mark/base/base-mark.js +20 -3
  688. package/esm/mark/base/base-mark.js.map +1 -1
  689. package/esm/mark/mark-set/index.d.ts +1 -0
  690. package/esm/mark/mark-set/index.js.map +1 -1
  691. package/esm/model/base-model.js +4 -4
  692. package/esm/model/base-model.js.map +1 -1
  693. package/esm/model/interface.d.ts +1 -1
  694. package/esm/model/interface.js.map +1 -1
  695. package/esm/plugin/components/index.d.ts +0 -2
  696. package/esm/plugin/components/index.js +0 -3
  697. package/esm/plugin/components/index.js.map +1 -1
  698. package/esm/series/area/area.d.ts +1 -0
  699. package/esm/series/area/area.js +5 -5
  700. package/esm/series/area/area.js.map +1 -1
  701. package/esm/series/bar/bar.js +2 -4
  702. package/esm/series/bar/bar.js.map +1 -1
  703. package/esm/series/base/base-series.d.ts +1 -0
  704. package/esm/series/base/base-series.js +25 -9
  705. package/esm/series/base/base-series.js.map +1 -1
  706. package/esm/series/cartesian/cartesian.d.ts +4 -0
  707. package/esm/series/cartesian/cartesian.js +15 -3
  708. package/esm/series/cartesian/cartesian.js.map +1 -1
  709. package/esm/series/cartesian/interface.d.ts +1 -0
  710. package/esm/series/cartesian/interface.js.map +1 -1
  711. package/esm/series/dot/dot.js +2 -2
  712. package/esm/series/dot/dot.js.map +1 -1
  713. package/esm/series/funnel/funnel.js +12 -2
  714. package/esm/series/funnel/funnel.js.map +1 -1
  715. package/esm/series/heatmap/heatmap.js +2 -2
  716. package/esm/series/heatmap/heatmap.js.map +1 -1
  717. package/esm/series/line/interface.d.ts +0 -2
  718. package/esm/series/line/interface.js.map +1 -1
  719. package/esm/series/line/line.d.ts +1 -0
  720. package/esm/series/line/line.js +1 -1
  721. package/esm/series/line/line.js.map +1 -1
  722. package/esm/series/map/geo-source.js +3 -1
  723. package/esm/series/map/geo-source.js.map +1 -1
  724. package/esm/series/map/interface.d.ts +1 -0
  725. package/esm/series/map/interface.js.map +1 -1
  726. package/esm/series/map/map.js +9 -3
  727. package/esm/series/map/map.js.map +1 -1
  728. package/esm/series/mixin/line-mixin.d.ts +1 -1
  729. package/esm/series/mixin/line-mixin.js +2 -2
  730. package/esm/series/mixin/line-mixin.js.map +1 -1
  731. package/esm/series/pie/pie.js +2 -2
  732. package/esm/series/pie/pie.js.map +1 -1
  733. package/esm/series/polar/interface.d.ts +1 -0
  734. package/esm/series/polar/interface.js.map +1 -1
  735. package/esm/series/polar/polar.d.ts +4 -0
  736. package/esm/series/polar/polar.js +15 -2
  737. package/esm/series/polar/polar.js.map +1 -1
  738. package/esm/series/radar/radar.d.ts +1 -0
  739. package/esm/series/radar/radar.js +1 -1
  740. package/esm/series/radar/radar.js.map +1 -1
  741. package/esm/series/range-column/range-column.js +2 -2
  742. package/esm/series/range-column/range-column.js.map +1 -1
  743. package/esm/series/rose/rose.js +2 -2
  744. package/esm/series/rose/rose.js.map +1 -1
  745. package/esm/series/sankey/interface.d.ts +3 -2
  746. package/esm/series/sankey/interface.js.map +1 -1
  747. package/esm/series/sankey/sankey.d.ts +5 -0
  748. package/esm/series/sankey/sankey.js +248 -93
  749. package/esm/series/sankey/sankey.js.map +1 -1
  750. package/esm/series/scatter/scatter.js +2 -2
  751. package/esm/series/scatter/scatter.js.map +1 -1
  752. package/esm/series/util/utils.d.ts +4 -1
  753. package/esm/series/util/utils.js +6 -4
  754. package/esm/series/util/utils.js.map +1 -1
  755. package/esm/theme/builtin/common/component/axis/cartesian-axis.js +4 -4
  756. package/esm/theme/builtin/common/component/axis/cartesian-axis.js.map +1 -1
  757. package/esm/theme/builtin/common/component/axis/common-axis.js +12 -6
  758. package/esm/theme/builtin/common/component/axis/common-axis.js.map +1 -1
  759. package/esm/theme/builtin/common/component/axis/polar-axis.js +1 -1
  760. package/esm/theme/builtin/common/component/axis/polar-axis.js.map +1 -1
  761. package/esm/theme/builtin/common/component/crosshair.js +73 -117
  762. package/esm/theme/builtin/common/component/crosshair.js.map +1 -1
  763. package/esm/theme/builtin/common/component/data-zoom.js +16 -6
  764. package/esm/theme/builtin/common/component/data-zoom.js.map +1 -1
  765. package/esm/theme/builtin/common/component/indicator.js +14 -4
  766. package/esm/theme/builtin/common/component/indicator.js.map +1 -1
  767. package/esm/theme/builtin/common/component/legend/color-legend.js +32 -4
  768. package/esm/theme/builtin/common/component/legend/color-legend.js.map +1 -1
  769. package/esm/theme/builtin/common/component/legend/continuous.js +26 -12
  770. package/esm/theme/builtin/common/component/legend/continuous.js.map +1 -1
  771. package/esm/theme/builtin/common/component/legend/discrete-legend.js +22 -9
  772. package/esm/theme/builtin/common/component/legend/discrete-legend.js.map +1 -1
  773. package/esm/theme/builtin/common/component/legend/size-legend.js +55 -14
  774. package/esm/theme/builtin/common/component/legend/size-legend.js.map +1 -1
  775. package/esm/theme/builtin/common/component/map-label.js +4 -6
  776. package/esm/theme/builtin/common/component/map-label.js.map +1 -1
  777. package/esm/theme/builtin/common/component/mark-area.js +4 -1
  778. package/esm/theme/builtin/common/component/mark-area.js.map +1 -1
  779. package/esm/theme/builtin/common/component/mark-line.js +4 -1
  780. package/esm/theme/builtin/common/component/mark-line.js.map +1 -1
  781. package/esm/theme/builtin/common/component/player.js +33 -7
  782. package/esm/theme/builtin/common/component/player.js.map +1 -1
  783. package/esm/theme/builtin/common/component/poptip.d.ts +2 -2
  784. package/esm/theme/builtin/common/component/poptip.js +17 -11
  785. package/esm/theme/builtin/common/component/poptip.js.map +1 -1
  786. package/esm/theme/builtin/common/component/title.js +9 -5
  787. package/esm/theme/builtin/common/component/title.js.map +1 -1
  788. package/esm/theme/builtin/common/component/tooltip.js +12 -11
  789. package/esm/theme/builtin/common/component/tooltip.js.map +1 -1
  790. package/esm/theme/builtin/common/component/total-label.js +3 -5
  791. package/esm/theme/builtin/common/component/total-label.js.map +1 -1
  792. package/esm/theme/builtin/common/constants.js +16 -7
  793. package/esm/theme/builtin/common/constants.js.map +1 -1
  794. package/esm/theme/builtin/common/mark.js +8 -4
  795. package/esm/theme/builtin/common/mark.js.map +1 -1
  796. package/esm/theme/builtin/common/series/area.js +1 -4
  797. package/esm/theme/builtin/common/series/area.js.map +1 -1
  798. package/esm/theme/builtin/common/series/bar.js +1 -4
  799. package/esm/theme/builtin/common/series/bar.js.map +1 -1
  800. package/esm/theme/builtin/common/series/bar3d.js +0 -3
  801. package/esm/theme/builtin/common/series/bar3d.js.map +1 -1
  802. package/esm/theme/builtin/common/series/circle-packing.js +8 -4
  803. package/esm/theme/builtin/common/series/circle-packing.js.map +1 -1
  804. package/esm/theme/builtin/common/series/dot.js +8 -2
  805. package/esm/theme/builtin/common/series/dot.js.map +1 -1
  806. package/esm/theme/builtin/common/series/funnel.js +6 -5
  807. package/esm/theme/builtin/common/series/funnel.js.map +1 -1
  808. package/esm/theme/builtin/common/series/funnel3d.js +6 -5
  809. package/esm/theme/builtin/common/series/funnel3d.js.map +1 -1
  810. package/esm/theme/builtin/common/series/line.js +1 -4
  811. package/esm/theme/builtin/common/series/line.js.map +1 -1
  812. package/esm/theme/builtin/common/series/map.js +4 -2
  813. package/esm/theme/builtin/common/series/map.js.map +1 -1
  814. package/esm/theme/builtin/common/series/pie.js +0 -3
  815. package/esm/theme/builtin/common/series/pie.js.map +1 -1
  816. package/esm/theme/builtin/common/series/pie3d.js +1 -6
  817. package/esm/theme/builtin/common/series/pie3d.js.map +1 -1
  818. package/esm/theme/builtin/common/series/radar.js +1 -4
  819. package/esm/theme/builtin/common/series/radar.js.map +1 -1
  820. package/esm/theme/builtin/common/series/rangeColumn.js +1 -4
  821. package/esm/theme/builtin/common/series/rangeColumn.js.map +1 -1
  822. package/esm/theme/builtin/common/series/rose.js +1 -2
  823. package/esm/theme/builtin/common/series/rose.js.map +1 -1
  824. package/esm/theme/builtin/common/series/sankey.js +0 -1
  825. package/esm/theme/builtin/common/series/sankey.js.map +1 -1
  826. package/esm/theme/builtin/common/series/scatter.js +1 -4
  827. package/esm/theme/builtin/common/series/scatter.js.map +1 -1
  828. package/esm/theme/builtin/common/series/sunburst.js +6 -1
  829. package/esm/theme/builtin/common/series/sunburst.js.map +1 -1
  830. package/esm/theme/builtin/common/series/treemap.js +8 -6
  831. package/esm/theme/builtin/common/series/treemap.js.map +1 -1
  832. package/esm/theme/builtin/common/series/waterfall.js +4 -7
  833. package/esm/theme/builtin/common/series/waterfall.js.map +1 -1
  834. package/esm/theme/builtin/dark/color-scheme.js +5 -3
  835. package/esm/theme/builtin/dark/color-scheme.js.map +1 -1
  836. package/esm/theme/builtin/index.d.ts +0 -1
  837. package/esm/theme/builtin/index.js +0 -2
  838. package/esm/theme/builtin/index.js.map +1 -1
  839. package/esm/theme/builtin/light/color-scheme.js +4 -2
  840. package/esm/theme/builtin/light/color-scheme.js.map +1 -1
  841. package/esm/theme/builtin/light/index.js +2 -2
  842. package/esm/theme/builtin/light/index.js.map +1 -1
  843. package/esm/theme/color-scheme/builtin/interface.d.ts +22 -0
  844. package/esm/theme/color-scheme/builtin/interface.js +2 -0
  845. package/esm/theme/color-scheme/builtin/interface.js.map +1 -0
  846. package/esm/theme/color-scheme/interface.d.ts +3 -2
  847. package/esm/theme/color-scheme/interface.js.map +1 -1
  848. package/esm/theme/color-scheme/util.js +8 -3
  849. package/esm/theme/color-scheme/util.js.map +1 -1
  850. package/esm/theme/interface.d.ts +16 -5
  851. package/esm/theme/interface.js.map +1 -1
  852. package/esm/typings/spec/common.d.ts +2 -1
  853. package/esm/typings/spec/common.js.map +1 -1
  854. package/esm/typings/visual.d.ts +10 -20
  855. package/esm/typings/visual.js.map +1 -1
  856. package/esm/util/data.d.ts +0 -8
  857. package/esm/util/data.js +1 -7
  858. package/esm/util/data.js.map +1 -1
  859. package/esm/util/object.d.ts +2 -4
  860. package/esm/util/object.js +2 -13
  861. package/esm/util/object.js.map +1 -1
  862. package/esm/util/scale.d.ts +2 -6
  863. package/esm/util/scale.js +1 -5
  864. package/esm/util/scale.js.map +1 -1
  865. package/esm/util/space.d.ts +3 -10
  866. package/esm/util/space.js +5 -23
  867. package/esm/util/space.js.map +1 -1
  868. package/esm/util/spec/background.d.ts +4 -0
  869. package/esm/util/spec/background.js +21 -0
  870. package/esm/util/spec/background.js.map +1 -0
  871. package/esm/util/spec/clone-deep.d.ts +1 -0
  872. package/esm/util/spec/clone-deep.js +20 -0
  873. package/esm/util/spec/clone-deep.js.map +1 -0
  874. package/esm/util/spec/common.d.ts +3 -0
  875. package/esm/util/spec/common.js +15 -0
  876. package/esm/util/spec/common.js.map +1 -0
  877. package/esm/util/spec/index.d.ts +7 -0
  878. package/esm/util/spec/index.js +14 -0
  879. package/esm/util/spec/index.js.map +1 -0
  880. package/esm/util/spec/merge-spec.d.ts +1 -0
  881. package/esm/util/spec/merge-spec.js +48 -0
  882. package/esm/util/spec/merge-spec.js.map +1 -0
  883. package/esm/util/spec/merge-theme.d.ts +3 -0
  884. package/esm/util/spec/merge-theme.js +34 -0
  885. package/esm/util/spec/merge-theme.js.map +1 -0
  886. package/esm/util/spec/preprocess.d.ts +3 -0
  887. package/esm/util/spec/preprocess.js +20 -0
  888. package/esm/util/spec/preprocess.js.map +1 -0
  889. package/esm/util/spec/transform.d.ts +3 -0
  890. package/esm/util/spec/transform.js +20 -0
  891. package/esm/util/spec/transform.js.map +1 -0
  892. package/esm/util/text.d.ts +1 -2
  893. package/esm/util/text.js +4 -12
  894. package/esm/util/text.js.map +1 -1
  895. package/esm/vchart-all.js +2 -2
  896. package/esm/vchart-all.js.map +1 -1
  897. package/esm/vchart-simple.js +18 -2
  898. package/esm/vchart-simple.js.map +1 -1
  899. package/package.json +20 -13
  900. package/cjs/component/axis/utils.js.map +0 -1
  901. package/cjs/plugin/components/axis-label-overlap-plugin.d.ts +0 -10
  902. package/cjs/plugin/components/axis-label-overlap-plugin.js +0 -75
  903. package/cjs/plugin/components/axis-label-overlap-plugin.js.map +0 -1
  904. package/cjs/theme/builtin/common/component/axis/log-axis.d.ts +0 -2
  905. package/cjs/theme/builtin/common/component/axis/log-axis.js +0 -22
  906. package/cjs/theme/builtin/common/component/axis/log-axis.js.map +0 -1
  907. package/cjs/theme/builtin/constant.d.ts +0 -2
  908. package/cjs/theme/builtin/constant.js +0 -8
  909. package/cjs/theme/builtin/constant.js.map +0 -1
  910. package/cjs/util/spec.d.ts +0 -17
  911. package/cjs/util/spec.js +0 -121
  912. package/cjs/util/spec.js.map +0 -1
  913. package/esm/component/axis/utils.js.map +0 -1
  914. package/esm/plugin/components/axis-label-overlap-plugin.d.ts +0 -10
  915. package/esm/plugin/components/axis-label-overlap-plugin.js +0 -72
  916. package/esm/plugin/components/axis-label-overlap-plugin.js.map +0 -1
  917. package/esm/theme/builtin/common/component/axis/log-axis.d.ts +0 -2
  918. package/esm/theme/builtin/common/component/axis/log-axis.js +0 -18
  919. package/esm/theme/builtin/common/component/axis/log-axis.js.map +0 -1
  920. package/esm/theme/builtin/constant.d.ts +0 -2
  921. package/esm/theme/builtin/constant.js +0 -4
  922. package/esm/theme/builtin/constant.js.map +0 -1
  923. package/esm/util/spec.d.ts +0 -17
  924. package/esm/util/spec.js +0 -112
  925. package/esm/util/spec.js.map +0 -1
@@ -4,7 +4,7 @@ import { AXIS_ELEMENT_NAME } from "@visactor/vrender-components";
4
4
 
5
5
  import { BaseComponent } from "../base";
6
6
 
7
- import { array, eachSeries, get, getSeries, isArray, isBoolean, isFunction, isNil, isValid, merge } from "../../util";
7
+ import { array, eachSeries, get, getSeries, isArray, isBoolean, isFunction, isNil, isValid, mergeSpec } from "../../util";
8
8
 
9
9
  import { ChartEvent } from "../../constant";
10
10
 
@@ -12,14 +12,14 @@ import { animationConfig } from "../../animation/utils";
12
12
 
13
13
  import { DEFAULT_MARK_ANIMATION } from "../../animation/config";
14
14
 
15
- import { degreeToRadian } from "@visactor/vutils";
15
+ import { degreeToRadian, pickWithout } from "@visactor/vutils";
16
16
 
17
- import { DEFAULT_TITLE_STYLE, transformAxisLineStyle } from "./utils";
17
+ import { DEFAULT_TITLE_STYLE, transformAxisLineStyle } from "./util";
18
18
 
19
19
  import { transformAxisLabelStateStyle, transformStateStyle, transformToGraphic } from "../../util/style";
20
20
 
21
21
  export class AxisComponent extends BaseComponent {
22
- get orient() {
22
+ getOrient() {
23
23
  return this._orient;
24
24
  }
25
25
  getScale() {
@@ -66,9 +66,9 @@ export class AxisComponent extends BaseComponent {
66
66
  this.updateSeriesScale(), this._initData(), this._visible) {
67
67
  const axisMark = this._createMark({
68
68
  type: "component",
69
- name: `axis-${this.orient}`
69
+ name: `axis-${this.getOrient()}`
70
70
  }, {
71
- componentType: "angle" === this.orient ? "circleAxis" : "axis",
71
+ componentType: "angle" === this.getOrient() ? "circleAxis" : "axis",
72
72
  mode: this._spec.mode
73
73
  });
74
74
  if (this._marks.addMark(axisMark), axisMark.setZIndex(this.layoutZIndex), isValid(this._spec.id) && axisMark.setUserId(this._spec.id),
@@ -169,34 +169,23 @@ export class AxisComponent extends BaseComponent {
169
169
  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
170
170
  const spec = this._spec;
171
171
  let titleTextStyle, titleAngle = spec.title.angle;
172
- return "left" !== spec.orient && "right" !== spec.orient || (null === (_a = spec.title) || void 0 === _a ? void 0 : _a.autoRotate) && isNil(spec.title.angle) && (titleAngle = "left" === spec.orient ? -90 : 90,
173
- titleTextStyle = DEFAULT_TITLE_STYLE[spec.orient]), {
174
- orient: this.orient,
172
+ "left" !== spec.orient && "right" !== spec.orient || (null === (_a = spec.title) || void 0 === _a ? void 0 : _a.autoRotate) && isNil(spec.title.angle) && (titleAngle = "left" === spec.orient ? -90 : 90,
173
+ titleTextStyle = DEFAULT_TITLE_STYLE[spec.orient]);
174
+ const labelSpec = pickWithout(spec.label, [ "style", "formatMethod", "state" ]);
175
+ return {
176
+ orient: this.getOrient(),
175
177
  select: spec.select,
176
178
  hover: spec.hover,
177
179
  line: transformAxisLineStyle(spec.domainLine),
178
- label: {
179
- visible: spec.label.visible,
180
- space: spec.label.space,
181
- inside: spec.label.inside,
180
+ label: Object.assign({
182
181
  style: isFunction(spec.label.style) ? (datum, index, data, layer) => {
183
182
  var _a;
184
183
  const style = this._preprocessSpec(spec.label.style(datum.rawValue, index, datum, data, layer));
185
- return transformToGraphic(this._preprocessSpec(merge({}, null === (_a = this._theme.label) || void 0 === _a ? void 0 : _a.style, style)));
184
+ return transformToGraphic(this._preprocessSpec(mergeSpec({}, null === (_a = this._theme.label) || void 0 === _a ? void 0 : _a.style, style)));
186
185
  } : transformToGraphic(spec.label.style),
187
186
  formatMethod: spec.label.formatMethod ? (value, datum, index) => spec.label.formatMethod(datum.rawValue, datum) : null,
188
- state: transformAxisLabelStateStyle(spec.label.state),
189
- autoRotate: !!spec.label.autoRotate,
190
- autoHide: !!spec.label.autoHide,
191
- autoLimit: !!spec.label.autoLimit,
192
- autoRotateAngle: spec.label.autoRotateAngle,
193
- autoHideMethod: spec.label.autoHideMethod,
194
- autoHideSeparation: spec.label.autoHideSeparation,
195
- limitEllipsis: spec.label.limitEllipsis,
196
- layoutFunc: spec.label.layoutFunc,
197
- dataFilter: spec.label.dataFilter,
198
- containerAlign: spec.label.containerAlign
199
- },
187
+ state: transformAxisLabelStateStyle(spec.label.state)
188
+ }, labelSpec),
200
189
  tick: {
201
190
  visible: spec.tick.visible,
202
191
  length: spec.tick.tickSize,
@@ -205,7 +194,7 @@ export class AxisComponent extends BaseComponent {
205
194
  style: isFunction(spec.tick.style) ? (value, index, datum, data) => {
206
195
  var _a;
207
196
  const style = this._preprocessSpec(spec.tick.style(value, index, datum, data));
208
- return transformToGraphic(this._preprocessSpec(merge({}, null === (_a = this._theme.tick) || void 0 === _a ? void 0 : _a.style, style)));
197
+ return transformToGraphic(this._preprocessSpec(mergeSpec({}, null === (_a = this._theme.tick) || void 0 === _a ? void 0 : _a.style, style)));
209
198
  } : transformToGraphic(spec.tick.style),
210
199
  state: transformStateStyle(spec.tick.state),
211
200
  dataFilter: spec.tick.dataFilter
@@ -218,7 +207,7 @@ export class AxisComponent extends BaseComponent {
218
207
  style: isFunction(spec.subTick.style) ? (value, index, datum, data) => {
219
208
  var _a;
220
209
  const style = spec.subTick.style(value, index, datum, data);
221
- return transformToGraphic(merge({}, null === (_a = this._theme.subTick) || void 0 === _a ? void 0 : _a.style, style));
210
+ return transformToGraphic(mergeSpec({}, null === (_a = this._theme.subTick) || void 0 === _a ? void 0 : _a.style, style));
222
211
  } : transformToGraphic(spec.subTick.style),
223
212
  state: transformStateStyle(spec.subTick.state)
224
213
  },
@@ -230,7 +219,7 @@ export class AxisComponent extends BaseComponent {
230
219
  style: isFunction(spec.grid.style) ? (datum, index) => {
231
220
  var _a, _b;
232
221
  const style = spec.grid.style(null === (_a = datum.datum) || void 0 === _a ? void 0 : _a.rawValue, index, datum.datum);
233
- return transformToGraphic(this._preprocessSpec(merge({}, null === (_b = this._theme.grid) || void 0 === _b ? void 0 : _b.style, style)));
222
+ return transformToGraphic(this._preprocessSpec(mergeSpec({}, null === (_b = this._theme.grid) || void 0 === _b ? void 0 : _b.style, style)));
234
223
  } : transformToGraphic(spec.grid.style)
235
224
  },
236
225
  subGrid: {
@@ -245,7 +234,7 @@ export class AxisComponent extends BaseComponent {
245
234
  space: spec.title.space,
246
235
  autoRotate: !1,
247
236
  angle: titleAngle ? degreeToRadian(titleAngle) : null,
248
- textStyle: merge({}, titleTextStyle, transformToGraphic(spec.title.style)),
237
+ textStyle: mergeSpec({}, titleTextStyle, transformToGraphic(spec.title.style)),
249
238
  padding: spec.title.padding,
250
239
  shape: {
251
240
  visible: null === (_b = spec.title.shape) || void 0 === _b ? void 0 : _b.visible,
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/component/axis/base-axis.ts"],"names":[],"mappings":"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","file":"base-axis.js","sourcesContent":["import type { IBaseScale } from '@visactor/vscale';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous } from '@visactor/vscale';\nimport type { INode, IGroup, IGraphic } from '@visactor/vrender';\nimport { AXIS_ELEMENT_NAME } from '@visactor/vrender-components';\n// eslint-disable-next-line no-duplicate-imports\nimport type { AxisItem } from '@visactor/vrender-components';\nimport type { IOrientType, IPolarOrientType, Datum, StringOrNumber } from '../../typings';\nimport { BaseComponent } from '../base';\nimport type { IPolarAxisCommonTheme } from './polar/interface';\nimport type { ICartesianAxisCommonTheme } from './cartesian/interface';\nimport type { CompilableData } from '../../compile/data';\nimport type { IAxis, ICommonAxisSpec, ITick, StatisticsDomain } from './interface';\nimport type { IComponentOption } from '../interface';\nimport { array, eachSeries, get, getSeries, isArray, isBoolean, isFunction, isNil, isValid, merge } from '../../util';\nimport type { ISeries } from '../../series/interface';\nimport { ChartEvent } from '../../constant';\nimport type { Group } from '../../series/base/group';\nimport { animationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport { degreeToRadian, type LooseFunction } from '@visactor/vutils';\nimport { DEFAULT_TITLE_STYLE, transformAxisLineStyle } from './utils';\nimport { transformAxisLabelStateStyle, transformStateStyle, transformToGraphic } from '../../util/style';\nimport type { ITransformOptions } from '@visactor/vdataset';\n\nexport abstract class AxisComponent<T extends ICommonAxisSpec & Record<string, any> = any> // FIXME: 补充公共类型,去掉 Record<string, any>\n extends BaseComponent<T>\n implements IAxis\n{\n static specKey = 'axes';\n\n protected _orient: IPolarOrientType | IOrientType;\n get orient() {\n return this._orient;\n }\n\n protected _scale!: IBaseScale;\n getScale() {\n return this._scale;\n }\n\n protected _scales: IBaseScale[] = [];\n getScales() {\n return this._scales;\n }\n\n protected declare _theme: ICartesianAxisCommonTheme | IPolarAxisCommonTheme;\n\n protected _tickData!: CompilableData;\n getTickData() {\n return this._tickData;\n }\n\n protected _statisticsDomain: StatisticsDomain = { domain: [], index: {} };\n getStatisticsDomain() {\n return this._statisticsDomain;\n }\n\n // 与系列的关联关系\n // 优先级:id > index\n // 最终结果:series & region取交集\n protected _seriesUserId?: StringOrNumber[];\n protected _seriesIndex?: number[];\n protected _regionUserId?: StringOrNumber[];\n protected _regionIndex?: number[];\n\n /**\n * if axis will be shown\n */\n protected _visible: boolean = true;\n get visible() {\n return this._visible;\n }\n\n protected _tick: ITick | undefined = undefined;\n protected abstract computeDomain(data: { min: number; max: number; values: any[] }[]): StringOrNumber[];\n abstract dataToPosition(values: any[], cfg?: any): number;\n abstract valueToPosition(value: any): number;\n protected abstract axisHelper(): any;\n protected abstract getSeriesStatisticsField(s: ISeries): string[];\n protected abstract updateSeriesScale(): void;\n protected abstract collectData(depth: number): { min: number; max: number; values: any[] }[];\n protected abstract _initData(): void;\n abstract transformScaleDomain(): void;\n\n protected _dataFieldText: string;\n\n constructor(spec: T, options: IComponentOption) {\n super(spec, {\n ...options\n });\n this._visible = spec.visible ?? true;\n }\n\n created() {\n super.created();\n //series and regions\n this.setSeriesAndRegionsFromSpec();\n // event\n this.initEvent();\n // scales\n this.initScales();\n this.updateSeriesScale();\n // data\n this._initData();\n\n if (this._visible) {\n // 创建语法元素\n\n const axisMark = this._createMark(\n { type: 'component', name: `axis-${this.orient}` },\n {\n componentType: this.orient === 'angle' ? 'circleAxis' : 'axis',\n mode: this._spec.mode\n }\n );\n this._marks.addMark(axisMark);\n\n axisMark.setZIndex(this.layoutZIndex);\n if (isValid(this._spec.id)) {\n axisMark.setUserId(this._spec.id);\n }\n // interactive\n if (isBoolean(this._spec.interactive)) {\n axisMark.setInteractive(this._spec.interactive);\n }\n\n // Tip: 支持 spec.animationAppear.axis,并且坐标轴默认关闭动画\n if (\n this._option.animation !== false &&\n get(this._option.getChart().getSpec(), 'animation') !== false &&\n this._spec.animation === true\n ) {\n const axisAnimateConfig = animationConfig(DEFAULT_MARK_ANIMATION.axis(), {\n appear:\n this._spec.animationAppear ??\n get(this._option.getChart().getSpec(), 'animationAppear.axis') ??\n get(this._option.getChart().getSpec(), 'animationAppear'),\n disappear:\n this._spec.animationDisappear ??\n get(this._option.getChart().getSpec(), 'animationDisappear.axis') ??\n get(this._option.getChart().getSpec(), 'animationDisappear'),\n enter:\n this._spec.animationEnter ??\n get(this._option.getChart().getSpec(), 'animationEnter.axis') ??\n get(this._option.getChart().getSpec(), 'animationEnter'),\n exit:\n this._spec.animationExit ??\n get(this._option.getChart().getSpec(), 'animationExit.axis') ??\n get(this._option.getChart().getSpec(), 'animationExit'),\n update:\n this._spec.animationUpdate ??\n get(this._option.getChart().getSpec(), 'animationUpdate.axis') ??\n get(this._option.getChart().getSpec(), 'animationUpdate')\n });\n // 因为坐标轴的更新动画中处理了 enter,所以需要将 enter 的参数传入\n axisAnimateConfig.update[0].customParameters = {\n enter: axisAnimateConfig.enter[0]\n };\n axisMark.setAnimationConfig(axisAnimateConfig);\n }\n }\n }\n\n protected isSeriesDataEnable() {\n let enable = true;\n eachSeries(\n this._regions,\n s => {\n if (isArray(s.getViewDataStatistics()?.latestData)) {\n enable = false;\n }\n },\n {\n userId: this._seriesUserId,\n specIndex: this._seriesIndex\n }\n );\n return enable;\n }\n\n protected setSeriesAndRegionsFromSpec() {\n const { seriesId, seriesIndex, regionId, regionIndex } = this._spec;\n isValid(seriesId) && (this._seriesUserId = array(seriesId));\n isValid(regionId) && (this._regionUserId = array(regionId));\n isValid(seriesIndex) && (this._seriesIndex = array(seriesIndex));\n isValid(regionIndex) && (this._regionIndex = array(regionIndex));\n this._regions = this._option.getRegionsInUserIdOrIndex(this._regionUserId as string[], this._regionIndex);\n // _regions 被更新了,layoutBindRegionID 也要更新\n this.layoutBindRegionID = this._regions.map(x => x.id);\n }\n\n getBindSeriesFilter() {\n return {\n userId: this._seriesUserId,\n specIndex: this._seriesIndex\n };\n }\n\n protected computeStatisticsDomain = () => {\n const data: { min: number; max: number; values: any[] }[] = [];\n eachSeries(\n this._regions,\n s => {\n const vd = s.getViewDataStatistics?.();\n vd &&\n this.getSeriesStatisticsField(s as ISeries).forEach(f => {\n vd.latestData?.[f] && data.push(vd.latestData[f]);\n });\n },\n {\n userId: this._seriesUserId,\n specIndex: this._seriesIndex\n }\n );\n\n this._statisticsDomain.domain = this.computeDomain(data);\n if (!isContinuous(this._scale.type)) {\n this._statisticsDomain.index = {};\n for (let i = 0; i < this._statisticsDomain.domain.length; i++) {\n this._statisticsDomain.index[this._statisticsDomain.domain[i]] = i;\n }\n }\n };\n\n protected initEvent() {\n this.event.on(\n ChartEvent.scaleUpdate,\n { filter: ({ model }) => model?.id === this.id },\n this.effect.scaleUpdate.bind(this)\n );\n const viewStatistics = getSeries(this._regions, {\n userId: this._seriesUserId,\n specIndex: this._seriesIndex\n })\n .map(s => s.getViewDataStatistics())\n .filter(v => !!v);\n this._option.dataSet.multipleDataViewAddListener(viewStatistics, 'change', () => {\n this.updateScaleDomain();\n });\n }\n\n protected updateScaleDomain() {\n // 留给各个类型的 axis 来 override\n }\n\n protected computeData(): void {\n this._tickData.getDataView().reRunAllTransform();\n this._tickData.updateData();\n }\n\n protected initScales() {\n this._scales = [this._scale];\n const groups: Group[] = [];\n eachSeries(\n this._regions,\n s => {\n const g = s.getGroups();\n g && groups.push(g);\n },\n {\n userId: this._seriesUserId,\n specIndex: this._seriesIndex\n }\n );\n if (groups.length !== 0) {\n const depth = Math.max(...groups.map(g => g.fields.length));\n for (let i = 1; i < depth; i++) {\n const scale = this._scale.clone();\n this._scales.push(scale);\n }\n }\n // this.updateScaleDomain();\n }\n\n /** Update API **/\n updateSpec(spec: any) {\n const originalSpec = this._originalSpec;\n const result = super.updateSpec(spec);\n result.reRender = true;\n if (originalSpec.type !== spec.type) {\n result.reMake = true;\n return result;\n }\n result.reMake =\n ['seriesId', 'seriesIndex', 'regionId', 'regionIndex'].some(k => {\n JSON.stringify(originalSpec[k]) !== JSON.stringify(spec[k]);\n }) || result.reMake;\n return result;\n }\n\n protected getLabelFormatMethod() {\n return this._spec.label.formatMethod\n ? (value: any, datum: any, index: number) => this._spec.label.formatMethod(datum.rawValue, datum)\n : null;\n }\n\n protected getLabelItems(length: number) {\n return isArray(this._tickData.getLatestData())\n ? [\n this._tickData\n .getLatestData()\n .map((obj: Datum) => {\n return {\n id: obj.value,\n label: obj.value,\n value: length === 0 ? 0 : this.dataToPosition([obj.value]) / length,\n rawValue: obj.value\n };\n })\n .filter((entry: AxisItem) => entry.value >= 0 && entry.value <= 1)\n ]\n : [];\n }\n\n protected _delegateAxisContainerEvent(component: IGroup) {\n const axisMainContainer = component?.find((node: INode) => node.name === AXIS_ELEMENT_NAME.axisContainer, true);\n if (axisMainContainer) {\n // 代理组件上的事件,目前坐标轴组件比较特殊,包含了网格线,但是事件这块只提供不包含网格线部分的响应\n axisMainContainer.addEventListener('*', ((event: any, type: string) =>\n this._delegateEvent(component as unknown as IGraphic, event, type)) as LooseFunction);\n }\n }\n\n protected _getAxisAttributes() {\n const spec = this._spec;\n let titleAngle = spec.title.angle;\n let titleTextStyle;\n if (spec.orient === 'left' || spec.orient === 'right') {\n // 处理纵轴的标题样式\n if (spec.title?.autoRotate && isNil(spec.title.angle)) {\n titleAngle = spec.orient === 'left' ? -90 : 90;\n titleTextStyle = DEFAULT_TITLE_STYLE[spec.orient];\n }\n }\n\n return {\n orient: this.orient,\n select: spec.select,\n hover: spec.hover,\n line: transformAxisLineStyle(spec.domainLine),\n label: {\n visible: spec.label.visible,\n space: spec.label.space,\n inside: spec.label.inside,\n style: isFunction(spec.label.style)\n ? (datum: Datum, index: number, data: Datum[], layer?: number) => {\n const style = this._preprocessSpec(spec.label.style(datum.rawValue, index, datum, data, layer));\n return transformToGraphic(this._preprocessSpec(merge({}, this._theme.label?.style, style)));\n }\n : transformToGraphic(spec.label.style),\n formatMethod: spec.label.formatMethod\n ? (value: any, datum: any, index: number) => {\n return spec.label.formatMethod(datum.rawValue, datum);\n }\n : null,\n state: transformAxisLabelStateStyle(spec.label.state),\n autoRotate: !!spec.label.autoRotate,\n autoHide: !!spec.label.autoHide,\n autoLimit: !!spec.label.autoLimit,\n autoRotateAngle: spec.label.autoRotateAngle,\n autoHideMethod: spec.label.autoHideMethod,\n autoHideSeparation: spec.label.autoHideSeparation,\n limitEllipsis: spec.label.limitEllipsis,\n layoutFunc: spec.label.layoutFunc,\n dataFilter: spec.label.dataFilter,\n containerAlign: spec.label.containerAlign\n },\n tick: {\n visible: spec.tick.visible,\n length: spec.tick.tickSize,\n inside: spec.tick.inside,\n alignWithLabel: spec.tick.alignWithLabel,\n style: isFunction(spec.tick.style)\n ? (value: number, index: number, datum: Datum, data: Datum[]) => {\n const style = this._preprocessSpec((spec.tick.style as any)(value, index, datum, data));\n return transformToGraphic(this._preprocessSpec(merge({}, this._theme.tick?.style, style)));\n }\n : transformToGraphic(spec.tick.style),\n state: transformStateStyle(spec.tick.state),\n dataFilter: spec.tick.dataFilter\n },\n subTick: {\n visible: spec.subTick.visible,\n length: spec.subTick.tickSize,\n inside: spec.subTick.inside,\n count: spec.subTick.tickCount,\n style: isFunction(spec.subTick.style)\n ? (value: number, index: number, datum: Datum, data: Datum[]) => {\n const style = (spec.subTick.style as any)(value, index, datum, data);\n return transformToGraphic(merge({}, this._theme.subTick?.style, style));\n }\n : transformToGraphic(spec.subTick.style),\n state: transformStateStyle(spec.subTick.state)\n },\n grid: {\n type: 'line',\n visible: spec.grid.visible,\n alternateColor: spec.grid.alternateColor,\n alignWithLabel: spec.grid.alignWithLabel,\n style: isFunction(spec.grid.style)\n ? (datum: Datum, index: number) => {\n const style = spec.grid.style(datum.datum?.rawValue, index, datum.datum);\n return transformToGraphic(this._preprocessSpec(merge({}, this._theme.grid?.style, style)));\n }\n : transformToGraphic(spec.grid.style)\n },\n subGrid: {\n type: 'line',\n visible: spec.subGrid.visible,\n alternateColor: spec.subGrid.alternateColor,\n style: transformToGraphic(spec.subGrid.style)\n },\n title: {\n visible: spec.title.visible,\n position: spec.title.position,\n space: spec.title.space,\n autoRotate: false, // 默认不对外提供该配置\n angle: titleAngle ? degreeToRadian(titleAngle) : null,\n textStyle: merge({}, titleTextStyle, transformToGraphic(spec.title.style)),\n padding: spec.title.padding,\n shape: {\n visible: spec.title.shape?.visible,\n space: spec.title.shape?.space,\n style: transformToGraphic(spec.title.shape?.style)\n },\n background: {\n visible: spec.title.background?.visible,\n style: transformToGraphic(spec.title.background?.style)\n },\n state: {\n text: transformStateStyle(spec.title.state),\n shape: transformStateStyle(spec.title.shape?.state),\n background: transformStateStyle(spec.title.background?.state)\n }\n },\n panel: {\n visible: spec.background?.visible,\n style: transformToGraphic(spec.background?.style),\n state: transformStateStyle(spec.background?.state)\n }\n };\n }\n\n addTransformToTickData(options: ITransformOptions, execute?: boolean) {\n this._tickData?.getDataView()?.transform(options, execute);\n }\n}\n"]}
1
+ {"version":3,"sources":["../src/component/axis/base-axis.ts"],"names":[],"mappings":"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","file":"base-axis.js","sourcesContent":["import type { IBaseScale } from '@visactor/vscale';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous } from '@visactor/vscale';\nimport type { INode, IGroup, IGraphic } from '@visactor/vrender';\nimport { AXIS_ELEMENT_NAME } from '@visactor/vrender-components';\n// eslint-disable-next-line no-duplicate-imports\nimport type { AxisItem } from '@visactor/vrender-components';\nimport type { IOrientType, IPolarOrientType, Datum, StringOrNumber } from '../../typings';\nimport { BaseComponent } from '../base';\nimport type { IPolarAxisCommonTheme } from './polar/interface';\nimport type { ICartesianAxisCommonTheme } from './cartesian/interface';\nimport type { CompilableData } from '../../compile/data';\nimport type { IAxis, ICommonAxisSpec, ITick, StatisticsDomain } from './interface';\nimport type { IComponentOption } from '../interface';\nimport {\n array,\n eachSeries,\n get,\n getSeries,\n isArray,\n isBoolean,\n isFunction,\n isNil,\n isValid,\n mergeSpec\n} from '../../util';\nimport type { ISeries } from '../../series/interface';\nimport { ChartEvent } from '../../constant';\nimport type { Group } from '../../series/base/group';\nimport { animationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport { degreeToRadian, pickWithout, type LooseFunction } from '@visactor/vutils';\nimport { DEFAULT_TITLE_STYLE, transformAxisLineStyle } from './util';\nimport { transformAxisLabelStateStyle, transformStateStyle, transformToGraphic } from '../../util/style';\nimport type { ITransformOptions } from '@visactor/vdataset';\n\nexport abstract class AxisComponent<T extends ICommonAxisSpec & Record<string, any> = any> // FIXME: 补充公共类型,去掉 Record<string, any>\n extends BaseComponent<T>\n implements IAxis\n{\n static specKey = 'axes';\n\n protected _orient: IPolarOrientType | IOrientType;\n getOrient() {\n return this._orient;\n }\n\n protected _scale!: IBaseScale;\n getScale() {\n return this._scale;\n }\n\n protected _scales: IBaseScale[] = [];\n getScales() {\n return this._scales;\n }\n\n protected declare _theme: ICartesianAxisCommonTheme | IPolarAxisCommonTheme;\n\n protected _tickData!: CompilableData;\n getTickData() {\n return this._tickData;\n }\n\n protected _statisticsDomain: StatisticsDomain = { domain: [], index: {} };\n getStatisticsDomain() {\n return this._statisticsDomain;\n }\n\n // 与系列的关联关系\n // 优先级:id > index\n // 最终结果:series & region取交集\n protected _seriesUserId?: StringOrNumber[];\n protected _seriesIndex?: number[];\n protected _regionUserId?: StringOrNumber[];\n protected _regionIndex?: number[];\n\n /**\n * if axis will be shown\n */\n protected _visible: boolean = true;\n get visible() {\n return this._visible;\n }\n\n protected _tick: ITick | undefined = undefined;\n protected abstract computeDomain(data: { min: number; max: number; values: any[] }[]): StringOrNumber[];\n abstract dataToPosition(values: any[], cfg?: any): number;\n abstract valueToPosition(value: any): number;\n protected abstract axisHelper(): any;\n protected abstract getSeriesStatisticsField(s: ISeries): string[];\n protected abstract updateSeriesScale(): void;\n protected abstract collectData(depth: number): { min: number; max: number; values: any[] }[];\n protected abstract _initData(): void;\n abstract transformScaleDomain(): void;\n\n protected _dataFieldText: string;\n\n constructor(spec: T, options: IComponentOption) {\n super(spec, {\n ...options\n });\n this._visible = spec.visible ?? true;\n }\n\n created() {\n super.created();\n //series and regions\n this.setSeriesAndRegionsFromSpec();\n // event\n this.initEvent();\n // scales\n this.initScales();\n this.updateSeriesScale();\n // data\n this._initData();\n\n if (this._visible) {\n // 创建语法元素\n\n const axisMark = this._createMark(\n { type: 'component', name: `axis-${this.getOrient()}` },\n {\n componentType: this.getOrient() === 'angle' ? 'circleAxis' : 'axis',\n mode: this._spec.mode\n }\n );\n this._marks.addMark(axisMark);\n\n axisMark.setZIndex(this.layoutZIndex);\n if (isValid(this._spec.id)) {\n axisMark.setUserId(this._spec.id);\n }\n // interactive\n if (isBoolean(this._spec.interactive)) {\n axisMark.setInteractive(this._spec.interactive);\n }\n\n // Tip: 支持 spec.animationAppear.axis,并且坐标轴默认关闭动画\n if (\n this._option.animation !== false &&\n get(this._option.getChart().getSpec(), 'animation') !== false &&\n this._spec.animation === true\n ) {\n const axisAnimateConfig = animationConfig(DEFAULT_MARK_ANIMATION.axis(), {\n appear:\n this._spec.animationAppear ??\n get(this._option.getChart().getSpec(), 'animationAppear.axis') ??\n get(this._option.getChart().getSpec(), 'animationAppear'),\n disappear:\n this._spec.animationDisappear ??\n get(this._option.getChart().getSpec(), 'animationDisappear.axis') ??\n get(this._option.getChart().getSpec(), 'animationDisappear'),\n enter:\n this._spec.animationEnter ??\n get(this._option.getChart().getSpec(), 'animationEnter.axis') ??\n get(this._option.getChart().getSpec(), 'animationEnter'),\n exit:\n this._spec.animationExit ??\n get(this._option.getChart().getSpec(), 'animationExit.axis') ??\n get(this._option.getChart().getSpec(), 'animationExit'),\n update:\n this._spec.animationUpdate ??\n get(this._option.getChart().getSpec(), 'animationUpdate.axis') ??\n get(this._option.getChart().getSpec(), 'animationUpdate')\n });\n // 因为坐标轴的更新动画中处理了 enter,所以需要将 enter 的参数传入\n axisAnimateConfig.update[0].customParameters = {\n enter: axisAnimateConfig.enter[0]\n };\n axisMark.setAnimationConfig(axisAnimateConfig);\n }\n }\n }\n\n protected isSeriesDataEnable() {\n let enable = true;\n eachSeries(\n this._regions,\n s => {\n if (isArray(s.getViewDataStatistics()?.latestData)) {\n enable = false;\n }\n },\n {\n userId: this._seriesUserId,\n specIndex: this._seriesIndex\n }\n );\n return enable;\n }\n\n protected setSeriesAndRegionsFromSpec() {\n const { seriesId, seriesIndex, regionId, regionIndex } = this._spec;\n isValid(seriesId) && (this._seriesUserId = array(seriesId));\n isValid(regionId) && (this._regionUserId = array(regionId));\n isValid(seriesIndex) && (this._seriesIndex = array(seriesIndex));\n isValid(regionIndex) && (this._regionIndex = array(regionIndex));\n this._regions = this._option.getRegionsInUserIdOrIndex(this._regionUserId as string[], this._regionIndex);\n // _regions 被更新了,layoutBindRegionID 也要更新\n this.layoutBindRegionID = this._regions.map(x => x.id);\n }\n\n getBindSeriesFilter() {\n return {\n userId: this._seriesUserId,\n specIndex: this._seriesIndex\n };\n }\n\n protected computeStatisticsDomain = () => {\n const data: { min: number; max: number; values: any[] }[] = [];\n eachSeries(\n this._regions,\n s => {\n const vd = s.getViewDataStatistics?.();\n vd &&\n this.getSeriesStatisticsField(s as ISeries).forEach(f => {\n vd.latestData?.[f] && data.push(vd.latestData[f]);\n });\n },\n {\n userId: this._seriesUserId,\n specIndex: this._seriesIndex\n }\n );\n\n this._statisticsDomain.domain = this.computeDomain(data);\n if (!isContinuous(this._scale.type)) {\n this._statisticsDomain.index = {};\n for (let i = 0; i < this._statisticsDomain.domain.length; i++) {\n this._statisticsDomain.index[this._statisticsDomain.domain[i]] = i;\n }\n }\n };\n\n protected initEvent() {\n this.event.on(\n ChartEvent.scaleUpdate,\n { filter: ({ model }) => model?.id === this.id },\n this.effect.scaleUpdate.bind(this)\n );\n const viewStatistics = getSeries(this._regions, {\n userId: this._seriesUserId,\n specIndex: this._seriesIndex\n })\n .map(s => s.getViewDataStatistics())\n .filter(v => !!v);\n this._option.dataSet.multipleDataViewAddListener(viewStatistics, 'change', () => {\n this.updateScaleDomain();\n });\n }\n\n protected updateScaleDomain() {\n // 留给各个类型的 axis 来 override\n }\n\n protected computeData(): void {\n this._tickData.getDataView().reRunAllTransform();\n this._tickData.updateData();\n }\n\n protected initScales() {\n this._scales = [this._scale];\n const groups: Group[] = [];\n eachSeries(\n this._regions,\n s => {\n const g = s.getGroups();\n g && groups.push(g);\n },\n {\n userId: this._seriesUserId,\n specIndex: this._seriesIndex\n }\n );\n if (groups.length !== 0) {\n const depth = Math.max(...groups.map(g => g.fields.length));\n for (let i = 1; i < depth; i++) {\n const scale = this._scale.clone();\n this._scales.push(scale);\n }\n }\n // this.updateScaleDomain();\n }\n\n /** Update API **/\n updateSpec(spec: any) {\n const originalSpec = this._originalSpec;\n const result = super.updateSpec(spec);\n result.reRender = true;\n if (originalSpec.type !== spec.type) {\n result.reMake = true;\n return result;\n }\n result.reMake =\n ['seriesId', 'seriesIndex', 'regionId', 'regionIndex'].some(k => {\n JSON.stringify(originalSpec[k]) !== JSON.stringify(spec[k]);\n }) || result.reMake;\n return result;\n }\n\n protected getLabelFormatMethod() {\n return this._spec.label.formatMethod\n ? (value: any, datum: any, index: number) => this._spec.label.formatMethod(datum.rawValue, datum)\n : null;\n }\n\n protected getLabelItems(length: number) {\n return isArray(this._tickData.getLatestData())\n ? [\n this._tickData\n .getLatestData()\n .map((obj: Datum) => {\n return {\n id: obj.value,\n label: obj.value,\n value: length === 0 ? 0 : this.dataToPosition([obj.value]) / length,\n rawValue: obj.value\n };\n })\n .filter((entry: AxisItem) => entry.value >= 0 && entry.value <= 1)\n ]\n : [];\n }\n\n protected _delegateAxisContainerEvent(component: IGroup) {\n const axisMainContainer = component?.find((node: INode) => node.name === AXIS_ELEMENT_NAME.axisContainer, true);\n if (axisMainContainer) {\n // 代理组件上的事件,目前坐标轴组件比较特殊,包含了网格线,但是事件这块只提供不包含网格线部分的响应\n axisMainContainer.addEventListener('*', ((event: any, type: string) =>\n this._delegateEvent(component as unknown as IGraphic, event, type)) as LooseFunction);\n }\n }\n\n protected _getAxisAttributes() {\n const spec = this._spec;\n let titleAngle = spec.title.angle;\n let titleTextStyle;\n if (spec.orient === 'left' || spec.orient === 'right') {\n // 处理纵轴的标题样式\n if (spec.title?.autoRotate && isNil(spec.title.angle)) {\n titleAngle = spec.orient === 'left' ? -90 : 90;\n titleTextStyle = DEFAULT_TITLE_STYLE[spec.orient];\n }\n }\n\n const labelSpec = pickWithout(spec.label, ['style', 'formatMethod', 'state']);\n\n return {\n orient: this.getOrient(),\n select: spec.select,\n hover: spec.hover,\n line: transformAxisLineStyle(spec.domainLine),\n label: {\n style: isFunction(spec.label.style)\n ? (datum: Datum, index: number, data: Datum[], layer?: number) => {\n const style = this._preprocessSpec(spec.label.style(datum.rawValue, index, datum, data, layer));\n return transformToGraphic(this._preprocessSpec(mergeSpec({}, this._theme.label?.style, style)));\n }\n : transformToGraphic(spec.label.style),\n formatMethod: spec.label.formatMethod\n ? (value: any, datum: any, index: number) => {\n return spec.label.formatMethod(datum.rawValue, datum);\n }\n : null,\n state: transformAxisLabelStateStyle(spec.label.state),\n ...labelSpec\n },\n tick: {\n visible: spec.tick.visible,\n length: spec.tick.tickSize,\n inside: spec.tick.inside,\n alignWithLabel: spec.tick.alignWithLabel,\n style: isFunction(spec.tick.style)\n ? (value: number, index: number, datum: Datum, data: Datum[]) => {\n const style = this._preprocessSpec((spec.tick.style as any)(value, index, datum, data));\n return transformToGraphic(this._preprocessSpec(mergeSpec({}, this._theme.tick?.style, style)));\n }\n : transformToGraphic(spec.tick.style),\n state: transformStateStyle(spec.tick.state),\n dataFilter: spec.tick.dataFilter\n },\n subTick: {\n visible: spec.subTick.visible,\n length: spec.subTick.tickSize,\n inside: spec.subTick.inside,\n count: spec.subTick.tickCount,\n style: isFunction(spec.subTick.style)\n ? (value: number, index: number, datum: Datum, data: Datum[]) => {\n const style = (spec.subTick.style as any)(value, index, datum, data);\n return transformToGraphic(mergeSpec({}, this._theme.subTick?.style, style));\n }\n : transformToGraphic(spec.subTick.style),\n state: transformStateStyle(spec.subTick.state)\n },\n grid: {\n type: 'line',\n visible: spec.grid.visible,\n alternateColor: spec.grid.alternateColor,\n alignWithLabel: spec.grid.alignWithLabel,\n style: isFunction(spec.grid.style)\n ? (datum: Datum, index: number) => {\n const style = spec.grid.style(datum.datum?.rawValue, index, datum.datum);\n return transformToGraphic(this._preprocessSpec(mergeSpec({}, this._theme.grid?.style, style)));\n }\n : transformToGraphic(spec.grid.style)\n },\n subGrid: {\n type: 'line',\n visible: spec.subGrid.visible,\n alternateColor: spec.subGrid.alternateColor,\n style: transformToGraphic(spec.subGrid.style)\n },\n title: {\n visible: spec.title.visible,\n position: spec.title.position,\n space: spec.title.space,\n autoRotate: false, // 默认不对外提供该配置\n angle: titleAngle ? degreeToRadian(titleAngle) : null,\n textStyle: mergeSpec({}, titleTextStyle, transformToGraphic(spec.title.style)),\n padding: spec.title.padding,\n shape: {\n visible: spec.title.shape?.visible,\n space: spec.title.shape?.space,\n style: transformToGraphic(spec.title.shape?.style)\n },\n background: {\n visible: spec.title.background?.visible,\n style: transformToGraphic(spec.title.background?.style)\n },\n state: {\n text: transformStateStyle(spec.title.state),\n shape: transformStateStyle(spec.title.shape?.state),\n background: transformStateStyle(spec.title.background?.state)\n }\n },\n panel: {\n visible: spec.background?.visible,\n style: transformToGraphic(spec.background?.style),\n state: transformStateStyle(spec.background?.state)\n }\n };\n }\n\n addTransformToTickData(options: ITransformOptions, execute?: boolean) {\n this._tickData?.getDataView()?.transform(options, execute);\n }\n}\n"]}
@@ -27,7 +27,7 @@ export declare abstract class CartesianAxis<T extends ICartesianAxisCommonSpec =
27
27
  length: number;
28
28
  };
29
29
  protected _orient: IOrientType;
30
- get orient(): IOrientType;
30
+ getOrient(): IOrientType;
31
31
  get layoutOrient(): IOrientType;
32
32
  set layoutOrient(v: IOrientType);
33
33
  protected _scales: IBaseScale[];
@@ -1,4 +1,4 @@
1
- import { isArray, isValid, isValidNumber, merge, eachSeries, isNil, isUndefined } from "../../../util";
1
+ import { isArray, isValid, isValidNumber, mergeSpec, eachSeries, isNil, isUndefined } from "../../../util";
2
2
 
3
3
  import { Direction } from "../../../typings/space";
4
4
 
@@ -18,7 +18,7 @@ import { ComponentTypeEnum } from "../../interface";
18
18
 
19
19
  import { HOOK_EVENT } from "@visactor/vgrammar";
20
20
 
21
- import { isValidCartesianAxis } from "../utils";
21
+ import { isValidCartesianAxis } from "../util";
22
22
 
23
23
  import { registerDataSetInstanceParser, registerDataSetInstanceTransform } from "../../../data/register";
24
24
 
@@ -32,10 +32,10 @@ import { CompilableData } from "../../../compile/data";
32
32
 
33
33
  import { AxisComponent } from "../base-axis";
34
34
 
35
- const CartesianAxisPlugin = [ pluginMap.AxisLabelOverlapPlugin, pluginMap.AxisSyncPlugin ];
35
+ const CartesianAxisPlugin = [ pluginMap.AxisSyncPlugin ];
36
36
 
37
37
  export class CartesianAxis extends AxisComponent {
38
- get orient() {
38
+ getOrient() {
39
39
  return this._orient;
40
40
  }
41
41
  get layoutOrient() {
@@ -69,7 +69,7 @@ export class CartesianAxis extends AxisComponent {
69
69
  }, this.effect = {
70
70
  scaleUpdate: () => {
71
71
  this.computeData(), eachSeries(this._regions, (s => {
72
- isXAxis(this.orient) ? s.setXAxisHelper(this.axisHelper()) : isYAxis(this.orient) ? s.setYAxisHelper(this.axisHelper()) : isZAxis(this.orient) && s.setZAxisHelper(this.axisHelper());
72
+ isXAxis(this.getOrient()) ? s.setXAxisHelper(this.axisHelper()) : isYAxis(this.getOrient()) ? s.setYAxisHelper(this.axisHelper()) : isZAxis(this.getOrient()) && s.setZAxisHelper(this.axisHelper());
73
73
  }), {
74
74
  userId: this._seriesUserId,
75
75
  specIndex: this._seriesIndex
@@ -78,7 +78,7 @@ export class CartesianAxis extends AxisComponent {
78
78
  }, this._fixAxisOnZero = () => {
79
79
  const {onZero: onZero, visible: visible} = this._spec.domainLine;
80
80
  if (this.visible && onZero && !1 !== visible) {
81
- const {onZeroAxisId: onZeroAxisId, onZeroAxisIndex: onZeroAxisIndex} = this._spec.domainLine, axesComponents = this._option.getComponentsByKey("axes"), isX = isXAxis(this.orient), isValidAxis = item => {
81
+ const {onZeroAxisId: onZeroAxisId, onZeroAxisIndex: onZeroAxisIndex} = this._spec.domainLine, axesComponents = this._option.getComponentsByKey("axes"), isX = isXAxis(this.getOrient()), isValidAxis = item => {
82
82
  var _a;
83
83
  return (isX ? !isXAxis(item.orient) : isXAxis(item.orient)) && isContinuous(item.getScale().type) && (null === (_a = item.getTickData().getLatestData()) || void 0 === _a ? void 0 : _a.find((d => 0 === d.value)));
84
84
  }, relativeAxes = axesComponents.filter((item => isValidAxis(item)));
@@ -147,7 +147,7 @@ export class CartesianAxis extends AxisComponent {
147
147
  let isScaleChange = !1;
148
148
  const {width: width, height: height} = this.getLayoutRect(), inverse = this._spec.inverse;
149
149
  let newRange = [];
150
- isXAxis(this.orient) ? isValidNumber(width) && (newRange = inverse ? [ width, 0 ] : [ 0, width ]) : isZAxis(this.orient) ? isValidNumber(width) && (newRange = inverse ? [ width, 0 ] : [ 0, width ],
150
+ isXAxis(this.getOrient()) ? isValidNumber(width) && (newRange = inverse ? [ width, 0 ] : [ 0, width ]) : isZAxis(this.getOrient()) ? isValidNumber(width) && (newRange = inverse ? [ width, 0 ] : [ 0, width ],
151
151
  this._scale.range(newRange)) : isValidNumber(height) && (newRange = inverse ? [ 0, height ] : [ height, 0 ]);
152
152
  const [start, end] = this._scale.range();
153
153
  return newRange[0] === start && newRange[1] === end || (isScaleChange = !0, this._scale.range(newRange)),
@@ -162,14 +162,14 @@ export class CartesianAxis extends AxisComponent {
162
162
  }
163
163
  setAttrFromSpec() {
164
164
  super.setAttrFromSpec();
165
- isXAxis(this.orient) ? isUndefined(this._spec.maxHeight) && (this._spec.maxHeight = "30%") : isUndefined(this._spec.maxWidth) && (this._spec.maxWidth = "30%");
165
+ isXAxis(this.getOrient()) ? isUndefined(this._spec.maxHeight) && (this._spec.maxHeight = "30%") : isUndefined(this._spec.maxWidth) && (this._spec.maxWidth = "30%");
166
166
  const axisStyle = this._getAxisAttributes();
167
- axisStyle.label.formatMethod = this.getLabelFormatMethod(), axisStyle.verticalFactor = "top" === this.orient || "right" === this.orient ? -1 : 1,
167
+ axisStyle.label.formatMethod = this.getLabelFormatMethod(), axisStyle.verticalFactor = "top" === this.getOrient() || "right" === this.getOrient() ? -1 : 1,
168
168
  this._axisStyle = axisStyle, this._tick = this._spec.tick;
169
169
  }
170
170
  getSeriesStatisticsField(s) {
171
171
  let f;
172
- return f = isXAxis(this.orient) ? s.fieldX : isZAxis(this.orient) ? s.fieldZ : s.fieldY,
172
+ return f = isXAxis(this.getOrient()) ? s.fieldX : isZAxis(this.getOrient()) ? s.fieldZ : s.fieldY,
173
173
  isContinuous(this._scale.type) ? f : [ f[0] ];
174
174
  }
175
175
  _initData() {
@@ -211,7 +211,7 @@ export class CartesianAxis extends AxisComponent {
211
211
  var _a;
212
212
  const product = null === (_a = this.getMarks()[0]) || void 0 === _a ? void 0 : _a.getProduct();
213
213
  product && product.addEventListener(HOOK_EVENT.AFTER_ELEMENT_ENCODE, (() => {
214
- !1 === this._isLayout && (isXAxis(this.orient) ? this.callPlugin((plugin => {
214
+ !1 === this._isLayout && (isXAxis(this.getOrient()) ? this.callPlugin((plugin => {
215
215
  this.pluginService && plugin.onDidLayoutHorizontal && plugin.onDidLayoutHorizontal(this.pluginService, this);
216
216
  })) : this.callPlugin((plugin => {
217
217
  this.pluginService && plugin.onDidLayoutVertical && plugin.onDidLayoutVertical(this.pluginService, this);
@@ -232,7 +232,7 @@ export class CartesianAxis extends AxisComponent {
232
232
  collectScale() {
233
233
  const scales = [];
234
234
  return eachSeries(this._regions, (s => {
235
- scales.push("left" === this.orient || "right" === this.orient ? s.scaleY : s.scaleX);
235
+ scales.push("left" === this.getOrient() || "right" === this.getOrient() ? s.scaleY : s.scaleX);
236
236
  }), {
237
237
  userId: this._seriesUserId,
238
238
  specIndex: this._seriesIndex
@@ -243,7 +243,7 @@ export class CartesianAxis extends AxisComponent {
243
243
  return eachSeries(this._regions, (s => {
244
244
  var _a, _b, _c;
245
245
  let field;
246
- field = depth > 0 ? null === (_b = null === (_a = s.getGroups()) || void 0 === _a ? void 0 : _a.fields) || void 0 === _b ? void 0 : _b[depth] : isXAxis(this.orient) ? s.fieldX2 ? [ ...s.fieldX, s.fieldX2 ] : s.fieldX : isZAxis(this.orient) ? s.fieldZ : s.fieldY,
246
+ field = depth > 0 ? null === (_b = null === (_a = s.getGroups()) || void 0 === _a ? void 0 : _a.fields) || void 0 === _b ? void 0 : _b[depth] : isXAxis(this.getOrient()) ? s.fieldX2 ? [ ...s.fieldX, s.fieldX2 ] : s.fieldX : isZAxis(this.getOrient()) ? s.fieldZ : s.fieldY,
247
247
  field = isArray(field) ? isContinuous(this._scale.type) ? field : [ field[0] ] : [ field ],
248
248
  depth || (this._dataFieldText = s.getFieldAlias(field[0]));
249
249
  const seriesData = null === (_c = s.getViewDataStatistics) || void 0 === _c ? void 0 : _c.call(s);
@@ -258,8 +258,8 @@ export class CartesianAxis extends AxisComponent {
258
258
  }
259
259
  updateSeriesScale() {
260
260
  eachSeries(this._regions, (s => {
261
- isXAxis(this.orient) ? (s.setScaleX(this._scale), s.setXAxisHelper(this.axisHelper())) : isYAxis(this.orient) ? (s.setScaleY(this._scale),
262
- s.setYAxisHelper(this.axisHelper())) : isZAxis(this.orient) && (s.setScaleZ(this._scale),
261
+ isXAxis(this.getOrient()) ? (s.setScaleX(this._scale), s.setXAxisHelper(this.axisHelper())) : isYAxis(this.getOrient()) ? (s.setScaleY(this._scale),
262
+ s.setYAxisHelper(this.axisHelper())) : isZAxis(this.getOrient()) && (s.setScaleZ(this._scale),
263
263
  s.setZAxisHelper(this.axisHelper()));
264
264
  }), {
265
265
  userId: this._seriesUserId,
@@ -306,9 +306,9 @@ export class CartesianAxis extends AxisComponent {
306
306
  y2: 0
307
307
  };
308
308
  if (!this._visible) return result;
309
- this._verticalLimitSize = isXAxis(this.orient) ? rect.height : rect.width, this.setLayoutRect(rect),
310
- this.updateScaleRange(), this.computeData();
311
- const isX = isXAxis(this.orient), context = {
309
+ this._verticalLimitSize = isXAxis(this.getOrient()) ? rect.height : rect.width,
310
+ this.setLayoutRect(rect), this.updateScaleRange(), this.computeData();
311
+ const isX = isXAxis(this.getOrient()), context = {
312
312
  skipLayout: !1
313
313
  };
314
314
  isX ? this.pluginService && this.callPlugin((plugin => {
@@ -318,14 +318,14 @@ export class CartesianAxis extends AxisComponent {
318
318
  }));
319
319
  const product = this.getMarks()[0].getProduct();
320
320
  if (this._latestBounds = product.getBounds(), !context.skipLayout) {
321
- const attrs = this._getUpdateAttribute(!0), updateBounds = product.getGroupGraphicItem().getBoundsWithoutRender(merge(Object.assign({}, this.getLayoutStartPoint()), this._axisStyle, attrs));
321
+ const attrs = this._getUpdateAttribute(!0), updateBounds = product.getGroupGraphicItem().getBoundsWithoutRender(mergeSpec(Object.assign({}, this.getLayoutStartPoint()), this._axisStyle, attrs));
322
322
  isFinite(updateBounds.width()) && (result = updateBounds, this._latestBounds = updateBounds);
323
323
  }
324
324
  return result;
325
325
  }
326
326
  updateLayoutAttribute() {
327
327
  if (!this.visible) return;
328
- const attrs = this._getUpdateAttribute(!1), product = this.getMarks()[0].getProduct(), axisAttrs = merge(Object.assign({}, this.getLayoutStartPoint()), this._axisStyle, attrs);
328
+ const attrs = this._getUpdateAttribute(!1), product = this.getMarks()[0].getProduct(), axisAttrs = mergeSpec(Object.assign({}, this.getLayoutStartPoint()), this._axisStyle, attrs);
329
329
  product.encode(axisAttrs), super.updateLayoutAttribute();
330
330
  }
331
331
  _getTitleLimit(isX) {