@visactor/vchart 1.6.7 → 1.7.0-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (993) hide show
  1. package/build/es5/index.js +1 -1
  2. package/build/index.js +44570 -43966
  3. package/build/index.min.js +1 -1
  4. package/build/tsconfig.tsbuildinfo +1 -1
  5. package/cjs/animation/utils.d.ts +2 -2
  6. package/cjs/chart/area/area.js +2 -1
  7. package/cjs/chart/area/area.js.map +1 -1
  8. package/cjs/chart/base-chart.d.ts +13 -16
  9. package/cjs/chart/base-chart.js +68 -68
  10. package/cjs/chart/base-chart.js.map +1 -1
  11. package/cjs/chart/interface/chart.d.ts +4 -6
  12. package/cjs/chart/interface/chart.js.map +1 -1
  13. package/cjs/chart/line/line.js +2 -1
  14. package/cjs/chart/line/line.js.map +1 -1
  15. package/cjs/chart/sequence/sequence.d.ts +1 -1
  16. package/cjs/chart/sequence/sequence.js +1 -1
  17. package/cjs/chart/sequence/sequence.js.map +1 -1
  18. package/cjs/compile/compiler.js +1 -2
  19. package/cjs/compile/grammar-item.js +2 -1
  20. package/cjs/compile/mark/compilable-mark.d.ts +10 -6
  21. package/cjs/compile/mark/compilable-mark.js +22 -11
  22. package/cjs/compile/mark/compilable-mark.js.map +1 -1
  23. package/cjs/compile/mark/interface.d.ts +6 -4
  24. package/cjs/compile/mark/interface.js.map +1 -1
  25. package/cjs/compile/mark/util.d.ts +1 -3
  26. package/cjs/compile/mark/util.js +1 -37
  27. package/cjs/compile/mark/util.js.map +1 -1
  28. package/cjs/component/axis/base-axis.d.ts +2 -4
  29. package/cjs/component/axis/base-axis.js +20 -35
  30. package/cjs/component/axis/base-axis.js.map +1 -1
  31. package/cjs/component/axis/cartesian/axis.d.ts +12 -22
  32. package/cjs/component/axis/cartesian/axis.js +51 -67
  33. package/cjs/component/axis/cartesian/axis.js.map +1 -1
  34. package/cjs/component/axis/cartesian/band-axis.d.ts +0 -7
  35. package/cjs/component/axis/cartesian/band-axis.js +0 -1
  36. package/cjs/component/axis/cartesian/band-axis.js.map +1 -1
  37. package/cjs/component/axis/cartesian/interface/common.d.ts +0 -6
  38. package/cjs/component/axis/cartesian/interface/common.js.map +1 -1
  39. package/cjs/component/axis/cartesian/interface/theme.d.ts +1 -1
  40. package/cjs/component/axis/cartesian/interface/theme.js.map +1 -1
  41. package/cjs/component/axis/interface/common.d.ts +0 -1
  42. package/cjs/component/axis/interface/common.js.map +1 -1
  43. package/cjs/component/axis/interface/spec.js.map +1 -1
  44. package/cjs/component/axis/mixin/band-axis-mixin.d.ts +0 -1
  45. package/cjs/component/axis/mixin/band-axis-mixin.js +2 -2
  46. package/cjs/component/axis/mixin/band-axis-mixin.js.map +1 -1
  47. package/cjs/component/axis/mixin/linear-axis-mixin.d.ts +0 -1
  48. package/cjs/component/axis/mixin/linear-axis-mixin.js +4 -3
  49. package/cjs/component/axis/mixin/linear-axis-mixin.js.map +1 -1
  50. package/cjs/component/axis/polar/axis.d.ts +3 -4
  51. package/cjs/component/axis/polar/axis.js +13 -15
  52. package/cjs/component/axis/polar/axis.js.map +1 -1
  53. package/cjs/component/base/base-component.d.ts +12 -4
  54. package/cjs/component/base/base-component.js +21 -11
  55. package/cjs/component/base/base-component.js.map +1 -1
  56. package/cjs/component/base/util.js +16 -12
  57. package/cjs/component/base/util.js.map +1 -1
  58. package/cjs/component/brush/brush.d.ts +2 -4
  59. package/cjs/component/brush/brush.js +4 -6
  60. package/cjs/component/brush/brush.js.map +1 -1
  61. package/cjs/component/crosshair/base.d.ts +3 -4
  62. package/cjs/component/crosshair/base.js +1 -1
  63. package/cjs/component/crosshair/base.js.map +1 -1
  64. package/cjs/component/crosshair/cartesian.d.ts +2 -0
  65. package/cjs/component/crosshair/cartesian.js +6 -8
  66. package/cjs/component/crosshair/cartesian.js.map +1 -1
  67. package/cjs/component/crosshair/interface/spec.d.ts +1 -1
  68. package/cjs/component/crosshair/interface/spec.js.map +1 -1
  69. package/cjs/component/crosshair/polar.d.ts +2 -0
  70. package/cjs/component/crosshair/polar.js +5 -8
  71. package/cjs/component/crosshair/polar.js.map +1 -1
  72. package/cjs/component/custom-mark/custom-mark.d.ts +2 -3
  73. package/cjs/component/custom-mark/custom-mark.js +2 -3
  74. package/cjs/component/custom-mark/custom-mark.js.map +1 -1
  75. package/cjs/component/data-zoom/data-filter-base-component.d.ts +8 -8
  76. package/cjs/component/data-zoom/data-filter-base-component.js +60 -38
  77. package/cjs/component/data-zoom/data-filter-base-component.js.map +1 -1
  78. package/cjs/component/data-zoom/data-zoom/data-zoom.d.ts +4 -2
  79. package/cjs/component/data-zoom/data-zoom/data-zoom.js +47 -44
  80. package/cjs/component/data-zoom/data-zoom/data-zoom.js.map +1 -1
  81. package/cjs/component/data-zoom/data-zoom/interface.d.ts +6 -1
  82. package/cjs/component/data-zoom/data-zoom/interface.js.map +1 -1
  83. package/cjs/component/data-zoom/scroll-bar/interface.d.ts +6 -2
  84. package/cjs/component/data-zoom/scroll-bar/interface.js.map +1 -1
  85. package/cjs/component/data-zoom/scroll-bar/scroll-bar.d.ts +3 -0
  86. package/cjs/component/data-zoom/scroll-bar/scroll-bar.js +24 -23
  87. package/cjs/component/data-zoom/scroll-bar/scroll-bar.js.map +1 -1
  88. package/cjs/component/data-zoom/util.d.ts +4 -0
  89. package/cjs/component/data-zoom/util.js +11 -2
  90. package/cjs/component/data-zoom/util.js.map +1 -1
  91. package/cjs/component/geo/geo-coordinate.d.ts +3 -2
  92. package/cjs/component/geo/geo-coordinate.js +4 -4
  93. package/cjs/component/geo/geo-coordinate.js.map +1 -1
  94. package/cjs/component/index.d.ts +3 -2
  95. package/cjs/component/index.js.map +1 -1
  96. package/cjs/component/indicator/indicator.d.ts +1 -3
  97. package/cjs/component/indicator/indicator.js +4 -5
  98. package/cjs/component/indicator/indicator.js.map +1 -1
  99. package/cjs/component/indicator/interface.d.ts +1 -1
  100. package/cjs/component/indicator/interface.js.map +1 -1
  101. package/cjs/component/interface/common.d.ts +3 -3
  102. package/cjs/component/interface/common.js.map +1 -1
  103. package/cjs/component/interface/theme.d.ts +2 -1
  104. package/cjs/component/interface/theme.js.map +1 -1
  105. package/cjs/component/label/base-label.d.ts +2 -4
  106. package/cjs/component/label/base-label.js +1 -3
  107. package/cjs/component/label/base-label.js.map +1 -1
  108. package/cjs/component/label/interface.d.ts +4 -0
  109. package/cjs/component/label/interface.js.map +1 -1
  110. package/cjs/component/label/label.d.ts +5 -7
  111. package/cjs/component/label/label.js +15 -11
  112. package/cjs/component/label/label.js.map +1 -1
  113. package/cjs/component/label/totalLabel.d.ts +1 -3
  114. package/cjs/component/label/totalLabel.js +4 -4
  115. package/cjs/component/label/totalLabel.js.map +1 -1
  116. package/cjs/component/label/util.d.ts +9 -2
  117. package/cjs/component/label/util.js +20 -5
  118. package/cjs/component/label/util.js.map +1 -1
  119. package/cjs/component/legend/base-legend.d.ts +6 -9
  120. package/cjs/component/legend/base-legend.js +3 -9
  121. package/cjs/component/legend/base-legend.js.map +1 -1
  122. package/cjs/component/legend/continuous/legend.d.ts +4 -1
  123. package/cjs/component/legend/continuous/legend.js +7 -7
  124. package/cjs/component/legend/continuous/legend.js.map +1 -1
  125. package/cjs/component/legend/discrete/legend.d.ts +4 -1
  126. package/cjs/component/legend/discrete/legend.js +6 -7
  127. package/cjs/component/legend/discrete/legend.js.map +1 -1
  128. package/cjs/component/legend/discrete/util.d.ts +1 -1
  129. package/cjs/component/legend/discrete/util.js.map +1 -1
  130. package/cjs/component/legend/util.d.ts +2 -2
  131. package/cjs/component/map-label/component.d.ts +1 -3
  132. package/cjs/component/map-label/component.js +2 -3
  133. package/cjs/component/map-label/component.js.map +1 -1
  134. package/cjs/component/marker/base-marker.d.ts +7 -3
  135. package/cjs/component/marker/base-marker.js +43 -19
  136. package/cjs/component/marker/base-marker.js.map +1 -1
  137. package/cjs/component/marker/interface.d.ts +15 -4
  138. package/cjs/component/marker/interface.js.map +1 -1
  139. package/cjs/component/marker/mark-area/interface/spec.d.ts +1 -1
  140. package/cjs/component/marker/mark-area/interface/spec.js.map +1 -1
  141. package/cjs/component/marker/mark-area/mark-area.d.ts +1 -3
  142. package/cjs/component/marker/mark-area/mark-area.js +32 -20
  143. package/cjs/component/marker/mark-area/mark-area.js.map +1 -1
  144. package/cjs/component/marker/mark-line/interface/spec.d.ts +3 -4
  145. package/cjs/component/marker/mark-line/interface/spec.js.map +1 -1
  146. package/cjs/component/marker/mark-line/mark-line.d.ts +1 -3
  147. package/cjs/component/marker/mark-line/mark-line.js +36 -22
  148. package/cjs/component/marker/mark-line/mark-line.js.map +1 -1
  149. package/cjs/component/marker/mark-line/util.d.ts +3 -3
  150. package/cjs/component/marker/mark-line/util.js.map +1 -1
  151. package/cjs/component/marker/mark-point/interface/spec.d.ts +5 -4
  152. package/cjs/component/marker/mark-point/interface/spec.js.map +1 -1
  153. package/cjs/component/marker/mark-point/interface/theme.d.ts +5 -5
  154. package/cjs/component/marker/mark-point/interface/theme.js.map +1 -1
  155. package/cjs/component/marker/mark-point/mark-point.d.ts +1 -3
  156. package/cjs/component/marker/mark-point/mark-point.js +17 -13
  157. package/cjs/component/marker/mark-point/mark-point.js.map +1 -1
  158. package/cjs/component/marker/utils.d.ts +3 -4
  159. package/cjs/component/marker/utils.js +44 -25
  160. package/cjs/component/marker/utils.js.map +1 -1
  161. package/cjs/component/player/interface/theme.d.ts +1 -1
  162. package/cjs/component/player/interface/theme.js.map +1 -1
  163. package/cjs/component/player/player.d.ts +6 -7
  164. package/cjs/component/player/player.js +4 -7
  165. package/cjs/component/player/player.js.map +1 -1
  166. package/cjs/component/title/interface/theme.d.ts +1 -1
  167. package/cjs/component/title/interface/theme.js.map +1 -1
  168. package/cjs/component/title/title.d.ts +6 -9
  169. package/cjs/component/title/title.js +13 -24
  170. package/cjs/component/title/title.js.map +1 -1
  171. package/cjs/component/tooltip/handler/base.js +6 -6
  172. package/cjs/component/tooltip/handler/base.js.map +1 -1
  173. package/cjs/component/tooltip/handler/dom/util.js +3 -2
  174. package/cjs/component/tooltip/handler/dom/util.js.map +1 -1
  175. package/cjs/component/tooltip/handler/utils/attribute.d.ts +3 -3
  176. package/cjs/component/tooltip/handler/utils/attribute.js.map +1 -1
  177. package/cjs/component/tooltip/handler/utils/common.js.map +1 -1
  178. package/cjs/component/tooltip/interface/spec.d.ts +1 -1
  179. package/cjs/component/tooltip/interface/spec.js.map +1 -1
  180. package/cjs/component/tooltip/interface/theme.d.ts +10 -11
  181. package/cjs/component/tooltip/interface/theme.js.map +1 -1
  182. package/cjs/component/tooltip/tooltip.d.ts +3 -2
  183. package/cjs/component/tooltip/tooltip.js +7 -11
  184. package/cjs/component/tooltip/tooltip.js.map +1 -1
  185. package/cjs/component/util.d.ts +1 -3
  186. package/cjs/component/util.js +2 -2
  187. package/cjs/component/util.js.map +1 -1
  188. package/cjs/constant/index.js +2 -1
  189. package/cjs/constant/layout.d.ts +1 -0
  190. package/cjs/constant/layout.js +2 -2
  191. package/cjs/constant/layout.js.map +1 -1
  192. package/cjs/constant/scatter.js +1 -2
  193. package/cjs/core/expression-function.d.ts +12 -0
  194. package/cjs/core/expression-function.js +30 -0
  195. package/cjs/core/expression-function.js.map +1 -0
  196. package/cjs/core/factory.d.ts +5 -2
  197. package/cjs/core/factory.js +6 -3
  198. package/cjs/core/factory.js.map +1 -1
  199. package/cjs/core/index.d.ts +2 -1
  200. package/cjs/core/index.js +3 -2
  201. package/cjs/core/index.js.map +1 -1
  202. package/cjs/core/interface.d.ts +5 -0
  203. package/cjs/core/interface.js.map +1 -1
  204. package/cjs/core/vchart.d.ts +9 -1
  205. package/cjs/core/vchart.js +94 -68
  206. package/cjs/core/vchart.js.map +1 -1
  207. package/cjs/data/initialize.js +7 -6
  208. package/cjs/data/initialize.js.map +1 -1
  209. package/cjs/data/transforms/aggregation.d.ts +4 -3
  210. package/cjs/data/transforms/aggregation.js +4 -4
  211. package/cjs/data/transforms/aggregation.js.map +1 -1
  212. package/cjs/data/transforms/dimension-statistics.js +14 -4
  213. package/cjs/data/transforms/dimension-statistics.js.map +1 -1
  214. package/cjs/event/bubble.js +1 -2
  215. package/cjs/event/event.js +2 -1
  216. package/cjs/event/events/base.d.ts +16 -0
  217. package/cjs/event/events/base.js +23 -0
  218. package/cjs/event/events/base.js.map +1 -0
  219. package/cjs/event/events/dimension/util/cartesian.d.ts +1 -1
  220. package/cjs/event/events/dimension/util/cartesian.js.map +1 -1
  221. package/cjs/event/events/dimension/util/common.d.ts +1 -2
  222. package/cjs/event/events/dimension/util/common.js +1 -1
  223. package/cjs/event/events/dimension/util/common.js.map +1 -1
  224. package/cjs/event/events/dimension/util/polar.d.ts +1 -1
  225. package/cjs/event/events/dimension/util/polar.js.map +1 -1
  226. package/cjs/event/interface.d.ts +2 -2
  227. package/cjs/event/interface.js.map +1 -1
  228. package/cjs/index-wx-simple.d.ts +4 -0
  229. package/cjs/index-wx-simple.js +35 -0
  230. package/cjs/index-wx-simple.js.map +1 -0
  231. package/cjs/interaction/trigger.js +1 -1
  232. package/cjs/interaction/zoom/zoomable.d.ts +1 -0
  233. package/cjs/interaction/zoom/zoomable.js +6 -5
  234. package/cjs/interaction/zoom/zoomable.js.map +1 -1
  235. package/cjs/layout/base-layout.d.ts +3 -5
  236. package/cjs/layout/base-layout.js +9 -9
  237. package/cjs/layout/base-layout.js.map +1 -1
  238. package/cjs/layout/grid-layout/grid-layout.d.ts +1 -2
  239. package/cjs/layout/grid-layout/grid-layout.js +6 -4
  240. package/cjs/layout/grid-layout/grid-layout.js.map +1 -1
  241. package/cjs/layout/interface.d.ts +74 -6
  242. package/cjs/layout/interface.js.map +1 -1
  243. package/cjs/{model → layout}/layout-item.d.ts +35 -23
  244. package/cjs/{model → layout}/layout-item.js +98 -64
  245. package/cjs/layout/layout-item.js.map +1 -0
  246. package/cjs/layout/layout3d/index.d.ts +2 -4
  247. package/cjs/layout/layout3d/index.js +6 -6
  248. package/cjs/layout/layout3d/index.js.map +1 -1
  249. package/cjs/layout/util.d.ts +1 -1
  250. package/cjs/layout/util.js.map +1 -1
  251. package/cjs/mark/arc.js +2 -2
  252. package/cjs/mark/arc.js.map +1 -1
  253. package/cjs/mark/base/base-mark.d.ts +2 -2
  254. package/cjs/mark/base/base-mark.js +62 -40
  255. package/cjs/mark/base/base-mark.js.map +1 -1
  256. package/cjs/mark/label.js +1 -4
  257. package/cjs/mark/label.js.map +1 -1
  258. package/cjs/model/base-model.d.ts +10 -8
  259. package/cjs/model/base-model.js +27 -31
  260. package/cjs/model/base-model.js.map +1 -1
  261. package/cjs/model/interface.d.ts +21 -89
  262. package/cjs/model/interface.js.map +1 -1
  263. package/cjs/model/layout-model.d.ts +41 -0
  264. package/cjs/model/layout-model.js +86 -0
  265. package/cjs/model/layout-model.js.map +1 -0
  266. package/cjs/region/interface.d.ts +3 -2
  267. package/cjs/region/interface.js.map +1 -1
  268. package/cjs/region/region.d.ts +12 -7
  269. package/cjs/region/region.js +18 -10
  270. package/cjs/region/region.js.map +1 -1
  271. package/cjs/series/area/area.d.ts +1 -1
  272. package/cjs/series/area/area.js +5 -6
  273. package/cjs/series/area/area.js.map +1 -1
  274. package/cjs/series/area/interface.d.ts +4 -0
  275. package/cjs/series/area/interface.js.map +1 -1
  276. package/cjs/series/bar/bar.js +2 -4
  277. package/cjs/series/bar/bar.js.map +1 -1
  278. package/cjs/series/base/base-series.d.ts +14 -4
  279. package/cjs/series/base/base-series.js +40 -15
  280. package/cjs/series/base/base-series.js.map +1 -1
  281. package/cjs/series/cartesian/cartesian.d.ts +3 -0
  282. package/cjs/series/cartesian/cartesian.js +16 -4
  283. package/cjs/series/cartesian/cartesian.js.map +1 -1
  284. package/cjs/series/correlation/correlation.js +3 -7
  285. package/cjs/series/correlation/correlation.js.map +1 -1
  286. package/cjs/series/funnel/funnel-3d.js +1 -1
  287. package/cjs/series/funnel/funnel-3d.js.map +1 -1
  288. package/cjs/series/funnel/funnel.js +2 -6
  289. package/cjs/series/funnel/funnel.js.map +1 -1
  290. package/cjs/series/funnel/interface.d.ts +1 -2
  291. package/cjs/series/funnel/interface.js.map +1 -1
  292. package/cjs/series/gauge/gauge.d.ts +0 -1
  293. package/cjs/series/gauge/gauge.js +3 -8
  294. package/cjs/series/gauge/gauge.js.map +1 -1
  295. package/cjs/series/heatmap/heatmap.js +2 -4
  296. package/cjs/series/heatmap/heatmap.js.map +1 -1
  297. package/cjs/series/index.d.ts +2 -2
  298. package/cjs/series/index.js.map +1 -1
  299. package/cjs/series/interface/common.d.ts +2 -2
  300. package/cjs/series/interface/common.js.map +1 -1
  301. package/cjs/series/interface/series.d.ts +4 -2
  302. package/cjs/series/interface/series.js.map +1 -1
  303. package/cjs/series/interface/type.d.ts +3 -1
  304. package/cjs/series/interface/type.js +2 -1
  305. package/cjs/series/interface/type.js.map +1 -1
  306. package/cjs/series/line/interface.d.ts +4 -0
  307. package/cjs/series/line/interface.js.map +1 -1
  308. package/cjs/series/line/line.d.ts +1 -1
  309. package/cjs/series/line/line.js.map +1 -1
  310. package/cjs/series/map/map.js +2 -4
  311. package/cjs/series/map/map.js.map +1 -1
  312. package/cjs/series/mixin/line-mixin.d.ts +5 -2
  313. package/cjs/series/mixin/line-mixin.js +16 -10
  314. package/cjs/series/mixin/line-mixin.js.map +1 -1
  315. package/cjs/series/pie/pie.js +1 -4
  316. package/cjs/series/pie/pie.js.map +1 -1
  317. package/cjs/series/polar/progress-like/progress-like.js +4 -4
  318. package/cjs/series/polar/progress-like/progress-like.js.map +1 -1
  319. package/cjs/series/radar/animation.js.map +1 -1
  320. package/cjs/series/range-column/range-column.js +2 -2
  321. package/cjs/series/range-column/range-column.js.map +1 -1
  322. package/cjs/series/rose/rose.d.ts +2 -1
  323. package/cjs/series/rose/rose.js +2 -4
  324. package/cjs/series/rose/rose.js.map +1 -1
  325. package/cjs/series/scatter/scatter.js +2 -4
  326. package/cjs/series/scatter/scatter.js.map +1 -1
  327. package/cjs/series/waterfall/waterfall.js +1 -1
  328. package/cjs/series/waterfall/waterfall.js.map +1 -1
  329. package/cjs/series/word-cloud/base.d.ts +1 -0
  330. package/cjs/series/word-cloud/base.js +33 -33
  331. package/cjs/series/word-cloud/base.js.map +1 -1
  332. package/cjs/series/word-cloud/word-cloud-3d.js +32 -32
  333. package/cjs/series/word-cloud/word-cloud-3d.js.map +1 -1
  334. package/cjs/theme/builtin/common/component/axis/cartesian-axis.js +2 -2
  335. package/cjs/theme/builtin/common/component/axis/cartesian-axis.js.map +1 -1
  336. package/cjs/theme/builtin/common/component/axis/common-axis.js +1 -1
  337. package/cjs/theme/builtin/common/component/axis/common-axis.js.map +1 -1
  338. package/cjs/theme/builtin/common/component/crosshair.js +5 -5
  339. package/cjs/theme/builtin/common/component/crosshair.js.map +1 -1
  340. package/cjs/theme/builtin/common/component/data-zoom.js +10 -10
  341. package/cjs/theme/builtin/common/component/data-zoom.js.map +1 -1
  342. package/cjs/theme/builtin/common/component/indicator.js +1 -1
  343. package/cjs/theme/builtin/common/component/indicator.js.map +1 -1
  344. package/cjs/theme/builtin/common/component/legend/color-legend.js +3 -4
  345. package/cjs/theme/builtin/common/component/legend/color-legend.js.map +1 -1
  346. package/cjs/theme/builtin/common/component/legend/discrete-legend.js +2 -2
  347. package/cjs/theme/builtin/common/component/legend/discrete-legend.js.map +1 -1
  348. package/cjs/theme/builtin/common/component/legend/size-legend.js +6 -6
  349. package/cjs/theme/builtin/common/component/legend/size-legend.js.map +1 -1
  350. package/cjs/theme/builtin/common/component/map-label.js.map +1 -1
  351. package/cjs/theme/builtin/common/component/mark-area.js.map +1 -1
  352. package/cjs/theme/builtin/common/component/mark-line.js +9 -9
  353. package/cjs/theme/builtin/common/component/mark-line.js.map +1 -1
  354. package/cjs/theme/builtin/common/component/mark-point.js +15 -3
  355. package/cjs/theme/builtin/common/component/mark-point.js.map +1 -1
  356. package/cjs/theme/builtin/common/component/player.js +7 -7
  357. package/cjs/theme/builtin/common/component/player.js.map +1 -1
  358. package/cjs/theme/builtin/common/component/poptip.js +3 -4
  359. package/cjs/theme/builtin/common/component/poptip.js.map +1 -1
  360. package/cjs/theme/builtin/common/component/scroll-bar.js +20 -7
  361. package/cjs/theme/builtin/common/component/scroll-bar.js.map +1 -1
  362. package/cjs/theme/builtin/common/component/title.js +1 -1
  363. package/cjs/theme/builtin/common/component/title.js.map +1 -1
  364. package/cjs/theme/builtin/common/component/tooltip.d.ts +2 -1
  365. package/cjs/theme/builtin/common/component/tooltip.js +3 -4
  366. package/cjs/theme/builtin/common/component/tooltip.js.map +1 -1
  367. package/cjs/theme/builtin/common/component/total-label.js.map +1 -1
  368. package/cjs/theme/builtin/common/mark.js.map +1 -1
  369. package/cjs/theme/builtin/common/series/rangeColumn.js +1 -1
  370. package/cjs/theme/builtin/common/series/rangeColumn.js.map +1 -1
  371. package/cjs/theme/builtin/common-mobile/component/axis/band-axis.d.ts +2 -0
  372. package/cjs/theme/builtin/common-mobile/component/axis/band-axis.js +22 -0
  373. package/cjs/theme/builtin/common-mobile/component/axis/band-axis.js.map +1 -0
  374. package/cjs/theme/builtin/common-mobile/component/axis/cartesian-axis.d.ts +3 -0
  375. package/cjs/theme/builtin/common-mobile/component/axis/cartesian-axis.js +36 -0
  376. package/cjs/theme/builtin/common-mobile/component/axis/cartesian-axis.js.map +1 -0
  377. package/cjs/theme/builtin/common-mobile/component/axis/common-axis.d.ts +2 -0
  378. package/cjs/theme/builtin/common-mobile/component/axis/common-axis.js +42 -0
  379. package/cjs/theme/builtin/common-mobile/component/axis/common-axis.js.map +1 -0
  380. package/cjs/theme/builtin/common-mobile/component/axis/linear-axis.d.ts +2 -0
  381. package/cjs/theme/builtin/common-mobile/component/axis/linear-axis.js +22 -0
  382. package/cjs/theme/builtin/common-mobile/component/axis/linear-axis.js.map +1 -0
  383. package/cjs/theme/builtin/common-mobile/component/axis/polar-axis.d.ts +3 -0
  384. package/cjs/theme/builtin/common-mobile/component/axis/polar-axis.js +25 -0
  385. package/cjs/theme/builtin/common-mobile/component/axis/polar-axis.js.map +1 -0
  386. package/cjs/theme/builtin/common-mobile/component/crosshair.d.ts +2 -0
  387. package/cjs/theme/builtin/common-mobile/component/crosshair.js +39 -0
  388. package/cjs/theme/builtin/common-mobile/component/crosshair.js.map +1 -0
  389. package/cjs/theme/builtin/common-mobile/component/data-zoom.d.ts +2 -0
  390. package/cjs/theme/builtin/common-mobile/component/data-zoom.js +40 -0
  391. package/cjs/theme/builtin/common-mobile/component/data-zoom.js.map +1 -0
  392. package/cjs/theme/builtin/common-mobile/component/index.d.ts +2 -0
  393. package/cjs/theme/builtin/common-mobile/component/index.js +33 -0
  394. package/cjs/theme/builtin/common-mobile/component/index.js.map +1 -0
  395. package/cjs/theme/builtin/common-mobile/component/indicator.d.ts +2 -0
  396. package/cjs/theme/builtin/common-mobile/component/indicator.js +23 -0
  397. package/cjs/theme/builtin/common-mobile/component/indicator.js.map +1 -0
  398. package/cjs/theme/builtin/common-mobile/component/legend/color-legend.d.ts +2 -0
  399. package/cjs/theme/builtin/common-mobile/component/legend/color-legend.js +23 -0
  400. package/cjs/theme/builtin/common-mobile/component/legend/color-legend.js.map +1 -0
  401. package/cjs/theme/builtin/common-mobile/component/legend/continuous.d.ts +2 -0
  402. package/cjs/theme/builtin/common-mobile/component/legend/continuous.js +44 -0
  403. package/cjs/theme/builtin/common-mobile/component/legend/continuous.js.map +1 -0
  404. package/cjs/theme/builtin/common-mobile/component/legend/discrete-legend.d.ts +2 -0
  405. package/cjs/theme/builtin/common-mobile/component/legend/discrete-legend.js +39 -0
  406. package/cjs/theme/builtin/common-mobile/component/legend/discrete-legend.js.map +1 -0
  407. package/cjs/theme/builtin/common-mobile/component/legend/size-legend.d.ts +2 -0
  408. package/cjs/theme/builtin/common-mobile/component/legend/size-legend.js +23 -0
  409. package/cjs/theme/builtin/common-mobile/component/legend/size-legend.js.map +1 -0
  410. package/cjs/theme/builtin/common-mobile/component/map-label.d.ts +2 -0
  411. package/cjs/theme/builtin/common-mobile/component/map-label.js +39 -0
  412. package/cjs/theme/builtin/common-mobile/component/map-label.js.map +1 -0
  413. package/cjs/theme/builtin/common-mobile/component/mark-area.d.ts +2 -0
  414. package/cjs/theme/builtin/common-mobile/component/mark-area.js +24 -0
  415. package/cjs/theme/builtin/common-mobile/component/mark-area.js.map +1 -0
  416. package/cjs/theme/builtin/common-mobile/component/mark-line.d.ts +2 -0
  417. package/cjs/theme/builtin/common-mobile/component/mark-line.js +33 -0
  418. package/cjs/theme/builtin/common-mobile/component/mark-line.js.map +1 -0
  419. package/cjs/theme/builtin/common-mobile/component/mark-point.d.ts +2 -0
  420. package/cjs/theme/builtin/common-mobile/component/mark-point.js +19 -0
  421. package/cjs/theme/builtin/common-mobile/component/mark-point.js.map +1 -0
  422. package/cjs/theme/builtin/common-mobile/component/player.d.ts +2 -0
  423. package/cjs/theme/builtin/common-mobile/component/player.js +51 -0
  424. package/cjs/theme/builtin/common-mobile/component/player.js.map +1 -0
  425. package/cjs/theme/builtin/common-mobile/component/poptip.d.ts +2 -0
  426. package/cjs/theme/builtin/common-mobile/component/poptip.js +25 -0
  427. package/cjs/theme/builtin/common-mobile/component/poptip.js.map +1 -0
  428. package/cjs/theme/builtin/common-mobile/component/title.d.ts +2 -0
  429. package/cjs/theme/builtin/common-mobile/component/title.js +23 -0
  430. package/cjs/theme/builtin/common-mobile/component/title.js.map +1 -0
  431. package/cjs/theme/builtin/common-mobile/component/tooltip.d.ts +2 -0
  432. package/cjs/theme/builtin/common-mobile/component/tooltip.js +43 -0
  433. package/cjs/theme/builtin/common-mobile/component/tooltip.js.map +1 -0
  434. package/cjs/theme/builtin/common-mobile/component/total-label.d.ts +2 -0
  435. package/cjs/theme/builtin/common-mobile/component/total-label.js +16 -0
  436. package/cjs/theme/builtin/common-mobile/component/total-label.js.map +1 -0
  437. package/cjs/theme/builtin/common-mobile/constants.d.ts +2 -0
  438. package/cjs/theme/builtin/common-mobile/constants.js +23 -0
  439. package/cjs/theme/builtin/common-mobile/constants.js.map +1 -0
  440. package/cjs/theme/builtin/common-mobile/mark.d.ts +3 -0
  441. package/cjs/theme/builtin/common-mobile/mark.js +35 -0
  442. package/cjs/theme/builtin/common-mobile/mark.js.map +1 -0
  443. package/cjs/theme/builtin/dark/color-scheme.js +20 -11
  444. package/cjs/theme/builtin/dark/color-scheme.js.map +1 -1
  445. package/cjs/theme/builtin/dark-mobile/index.d.ts +2 -0
  446. package/cjs/theme/builtin/dark-mobile/index.js +18 -0
  447. package/cjs/theme/builtin/dark-mobile/index.js.map +1 -0
  448. package/cjs/theme/builtin/index.d.ts +2 -4
  449. package/cjs/theme/builtin/index.js +17 -20
  450. package/cjs/theme/builtin/index.js.map +1 -1
  451. package/cjs/theme/builtin/light/color-scheme.js +19 -10
  452. package/cjs/theme/builtin/light/color-scheme.js.map +1 -1
  453. package/cjs/theme/builtin/light-mobile/index.d.ts +2 -0
  454. package/cjs/theme/builtin/light-mobile/index.js +18 -0
  455. package/cjs/theme/builtin/light-mobile/index.js.map +1 -0
  456. package/cjs/theme/color-scheme/builtin/interface.d.ts +16 -7
  457. package/cjs/theme/color-scheme/builtin/interface.js.map +1 -1
  458. package/cjs/theme/color-scheme/legacy.js +18 -2
  459. package/cjs/theme/color-scheme/legacy.js.map +1 -1
  460. package/cjs/theme/color-scheme/util.js +2 -2
  461. package/cjs/theme/color-scheme/util.js.map +1 -1
  462. package/cjs/theme/interface.d.ts +1 -2
  463. package/cjs/theme/interface.js.map +1 -1
  464. package/cjs/theme/theme-manager.d.ts +1 -1
  465. package/cjs/theme/theme-manager.js +2 -2
  466. package/cjs/theme/theme-manager.js.map +1 -1
  467. package/cjs/typings/index.d.ts +1 -0
  468. package/cjs/typings/index.js +2 -1
  469. package/cjs/typings/index.js.map +1 -1
  470. package/cjs/typings/layout.d.ts +23 -0
  471. package/cjs/typings/layout.js +6 -0
  472. package/cjs/typings/layout.js.map +1 -0
  473. package/cjs/typings/spec/common.d.ts +2 -4
  474. package/cjs/typings/spec/common.js.map +1 -1
  475. package/cjs/typings/visual.d.ts +1 -1
  476. package/cjs/typings/visual.js.map +1 -1
  477. package/cjs/util/space.d.ts +1 -1
  478. package/cjs/util/space.js.map +1 -1
  479. package/cjs/util/spec/background.js +8 -14
  480. package/cjs/util/spec/background.js.map +1 -1
  481. package/cjs/util/spec/common.d.ts +1 -1
  482. package/cjs/util/spec/common.js +2 -2
  483. package/cjs/util/spec/common.js.map +1 -1
  484. package/cjs/util/spec/preprocess.d.ts +1 -1
  485. package/cjs/util/spec/preprocess.js +7 -17
  486. package/cjs/util/spec/preprocess.js.map +1 -1
  487. package/cjs/util/spec/transform.d.ts +2 -0
  488. package/cjs/util/spec/transform.js +18 -2
  489. package/cjs/util/spec/transform.js.map +1 -1
  490. package/cjs/vchart-all.js +2 -3
  491. package/cjs/vchart-all.js.map +1 -1
  492. package/cjs/vchart-simple.d.ts +1 -0
  493. package/cjs/vchart-simple.js +4 -4
  494. package/cjs/vchart-simple.js.map +1 -1
  495. package/esm/animation/utils.d.ts +2 -2
  496. package/esm/chart/area/area.js +2 -1
  497. package/esm/chart/area/area.js.map +1 -1
  498. package/esm/chart/base-chart.d.ts +13 -16
  499. package/esm/chart/base-chart.js +66 -67
  500. package/esm/chart/base-chart.js.map +1 -1
  501. package/esm/chart/interface/chart.d.ts +4 -6
  502. package/esm/chart/interface/chart.js.map +1 -1
  503. package/esm/chart/line/line.js +2 -1
  504. package/esm/chart/line/line.js.map +1 -1
  505. package/esm/chart/sequence/sequence.d.ts +1 -1
  506. package/esm/chart/sequence/sequence.js +1 -1
  507. package/esm/chart/sequence/sequence.js.map +1 -1
  508. package/esm/compile/compiler.js +1 -2
  509. package/esm/compile/grammar-item.js +2 -1
  510. package/esm/compile/mark/compilable-mark.d.ts +10 -6
  511. package/esm/compile/mark/compilable-mark.js +23 -12
  512. package/esm/compile/mark/compilable-mark.js.map +1 -1
  513. package/esm/compile/mark/interface.d.ts +6 -4
  514. package/esm/compile/mark/interface.js.map +1 -1
  515. package/esm/compile/mark/util.d.ts +1 -3
  516. package/esm/compile/mark/util.js +0 -34
  517. package/esm/compile/mark/util.js.map +1 -1
  518. package/esm/component/axis/base-axis.d.ts +2 -4
  519. package/esm/component/axis/base-axis.js +19 -36
  520. package/esm/component/axis/base-axis.js.map +1 -1
  521. package/esm/component/axis/cartesian/axis.d.ts +12 -22
  522. package/esm/component/axis/cartesian/axis.js +49 -63
  523. package/esm/component/axis/cartesian/axis.js.map +1 -1
  524. package/esm/component/axis/cartesian/band-axis.d.ts +0 -7
  525. package/esm/component/axis/cartesian/band-axis.js +0 -1
  526. package/esm/component/axis/cartesian/band-axis.js.map +1 -1
  527. package/esm/component/axis/cartesian/interface/common.d.ts +0 -6
  528. package/esm/component/axis/cartesian/interface/common.js.map +1 -1
  529. package/esm/component/axis/cartesian/interface/theme.d.ts +1 -1
  530. package/esm/component/axis/cartesian/interface/theme.js.map +1 -1
  531. package/esm/component/axis/interface/common.d.ts +0 -1
  532. package/esm/component/axis/interface/common.js.map +1 -1
  533. package/esm/component/axis/interface/spec.js.map +1 -1
  534. package/esm/component/axis/mixin/band-axis-mixin.d.ts +0 -1
  535. package/esm/component/axis/mixin/band-axis-mixin.js +2 -2
  536. package/esm/component/axis/mixin/band-axis-mixin.js.map +1 -1
  537. package/esm/component/axis/mixin/linear-axis-mixin.d.ts +0 -1
  538. package/esm/component/axis/mixin/linear-axis-mixin.js +4 -3
  539. package/esm/component/axis/mixin/linear-axis-mixin.js.map +1 -1
  540. package/esm/component/axis/polar/axis.d.ts +3 -4
  541. package/esm/component/axis/polar/axis.js +12 -14
  542. package/esm/component/axis/polar/axis.js.map +1 -1
  543. package/esm/component/base/base-component.d.ts +12 -4
  544. package/esm/component/base/base-component.js +22 -14
  545. package/esm/component/base/base-component.js.map +1 -1
  546. package/esm/component/base/util.js +7 -3
  547. package/esm/component/base/util.js.map +1 -1
  548. package/esm/component/brush/brush.d.ts +2 -4
  549. package/esm/component/brush/brush.js +4 -6
  550. package/esm/component/brush/brush.js.map +1 -1
  551. package/esm/component/crosshair/base.d.ts +3 -4
  552. package/esm/component/crosshair/base.js +1 -1
  553. package/esm/component/crosshair/base.js.map +1 -1
  554. package/esm/component/crosshair/cartesian.d.ts +2 -0
  555. package/esm/component/crosshair/cartesian.js +5 -8
  556. package/esm/component/crosshair/cartesian.js.map +1 -1
  557. package/esm/component/crosshair/interface/spec.d.ts +1 -1
  558. package/esm/component/crosshair/interface/spec.js.map +1 -1
  559. package/esm/component/crosshair/polar.d.ts +2 -0
  560. package/esm/component/crosshair/polar.js +5 -8
  561. package/esm/component/crosshair/polar.js.map +1 -1
  562. package/esm/component/custom-mark/custom-mark.d.ts +2 -3
  563. package/esm/component/custom-mark/custom-mark.js +2 -3
  564. package/esm/component/custom-mark/custom-mark.js.map +1 -1
  565. package/esm/component/data-zoom/data-filter-base-component.d.ts +8 -8
  566. package/esm/component/data-zoom/data-filter-base-component.js +60 -37
  567. package/esm/component/data-zoom/data-filter-base-component.js.map +1 -1
  568. package/esm/component/data-zoom/data-zoom/data-zoom.d.ts +4 -2
  569. package/esm/component/data-zoom/data-zoom/data-zoom.js +47 -44
  570. package/esm/component/data-zoom/data-zoom/data-zoom.js.map +1 -1
  571. package/esm/component/data-zoom/data-zoom/interface.d.ts +6 -1
  572. package/esm/component/data-zoom/data-zoom/interface.js.map +1 -1
  573. package/esm/component/data-zoom/scroll-bar/interface.d.ts +6 -2
  574. package/esm/component/data-zoom/scroll-bar/interface.js.map +1 -1
  575. package/esm/component/data-zoom/scroll-bar/scroll-bar.d.ts +3 -0
  576. package/esm/component/data-zoom/scroll-bar/scroll-bar.js +24 -23
  577. package/esm/component/data-zoom/scroll-bar/scroll-bar.js.map +1 -1
  578. package/esm/component/data-zoom/util.d.ts +4 -0
  579. package/esm/component/data-zoom/util.js +13 -1
  580. package/esm/component/data-zoom/util.js.map +1 -1
  581. package/esm/component/geo/geo-coordinate.d.ts +3 -2
  582. package/esm/component/geo/geo-coordinate.js +3 -1
  583. package/esm/component/geo/geo-coordinate.js.map +1 -1
  584. package/esm/component/index.d.ts +3 -2
  585. package/esm/component/index.js.map +1 -1
  586. package/esm/component/indicator/indicator.d.ts +1 -3
  587. package/esm/component/indicator/indicator.js +4 -5
  588. package/esm/component/indicator/indicator.js.map +1 -1
  589. package/esm/component/indicator/interface.d.ts +1 -1
  590. package/esm/component/indicator/interface.js.map +1 -1
  591. package/esm/component/interface/common.d.ts +3 -3
  592. package/esm/component/interface/common.js.map +1 -1
  593. package/esm/component/interface/theme.d.ts +2 -1
  594. package/esm/component/interface/theme.js.map +1 -1
  595. package/esm/component/label/base-label.d.ts +2 -4
  596. package/esm/component/label/base-label.js +1 -3
  597. package/esm/component/label/base-label.js.map +1 -1
  598. package/esm/component/label/interface.d.ts +4 -0
  599. package/esm/component/label/interface.js.map +1 -1
  600. package/esm/component/label/label.d.ts +5 -7
  601. package/esm/component/label/label.js +16 -11
  602. package/esm/component/label/label.js.map +1 -1
  603. package/esm/component/label/totalLabel.d.ts +1 -3
  604. package/esm/component/label/totalLabel.js +4 -4
  605. package/esm/component/label/totalLabel.js.map +1 -1
  606. package/esm/component/label/util.d.ts +9 -2
  607. package/esm/component/label/util.js +17 -3
  608. package/esm/component/label/util.js.map +1 -1
  609. package/esm/component/legend/base-legend.d.ts +6 -9
  610. package/esm/component/legend/base-legend.js +3 -9
  611. package/esm/component/legend/base-legend.js.map +1 -1
  612. package/esm/component/legend/continuous/legend.d.ts +4 -1
  613. package/esm/component/legend/continuous/legend.js +6 -7
  614. package/esm/component/legend/continuous/legend.js.map +1 -1
  615. package/esm/component/legend/discrete/legend.d.ts +4 -1
  616. package/esm/component/legend/discrete/legend.js +6 -7
  617. package/esm/component/legend/discrete/legend.js.map +1 -1
  618. package/esm/component/legend/discrete/util.d.ts +1 -1
  619. package/esm/component/legend/discrete/util.js.map +1 -1
  620. package/esm/component/legend/util.d.ts +2 -2
  621. package/esm/component/map-label/component.d.ts +1 -3
  622. package/esm/component/map-label/component.js +2 -2
  623. package/esm/component/map-label/component.js.map +1 -1
  624. package/esm/component/marker/base-marker.d.ts +7 -3
  625. package/esm/component/marker/base-marker.js +41 -18
  626. package/esm/component/marker/base-marker.js.map +1 -1
  627. package/esm/component/marker/interface.d.ts +15 -4
  628. package/esm/component/marker/interface.js.map +1 -1
  629. package/esm/component/marker/mark-area/interface/spec.d.ts +1 -1
  630. package/esm/component/marker/mark-area/interface/spec.js.map +1 -1
  631. package/esm/component/marker/mark-area/mark-area.d.ts +1 -3
  632. package/esm/component/marker/mark-area/mark-area.js +29 -18
  633. package/esm/component/marker/mark-area/mark-area.js.map +1 -1
  634. package/esm/component/marker/mark-line/interface/spec.d.ts +3 -4
  635. package/esm/component/marker/mark-line/interface/spec.js.map +1 -1
  636. package/esm/component/marker/mark-line/mark-line.d.ts +1 -3
  637. package/esm/component/marker/mark-line/mark-line.js +36 -18
  638. package/esm/component/marker/mark-line/mark-line.js.map +1 -1
  639. package/esm/component/marker/mark-line/util.d.ts +3 -3
  640. package/esm/component/marker/mark-line/util.js.map +1 -1
  641. package/esm/component/marker/mark-point/interface/spec.d.ts +5 -4
  642. package/esm/component/marker/mark-point/interface/spec.js.map +1 -1
  643. package/esm/component/marker/mark-point/interface/theme.d.ts +5 -5
  644. package/esm/component/marker/mark-point/interface/theme.js.map +1 -1
  645. package/esm/component/marker/mark-point/mark-point.d.ts +1 -3
  646. package/esm/component/marker/mark-point/mark-point.js +17 -12
  647. package/esm/component/marker/mark-point/mark-point.js.map +1 -1
  648. package/esm/component/marker/utils.d.ts +3 -4
  649. package/esm/component/marker/utils.js +43 -23
  650. package/esm/component/marker/utils.js.map +1 -1
  651. package/esm/component/player/interface/theme.d.ts +1 -1
  652. package/esm/component/player/interface/theme.js.map +1 -1
  653. package/esm/component/player/player.d.ts +6 -7
  654. package/esm/component/player/player.js +4 -7
  655. package/esm/component/player/player.js.map +1 -1
  656. package/esm/component/title/interface/theme.d.ts +1 -1
  657. package/esm/component/title/interface/theme.js.map +1 -1
  658. package/esm/component/title/title.d.ts +6 -9
  659. package/esm/component/title/title.js +12 -22
  660. package/esm/component/title/title.js.map +1 -1
  661. package/esm/component/tooltip/handler/base.js +5 -7
  662. package/esm/component/tooltip/handler/base.js.map +1 -1
  663. package/esm/component/tooltip/handler/dom/util.js +3 -1
  664. package/esm/component/tooltip/handler/dom/util.js.map +1 -1
  665. package/esm/component/tooltip/handler/utils/attribute.d.ts +3 -3
  666. package/esm/component/tooltip/handler/utils/attribute.js.map +1 -1
  667. package/esm/component/tooltip/handler/utils/common.js.map +1 -1
  668. package/esm/component/tooltip/interface/spec.d.ts +1 -1
  669. package/esm/component/tooltip/interface/spec.js.map +1 -1
  670. package/esm/component/tooltip/interface/theme.d.ts +10 -11
  671. package/esm/component/tooltip/interface/theme.js.map +1 -1
  672. package/esm/component/tooltip/tooltip.d.ts +3 -2
  673. package/esm/component/tooltip/tooltip.js +7 -10
  674. package/esm/component/tooltip/tooltip.js.map +1 -1
  675. package/esm/component/util.d.ts +1 -3
  676. package/esm/component/util.js +2 -2
  677. package/esm/component/util.js.map +1 -1
  678. package/esm/constant/index.js +2 -1
  679. package/esm/constant/layout.d.ts +1 -0
  680. package/esm/constant/layout.js +2 -0
  681. package/esm/constant/layout.js.map +1 -1
  682. package/esm/constant/scatter.js +1 -2
  683. package/esm/core/expression-function.d.ts +12 -0
  684. package/esm/core/expression-function.js +22 -0
  685. package/esm/core/expression-function.js.map +1 -0
  686. package/esm/core/factory.d.ts +5 -2
  687. package/esm/core/factory.js +6 -3
  688. package/esm/core/factory.js.map +1 -1
  689. package/esm/core/index.d.ts +2 -1
  690. package/esm/core/index.js +3 -1
  691. package/esm/core/index.js.map +1 -1
  692. package/esm/core/interface.d.ts +5 -0
  693. package/esm/core/interface.js.map +1 -1
  694. package/esm/core/vchart.d.ts +9 -1
  695. package/esm/core/vchart.js +62 -41
  696. package/esm/core/vchart.js.map +1 -1
  697. package/esm/data/initialize.js +7 -7
  698. package/esm/data/initialize.js.map +1 -1
  699. package/esm/data/transforms/aggregation.d.ts +4 -3
  700. package/esm/data/transforms/aggregation.js +6 -6
  701. package/esm/data/transforms/aggregation.js.map +1 -1
  702. package/esm/data/transforms/dimension-statistics.js +14 -4
  703. package/esm/data/transforms/dimension-statistics.js.map +1 -1
  704. package/esm/event/bubble.js +1 -2
  705. package/esm/event/event.js +2 -1
  706. package/esm/event/events/base.d.ts +16 -0
  707. package/esm/event/events/base.js +15 -0
  708. package/esm/event/events/base.js.map +1 -0
  709. package/esm/event/events/dimension/util/cartesian.d.ts +1 -1
  710. package/esm/event/events/dimension/util/cartesian.js.map +1 -1
  711. package/esm/event/events/dimension/util/common.d.ts +1 -2
  712. package/esm/event/events/dimension/util/common.js +1 -1
  713. package/esm/event/events/dimension/util/common.js.map +1 -1
  714. package/esm/event/events/dimension/util/polar.d.ts +1 -1
  715. package/esm/event/events/dimension/util/polar.js.map +1 -1
  716. package/esm/event/interface.d.ts +2 -2
  717. package/esm/event/interface.js.map +1 -1
  718. package/esm/index-wx-simple.d.ts +4 -0
  719. package/esm/index-wx-simple.js +35 -0
  720. package/esm/index-wx-simple.js.map +1 -0
  721. package/esm/interaction/trigger.js +1 -1
  722. package/esm/interaction/zoom/zoomable.d.ts +1 -0
  723. package/esm/interaction/zoom/zoomable.js +6 -5
  724. package/esm/interaction/zoom/zoomable.js.map +1 -1
  725. package/esm/layout/base-layout.d.ts +3 -5
  726. package/esm/layout/base-layout.js +9 -9
  727. package/esm/layout/base-layout.js.map +1 -1
  728. package/esm/layout/grid-layout/grid-layout.d.ts +1 -2
  729. package/esm/layout/grid-layout/grid-layout.js +6 -4
  730. package/esm/layout/grid-layout/grid-layout.js.map +1 -1
  731. package/esm/layout/interface.d.ts +74 -6
  732. package/esm/layout/interface.js.map +1 -1
  733. package/esm/{model → layout}/layout-item.d.ts +35 -23
  734. package/esm/{model → layout}/layout-item.js +93 -63
  735. package/esm/layout/layout-item.js.map +1 -0
  736. package/esm/layout/layout3d/index.d.ts +2 -4
  737. package/esm/layout/layout3d/index.js +5 -5
  738. package/esm/layout/layout3d/index.js.map +1 -1
  739. package/esm/layout/util.d.ts +1 -1
  740. package/esm/layout/util.js.map +1 -1
  741. package/esm/mark/arc.js +2 -2
  742. package/esm/mark/arc.js.map +1 -1
  743. package/esm/mark/base/base-mark.d.ts +2 -2
  744. package/esm/mark/base/base-mark.js +59 -38
  745. package/esm/mark/base/base-mark.js.map +1 -1
  746. package/esm/mark/label.js +1 -4
  747. package/esm/mark/label.js.map +1 -1
  748. package/esm/model/base-model.d.ts +10 -8
  749. package/esm/model/base-model.js +27 -35
  750. package/esm/model/base-model.js.map +1 -1
  751. package/esm/model/interface.d.ts +21 -89
  752. package/esm/model/interface.js.map +1 -1
  753. package/esm/model/layout-model.d.ts +41 -0
  754. package/esm/model/layout-model.js +80 -0
  755. package/esm/model/layout-model.js.map +1 -0
  756. package/esm/region/interface.d.ts +3 -2
  757. package/esm/region/interface.js.map +1 -1
  758. package/esm/region/region.d.ts +12 -7
  759. package/esm/region/region.js +19 -11
  760. package/esm/region/region.js.map +1 -1
  761. package/esm/series/area/area.d.ts +1 -1
  762. package/esm/series/area/area.js +5 -6
  763. package/esm/series/area/area.js.map +1 -1
  764. package/esm/series/area/interface.d.ts +4 -0
  765. package/esm/series/area/interface.js.map +1 -1
  766. package/esm/series/bar/bar.js +1 -5
  767. package/esm/series/bar/bar.js.map +1 -1
  768. package/esm/series/base/base-series.d.ts +14 -4
  769. package/esm/series/base/base-series.js +38 -16
  770. package/esm/series/base/base-series.js.map +1 -1
  771. package/esm/series/cartesian/cartesian.d.ts +3 -0
  772. package/esm/series/cartesian/cartesian.js +16 -4
  773. package/esm/series/cartesian/cartesian.js.map +1 -1
  774. package/esm/series/correlation/correlation.js +2 -8
  775. package/esm/series/correlation/correlation.js.map +1 -1
  776. package/esm/series/funnel/funnel-3d.js +1 -1
  777. package/esm/series/funnel/funnel-3d.js.map +1 -1
  778. package/esm/series/funnel/funnel.js +3 -7
  779. package/esm/series/funnel/funnel.js.map +1 -1
  780. package/esm/series/funnel/interface.d.ts +1 -2
  781. package/esm/series/funnel/interface.js.map +1 -1
  782. package/esm/series/gauge/gauge.d.ts +0 -1
  783. package/esm/series/gauge/gauge.js +2 -9
  784. package/esm/series/gauge/gauge.js.map +1 -1
  785. package/esm/series/heatmap/heatmap.js +1 -5
  786. package/esm/series/heatmap/heatmap.js.map +1 -1
  787. package/esm/series/index.d.ts +2 -2
  788. package/esm/series/index.js.map +1 -1
  789. package/esm/series/interface/common.d.ts +2 -2
  790. package/esm/series/interface/common.js.map +1 -1
  791. package/esm/series/interface/series.d.ts +4 -2
  792. package/esm/series/interface/series.js.map +1 -1
  793. package/esm/series/interface/type.d.ts +3 -1
  794. package/esm/series/interface/type.js +2 -1
  795. package/esm/series/interface/type.js.map +1 -1
  796. package/esm/series/line/interface.d.ts +4 -0
  797. package/esm/series/line/interface.js.map +1 -1
  798. package/esm/series/line/line.d.ts +1 -1
  799. package/esm/series/line/line.js.map +1 -1
  800. package/esm/series/map/map.js +1 -5
  801. package/esm/series/map/map.js.map +1 -1
  802. package/esm/series/mixin/line-mixin.d.ts +5 -2
  803. package/esm/series/mixin/line-mixin.js +15 -10
  804. package/esm/series/mixin/line-mixin.js.map +1 -1
  805. package/esm/series/pie/pie.js +1 -4
  806. package/esm/series/pie/pie.js.map +1 -1
  807. package/esm/series/polar/progress-like/progress-like.js +3 -4
  808. package/esm/series/polar/progress-like/progress-like.js.map +1 -1
  809. package/esm/series/radar/animation.js.map +1 -1
  810. package/esm/series/range-column/range-column.js +1 -3
  811. package/esm/series/range-column/range-column.js.map +1 -1
  812. package/esm/series/rose/rose.d.ts +2 -1
  813. package/esm/series/rose/rose.js +1 -5
  814. package/esm/series/rose/rose.js.map +1 -1
  815. package/esm/series/scatter/scatter.js +1 -5
  816. package/esm/series/scatter/scatter.js.map +1 -1
  817. package/esm/series/waterfall/waterfall.js +1 -1
  818. package/esm/series/waterfall/waterfall.js.map +1 -1
  819. package/esm/series/word-cloud/base.d.ts +1 -0
  820. package/esm/series/word-cloud/base.js +33 -33
  821. package/esm/series/word-cloud/base.js.map +1 -1
  822. package/esm/series/word-cloud/word-cloud-3d.js +32 -32
  823. package/esm/series/word-cloud/word-cloud-3d.js.map +1 -1
  824. package/esm/theme/builtin/common/component/axis/cartesian-axis.js +2 -2
  825. package/esm/theme/builtin/common/component/axis/cartesian-axis.js.map +1 -1
  826. package/esm/theme/builtin/common/component/axis/common-axis.js +1 -1
  827. package/esm/theme/builtin/common/component/axis/common-axis.js.map +1 -1
  828. package/esm/theme/builtin/common/component/crosshair.js +5 -5
  829. package/esm/theme/builtin/common/component/crosshair.js.map +1 -1
  830. package/esm/theme/builtin/common/component/data-zoom.js +10 -10
  831. package/esm/theme/builtin/common/component/data-zoom.js.map +1 -1
  832. package/esm/theme/builtin/common/component/indicator.js +1 -1
  833. package/esm/theme/builtin/common/component/indicator.js.map +1 -1
  834. package/esm/theme/builtin/common/component/legend/color-legend.js +3 -4
  835. package/esm/theme/builtin/common/component/legend/color-legend.js.map +1 -1
  836. package/esm/theme/builtin/common/component/legend/discrete-legend.js +2 -2
  837. package/esm/theme/builtin/common/component/legend/discrete-legend.js.map +1 -1
  838. package/esm/theme/builtin/common/component/legend/size-legend.js +6 -6
  839. package/esm/theme/builtin/common/component/legend/size-legend.js.map +1 -1
  840. package/esm/theme/builtin/common/component/map-label.js.map +1 -1
  841. package/esm/theme/builtin/common/component/mark-area.js.map +1 -1
  842. package/esm/theme/builtin/common/component/mark-line.js +9 -9
  843. package/esm/theme/builtin/common/component/mark-line.js.map +1 -1
  844. package/esm/theme/builtin/common/component/mark-point.js +15 -3
  845. package/esm/theme/builtin/common/component/mark-point.js.map +1 -1
  846. package/esm/theme/builtin/common/component/player.js +7 -7
  847. package/esm/theme/builtin/common/component/player.js.map +1 -1
  848. package/esm/theme/builtin/common/component/poptip.js +3 -4
  849. package/esm/theme/builtin/common/component/poptip.js.map +1 -1
  850. package/esm/theme/builtin/common/component/scroll-bar.js +20 -7
  851. package/esm/theme/builtin/common/component/scroll-bar.js.map +1 -1
  852. package/esm/theme/builtin/common/component/title.js +1 -1
  853. package/esm/theme/builtin/common/component/title.js.map +1 -1
  854. package/esm/theme/builtin/common/component/tooltip.d.ts +2 -1
  855. package/esm/theme/builtin/common/component/tooltip.js +3 -4
  856. package/esm/theme/builtin/common/component/tooltip.js.map +1 -1
  857. package/esm/theme/builtin/common/component/total-label.js.map +1 -1
  858. package/esm/theme/builtin/common/mark.js.map +1 -1
  859. package/esm/theme/builtin/common/series/rangeColumn.js +1 -1
  860. package/esm/theme/builtin/common/series/rangeColumn.js.map +1 -1
  861. package/esm/theme/builtin/common-mobile/component/axis/band-axis.d.ts +2 -0
  862. package/esm/theme/builtin/common-mobile/component/axis/band-axis.js +18 -0
  863. package/esm/theme/builtin/common-mobile/component/axis/band-axis.js.map +1 -0
  864. package/esm/theme/builtin/common-mobile/component/axis/cartesian-axis.d.ts +3 -0
  865. package/esm/theme/builtin/common-mobile/component/axis/cartesian-axis.js +32 -0
  866. package/esm/theme/builtin/common-mobile/component/axis/cartesian-axis.js.map +1 -0
  867. package/esm/theme/builtin/common-mobile/component/axis/common-axis.d.ts +2 -0
  868. package/esm/theme/builtin/common-mobile/component/axis/common-axis.js +36 -0
  869. package/esm/theme/builtin/common-mobile/component/axis/common-axis.js.map +1 -0
  870. package/esm/theme/builtin/common-mobile/component/axis/linear-axis.d.ts +2 -0
  871. package/esm/theme/builtin/common-mobile/component/axis/linear-axis.js +18 -0
  872. package/esm/theme/builtin/common-mobile/component/axis/linear-axis.js.map +1 -0
  873. package/esm/theme/builtin/common-mobile/component/axis/polar-axis.d.ts +3 -0
  874. package/esm/theme/builtin/common-mobile/component/axis/polar-axis.js +23 -0
  875. package/esm/theme/builtin/common-mobile/component/axis/polar-axis.js.map +1 -0
  876. package/esm/theme/builtin/common-mobile/component/crosshair.d.ts +2 -0
  877. package/esm/theme/builtin/common-mobile/component/crosshair.js +35 -0
  878. package/esm/theme/builtin/common-mobile/component/crosshair.js.map +1 -0
  879. package/esm/theme/builtin/common-mobile/component/data-zoom.d.ts +2 -0
  880. package/esm/theme/builtin/common-mobile/component/data-zoom.js +34 -0
  881. package/esm/theme/builtin/common-mobile/component/data-zoom.js.map +1 -0
  882. package/esm/theme/builtin/common-mobile/component/index.d.ts +2 -0
  883. package/esm/theme/builtin/common-mobile/component/index.js +65 -0
  884. package/esm/theme/builtin/common-mobile/component/index.js.map +1 -0
  885. package/esm/theme/builtin/common-mobile/component/indicator.d.ts +2 -0
  886. package/esm/theme/builtin/common-mobile/component/indicator.js +17 -0
  887. package/esm/theme/builtin/common-mobile/component/indicator.js.map +1 -0
  888. package/esm/theme/builtin/common-mobile/component/legend/color-legend.d.ts +2 -0
  889. package/esm/theme/builtin/common-mobile/component/legend/color-legend.js +17 -0
  890. package/esm/theme/builtin/common-mobile/component/legend/color-legend.js.map +1 -0
  891. package/esm/theme/builtin/common-mobile/component/legend/continuous.d.ts +2 -0
  892. package/esm/theme/builtin/common-mobile/component/legend/continuous.js +38 -0
  893. package/esm/theme/builtin/common-mobile/component/legend/continuous.js.map +1 -0
  894. package/esm/theme/builtin/common-mobile/component/legend/discrete-legend.d.ts +2 -0
  895. package/esm/theme/builtin/common-mobile/component/legend/discrete-legend.js +33 -0
  896. package/esm/theme/builtin/common-mobile/component/legend/discrete-legend.js.map +1 -0
  897. package/esm/theme/builtin/common-mobile/component/legend/size-legend.d.ts +2 -0
  898. package/esm/theme/builtin/common-mobile/component/legend/size-legend.js +17 -0
  899. package/esm/theme/builtin/common-mobile/component/legend/size-legend.js.map +1 -0
  900. package/esm/theme/builtin/common-mobile/component/map-label.d.ts +2 -0
  901. package/esm/theme/builtin/common-mobile/component/map-label.js +33 -0
  902. package/esm/theme/builtin/common-mobile/component/map-label.js.map +1 -0
  903. package/esm/theme/builtin/common-mobile/component/mark-area.d.ts +2 -0
  904. package/esm/theme/builtin/common-mobile/component/mark-area.js +18 -0
  905. package/esm/theme/builtin/common-mobile/component/mark-area.js.map +1 -0
  906. package/esm/theme/builtin/common-mobile/component/mark-line.d.ts +2 -0
  907. package/esm/theme/builtin/common-mobile/component/mark-line.js +27 -0
  908. package/esm/theme/builtin/common-mobile/component/mark-line.js.map +1 -0
  909. package/esm/theme/builtin/common-mobile/component/mark-point.d.ts +2 -0
  910. package/esm/theme/builtin/common-mobile/component/mark-point.js +15 -0
  911. package/esm/theme/builtin/common-mobile/component/mark-point.js.map +1 -0
  912. package/esm/theme/builtin/common-mobile/component/player.d.ts +2 -0
  913. package/esm/theme/builtin/common-mobile/component/player.js +47 -0
  914. package/esm/theme/builtin/common-mobile/component/player.js.map +1 -0
  915. package/esm/theme/builtin/common-mobile/component/poptip.d.ts +2 -0
  916. package/esm/theme/builtin/common-mobile/component/poptip.js +19 -0
  917. package/esm/theme/builtin/common-mobile/component/poptip.js.map +1 -0
  918. package/esm/theme/builtin/common-mobile/component/title.d.ts +2 -0
  919. package/esm/theme/builtin/common-mobile/component/title.js +17 -0
  920. package/esm/theme/builtin/common-mobile/component/title.js.map +1 -0
  921. package/esm/theme/builtin/common-mobile/component/tooltip.d.ts +2 -0
  922. package/esm/theme/builtin/common-mobile/component/tooltip.js +37 -0
  923. package/esm/theme/builtin/common-mobile/component/tooltip.js.map +1 -0
  924. package/esm/theme/builtin/common-mobile/component/total-label.d.ts +2 -0
  925. package/esm/theme/builtin/common-mobile/component/total-label.js +10 -0
  926. package/esm/theme/builtin/common-mobile/component/total-label.js.map +1 -0
  927. package/esm/theme/builtin/common-mobile/constants.d.ts +2 -0
  928. package/esm/theme/builtin/common-mobile/constants.js +19 -0
  929. package/esm/theme/builtin/common-mobile/constants.js.map +1 -0
  930. package/esm/theme/builtin/common-mobile/mark.d.ts +3 -0
  931. package/esm/theme/builtin/common-mobile/mark.js +31 -0
  932. package/esm/theme/builtin/common-mobile/mark.js.map +1 -0
  933. package/esm/theme/builtin/dark/color-scheme.js +20 -11
  934. package/esm/theme/builtin/dark/color-scheme.js.map +1 -1
  935. package/esm/theme/builtin/dark-mobile/index.d.ts +2 -0
  936. package/esm/theme/builtin/dark-mobile/index.js +16 -0
  937. package/esm/theme/builtin/dark-mobile/index.js.map +1 -0
  938. package/esm/theme/builtin/index.d.ts +2 -4
  939. package/esm/theme/builtin/index.js +16 -23
  940. package/esm/theme/builtin/index.js.map +1 -1
  941. package/esm/theme/builtin/light/color-scheme.js +19 -10
  942. package/esm/theme/builtin/light/color-scheme.js.map +1 -1
  943. package/esm/theme/builtin/light-mobile/index.d.ts +2 -0
  944. package/esm/theme/builtin/light-mobile/index.js +16 -0
  945. package/esm/theme/builtin/light-mobile/index.js.map +1 -0
  946. package/esm/theme/color-scheme/builtin/interface.d.ts +16 -7
  947. package/esm/theme/color-scheme/builtin/interface.js.map +1 -1
  948. package/esm/theme/color-scheme/legacy.js +18 -2
  949. package/esm/theme/color-scheme/legacy.js.map +1 -1
  950. package/esm/theme/color-scheme/util.js +2 -2
  951. package/esm/theme/color-scheme/util.js.map +1 -1
  952. package/esm/theme/interface.d.ts +1 -2
  953. package/esm/theme/interface.js.map +1 -1
  954. package/esm/theme/theme-manager.d.ts +1 -1
  955. package/esm/theme/theme-manager.js +2 -2
  956. package/esm/theme/theme-manager.js.map +1 -1
  957. package/esm/typings/index.d.ts +1 -0
  958. package/esm/typings/index.js +2 -0
  959. package/esm/typings/index.js.map +1 -1
  960. package/esm/typings/layout.d.ts +23 -0
  961. package/esm/typings/layout.js +2 -0
  962. package/esm/typings/layout.js.map +1 -0
  963. package/esm/typings/spec/common.d.ts +2 -4
  964. package/esm/typings/spec/common.js.map +1 -1
  965. package/esm/typings/visual.d.ts +1 -1
  966. package/esm/typings/visual.js.map +1 -1
  967. package/esm/util/space.d.ts +1 -1
  968. package/esm/util/space.js.map +1 -1
  969. package/esm/util/spec/background.js +3 -11
  970. package/esm/util/spec/background.js.map +1 -1
  971. package/esm/util/spec/common.d.ts +1 -1
  972. package/esm/util/spec/common.js +2 -2
  973. package/esm/util/spec/common.js.map +1 -1
  974. package/esm/util/spec/preprocess.d.ts +1 -1
  975. package/esm/util/spec/preprocess.js +5 -18
  976. package/esm/util/spec/preprocess.js.map +1 -1
  977. package/esm/util/spec/transform.d.ts +2 -0
  978. package/esm/util/spec/transform.js +17 -1
  979. package/esm/util/spec/transform.js.map +1 -1
  980. package/esm/vchart-all.js +1 -4
  981. package/esm/vchart-all.js.map +1 -1
  982. package/esm/vchart-simple.d.ts +1 -0
  983. package/esm/vchart-simple.js +15 -14
  984. package/esm/vchart-simple.js.map +1 -1
  985. package/package.json +18 -19
  986. package/cjs/model/layout-item.js.map +0 -1
  987. package/cjs/theme/util.d.ts +0 -5
  988. package/cjs/theme/util.js +0 -35
  989. package/cjs/theme/util.js.map +0 -1
  990. package/esm/model/layout-item.js.map +0 -1
  991. package/esm/theme/util.d.ts +0 -5
  992. package/esm/theme/util.js +0 -37
  993. package/esm/theme/util.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/vchart-simple.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AAIrF,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAEvC,cAAc,QAAQ,CAAC;AAEvB,MAAM,CAAC,YAAY,CAAC;IAElB,iBAAiB;IACjB,gBAAgB;IAChB,gBAAgB;IAGhB,2BAA2B;IAC3B,yBAAyB;IACzB,yBAAyB;IACzB,sBAAsB;IACtB,eAAe;IACf,0BAA0B;IAC1B,aAAa;CACd,CAAC,CAAC;AAGH,MAAM,CAAC,YAAY,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;AAEtC,OAAO,EAAE,MAAM,EAAE,CAAC","file":"vchart-simple.js","sourcesContent":["import { registerLabel } from './component/label/label';\nimport { registerCartesianCrossHair } from './component/crosshair/cartesian';\nimport { registerTooltip } from './component/tooltip/tooltip';\nimport { registerDiscreteLegend } from './component/legend/discrete/legend';\nimport { registerCartesianTimeAxis } from './component/axis/cartesian/time-axis';\nimport { registerCartesianBandAxis } from './component/axis/cartesian/band-axis';\nimport { registerCartesianLinearAxis } from './component/axis/cartesian/linear-axis';\n/**\n * @description 包含基础的折柱饼图,提供坐标轴、离散图例以及 tooltip、crosshair、label 组件\n */\nimport { VChart } from './core';\nimport { registerLineChart } from './chart/line';\nimport { registerBarChart } from './chart/bar';\nimport { registerPieChart } from './chart/pie';\nimport { registerAllEnv } from './env';\n\nexport * from './core';\n\nVChart.useRegisters([\n // charts\n registerLineChart,\n registerBarChart,\n registerPieChart,\n\n // components\n registerCartesianLinearAxis,\n registerCartesianBandAxis,\n registerCartesianTimeAxis,\n registerDiscreteLegend,\n registerTooltip,\n registerCartesianCrossHair,\n registerLabel\n]);\n\n// load env code\nVChart.useRegisters([registerAllEnv]);\n\nexport { VChart };\n"]}
1
+ {"version":3,"sources":["../src/vchart-simple.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AAErF,cAAc,QAAQ,CAAC;AAEvB,MAAM,CAAC,YAAY,CAAC;IAElB,iBAAiB;IACjB,iBAAiB;IACjB,gBAAgB;IAChB,gBAAgB;IAChB,mBAAmB;IAGnB,2BAA2B;IAC3B,yBAAyB;IACzB,sBAAsB;IACtB,eAAe;IACf,0BAA0B;IAC1B,aAAa;CACd,CAAC,CAAC;AAEH,OAAO,EAAE,MAAM,EAAE,CAAC;AAElB,eAAe,MAAM,CAAC","file":"vchart-simple.js","sourcesContent":["/**\n * @description 包含基础的折柱饼图,提供坐标轴、离散图例以及 tooltip、crosshair、label 组件\n */\nimport { VChart } from './core';\nimport { registerLineChart } from './chart/line/line';\nimport { registerBarChart } from './chart/bar/bar';\nimport { registerAreaChart } from './chart/area/area';\nimport { registerPieChart } from './chart/pie/pie';\nimport { registerCommonChart } from './chart/common/common';\n\nimport { registerLabel } from './component/label/label';\nimport { registerCartesianCrossHair } from './component/crosshair/cartesian';\nimport { registerTooltip } from './component/tooltip/tooltip';\nimport { registerDiscreteLegend } from './component/legend/discrete/legend';\nimport { registerCartesianBandAxis } from './component/axis/cartesian/band-axis';\nimport { registerCartesianLinearAxis } from './component/axis/cartesian/linear-axis';\n\nexport * from './core';\n\nVChart.useRegisters([\n // charts\n registerLineChart,\n registerAreaChart,\n registerBarChart,\n registerPieChart,\n registerCommonChart,\n\n // components\n registerCartesianLinearAxis,\n registerCartesianBandAxis,\n registerDiscreteLegend,\n registerTooltip,\n registerCartesianCrossHair,\n registerLabel\n]);\n\nexport { VChart };\n\nexport default VChart;\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@visactor/vchart",
3
- "version": "1.6.7",
3
+ "version": "1.7.0-alpha.1",
4
4
  "description": "charts lib based @visactor/VGrammar",
5
5
  "main": "cjs/index.js",
6
6
  "module": "esm/index.js",
@@ -76,25 +76,25 @@
76
76
  "size-limit": "9.0.0",
77
77
  "@size-limit/file": "9.0.0",
78
78
  "@internal/typescript-json-schema": "0.0.1",
79
- "@internal/bundler": "0.0.1",
80
79
  "@internal/eslint-config": "0.0.1",
80
+ "@internal/bundler": "0.0.1",
81
81
  "@internal/ts-config": "0.0.1"
82
82
  },
83
83
  "dependencies": {
84
- "@visactor/vutils": "~0.16.10",
85
- "@visactor/vdataset": "~0.16.10",
86
- "@visactor/vscale": "~0.16.10",
87
- "@visactor/vrender-core": "~0.16.15",
88
- "@visactor/vrender-kits": "~0.16.15",
89
- "@visactor/vrender-components": "~0.16.15",
90
- "@visactor/vgrammar-core": "~0.8.6",
91
- "@visactor/vgrammar-projection": "~0.8.6",
92
- "@visactor/vgrammar-wordcloud": "~0.8.6",
93
- "@visactor/vgrammar-wordcloud-shape": "~0.8.6",
94
- "@visactor/vgrammar-hierarchy": "~0.8.6",
95
- "@visactor/vgrammar-sankey": "~0.8.6",
96
- "@visactor/vgrammar-util": "~0.8.6",
97
- "@visactor/vutils-extension": "1.6.7"
84
+ "@visactor/vutils": "~0.16.14",
85
+ "@visactor/vdataset": "~0.16.14",
86
+ "@visactor/vscale": "~0.16.14",
87
+ "@visactor/vrender-core": "~0.16.16",
88
+ "@visactor/vrender-kits": "~0.16.16",
89
+ "@visactor/vrender-components": "~0.16.16",
90
+ "@visactor/vgrammar-core": "~0.9.1",
91
+ "@visactor/vgrammar-projection": "~0.9.1",
92
+ "@visactor/vgrammar-wordcloud": "~0.9.1",
93
+ "@visactor/vgrammar-wordcloud-shape": "~0.9.1",
94
+ "@visactor/vgrammar-hierarchy": "~0.9.1",
95
+ "@visactor/vgrammar-sankey": "~0.9.1",
96
+ "@visactor/vgrammar-util": "~0.9.1",
97
+ "@visactor/vutils-extension": "1.7.0-alpha.1"
98
98
  },
99
99
  "publishConfig": {
100
100
  "access": "public",
@@ -104,7 +104,7 @@
104
104
  "build:es5": "rm -rf lib && rollup -c --bundleConfigAsCjs",
105
105
  "build:schema": "schema src/typings/spec/chart.ts ISpec --useTypeOfKeyword --ignoreErrors --required > ../vchart-schema/vchart.json",
106
106
  "build:types": "tsc --declaration --emitDeclarationOnly --outDir ../vchart-types/types",
107
- "build": "bundle --clean && npm run build:schema && npm run build:types && npm run export:theme && npm run build:es5",
107
+ "build": "bundle --clean && npm run build:schema && npm run build:types && npm run build:es5",
108
108
  "build:ci": "bundle --clean",
109
109
  "build:umd": "bundle -f umd",
110
110
  "analyze": "npm run analyze-full && npm run analyze-line && npm run analyze-simple",
@@ -122,11 +122,10 @@
122
122
  "eslint:err": "eslint . --quiet",
123
123
  "test": "jest",
124
124
  "test-cov": "jest -w 16 --coverage",
125
- "test-live": "npm run test-watch __tests__/unit/theme/line.test.ts",
125
+ "test-live": "npm run test-watch __tests__/unit",
126
126
  "test-watch": "DEBUG_MODE=1 jest --watch",
127
127
  "ci": "ts-node --transpileOnly --skipProject ./scripts/trigger-test.ts",
128
128
  "build:es": "bundle --clean -f es --ignorePostTasks",
129
- "export:theme": "ts-node scripts/export-theme.ts",
130
129
  "size": "size-limit"
131
130
  }
132
131
  }
@@ -1 +0,0 @@
1
- {"version":3,"sources":["../src/model/layout-item.ts"],"names":[],"mappings":"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","file":"layout-item.js","sourcesContent":["import type { IPadding, IRect, IPoint } from '../typings';\nimport type { IBoundsLike } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isNil, isValidNumber } from '@visactor/vutils';\nimport { calcLayoutNumber, calcPadding, normalizeLayoutPaddingSpec, boundsInRect } from '../util/space';\nimport { LayoutLevel, DEFAULT_LAYOUT_RECT_LEVEL, USER_LAYOUT_RECT_LEVEL } from '../constant';\n\nimport type { ILayoutItem, ILayoutItemSpec, ILayoutPoint, ILayoutRect, ILayoutRectLevel } from './interface';\nimport { CompilableBase } from '../compile/compilable-base';\n\nexport class LayoutItem<T extends ILayoutItemSpec = ILayoutItemSpec> extends CompilableBase implements ILayoutItem {\n protected _spec: T;\n getSpec(): T {\n return this._spec || ({} as T);\n }\n\n layoutClip: boolean = false;\n\n protected _autoIndent: boolean = true;\n getAutoIndent(): boolean {\n return this._autoIndent;\n }\n\n private _layoutStartPoint: ILayoutPoint = {\n x: 0,\n y: 0\n };\n\n getLayoutStartPoint(): ILayoutPoint {\n return this._layoutStartPoint;\n }\n\n private _layoutRect: ILayoutRect = { width: 0, height: 0 };\n\n protected _minWidth: number | null = null;\n protected _maxWidth: number | null = null;\n protected _minHeight: number | null = null;\n protected _maxHeight: number | null = null;\n\n // 处理用户和逻辑的优先级覆盖,让用户也可以设置 rect\n protected _layoutRectLevelMap: ILayoutRectLevel = {\n width: DEFAULT_LAYOUT_RECT_LEVEL,\n height: DEFAULT_LAYOUT_RECT_LEVEL\n };\n /** for layout diff */\n protected _lastComputeRect: ILayoutRect = null;\n protected _lastComputeOutBounds: IBoundsLike = { x1: 0, x2: 0, y1: 0, y2: 0 };\n getLastComputeOutBounds(): IBoundsLike {\n return this._lastComputeOutBounds;\n }\n protected _forceLayoutTag: boolean = false;\n\n getLayoutRect: () => ILayoutRect = () => {\n return this._layoutRect;\n };\n\n layoutType: ILayoutItem['layoutType'] = 'normal';\n\n layoutBindRegionID!: ILayoutItem['layoutBindRegionID'];\n\n _layoutOrient: ILayoutItem['layoutOrient'] = 'left';\n get layoutOrient() {\n return this._layoutOrient;\n }\n set layoutOrient(v: ILayoutItem['layoutOrient']) {\n this._layoutOrient = v;\n }\n layoutPaddingLeft: ILayoutItem['layoutPaddingLeft'] = 0;\n layoutPaddingTop: ILayoutItem['layoutPaddingTop'] = 0;\n layoutPaddingRight: ILayoutItem['layoutPaddingRight'] = 0;\n layoutPaddingBottom: ILayoutItem['layoutPaddingBottom'] = 0;\n\n layoutOffsetX: ILayoutItem['layoutOffsetX'] = 0;\n layoutOffsetY: ILayoutItem['layoutOffsetY'] = 0;\n\n layoutLevel: ILayoutItem['layoutLevel'] = LayoutLevel.Region;\n\n // layoutAbsoluteLeft: ILayoutItem['layoutAbsoluteLeft'] = Number.NaN;\n // layoutAbsoluteTop: ILayoutItem['layoutAbsoluteTop'] = Number.NaN;\n // layoutAbsoluteRight: ILayoutItem['layoutAbsoluteRight'] = Number.NaN;\n // layoutAbsoluteBottom: ILayoutItem['layoutAbsoluteBottom'] = Number.NaN;\n layoutZIndex: ILayoutItem['layoutZIndex'] = 0;\n chartLayoutRect!: ILayoutRect;\n\n getVisible() {\n return (this._spec as unknown as any)?.visible !== false;\n }\n\n private _setLayoutAttributeFromSpec(spec: ILayoutItemSpec, chartViewRect: ILayoutRect) {\n if ((this._spec as unknown as any).visible !== false) {\n // 处理 user spec value to px;\n const padding = normalizeLayoutPaddingSpec(spec.padding);\n const paddingValue = calcPadding(padding, chartViewRect, chartViewRect);\n this.layoutPaddingLeft = paddingValue.left;\n this.layoutPaddingRight = paddingValue.right;\n this.layoutPaddingTop = paddingValue.top;\n this.layoutPaddingBottom = paddingValue.bottom;\n\n this._minHeight = isNil(spec.minHeight)\n ? null\n : calcLayoutNumber(spec.minHeight, chartViewRect.height, chartViewRect);\n this._maxHeight = isNil(spec.maxHeight)\n ? null\n : calcLayoutNumber(spec.maxHeight, chartViewRect.height, chartViewRect);\n this._minWidth = isNil(spec.minWidth)\n ? null\n : calcLayoutNumber(spec.minWidth, chartViewRect.width, chartViewRect);\n this._maxWidth = isNil(spec.maxWidth)\n ? null\n : calcLayoutNumber(spec.maxWidth, chartViewRect.width, chartViewRect);\n // 处理 user width\n if (spec.width) {\n this.setLayoutRect(\n {\n width: calcLayoutNumber(spec.width, chartViewRect.width, chartViewRect)\n },\n {\n width: USER_LAYOUT_RECT_LEVEL\n }\n );\n }\n if (spec.height) {\n this.setLayoutRect(\n {\n height: calcLayoutNumber(spec.height, chartViewRect.height, chartViewRect)\n },\n {\n height: USER_LAYOUT_RECT_LEVEL\n }\n );\n }\n\n // offset\n if (!isNil(spec.offsetX)) {\n this.layoutOffsetX = calcLayoutNumber(spec.offsetX, chartViewRect.width, chartViewRect);\n }\n if (!isNil(spec.offsetY)) {\n this.layoutOffsetY = calcLayoutNumber(spec.offsetY, chartViewRect.height, chartViewRect);\n }\n }\n }\n\n setAttrFromSpec(spec: ILayoutItemSpec, chartViewRect: ILayoutRect) {\n this.layoutType = spec.layoutType ?? this.layoutType;\n this.layoutLevel = spec.layoutLevel ?? this.layoutLevel;\n this.layoutOrient = spec.orient ?? this.layoutOrient;\n\n this._setLayoutAttributeFromSpec(spec, chartViewRect);\n\n this.layoutClip = spec.clip ?? this.layoutClip;\n this.layoutZIndex = spec.zIndex ?? this.layoutZIndex;\n }\n\n onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, _ctx: any) {\n // 在 layoutStart 时重新计算 spec 中的布局属性值,确保 resize 后,这些值保持正确的px值。\n this._setLayoutAttributeFromSpec(this._spec, viewRect);\n }\n\n private _getAbsoluteSpecValue(layoutRect: ILayoutRect) {\n const result: IPadding = { top: null, bottom: null, left: null, right: null };\n ['top', 'bottom', 'left', 'right'].forEach(k => {\n if (!isNil(this._spec[k])) {\n result[k] = calcLayoutNumber(\n this._spec[k],\n k === 'top' || k === 'bottom' ? layoutRect.height : layoutRect.width,\n layoutRect\n );\n }\n });\n return result;\n }\n\n absoluteLayoutInRect(layoutRect: IRect) {\n const { top, bottom, left, right } = this._getAbsoluteSpecValue(layoutRect);\n\n // size first\n const layoutSize = {\n width: layoutRect.width - this.layoutPaddingLeft - this.layoutPaddingRight,\n height: layoutRect.height - this.layoutPaddingTop - this.layoutPaddingBottom\n };\n if (!isNil(left)) {\n layoutSize.width -= left;\n }\n if (!isNil(right)) {\n layoutSize.width -= right;\n }\n if (!isNil(top)) {\n layoutSize.height -= top;\n }\n if (!isNil(bottom)) {\n layoutSize.height -= bottom;\n }\n\n this.setLayoutRect(layoutSize);\n const { width, height } = this.computeBoundsInRect(this.getLayoutRect());\n this.setLayoutRect({ width, height });\n const pos = { x: layoutRect.x, y: layoutRect.y };\n if (this._spec.center === true) {\n pos.x = layoutRect.x + layoutRect.width * 0.5 - width * 0.5;\n pos.y = layoutRect.y + layoutRect.height * 0.5 - height * 0.5;\n } else {\n if (!isNil(left)) {\n pos.x = layoutRect.x + left + this.layoutPaddingLeft;\n } else if (!isNil(right)) {\n pos.x = layoutRect.x + layoutRect.width - this.layoutPaddingRight - right - width;\n }\n if (!isNil(top)) {\n pos.y = layoutRect.y + top + this.layoutPaddingTop;\n } else if (!isNil(bottom)) {\n pos.y = layoutRect.y + layoutRect.height - this.layoutPaddingBottom - bottom - height;\n }\n }\n\n this.setLayoutStartPosition(pos);\n }\n\n setLayoutStartPosition({ x, y }: Partial<IPoint>): void {\n if (isValidNumber(x)) {\n this._layoutStartPoint.x = x;\n }\n if (isValidNumber(y)) {\n this._layoutStartPoint.y = y;\n }\n }\n\n setLayoutRect({ width, height }: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRectLevel>) {\n if (isValidNumber(width) && (levelMap?.width ?? DEFAULT_LAYOUT_RECT_LEVEL) >= this._layoutRectLevelMap.width) {\n this._layoutRect.width = width;\n this._layoutRectLevelMap.width = levelMap?.width ?? DEFAULT_LAYOUT_RECT_LEVEL;\n }\n\n if (isValidNumber(height) && (levelMap?.height ?? DEFAULT_LAYOUT_RECT_LEVEL) >= this._layoutRectLevelMap.height) {\n this._layoutRect.height = height;\n this._layoutRectLevelMap.height = levelMap?.height ?? DEFAULT_LAYOUT_RECT_LEVEL;\n }\n\n this._setRectInSpec(this._layoutRect);\n }\n\n mergeLayoutRect({ width, height }: ILayoutRect): ILayoutRect {\n const rect = { width, height };\n if (this._layoutRectLevelMap.width > DEFAULT_LAYOUT_RECT_LEVEL) {\n rect.width = this._layoutRect.width;\n }\n if (this._layoutRectLevelMap.height > DEFAULT_LAYOUT_RECT_LEVEL) {\n rect.height = this._layoutRect.height;\n }\n return rect;\n }\n\n getOrientPosAttribute() {\n return this._layoutOrient === 'bottom' || this._layoutOrient === 'top' ? 'x' : 'y';\n }\n getOrientSizeAttribute() {\n return this._layoutOrient === 'bottom' || this._layoutOrient === 'top' ? 'width' : 'height';\n }\n\n protected changeBoundsBySetting(bounds: IBoundsLike): IBoundsLike {\n // 用户设置了布局元素宽高的场景下,内部布局结果的 bounds 不能直接作为图表布局bounds\n if (this._layoutRectLevelMap.width > DEFAULT_LAYOUT_RECT_LEVEL) {\n bounds.x2 = bounds.x1 + this._layoutRect.width;\n }\n if (this._layoutRectLevelMap.height > DEFAULT_LAYOUT_RECT_LEVEL) {\n bounds.y2 = bounds.y1 + this._layoutRect.height;\n }\n bounds.x1 -= this._layoutStartPoint.x;\n bounds.x2 -= this._layoutStartPoint.x;\n bounds.y1 -= this._layoutStartPoint.y;\n bounds.y2 -= this._layoutStartPoint.y;\n return bounds;\n }\n\n protected _setRectInSpec(rect: ILayoutRect) {\n const result = { ...rect };\n if (this._layoutRectLevelMap.width < USER_LAYOUT_RECT_LEVEL) {\n if (!isNil(this._minWidth)) {\n result.width = Math.max(result.width, this._minWidth);\n }\n if (!isNil(this._maxWidth)) {\n result.width = Math.min(result.width, this._maxWidth);\n }\n } else {\n result.width = this._layoutRect.width;\n }\n\n if (this._layoutRectLevelMap.height < USER_LAYOUT_RECT_LEVEL) {\n if (!isNil(this._minHeight)) {\n result.height = Math.max(result.height, this._minHeight);\n }\n if (!isNil(this._maxHeight)) {\n result.height = Math.min(result.height, this._maxHeight);\n }\n } else {\n result.height = this._layoutRect.height;\n }\n return result;\n }\n\n computeBoundsInRect(rect: ILayoutRect): ILayoutRect {\n // 保留布局使用的rect\n this._lastComputeRect = rect;\n // 将布局空间限制到 spec 设置内\n // 避免操作到元素本身的 aabbbounds\n const bounds = { ...this._boundsInRect(this._setRectInSpec(rect), rect) };\n // 用户设置了布局元素宽高的场景下,内部布局结果的 bounds 不能直接作为图表布局bounds\n this.changeBoundsBySetting(bounds);\n // 保留当前模块的布局超出内容,用来处理自动缩进\n if (this._autoIndent) {\n this._lastComputeOutBounds.x1 = Math.ceil(-bounds.x1);\n this._lastComputeOutBounds.x2 = Math.ceil(bounds.x2 - rect.width);\n this._lastComputeOutBounds.y1 = Math.ceil(-bounds.y1);\n this._lastComputeOutBounds.y2 = Math.ceil(bounds.y2 - rect.height);\n }\n // 返回的布局大小也要限制到 spec 设置内\n return this._setRectInSpec(boundsInRect(bounds, rect));\n }\n\n /**\n * 实际bounds预计算方法\n * 需要在布局方法中更新 _lastComputeBounds\n * @param rect 布局最终使用的rect\n * @param fullSpace 布局可以使用的空间,用与部分模块的 position 计算\n */\n protected _boundsInRect(rect: ILayoutRect, fullSpace: ILayoutRect): IBoundsLike {\n return { x1: 0, y1: 0, x2: rect.width, y2: rect.height };\n }\n\n updateLayoutAttribute(): void {\n // do nothing\n }\n\n compile(): void {\n // do nothing\n }\n\n getGraphicBounds(): IBoundsLike {\n return {\n x1: this._layoutStartPoint.x,\n y1: this._layoutStartPoint.y,\n x2: this._layoutStartPoint.x + this._layoutRect.width,\n y2: this._layoutStartPoint.y + this._layoutRect.height\n };\n }\n}\n"]}
@@ -1,5 +0,0 @@
1
- import type { ITheme } from './interface';
2
- import type { IThemeColorScheme } from './color-scheme/interface';
3
- import type { IModelOption } from '../model/interface';
4
- export declare const mergeThemeAndGet: (path: string, currentThemeName?: string, optionTheme?: string | ITheme, specTheme?: string | ITheme, colorScheme?: IThemeColorScheme) => any;
5
- export declare const getThemeFromOption: (path: string, option: Partial<IModelOption>) => any;
package/cjs/theme/util.js DELETED
@@ -1,35 +0,0 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: !0
5
- }), exports.getThemeFromOption = exports.mergeThemeAndGet = void 0;
6
-
7
- const vutils_1 = require("@visactor/vutils"), theme_manager_1 = require("./theme-manager"), merge_spec_1 = require("../util/spec/merge-spec"), merge_theme_1 = require("../util/spec/merge-theme"), util_1 = require("./color-scheme/util"), builtin_1 = require("./builtin"), mergeThemeAndGet = (path, currentThemeName, optionTheme, specTheme, colorScheme) => (0,
8
- vutils_1.isString)(specTheme) && theme_manager_1.ThemeManager.themeExist(specTheme) ? getMergedValue(getThemeValue(path, specTheme, colorScheme)) : (0,
9
- vutils_1.isString)(optionTheme) && theme_manager_1.ThemeManager.themeExist(optionTheme) ? getMergedValue(getThemeValue(path, optionTheme, colorScheme), getThemeValue(path, specTheme, colorScheme)) : getMergedValue(getThemeValue(path, currentThemeName, colorScheme), getThemeValue(path, optionTheme, colorScheme), getThemeValue(path, specTheme, colorScheme));
10
-
11
- exports.mergeThemeAndGet = mergeThemeAndGet;
12
-
13
- const getThemeValue = (path, theme, colorScheme) => {
14
- if ((0, vutils_1.isNil)(theme)) return;
15
- let themeObject;
16
- if ((0, vutils_1.isString)(theme) && theme_manager_1.ThemeManager.themeExist(theme) ? themeObject = theme_manager_1.ThemeManager.getTheme(theme) : (0,
17
- vutils_1.isObject)(theme) && (themeObject = theme), (0, vutils_1.isNil)(themeObject)) return;
18
- const paths = path.split(".");
19
- if ("colorScheme" === path) return (0, merge_theme_1.transformColorSchemeToMerge)(themeObject.colorScheme);
20
- if ("background" === path) return (0, util_1.getActualColor)(themeObject.background, colorScheme);
21
- if (2 === paths.length && "series" === paths[0]) {
22
- const {markByName: markByName, mark: mark} = themeObject;
23
- return (0, merge_theme_1.transformSeriesThemeToMerge)((0, vutils_1.get)(themeObject, paths), paths[1], mark, markByName);
24
- }
25
- return (0, vutils_1.get)(themeObject, paths);
26
- }, getMergedValue = (...sources) => (0, merge_spec_1.mergeSpec)({}, ...sources.map((source => ({
27
- __TMP_KEY__: source
28
- })))).__TMP_KEY__, getThemeFromOption = (path, option) => {
29
- var _a, _b;
30
- const {globalTheme: globalTheme = builtin_1.defaultThemeName, optionTheme: optionTheme, specTheme: specTheme, chartLevelTheme: chartLevelTheme = builtin_1.defaultChartLevelTheme} = null !== (_b = null === (_a = option.getThemeConfig) || void 0 === _a ? void 0 : _a.call(option)) && void 0 !== _b ? _b : {};
31
- return (0, exports.mergeThemeAndGet)(path, globalTheme, optionTheme, specTheme, null == chartLevelTheme ? void 0 : chartLevelTheme.colorScheme);
32
- };
33
-
34
- exports.getThemeFromOption = getThemeFromOption;
35
- //# sourceMappingURL=util.js.map
@@ -1 +0,0 @@
1
- {"version":3,"sources":["../src/theme/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { isString, get, isObject, isNil } from '@visactor/vutils';\nimport type { ITheme } from './interface';\nimport { ThemeManager } from './theme-manager';\nimport { mergeSpec } from '../util/spec/merge-spec';\nimport { transformColorSchemeToMerge, transformSeriesThemeToMerge } from '../util/spec/merge-theme';\nimport { getActualColor } from './color-scheme/util';\nimport type { IThemeColorScheme } from './color-scheme/interface';\nimport type { IModelOption } from '../model/interface';\nimport { defaultChartLevelTheme, defaultThemeName } from './builtin';\n\n/**\n * 性能优化过的主题合并,只合并需要取用的主题部分\n * @param path 需要取用的路径\n * @param currentThemeName (低优先级)当前全局主题 name\n * @param optionTheme (中优先级)option 中设置的主题\n * @param specTheme (高优先级)spec 中设置的主题\n * @returns\n */\nexport const mergeThemeAndGet = (\n path: string,\n currentThemeName?: string,\n optionTheme?: string | ITheme,\n specTheme?: string | ITheme,\n colorScheme?: IThemeColorScheme\n) => {\n if (isString(specTheme) && ThemeManager.themeExist(specTheme)) {\n // 以 specTheme 为最底开始合并\n return getMergedValue(getThemeValue(path, specTheme, colorScheme));\n } else if (isString(optionTheme) && ThemeManager.themeExist(optionTheme)) {\n // 以 optionTheme 为最底开始合并\n return getMergedValue(getThemeValue(path, optionTheme, colorScheme), getThemeValue(path, specTheme, colorScheme));\n }\n // 以 baseTheme 为最底开始合并\n return getMergedValue(\n getThemeValue(path, currentThemeName, colorScheme),\n getThemeValue(path, optionTheme, colorScheme),\n getThemeValue(path, specTheme, colorScheme)\n );\n};\n\n/** 从 theme 取特定 path 的值,但可能会改变形式为 merge 作准备 */\nconst getThemeValue = (path: string, theme?: string | ITheme, colorScheme?: IThemeColorScheme) => {\n if (isNil(theme)) {\n return undefined;\n }\n\n let themeObject: ITheme;\n if (isString(theme) && ThemeManager.themeExist(theme)) {\n themeObject = ThemeManager.getTheme(theme);\n } else if (isObject(theme)) {\n themeObject = theme;\n }\n if (isNil(themeObject)) {\n return undefined;\n }\n\n const paths = path.split('.');\n\n const colorSchemePath: keyof ITheme = 'colorScheme';\n if (path === colorSchemePath) {\n return transformColorSchemeToMerge(themeObject.colorScheme);\n }\n const backgroundPath: keyof ITheme = 'background';\n if (path === backgroundPath) {\n return getActualColor(themeObject.background, colorScheme);\n }\n const seriesPath: keyof ITheme = 'series';\n if (paths.length === 2 && paths[0] === seriesPath) {\n const { markByName, mark } = themeObject;\n return transformSeriesThemeToMerge(get(themeObject, paths), paths[1], mark, markByName);\n }\n\n return get(themeObject, paths);\n};\n\nconst getMergedValue = (...sources: any[]) => {\n const tmpKey = '__TMP_KEY__';\n const obj = mergeSpec(\n {},\n ...sources.map(source => ({\n [tmpKey]: source\n }))\n );\n return obj[tmpKey];\n};\n\nexport const getThemeFromOption = (path: string, option: Partial<IModelOption>) => {\n const {\n globalTheme = defaultThemeName,\n optionTheme,\n specTheme,\n chartLevelTheme = defaultChartLevelTheme\n } = option.getThemeConfig?.() ?? {};\n return mergeThemeAndGet(path, globalTheme, optionTheme, specTheme, chartLevelTheme?.colorScheme);\n};\n"]}
@@ -1 +0,0 @@
1
- {"version":3,"sources":["../src/model/layout-item.ts"],"names":[],"mappings":"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","file":"layout-item.js","sourcesContent":["import type { IPadding, IRect, IPoint } from '../typings';\nimport type { IBoundsLike } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isNil, isValidNumber } from '@visactor/vutils';\nimport { calcLayoutNumber, calcPadding, normalizeLayoutPaddingSpec, boundsInRect } from '../util/space';\nimport { LayoutLevel, DEFAULT_LAYOUT_RECT_LEVEL, USER_LAYOUT_RECT_LEVEL } from '../constant';\n\nimport type { ILayoutItem, ILayoutItemSpec, ILayoutPoint, ILayoutRect, ILayoutRectLevel } from './interface';\nimport { CompilableBase } from '../compile/compilable-base';\n\nexport class LayoutItem<T extends ILayoutItemSpec = ILayoutItemSpec> extends CompilableBase implements ILayoutItem {\n protected _spec: T;\n getSpec(): T {\n return this._spec || ({} as T);\n }\n\n layoutClip: boolean = false;\n\n protected _autoIndent: boolean = true;\n getAutoIndent(): boolean {\n return this._autoIndent;\n }\n\n private _layoutStartPoint: ILayoutPoint = {\n x: 0,\n y: 0\n };\n\n getLayoutStartPoint(): ILayoutPoint {\n return this._layoutStartPoint;\n }\n\n private _layoutRect: ILayoutRect = { width: 0, height: 0 };\n\n protected _minWidth: number | null = null;\n protected _maxWidth: number | null = null;\n protected _minHeight: number | null = null;\n protected _maxHeight: number | null = null;\n\n // 处理用户和逻辑的优先级覆盖,让用户也可以设置 rect\n protected _layoutRectLevelMap: ILayoutRectLevel = {\n width: DEFAULT_LAYOUT_RECT_LEVEL,\n height: DEFAULT_LAYOUT_RECT_LEVEL\n };\n /** for layout diff */\n protected _lastComputeRect: ILayoutRect = null;\n protected _lastComputeOutBounds: IBoundsLike = { x1: 0, x2: 0, y1: 0, y2: 0 };\n getLastComputeOutBounds(): IBoundsLike {\n return this._lastComputeOutBounds;\n }\n protected _forceLayoutTag: boolean = false;\n\n getLayoutRect: () => ILayoutRect = () => {\n return this._layoutRect;\n };\n\n layoutType: ILayoutItem['layoutType'] = 'normal';\n\n layoutBindRegionID!: ILayoutItem['layoutBindRegionID'];\n\n _layoutOrient: ILayoutItem['layoutOrient'] = 'left';\n get layoutOrient() {\n return this._layoutOrient;\n }\n set layoutOrient(v: ILayoutItem['layoutOrient']) {\n this._layoutOrient = v;\n }\n layoutPaddingLeft: ILayoutItem['layoutPaddingLeft'] = 0;\n layoutPaddingTop: ILayoutItem['layoutPaddingTop'] = 0;\n layoutPaddingRight: ILayoutItem['layoutPaddingRight'] = 0;\n layoutPaddingBottom: ILayoutItem['layoutPaddingBottom'] = 0;\n\n layoutOffsetX: ILayoutItem['layoutOffsetX'] = 0;\n layoutOffsetY: ILayoutItem['layoutOffsetY'] = 0;\n\n layoutLevel: ILayoutItem['layoutLevel'] = LayoutLevel.Region;\n\n // layoutAbsoluteLeft: ILayoutItem['layoutAbsoluteLeft'] = Number.NaN;\n // layoutAbsoluteTop: ILayoutItem['layoutAbsoluteTop'] = Number.NaN;\n // layoutAbsoluteRight: ILayoutItem['layoutAbsoluteRight'] = Number.NaN;\n // layoutAbsoluteBottom: ILayoutItem['layoutAbsoluteBottom'] = Number.NaN;\n layoutZIndex: ILayoutItem['layoutZIndex'] = 0;\n chartLayoutRect!: ILayoutRect;\n\n getVisible() {\n return (this._spec as unknown as any)?.visible !== false;\n }\n\n private _setLayoutAttributeFromSpec(spec: ILayoutItemSpec, chartViewRect: ILayoutRect) {\n if ((this._spec as unknown as any).visible !== false) {\n // 处理 user spec value to px;\n const padding = normalizeLayoutPaddingSpec(spec.padding);\n const paddingValue = calcPadding(padding, chartViewRect, chartViewRect);\n this.layoutPaddingLeft = paddingValue.left;\n this.layoutPaddingRight = paddingValue.right;\n this.layoutPaddingTop = paddingValue.top;\n this.layoutPaddingBottom = paddingValue.bottom;\n\n this._minHeight = isNil(spec.minHeight)\n ? null\n : calcLayoutNumber(spec.minHeight, chartViewRect.height, chartViewRect);\n this._maxHeight = isNil(spec.maxHeight)\n ? null\n : calcLayoutNumber(spec.maxHeight, chartViewRect.height, chartViewRect);\n this._minWidth = isNil(spec.minWidth)\n ? null\n : calcLayoutNumber(spec.minWidth, chartViewRect.width, chartViewRect);\n this._maxWidth = isNil(spec.maxWidth)\n ? null\n : calcLayoutNumber(spec.maxWidth, chartViewRect.width, chartViewRect);\n // 处理 user width\n if (spec.width) {\n this.setLayoutRect(\n {\n width: calcLayoutNumber(spec.width, chartViewRect.width, chartViewRect)\n },\n {\n width: USER_LAYOUT_RECT_LEVEL\n }\n );\n }\n if (spec.height) {\n this.setLayoutRect(\n {\n height: calcLayoutNumber(spec.height, chartViewRect.height, chartViewRect)\n },\n {\n height: USER_LAYOUT_RECT_LEVEL\n }\n );\n }\n\n // offset\n if (!isNil(spec.offsetX)) {\n this.layoutOffsetX = calcLayoutNumber(spec.offsetX, chartViewRect.width, chartViewRect);\n }\n if (!isNil(spec.offsetY)) {\n this.layoutOffsetY = calcLayoutNumber(spec.offsetY, chartViewRect.height, chartViewRect);\n }\n }\n }\n\n setAttrFromSpec(spec: ILayoutItemSpec, chartViewRect: ILayoutRect) {\n this.layoutType = spec.layoutType ?? this.layoutType;\n this.layoutLevel = spec.layoutLevel ?? this.layoutLevel;\n this.layoutOrient = spec.orient ?? this.layoutOrient;\n\n this._setLayoutAttributeFromSpec(spec, chartViewRect);\n\n this.layoutClip = spec.clip ?? this.layoutClip;\n this.layoutZIndex = spec.zIndex ?? this.layoutZIndex;\n }\n\n onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, _ctx: any) {\n // 在 layoutStart 时重新计算 spec 中的布局属性值,确保 resize 后,这些值保持正确的px值。\n this._setLayoutAttributeFromSpec(this._spec, viewRect);\n }\n\n private _getAbsoluteSpecValue(layoutRect: ILayoutRect) {\n const result: IPadding = { top: null, bottom: null, left: null, right: null };\n ['top', 'bottom', 'left', 'right'].forEach(k => {\n if (!isNil(this._spec[k])) {\n result[k] = calcLayoutNumber(\n this._spec[k],\n k === 'top' || k === 'bottom' ? layoutRect.height : layoutRect.width,\n layoutRect\n );\n }\n });\n return result;\n }\n\n absoluteLayoutInRect(layoutRect: IRect) {\n const { top, bottom, left, right } = this._getAbsoluteSpecValue(layoutRect);\n\n // size first\n const layoutSize = {\n width: layoutRect.width - this.layoutPaddingLeft - this.layoutPaddingRight,\n height: layoutRect.height - this.layoutPaddingTop - this.layoutPaddingBottom\n };\n if (!isNil(left)) {\n layoutSize.width -= left;\n }\n if (!isNil(right)) {\n layoutSize.width -= right;\n }\n if (!isNil(top)) {\n layoutSize.height -= top;\n }\n if (!isNil(bottom)) {\n layoutSize.height -= bottom;\n }\n\n this.setLayoutRect(layoutSize);\n const { width, height } = this.computeBoundsInRect(this.getLayoutRect());\n this.setLayoutRect({ width, height });\n const pos = { x: layoutRect.x, y: layoutRect.y };\n if (this._spec.center === true) {\n pos.x = layoutRect.x + layoutRect.width * 0.5 - width * 0.5;\n pos.y = layoutRect.y + layoutRect.height * 0.5 - height * 0.5;\n } else {\n if (!isNil(left)) {\n pos.x = layoutRect.x + left + this.layoutPaddingLeft;\n } else if (!isNil(right)) {\n pos.x = layoutRect.x + layoutRect.width - this.layoutPaddingRight - right - width;\n }\n if (!isNil(top)) {\n pos.y = layoutRect.y + top + this.layoutPaddingTop;\n } else if (!isNil(bottom)) {\n pos.y = layoutRect.y + layoutRect.height - this.layoutPaddingBottom - bottom - height;\n }\n }\n\n this.setLayoutStartPosition(pos);\n }\n\n setLayoutStartPosition({ x, y }: Partial<IPoint>): void {\n if (isValidNumber(x)) {\n this._layoutStartPoint.x = x;\n }\n if (isValidNumber(y)) {\n this._layoutStartPoint.y = y;\n }\n }\n\n setLayoutRect({ width, height }: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRectLevel>) {\n if (isValidNumber(width) && (levelMap?.width ?? DEFAULT_LAYOUT_RECT_LEVEL) >= this._layoutRectLevelMap.width) {\n this._layoutRect.width = width;\n this._layoutRectLevelMap.width = levelMap?.width ?? DEFAULT_LAYOUT_RECT_LEVEL;\n }\n\n if (isValidNumber(height) && (levelMap?.height ?? DEFAULT_LAYOUT_RECT_LEVEL) >= this._layoutRectLevelMap.height) {\n this._layoutRect.height = height;\n this._layoutRectLevelMap.height = levelMap?.height ?? DEFAULT_LAYOUT_RECT_LEVEL;\n }\n\n this._setRectInSpec(this._layoutRect);\n }\n\n mergeLayoutRect({ width, height }: ILayoutRect): ILayoutRect {\n const rect = { width, height };\n if (this._layoutRectLevelMap.width > DEFAULT_LAYOUT_RECT_LEVEL) {\n rect.width = this._layoutRect.width;\n }\n if (this._layoutRectLevelMap.height > DEFAULT_LAYOUT_RECT_LEVEL) {\n rect.height = this._layoutRect.height;\n }\n return rect;\n }\n\n getOrientPosAttribute() {\n return this._layoutOrient === 'bottom' || this._layoutOrient === 'top' ? 'x' : 'y';\n }\n getOrientSizeAttribute() {\n return this._layoutOrient === 'bottom' || this._layoutOrient === 'top' ? 'width' : 'height';\n }\n\n protected changeBoundsBySetting(bounds: IBoundsLike): IBoundsLike {\n // 用户设置了布局元素宽高的场景下,内部布局结果的 bounds 不能直接作为图表布局bounds\n if (this._layoutRectLevelMap.width > DEFAULT_LAYOUT_RECT_LEVEL) {\n bounds.x2 = bounds.x1 + this._layoutRect.width;\n }\n if (this._layoutRectLevelMap.height > DEFAULT_LAYOUT_RECT_LEVEL) {\n bounds.y2 = bounds.y1 + this._layoutRect.height;\n }\n bounds.x1 -= this._layoutStartPoint.x;\n bounds.x2 -= this._layoutStartPoint.x;\n bounds.y1 -= this._layoutStartPoint.y;\n bounds.y2 -= this._layoutStartPoint.y;\n return bounds;\n }\n\n protected _setRectInSpec(rect: ILayoutRect) {\n const result = { ...rect };\n if (this._layoutRectLevelMap.width < USER_LAYOUT_RECT_LEVEL) {\n if (!isNil(this._minWidth)) {\n result.width = Math.max(result.width, this._minWidth);\n }\n if (!isNil(this._maxWidth)) {\n result.width = Math.min(result.width, this._maxWidth);\n }\n } else {\n result.width = this._layoutRect.width;\n }\n\n if (this._layoutRectLevelMap.height < USER_LAYOUT_RECT_LEVEL) {\n if (!isNil(this._minHeight)) {\n result.height = Math.max(result.height, this._minHeight);\n }\n if (!isNil(this._maxHeight)) {\n result.height = Math.min(result.height, this._maxHeight);\n }\n } else {\n result.height = this._layoutRect.height;\n }\n return result;\n }\n\n computeBoundsInRect(rect: ILayoutRect): ILayoutRect {\n // 保留布局使用的rect\n this._lastComputeRect = rect;\n // 将布局空间限制到 spec 设置内\n // 避免操作到元素本身的 aabbbounds\n const bounds = { ...this._boundsInRect(this._setRectInSpec(rect), rect) };\n // 用户设置了布局元素宽高的场景下,内部布局结果的 bounds 不能直接作为图表布局bounds\n this.changeBoundsBySetting(bounds);\n // 保留当前模块的布局超出内容,用来处理自动缩进\n if (this._autoIndent) {\n this._lastComputeOutBounds.x1 = Math.ceil(-bounds.x1);\n this._lastComputeOutBounds.x2 = Math.ceil(bounds.x2 - rect.width);\n this._lastComputeOutBounds.y1 = Math.ceil(-bounds.y1);\n this._lastComputeOutBounds.y2 = Math.ceil(bounds.y2 - rect.height);\n }\n // 返回的布局大小也要限制到 spec 设置内\n return this._setRectInSpec(boundsInRect(bounds, rect));\n }\n\n /**\n * 实际bounds预计算方法\n * 需要在布局方法中更新 _lastComputeBounds\n * @param rect 布局最终使用的rect\n * @param fullSpace 布局可以使用的空间,用与部分模块的 position 计算\n */\n protected _boundsInRect(rect: ILayoutRect, fullSpace: ILayoutRect): IBoundsLike {\n return { x1: 0, y1: 0, x2: rect.width, y2: rect.height };\n }\n\n updateLayoutAttribute(): void {\n // do nothing\n }\n\n compile(): void {\n // do nothing\n }\n\n getGraphicBounds(): IBoundsLike {\n return {\n x1: this._layoutStartPoint.x,\n y1: this._layoutStartPoint.y,\n x2: this._layoutStartPoint.x + this._layoutRect.width,\n y2: this._layoutStartPoint.y + this._layoutRect.height\n };\n }\n}\n"]}
@@ -1,5 +0,0 @@
1
- import type { ITheme } from './interface';
2
- import type { IThemeColorScheme } from './color-scheme/interface';
3
- import type { IModelOption } from '../model/interface';
4
- export declare const mergeThemeAndGet: (path: string, currentThemeName?: string, optionTheme?: string | ITheme, specTheme?: string | ITheme, colorScheme?: IThemeColorScheme) => any;
5
- export declare const getThemeFromOption: (path: string, option: Partial<IModelOption>) => any;
package/esm/theme/util.js DELETED
@@ -1,37 +0,0 @@
1
- import { isString, get, isObject, isNil } from "@visactor/vutils";
2
-
3
- import { ThemeManager } from "./theme-manager";
4
-
5
- import { mergeSpec } from "../util/spec/merge-spec";
6
-
7
- import { transformColorSchemeToMerge, transformSeriesThemeToMerge } from "../util/spec/merge-theme";
8
-
9
- import { getActualColor } from "./color-scheme/util";
10
-
11
- import { defaultChartLevelTheme, defaultThemeName } from "./builtin";
12
-
13
- export const mergeThemeAndGet = (path, currentThemeName, optionTheme, specTheme, colorScheme) => isString(specTheme) && ThemeManager.themeExist(specTheme) ? getMergedValue(getThemeValue(path, specTheme, colorScheme)) : isString(optionTheme) && ThemeManager.themeExist(optionTheme) ? getMergedValue(getThemeValue(path, optionTheme, colorScheme), getThemeValue(path, specTheme, colorScheme)) : getMergedValue(getThemeValue(path, currentThemeName, colorScheme), getThemeValue(path, optionTheme, colorScheme), getThemeValue(path, specTheme, colorScheme));
14
-
15
- const getThemeValue = (path, theme, colorScheme) => {
16
- if (isNil(theme)) return;
17
- let themeObject;
18
- if (isString(theme) && ThemeManager.themeExist(theme) ? themeObject = ThemeManager.getTheme(theme) : isObject(theme) && (themeObject = theme),
19
- isNil(themeObject)) return;
20
- const paths = path.split(".");
21
- if ("colorScheme" === path) return transformColorSchemeToMerge(themeObject.colorScheme);
22
- if ("background" === path) return getActualColor(themeObject.background, colorScheme);
23
- if (2 === paths.length && "series" === paths[0]) {
24
- const {markByName: markByName, mark: mark} = themeObject;
25
- return transformSeriesThemeToMerge(get(themeObject, paths), paths[1], mark, markByName);
26
- }
27
- return get(themeObject, paths);
28
- }, getMergedValue = (...sources) => mergeSpec({}, ...sources.map((source => ({
29
- __TMP_KEY__: source
30
- })))).__TMP_KEY__;
31
-
32
- export const getThemeFromOption = (path, option) => {
33
- var _a, _b;
34
- const {globalTheme: globalTheme = defaultThemeName, optionTheme: optionTheme, specTheme: specTheme, chartLevelTheme: chartLevelTheme = defaultChartLevelTheme} = null !== (_b = null === (_a = option.getThemeConfig) || void 0 === _a ? void 0 : _a.call(option)) && void 0 !== _b ? _b : {};
35
- return mergeThemeAndGet(path, globalTheme, optionTheme, specTheme, null == chartLevelTheme ? void 0 : chartLevelTheme.colorScheme);
36
- };
37
- //# sourceMappingURL=util.js.map
@@ -1 +0,0 @@
1
- {"version":3,"sources":["../src/theme/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { isString, get, isObject, isNil } from '@visactor/vutils';\nimport type { ITheme } from './interface';\nimport { ThemeManager } from './theme-manager';\nimport { mergeSpec } from '../util/spec/merge-spec';\nimport { transformColorSchemeToMerge, transformSeriesThemeToMerge } from '../util/spec/merge-theme';\nimport { getActualColor } from './color-scheme/util';\nimport type { IThemeColorScheme } from './color-scheme/interface';\nimport type { IModelOption } from '../model/interface';\nimport { defaultChartLevelTheme, defaultThemeName } from './builtin';\n\n/**\n * 性能优化过的主题合并,只合并需要取用的主题部分\n * @param path 需要取用的路径\n * @param currentThemeName (低优先级)当前全局主题 name\n * @param optionTheme (中优先级)option 中设置的主题\n * @param specTheme (高优先级)spec 中设置的主题\n * @returns\n */\nexport const mergeThemeAndGet = (\n path: string,\n currentThemeName?: string,\n optionTheme?: string | ITheme,\n specTheme?: string | ITheme,\n colorScheme?: IThemeColorScheme\n) => {\n if (isString(specTheme) && ThemeManager.themeExist(specTheme)) {\n // 以 specTheme 为最底开始合并\n return getMergedValue(getThemeValue(path, specTheme, colorScheme));\n } else if (isString(optionTheme) && ThemeManager.themeExist(optionTheme)) {\n // 以 optionTheme 为最底开始合并\n return getMergedValue(getThemeValue(path, optionTheme, colorScheme), getThemeValue(path, specTheme, colorScheme));\n }\n // 以 baseTheme 为最底开始合并\n return getMergedValue(\n getThemeValue(path, currentThemeName, colorScheme),\n getThemeValue(path, optionTheme, colorScheme),\n getThemeValue(path, specTheme, colorScheme)\n );\n};\n\n/** 从 theme 取特定 path 的值,但可能会改变形式为 merge 作准备 */\nconst getThemeValue = (path: string, theme?: string | ITheme, colorScheme?: IThemeColorScheme) => {\n if (isNil(theme)) {\n return undefined;\n }\n\n let themeObject: ITheme;\n if (isString(theme) && ThemeManager.themeExist(theme)) {\n themeObject = ThemeManager.getTheme(theme);\n } else if (isObject(theme)) {\n themeObject = theme;\n }\n if (isNil(themeObject)) {\n return undefined;\n }\n\n const paths = path.split('.');\n\n const colorSchemePath: keyof ITheme = 'colorScheme';\n if (path === colorSchemePath) {\n return transformColorSchemeToMerge(themeObject.colorScheme);\n }\n const backgroundPath: keyof ITheme = 'background';\n if (path === backgroundPath) {\n return getActualColor(themeObject.background, colorScheme);\n }\n const seriesPath: keyof ITheme = 'series';\n if (paths.length === 2 && paths[0] === seriesPath) {\n const { markByName, mark } = themeObject;\n return transformSeriesThemeToMerge(get(themeObject, paths), paths[1], mark, markByName);\n }\n\n return get(themeObject, paths);\n};\n\nconst getMergedValue = (...sources: any[]) => {\n const tmpKey = '__TMP_KEY__';\n const obj = mergeSpec(\n {},\n ...sources.map(source => ({\n [tmpKey]: source\n }))\n );\n return obj[tmpKey];\n};\n\nexport const getThemeFromOption = (path: string, option: Partial<IModelOption>) => {\n const {\n globalTheme = defaultThemeName,\n optionTheme,\n specTheme,\n chartLevelTheme = defaultChartLevelTheme\n } = option.getThemeConfig?.() ?? {};\n return mergeThemeAndGet(path, globalTheme, optionTheme, specTheme, chartLevelTheme?.colorScheme);\n};\n"]}