@visactor/vchart 0.0.1-alpha.2 → 1.0.0-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (896) hide show
  1. package/README.md +82 -1
  2. package/build/index.js +2680 -2068
  3. package/build/index.min.js +2 -2
  4. package/cjs/animation/utils.d.ts +2 -1
  5. package/cjs/animation/utils.js.map +1 -1
  6. package/cjs/chart/base-chart.js +2 -2
  7. package/cjs/chart/base-chart.js.map +1 -1
  8. package/cjs/chart/{boxplot/boxPlot.js → box-plot/box-plot.js} +1 -1
  9. package/cjs/chart/box-plot/box-plot.js.map +1 -0
  10. package/{esm/chart/boxplot → cjs/chart/box-plot}/index.d.ts +1 -1
  11. package/cjs/chart/{boxplot → box-plot}/index.js +1 -1
  12. package/cjs/chart/box-plot/index.js.map +1 -0
  13. package/cjs/chart/box-plot/interface.js.map +1 -0
  14. package/cjs/chart/index.d.ts +3 -1
  15. package/cjs/chart/index.js +2 -1
  16. package/cjs/chart/index.js.map +1 -1
  17. package/cjs/chart/treemap/treemap.js.map +1 -1
  18. package/cjs/compile/compilable-base.js +1 -1
  19. package/cjs/compile/compiler.d.ts +2 -2
  20. package/cjs/compile/compiler.js +24 -25
  21. package/cjs/compile/compiler.js.map +1 -1
  22. package/cjs/compile/grammar-item.js +1 -1
  23. package/cjs/compile/mark/interface.js.map +1 -1
  24. package/cjs/compile/util.js +1 -1
  25. package/cjs/component/axis/base-axis.d.ts +70 -1
  26. package/cjs/component/axis/base-axis.js +93 -4
  27. package/cjs/component/axis/base-axis.js.map +1 -1
  28. package/cjs/component/axis/cartesian/axis.d.ts +0 -1
  29. package/cjs/component/axis/cartesian/axis.js +3 -6
  30. package/cjs/component/axis/cartesian/axis.js.map +1 -1
  31. package/cjs/component/axis/polar/axis.d.ts +0 -1
  32. package/cjs/component/axis/polar/axis.js +3 -6
  33. package/cjs/component/axis/polar/axis.js.map +1 -1
  34. package/cjs/component/axis/utils.d.ts +13 -70
  35. package/cjs/component/axis/utils.js +23 -109
  36. package/cjs/component/axis/utils.js.map +1 -1
  37. package/cjs/component/base/base-component.d.ts +0 -5
  38. package/cjs/component/base/base-component.js +8 -19
  39. package/cjs/component/base/base-component.js.map +1 -1
  40. package/cjs/component/base/util.d.ts +1 -1
  41. package/cjs/component/base/util.js +20 -9
  42. package/cjs/component/base/util.js.map +1 -1
  43. package/cjs/component/crosshair/base.d.ts +0 -1
  44. package/cjs/component/crosshair/base.js +1 -4
  45. package/cjs/component/crosshair/base.js.map +1 -1
  46. package/cjs/component/custom-mark/custom-mark.js +4 -1
  47. package/cjs/component/custom-mark/custom-mark.js.map +1 -1
  48. package/cjs/component/data-zoom/data-filter-base-component.d.ts +1 -1
  49. package/cjs/component/data-zoom/data-filter-base-component.js +2 -2
  50. package/cjs/component/data-zoom/data-filter-base-component.js.map +1 -1
  51. package/cjs/component/index.js +1 -1
  52. package/cjs/component/interface/index.d.ts +1 -0
  53. package/cjs/component/interface/index.js +1 -1
  54. package/cjs/component/interface/index.js.map +1 -1
  55. package/cjs/component/interface/theme.d.ts +38 -0
  56. package/cjs/component/interface/theme.js +6 -0
  57. package/cjs/component/interface/theme.js.map +1 -0
  58. package/cjs/component/label/label.d.ts +0 -1
  59. package/cjs/component/label/label.js +12 -6
  60. package/cjs/component/label/label.js.map +1 -1
  61. package/cjs/component/legend/base-legend.js +5 -2
  62. package/cjs/component/legend/base-legend.js.map +1 -1
  63. package/cjs/component/legend/continuous/legend.d.ts +1 -1
  64. package/cjs/component/legend/continuous/legend.js +2 -2
  65. package/cjs/component/legend/continuous/legend.js.map +1 -1
  66. package/cjs/component/legend/discrete/legend.d.ts +1 -1
  67. package/cjs/component/legend/discrete/legend.js +2 -2
  68. package/cjs/component/legend/discrete/legend.js.map +1 -1
  69. package/cjs/component/legend/util.d.ts +4 -4
  70. package/cjs/component/map-label/component.js +2 -2
  71. package/cjs/component/map-label/component.js.map +1 -1
  72. package/cjs/component/map-label/interface.d.ts +6 -4
  73. package/cjs/component/map-label/interface.js.map +1 -1
  74. package/cjs/component/marker/utils.js +14 -9
  75. package/cjs/component/marker/utils.js.map +1 -1
  76. package/cjs/component/player/interface/theme.d.ts +2 -1
  77. package/cjs/component/player/interface/theme.js.map +1 -1
  78. package/cjs/component/player/player.d.ts +0 -1
  79. package/cjs/component/player/player.js +0 -3
  80. package/cjs/component/player/player.js.map +1 -1
  81. package/cjs/component/player/utils/transform.js.map +1 -1
  82. package/cjs/component/title/interface/theme.d.ts +4 -2
  83. package/cjs/component/title/interface/theme.js.map +1 -1
  84. package/cjs/component/title/title.d.ts +1 -1
  85. package/cjs/component/title/title.js +4 -6
  86. package/cjs/component/title/title.js.map +1 -1
  87. package/cjs/component/tooltip/handler/base.d.ts +5 -3
  88. package/cjs/component/tooltip/handler/base.js +9 -8
  89. package/cjs/component/tooltip/handler/base.js.map +1 -1
  90. package/cjs/component/tooltip/handler/canvas/canvas-tooltip-handler.d.ts +4 -5
  91. package/cjs/component/tooltip/handler/canvas/canvas-tooltip-handler.js +4 -4
  92. package/cjs/component/tooltip/handler/canvas/canvas-tooltip-handler.js.map +1 -1
  93. package/cjs/component/tooltip/handler/dom/dom-tooltip-handler.d.ts +2 -4
  94. package/cjs/component/tooltip/handler/dom/dom-tooltip-handler.js +2 -2
  95. package/cjs/component/tooltip/handler/dom/dom-tooltip-handler.js.map +1 -1
  96. package/cjs/component/tooltip/handler/dom/model/base-tooltip-model.d.ts +1 -1
  97. package/cjs/component/tooltip/tooltip.js +1 -1
  98. package/cjs/component/tooltip/tooltip.js.map +1 -1
  99. package/cjs/constant/box-plot.js +1 -2
  100. package/cjs/constant/label.js +2 -1
  101. package/cjs/core/factory.d.ts +1 -0
  102. package/cjs/core/factory.js +3 -0
  103. package/cjs/core/factory.js.map +1 -1
  104. package/cjs/core/instance-manager.d.ts +9 -0
  105. package/cjs/core/instance-manager.js +26 -0
  106. package/cjs/core/instance-manager.js.map +1 -0
  107. package/cjs/core/interface.js +1 -2
  108. package/cjs/core/vchart.d.ts +2 -6
  109. package/cjs/core/vchart.js +10 -23
  110. package/cjs/core/vchart.js.map +1 -1
  111. package/cjs/event/event.js +2 -1
  112. package/cjs/index.d.ts +1 -1
  113. package/cjs/index.js +1 -1
  114. package/cjs/index.js.map +1 -1
  115. package/cjs/mark/arc.d.ts +1 -1
  116. package/cjs/mark/arc.js +4 -3
  117. package/cjs/mark/arc.js.map +1 -1
  118. package/cjs/mark/area.d.ts +3 -2
  119. package/cjs/mark/area.js +8 -4
  120. package/cjs/mark/area.js.map +1 -1
  121. package/cjs/mark/base/base-mark.js +2 -1
  122. package/cjs/mark/base/base-mark.js.map +1 -1
  123. package/cjs/mark/base/index.d.ts +1 -2
  124. package/cjs/mark/base/index.js +1 -10
  125. package/cjs/mark/base/index.js.map +1 -1
  126. package/{esm/mark/boxPlot.d.ts → cjs/mark/box-plot.d.ts} +1 -1
  127. package/cjs/mark/{boxPlot.js → box-plot.js} +3 -3
  128. package/{esm/mark/boxPlot.js.map → cjs/mark/box-plot.js.map} +1 -1
  129. package/cjs/mark/component.d.ts +1 -1
  130. package/cjs/mark/component.js +2 -2
  131. package/cjs/mark/component.js.map +1 -1
  132. package/cjs/mark/line.d.ts +1 -1
  133. package/cjs/mark/line.js +2 -2
  134. package/cjs/mark/line.js.map +1 -1
  135. package/cjs/mark/linkPath.d.ts +1 -1
  136. package/cjs/mark/linkPath.js +4 -3
  137. package/cjs/mark/linkPath.js.map +1 -1
  138. package/cjs/mark/mark-set/index.d.ts +6 -5
  139. package/cjs/mark/mark-set/index.js +15 -12
  140. package/cjs/mark/mark-set/index.js.map +1 -1
  141. package/cjs/mark/path.d.ts +1 -1
  142. package/cjs/mark/path.js +2 -2
  143. package/cjs/mark/path.js.map +1 -1
  144. package/cjs/mark/polygon.d.ts +1 -1
  145. package/cjs/mark/polygon.js +3 -3
  146. package/cjs/mark/polygon.js.map +1 -1
  147. package/cjs/mark/progress-arc.js +1 -1
  148. package/cjs/mark/rect.d.ts +1 -1
  149. package/cjs/mark/rect.js +6 -5
  150. package/cjs/mark/rect.js.map +1 -1
  151. package/cjs/mark/rule.d.ts +1 -1
  152. package/cjs/mark/rule.js +3 -3
  153. package/cjs/mark/rule.js.map +1 -1
  154. package/cjs/mark/symbol.d.ts +1 -1
  155. package/cjs/mark/symbol.js +5 -4
  156. package/cjs/mark/symbol.js.map +1 -1
  157. package/cjs/mark/text.d.ts +1 -1
  158. package/cjs/mark/text.js +5 -4
  159. package/cjs/mark/text.js.map +1 -1
  160. package/cjs/model/base-model.d.ts +12 -5
  161. package/cjs/model/base-model.js +52 -29
  162. package/cjs/model/base-model.js.map +1 -1
  163. package/cjs/model/interface.d.ts +8 -2
  164. package/cjs/model/interface.js.map +1 -1
  165. package/cjs/model/layout-item.js +20 -18
  166. package/cjs/model/layout-item.js.map +1 -1
  167. package/cjs/region/region.d.ts +1 -4
  168. package/cjs/region/region.js +16 -13
  169. package/cjs/region/region.js.map +1 -1
  170. package/cjs/scale/color-ordinal-scale.d.ts +8 -0
  171. package/cjs/scale/color-ordinal-scale.js +24 -0
  172. package/cjs/scale/color-ordinal-scale.js.map +1 -0
  173. package/cjs/scale/global-scale.js +2 -1
  174. package/cjs/scale/global-scale.js.map +1 -1
  175. package/cjs/series/area/area.d.ts +2 -0
  176. package/cjs/series/area/area.js +15 -9
  177. package/cjs/series/area/area.js.map +1 -1
  178. package/cjs/series/area/interface.d.ts +5 -5
  179. package/cjs/series/area/interface.js.map +1 -1
  180. package/cjs/series/bar/bar.d.ts +6 -0
  181. package/cjs/series/bar/bar.js +24 -8
  182. package/cjs/series/bar/bar.js.map +1 -1
  183. package/cjs/series/bar/interface.d.ts +5 -4
  184. package/cjs/series/bar/interface.js.map +1 -1
  185. package/cjs/series/base/base-series.d.ts +10 -11
  186. package/cjs/series/base/base-series.js +53 -31
  187. package/cjs/series/base/base-series.js.map +1 -1
  188. package/{esm/series/box-plot/boxPlot.d.ts → cjs/series/box-plot/box-plot.d.ts} +2 -0
  189. package/cjs/series/box-plot/{boxPlot.js → box-plot.js} +16 -6
  190. package/cjs/series/box-plot/box-plot.js.map +1 -0
  191. package/cjs/series/box-plot/interface.d.ts +3 -2
  192. package/cjs/series/box-plot/interface.js.map +1 -1
  193. package/cjs/series/box-plot/tooltip-helper.js.map +1 -1
  194. package/cjs/series/cartesian/cartesian.d.ts +1 -1
  195. package/cjs/series/circle-packing/circle-packing.d.ts +2 -0
  196. package/cjs/series/circle-packing/circle-packing.js +13 -8
  197. package/cjs/series/circle-packing/circle-packing.js.map +1 -1
  198. package/cjs/series/circle-packing/interface.d.ts +5 -4
  199. package/cjs/series/circle-packing/interface.js.map +1 -1
  200. package/cjs/series/dot/dot.d.ts +6 -8
  201. package/cjs/series/dot/dot.js +43 -17
  202. package/cjs/series/dot/dot.js.map +1 -1
  203. package/cjs/series/dot/interface.d.ts +10 -10
  204. package/cjs/series/dot/interface.js.map +1 -1
  205. package/cjs/series/funnel/funnel.d.ts +12 -2
  206. package/cjs/series/funnel/funnel.js +84 -23
  207. package/cjs/series/funnel/funnel.js.map +1 -1
  208. package/cjs/series/funnel/interface.d.ts +16 -15
  209. package/cjs/series/funnel/interface.js.map +1 -1
  210. package/cjs/series/gauge/gauge-pointer.d.ts +2 -0
  211. package/cjs/series/gauge/gauge-pointer.js +22 -6
  212. package/cjs/series/gauge/gauge-pointer.js.map +1 -1
  213. package/cjs/series/gauge/gauge.d.ts +3 -2
  214. package/cjs/series/gauge/gauge.js +26 -17
  215. package/cjs/series/gauge/gauge.js.map +1 -1
  216. package/cjs/series/gauge/interface.d.ts +12 -11
  217. package/cjs/series/gauge/interface.js.map +1 -1
  218. package/cjs/series/heatmap/heatmap.d.ts +3 -1
  219. package/cjs/series/heatmap/heatmap.js +18 -9
  220. package/cjs/series/heatmap/heatmap.js.map +1 -1
  221. package/cjs/series/heatmap/interface.d.ts +6 -5
  222. package/cjs/series/heatmap/interface.js.map +1 -1
  223. package/cjs/series/interface/common.d.ts +56 -1
  224. package/cjs/series/interface/common.js +24 -1
  225. package/cjs/series/interface/common.js.map +1 -1
  226. package/cjs/series/interface/series.d.ts +2 -1
  227. package/cjs/series/interface/series.js.map +1 -1
  228. package/cjs/series/line/line.d.ts +2 -0
  229. package/cjs/series/line/line.js +7 -5
  230. package/cjs/series/line/line.js.map +1 -1
  231. package/cjs/series/link/interface.d.ts +4 -4
  232. package/cjs/series/link/interface.js.map +1 -1
  233. package/cjs/series/link/link.d.ts +4 -7
  234. package/cjs/series/link/link.js +20 -14
  235. package/cjs/series/link/link.js.map +1 -1
  236. package/cjs/series/map/map.d.ts +2 -0
  237. package/cjs/series/map/map.js +13 -6
  238. package/cjs/series/map/map.js.map +1 -1
  239. package/cjs/series/mixin/line-mixin.d.ts +4 -3
  240. package/cjs/series/mixin/line-mixin.js +15 -7
  241. package/cjs/series/mixin/line-mixin.js.map +1 -1
  242. package/cjs/series/pie/interface.d.ts +7 -6
  243. package/cjs/series/pie/interface.js.map +1 -1
  244. package/cjs/series/pie/pie.d.ts +8 -3
  245. package/cjs/series/pie/pie.js +61 -33
  246. package/cjs/series/pie/pie.js.map +1 -1
  247. package/cjs/series/progress/circular/circular.d.ts +2 -0
  248. package/cjs/series/progress/circular/circular.js +16 -9
  249. package/cjs/series/progress/circular/circular.js.map +1 -1
  250. package/cjs/series/progress/circular/interface.d.ts +5 -4
  251. package/cjs/series/progress/circular/interface.js.map +1 -1
  252. package/cjs/series/progress/linear/interface.d.ts +6 -5
  253. package/cjs/series/progress/linear/interface.js.map +1 -1
  254. package/cjs/series/progress/linear/linear.d.ts +2 -0
  255. package/cjs/series/progress/linear/linear.js +31 -21
  256. package/cjs/series/progress/linear/linear.js.map +1 -1
  257. package/cjs/series/radar/interface.d.ts +5 -4
  258. package/cjs/series/radar/interface.js.map +1 -1
  259. package/cjs/series/radar/radar.d.ts +2 -0
  260. package/cjs/series/radar/radar.js +9 -4
  261. package/cjs/series/radar/radar.js.map +1 -1
  262. package/cjs/series/range-area/range-area.d.ts +2 -0
  263. package/cjs/series/range-area/range-area.js +4 -3
  264. package/cjs/series/range-area/range-area.js.map +1 -1
  265. package/cjs/series/range-column/interface.d.ts +9 -8
  266. package/cjs/series/range-column/interface.js.map +1 -1
  267. package/cjs/series/range-column/rangeColumn.d.ts +2 -0
  268. package/cjs/series/range-column/rangeColumn.js +28 -19
  269. package/cjs/series/range-column/rangeColumn.js.map +1 -1
  270. package/cjs/series/rose/interface.d.ts +3 -2
  271. package/cjs/series/rose/interface.js.map +1 -1
  272. package/cjs/series/rose/rose.d.ts +2 -0
  273. package/cjs/series/rose/rose.js +14 -13
  274. package/cjs/series/rose/rose.js.map +1 -1
  275. package/cjs/series/sankey/animation.js.map +1 -1
  276. package/cjs/series/sankey/interface.d.ts +7 -6
  277. package/cjs/series/sankey/interface.js.map +1 -1
  278. package/cjs/series/sankey/sankey.d.ts +2 -0
  279. package/cjs/series/sankey/sankey.js +25 -22
  280. package/cjs/series/sankey/sankey.js.map +1 -1
  281. package/cjs/series/scatter/interface.d.ts +6 -5
  282. package/cjs/series/scatter/interface.js.map +1 -1
  283. package/cjs/series/scatter/scatter.d.ts +2 -0
  284. package/cjs/series/scatter/scatter.js +15 -10
  285. package/cjs/series/scatter/scatter.js.map +1 -1
  286. package/cjs/series/sunburst/interface.d.ts +5 -4
  287. package/cjs/series/sunburst/interface.js.map +1 -1
  288. package/cjs/series/sunburst/sunburst.d.ts +3 -1
  289. package/cjs/series/sunburst/sunburst.js +9 -4
  290. package/cjs/series/sunburst/sunburst.js.map +1 -1
  291. package/cjs/series/treemap/interface.d.ts +9 -8
  292. package/cjs/series/treemap/interface.js.map +1 -1
  293. package/cjs/series/treemap/treemap.d.ts +2 -0
  294. package/cjs/series/treemap/treemap.js +19 -6
  295. package/cjs/series/treemap/treemap.js.map +1 -1
  296. package/cjs/series/waterfall/interface.d.ts +6 -5
  297. package/cjs/series/waterfall/interface.js.map +1 -1
  298. package/cjs/series/waterfall/waterfall.d.ts +2 -0
  299. package/cjs/series/waterfall/waterfall.js +15 -5
  300. package/cjs/series/waterfall/waterfall.js.map +1 -1
  301. package/cjs/series/word-cloud/interface.d.ts +7 -6
  302. package/cjs/series/word-cloud/interface.js.map +1 -1
  303. package/cjs/series/word-cloud/word-cloud.d.ts +4 -3
  304. package/cjs/series/word-cloud/word-cloud.js +22 -11
  305. package/cjs/series/word-cloud/word-cloud.js.map +1 -1
  306. package/cjs/theme/buildin-theme/config.d.ts +1 -4
  307. package/cjs/theme/buildin-theme/config.js +2 -18
  308. package/cjs/theme/buildin-theme/config.js.map +1 -1
  309. package/cjs/theme/buildin-theme/dark.js.map +1 -1
  310. package/cjs/theme/buildin-theme/light/color-scheme.js +14 -1
  311. package/cjs/theme/buildin-theme/light/color-scheme.js.map +1 -1
  312. package/cjs/theme/buildin-theme/light/component/axis/band-axis.d.ts +2 -0
  313. package/cjs/theme/buildin-theme/light/component/axis/band-axis.js +22 -0
  314. package/cjs/theme/buildin-theme/light/component/axis/band-axis.js.map +1 -0
  315. package/cjs/theme/buildin-theme/light/component/{cartesian-axis.d.ts → axis/cartesian-axis.d.ts} +1 -1
  316. package/cjs/theme/buildin-theme/light/component/{cartesian-axis.js → axis/cartesian-axis.js} +7 -9
  317. package/cjs/theme/buildin-theme/light/component/axis/cartesian-axis.js.map +1 -0
  318. package/cjs/theme/buildin-theme/light/component/axis/common-axis.d.ts +2 -0
  319. package/cjs/theme/buildin-theme/light/component/{common-axis.js → axis/common-axis.js} +32 -14
  320. package/cjs/theme/buildin-theme/light/component/axis/common-axis.js.map +1 -0
  321. package/cjs/theme/buildin-theme/light/component/axis/linear-axis.d.ts +2 -0
  322. package/cjs/theme/buildin-theme/light/component/axis/linear-axis.js +22 -0
  323. package/cjs/theme/buildin-theme/light/component/axis/linear-axis.js.map +1 -0
  324. package/cjs/theme/buildin-theme/light/component/{polar-axis.d.ts → axis/polar-axis.d.ts} +1 -1
  325. package/cjs/theme/buildin-theme/light/component/axis/polar-axis.js +25 -0
  326. package/cjs/theme/buildin-theme/light/component/axis/polar-axis.js.map +1 -0
  327. package/cjs/theme/buildin-theme/light/component/crosshair.js +9 -5
  328. package/cjs/theme/buildin-theme/light/component/crosshair.js.map +1 -1
  329. package/cjs/theme/buildin-theme/light/component/index.d.ts +2 -0
  330. package/cjs/theme/buildin-theme/light/component/index.js +32 -0
  331. package/cjs/theme/buildin-theme/light/component/index.js.map +1 -0
  332. package/cjs/theme/buildin-theme/light/component/legend/color-legend.d.ts +2 -0
  333. package/cjs/theme/buildin-theme/light/component/{color-legend.js → legend/color-legend.js} +3 -3
  334. package/cjs/theme/buildin-theme/light/component/legend/color-legend.js.map +1 -0
  335. package/cjs/theme/buildin-theme/light/component/legend/continuous.d.ts +2 -0
  336. package/cjs/theme/buildin-theme/light/component/legend/continuous.js +60 -0
  337. package/cjs/theme/buildin-theme/light/component/legend/continuous.js.map +1 -0
  338. package/cjs/theme/buildin-theme/light/component/legend/discrete-legend.d.ts +2 -0
  339. package/cjs/theme/buildin-theme/light/component/{discrete-legend.js → legend/discrete-legend.js} +17 -6
  340. package/cjs/theme/buildin-theme/light/component/legend/discrete-legend.js.map +1 -0
  341. package/cjs/theme/buildin-theme/light/component/legend/size-legend.d.ts +2 -0
  342. package/cjs/theme/buildin-theme/light/component/{size-legend.js → legend/size-legend.js} +3 -3
  343. package/cjs/theme/buildin-theme/light/component/legend/size-legend.js.map +1 -0
  344. package/cjs/theme/buildin-theme/light/component/map-label.d.ts +2 -0
  345. package/cjs/{component/map-label/config.js → theme/buildin-theme/light/component/map-label.js} +8 -8
  346. package/cjs/theme/buildin-theme/light/component/map-label.js.map +1 -0
  347. package/cjs/theme/buildin-theme/light/component/player.js +20 -11
  348. package/cjs/theme/buildin-theme/light/component/player.js.map +1 -1
  349. package/cjs/theme/buildin-theme/light/component/title.js +19 -3
  350. package/cjs/theme/buildin-theme/light/component/title.js.map +1 -1
  351. package/cjs/theme/buildin-theme/light/component/tooltip.js +7 -3
  352. package/cjs/theme/buildin-theme/light/component/tooltip.js.map +1 -1
  353. package/cjs/theme/buildin-theme/light/constants.d.ts +2 -0
  354. package/cjs/theme/buildin-theme/light/constants.js +16 -0
  355. package/cjs/theme/buildin-theme/light/constants.js.map +1 -0
  356. package/cjs/theme/buildin-theme/light/index.js +5 -20
  357. package/cjs/theme/buildin-theme/light/index.js.map +1 -1
  358. package/cjs/theme/buildin-theme/light/mark.d.ts +3 -0
  359. package/cjs/theme/buildin-theme/light/mark.js +72 -0
  360. package/cjs/theme/buildin-theme/light/mark.js.map +1 -0
  361. package/cjs/theme/buildin-theme/light/series/area.js +2 -12
  362. package/cjs/theme/buildin-theme/light/series/area.js.map +1 -1
  363. package/cjs/theme/buildin-theme/light/series/bar.js +2 -2
  364. package/cjs/theme/buildin-theme/light/series/bar.js.map +1 -1
  365. package/cjs/theme/buildin-theme/light/series/bar3d.js +2 -2
  366. package/cjs/theme/buildin-theme/light/series/bar3d.js.map +1 -1
  367. package/cjs/theme/buildin-theme/light/series/box-plot.d.ts +2 -0
  368. package/cjs/theme/buildin-theme/light/series/box-plot.js +12 -0
  369. package/cjs/theme/buildin-theme/light/series/box-plot.js.map +1 -0
  370. package/cjs/theme/buildin-theme/light/series/circular-progress.js +11 -1
  371. package/cjs/theme/buildin-theme/light/series/circular-progress.js.map +1 -1
  372. package/cjs/theme/buildin-theme/light/series/funnel.js +8 -5
  373. package/cjs/theme/buildin-theme/light/series/funnel.js.map +1 -1
  374. package/cjs/theme/buildin-theme/light/series/funnel3d.js +9 -6
  375. package/cjs/theme/buildin-theme/light/series/funnel3d.js.map +1 -1
  376. package/cjs/theme/buildin-theme/light/series/gauge.js +6 -1
  377. package/cjs/theme/buildin-theme/light/series/gauge.js.map +1 -1
  378. package/cjs/theme/buildin-theme/light/series/index.js +5 -2
  379. package/cjs/theme/buildin-theme/light/series/index.js.map +1 -1
  380. package/cjs/theme/buildin-theme/light/series/line.js +2 -7
  381. package/cjs/theme/buildin-theme/light/series/line.js.map +1 -1
  382. package/cjs/theme/buildin-theme/light/series/linear-progress.js +5 -0
  383. package/cjs/theme/buildin-theme/light/series/linear-progress.js.map +1 -1
  384. package/cjs/theme/buildin-theme/light/series/map.js +8 -4
  385. package/cjs/theme/buildin-theme/light/series/map.js.map +1 -1
  386. package/cjs/theme/buildin-theme/light/series/pie.js +9 -2
  387. package/cjs/theme/buildin-theme/light/series/pie.js.map +1 -1
  388. package/cjs/theme/buildin-theme/light/series/pie3d.js +4 -3
  389. package/cjs/theme/buildin-theme/light/series/pie3d.js.map +1 -1
  390. package/cjs/theme/buildin-theme/light/series/radar.js +2 -12
  391. package/cjs/theme/buildin-theme/light/series/radar.js.map +1 -1
  392. package/cjs/theme/buildin-theme/light/series/rangeColumn.js +2 -2
  393. package/cjs/theme/buildin-theme/light/series/rangeColumn.js.map +1 -1
  394. package/cjs/theme/buildin-theme/light/series/rose.d.ts +2 -0
  395. package/cjs/theme/buildin-theme/light/series/rose.js +20 -0
  396. package/cjs/theme/buildin-theme/light/series/rose.js.map +1 -0
  397. package/cjs/theme/buildin-theme/light/series/sankey.d.ts +2 -0
  398. package/cjs/theme/buildin-theme/light/series/sankey.js +14 -0
  399. package/cjs/theme/buildin-theme/light/series/sankey.js.map +1 -0
  400. package/cjs/theme/buildin-theme/light/series/scatter.js +10 -4
  401. package/cjs/theme/buildin-theme/light/series/scatter.js.map +1 -1
  402. package/cjs/theme/buildin-theme/light/series/treemap.js +4 -4
  403. package/cjs/theme/buildin-theme/light/series/treemap.js.map +1 -1
  404. package/cjs/theme/buildin-theme/light/series/waterfall.js +3 -3
  405. package/cjs/theme/buildin-theme/light/series/waterfall.js.map +1 -1
  406. package/cjs/theme/buildin-theme/light/series/word-cloud3d.js +1 -1
  407. package/cjs/theme/buildin-theme/light/series/word-cloud3d.js.map +1 -1
  408. package/cjs/theme/color-scheme/interface.d.ts +16 -8
  409. package/cjs/theme/color-scheme/interface.js.map +1 -1
  410. package/cjs/theme/color-scheme/util.d.ts +6 -3
  411. package/cjs/theme/color-scheme/util.js +39 -10
  412. package/cjs/theme/color-scheme/util.js.map +1 -1
  413. package/cjs/theme/interface.d.ts +22 -38
  414. package/cjs/theme/interface.js.map +1 -1
  415. package/cjs/theme/theme-manager.d.ts +1 -0
  416. package/cjs/theme/theme-manager.js +5 -2
  417. package/cjs/theme/theme-manager.js.map +1 -1
  418. package/cjs/typings/spec/chart.d.ts +1 -1
  419. package/cjs/typings/spec/chart.js.map +1 -1
  420. package/cjs/typings/visual.d.ts +13 -12
  421. package/cjs/typings/visual.js.map +1 -1
  422. package/cjs/util/color.d.ts +0 -3
  423. package/cjs/util/color.js +2 -12
  424. package/cjs/util/color.js.map +1 -1
  425. package/cjs/util/scale.d.ts +12 -1
  426. package/cjs/util/scale.js +4 -2
  427. package/cjs/util/scale.js.map +1 -1
  428. package/cjs/vchart-all.js +4 -4
  429. package/cjs/vchart-all.js.map +1 -1
  430. package/esm/animation/utils.d.ts +2 -1
  431. package/esm/animation/utils.js.map +1 -1
  432. package/esm/chart/base-chart.js +3 -3
  433. package/esm/chart/base-chart.js.map +1 -1
  434. package/esm/chart/{boxplot/boxPlot.js → box-plot/box-plot.js} +1 -1
  435. package/esm/chart/box-plot/box-plot.js.map +1 -0
  436. package/{cjs/chart/boxplot → esm/chart/box-plot}/index.d.ts +1 -1
  437. package/esm/chart/{boxplot → box-plot}/index.js +1 -1
  438. package/esm/chart/box-plot/index.js.map +1 -0
  439. package/esm/chart/box-plot/interface.js.map +1 -0
  440. package/esm/chart/index.d.ts +3 -1
  441. package/esm/chart/index.js +5 -1
  442. package/esm/chart/index.js.map +1 -1
  443. package/esm/chart/treemap/treemap.js.map +1 -1
  444. package/esm/compile/compilable-base.js +1 -1
  445. package/esm/compile/compiler.d.ts +2 -2
  446. package/esm/compile/compiler.js +24 -25
  447. package/esm/compile/compiler.js.map +1 -1
  448. package/esm/compile/grammar-item.js +1 -1
  449. package/esm/compile/mark/interface.js.map +1 -1
  450. package/esm/compile/util.js +1 -1
  451. package/esm/component/axis/base-axis.d.ts +70 -1
  452. package/esm/component/axis/base-axis.js +98 -4
  453. package/esm/component/axis/base-axis.js.map +1 -1
  454. package/esm/component/axis/cartesian/axis.d.ts +0 -1
  455. package/esm/component/axis/cartesian/axis.js +4 -7
  456. package/esm/component/axis/cartesian/axis.js.map +1 -1
  457. package/esm/component/axis/polar/axis.d.ts +0 -1
  458. package/esm/component/axis/polar/axis.js +4 -7
  459. package/esm/component/axis/polar/axis.js.map +1 -1
  460. package/esm/component/axis/utils.d.ts +13 -70
  461. package/esm/component/axis/utils.js +12 -99
  462. package/esm/component/axis/utils.js.map +1 -1
  463. package/esm/component/base/base-component.d.ts +0 -5
  464. package/esm/component/base/base-component.js +7 -20
  465. package/esm/component/base/base-component.js.map +1 -1
  466. package/esm/component/base/util.d.ts +1 -1
  467. package/esm/component/base/util.js +18 -9
  468. package/esm/component/base/util.js.map +1 -1
  469. package/esm/component/crosshair/base.d.ts +0 -1
  470. package/esm/component/crosshair/base.js +1 -4
  471. package/esm/component/crosshair/base.js.map +1 -1
  472. package/esm/component/custom-mark/custom-mark.js +4 -1
  473. package/esm/component/custom-mark/custom-mark.js.map +1 -1
  474. package/esm/component/data-zoom/data-filter-base-component.d.ts +1 -1
  475. package/esm/component/data-zoom/data-filter-base-component.js +2 -2
  476. package/esm/component/data-zoom/data-filter-base-component.js.map +1 -1
  477. package/esm/component/index.js +1 -1
  478. package/esm/component/interface/index.d.ts +1 -0
  479. package/esm/component/interface/index.js +2 -0
  480. package/esm/component/interface/index.js.map +1 -1
  481. package/esm/component/interface/theme.d.ts +38 -0
  482. package/esm/component/interface/theme.js +2 -0
  483. package/esm/component/interface/theme.js.map +1 -0
  484. package/esm/component/label/label.d.ts +0 -1
  485. package/esm/component/label/label.js +12 -6
  486. package/esm/component/label/label.js.map +1 -1
  487. package/esm/component/legend/base-legend.js +5 -2
  488. package/esm/component/legend/base-legend.js.map +1 -1
  489. package/esm/component/legend/continuous/legend.d.ts +1 -1
  490. package/esm/component/legend/continuous/legend.js +2 -2
  491. package/esm/component/legend/continuous/legend.js.map +1 -1
  492. package/esm/component/legend/discrete/legend.d.ts +1 -1
  493. package/esm/component/legend/discrete/legend.js +2 -2
  494. package/esm/component/legend/discrete/legend.js.map +1 -1
  495. package/esm/component/legend/util.d.ts +4 -4
  496. package/esm/component/map-label/component.js +1 -5
  497. package/esm/component/map-label/component.js.map +1 -1
  498. package/esm/component/map-label/interface.d.ts +6 -4
  499. package/esm/component/map-label/interface.js.map +1 -1
  500. package/esm/component/marker/utils.js +14 -9
  501. package/esm/component/marker/utils.js.map +1 -1
  502. package/esm/component/player/interface/theme.d.ts +2 -1
  503. package/esm/component/player/interface/theme.js.map +1 -1
  504. package/esm/component/player/player.d.ts +0 -1
  505. package/esm/component/player/player.js +0 -3
  506. package/esm/component/player/player.js.map +1 -1
  507. package/esm/component/player/utils/transform.js.map +1 -1
  508. package/esm/component/title/interface/theme.d.ts +4 -2
  509. package/esm/component/title/interface/theme.js.map +1 -1
  510. package/esm/component/title/title.d.ts +1 -1
  511. package/esm/component/title/title.js +3 -6
  512. package/esm/component/title/title.js.map +1 -1
  513. package/esm/component/tooltip/handler/base.d.ts +5 -3
  514. package/esm/component/tooltip/handler/base.js +9 -8
  515. package/esm/component/tooltip/handler/base.js.map +1 -1
  516. package/esm/component/tooltip/handler/canvas/canvas-tooltip-handler.d.ts +4 -5
  517. package/esm/component/tooltip/handler/canvas/canvas-tooltip-handler.js +6 -6
  518. package/esm/component/tooltip/handler/canvas/canvas-tooltip-handler.js.map +1 -1
  519. package/esm/component/tooltip/handler/dom/dom-tooltip-handler.d.ts +2 -4
  520. package/esm/component/tooltip/handler/dom/dom-tooltip-handler.js +2 -3
  521. package/esm/component/tooltip/handler/dom/dom-tooltip-handler.js.map +1 -1
  522. package/esm/component/tooltip/handler/dom/model/base-tooltip-model.d.ts +1 -1
  523. package/esm/component/tooltip/tooltip.js +1 -1
  524. package/esm/component/tooltip/tooltip.js.map +1 -1
  525. package/esm/constant/box-plot.js +1 -2
  526. package/esm/constant/label.js +2 -1
  527. package/esm/core/factory.d.ts +1 -0
  528. package/esm/core/factory.js +3 -0
  529. package/esm/core/factory.js.map +1 -1
  530. package/esm/core/instance-manager.d.ts +9 -0
  531. package/esm/core/instance-manager.js +20 -0
  532. package/esm/core/instance-manager.js.map +1 -0
  533. package/esm/core/interface.js +1 -2
  534. package/esm/core/vchart.d.ts +2 -6
  535. package/esm/core/vchart.js +10 -22
  536. package/esm/core/vchart.js.map +1 -1
  537. package/esm/event/event.js +2 -1
  538. package/esm/index.d.ts +1 -1
  539. package/esm/index.js +1 -1
  540. package/esm/index.js.map +1 -1
  541. package/esm/mark/arc.d.ts +1 -1
  542. package/esm/mark/arc.js +3 -2
  543. package/esm/mark/arc.js.map +1 -1
  544. package/esm/mark/area.d.ts +3 -2
  545. package/esm/mark/area.js +7 -3
  546. package/esm/mark/area.js.map +1 -1
  547. package/esm/mark/base/base-mark.js +4 -3
  548. package/esm/mark/base/base-mark.js.map +1 -1
  549. package/esm/mark/base/index.d.ts +1 -2
  550. package/esm/mark/base/index.js +1 -3
  551. package/esm/mark/base/index.js.map +1 -1
  552. package/{cjs/mark/boxPlot.d.ts → esm/mark/box-plot.d.ts} +1 -1
  553. package/esm/mark/{boxPlot.js → box-plot.js} +2 -2
  554. package/esm/mark/box-plot.js.map +1 -0
  555. package/esm/mark/component.d.ts +1 -1
  556. package/esm/mark/component.js +1 -1
  557. package/esm/mark/component.js.map +1 -1
  558. package/esm/mark/line.d.ts +1 -1
  559. package/esm/mark/line.js +1 -1
  560. package/esm/mark/line.js.map +1 -1
  561. package/esm/mark/linkPath.d.ts +1 -1
  562. package/esm/mark/linkPath.js +3 -2
  563. package/esm/mark/linkPath.js.map +1 -1
  564. package/esm/mark/mark-set/index.d.ts +6 -5
  565. package/esm/mark/mark-set/index.js +16 -13
  566. package/esm/mark/mark-set/index.js.map +1 -1
  567. package/esm/mark/path.d.ts +1 -1
  568. package/esm/mark/path.js +1 -1
  569. package/esm/mark/path.js.map +1 -1
  570. package/esm/mark/polygon.d.ts +1 -1
  571. package/esm/mark/polygon.js +2 -2
  572. package/esm/mark/polygon.js.map +1 -1
  573. package/esm/mark/progress-arc.js +1 -1
  574. package/esm/mark/rect.d.ts +1 -1
  575. package/esm/mark/rect.js +4 -3
  576. package/esm/mark/rect.js.map +1 -1
  577. package/esm/mark/rule.d.ts +1 -1
  578. package/esm/mark/rule.js +2 -2
  579. package/esm/mark/rule.js.map +1 -1
  580. package/esm/mark/symbol.d.ts +1 -1
  581. package/esm/mark/symbol.js +4 -3
  582. package/esm/mark/symbol.js.map +1 -1
  583. package/esm/mark/text.d.ts +1 -1
  584. package/esm/mark/text.js +4 -3
  585. package/esm/mark/text.js.map +1 -1
  586. package/esm/model/base-model.d.ts +12 -5
  587. package/esm/model/base-model.js +50 -29
  588. package/esm/model/base-model.js.map +1 -1
  589. package/esm/model/interface.d.ts +8 -2
  590. package/esm/model/interface.js.map +1 -1
  591. package/esm/model/layout-item.js +19 -17
  592. package/esm/model/layout-item.js.map +1 -1
  593. package/esm/region/region.d.ts +1 -4
  594. package/esm/region/region.js +15 -13
  595. package/esm/region/region.js.map +1 -1
  596. package/esm/scale/color-ordinal-scale.d.ts +8 -0
  597. package/esm/scale/color-ordinal-scale.js +18 -0
  598. package/esm/scale/color-ordinal-scale.js.map +1 -0
  599. package/esm/scale/global-scale.js +3 -2
  600. package/esm/scale/global-scale.js.map +1 -1
  601. package/esm/series/area/area.d.ts +2 -0
  602. package/esm/series/area/area.js +15 -6
  603. package/esm/series/area/area.js.map +1 -1
  604. package/esm/series/area/interface.d.ts +5 -5
  605. package/esm/series/area/interface.js.map +1 -1
  606. package/esm/series/bar/bar.d.ts +6 -0
  607. package/esm/series/bar/bar.js +25 -7
  608. package/esm/series/bar/bar.js.map +1 -1
  609. package/esm/series/bar/interface.d.ts +5 -4
  610. package/esm/series/bar/interface.js.map +1 -1
  611. package/esm/series/base/base-series.d.ts +10 -11
  612. package/esm/series/base/base-series.js +59 -30
  613. package/esm/series/base/base-series.js.map +1 -1
  614. package/{cjs/series/box-plot/boxPlot.d.ts → esm/series/box-plot/box-plot.d.ts} +2 -0
  615. package/esm/series/box-plot/{boxPlot.js → box-plot.js} +17 -6
  616. package/esm/series/box-plot/box-plot.js.map +1 -0
  617. package/esm/series/box-plot/interface.d.ts +3 -2
  618. package/esm/series/box-plot/interface.js.map +1 -1
  619. package/esm/series/box-plot/tooltip-helper.js.map +1 -1
  620. package/esm/series/cartesian/cartesian.d.ts +1 -1
  621. package/esm/series/circle-packing/circle-packing.d.ts +2 -0
  622. package/esm/series/circle-packing/circle-packing.js +12 -3
  623. package/esm/series/circle-packing/circle-packing.js.map +1 -1
  624. package/esm/series/circle-packing/interface.d.ts +5 -4
  625. package/esm/series/circle-packing/interface.js.map +1 -1
  626. package/esm/series/dot/dot.d.ts +6 -8
  627. package/esm/series/dot/dot.js +47 -16
  628. package/esm/series/dot/dot.js.map +1 -1
  629. package/esm/series/dot/interface.d.ts +10 -10
  630. package/esm/series/dot/interface.js.map +1 -1
  631. package/esm/series/funnel/funnel.d.ts +12 -2
  632. package/esm/series/funnel/funnel.js +81 -22
  633. package/esm/series/funnel/funnel.js.map +1 -1
  634. package/esm/series/funnel/interface.d.ts +16 -15
  635. package/esm/series/funnel/interface.js.map +1 -1
  636. package/esm/series/gauge/gauge-pointer.d.ts +2 -0
  637. package/esm/series/gauge/gauge-pointer.js +23 -6
  638. package/esm/series/gauge/gauge-pointer.js.map +1 -1
  639. package/esm/series/gauge/gauge.d.ts +3 -2
  640. package/esm/series/gauge/gauge.js +32 -18
  641. package/esm/series/gauge/gauge.js.map +1 -1
  642. package/esm/series/gauge/interface.d.ts +12 -11
  643. package/esm/series/gauge/interface.js.map +1 -1
  644. package/esm/series/heatmap/heatmap.d.ts +3 -1
  645. package/esm/series/heatmap/heatmap.js +19 -9
  646. package/esm/series/heatmap/heatmap.js.map +1 -1
  647. package/esm/series/heatmap/interface.d.ts +6 -5
  648. package/esm/series/heatmap/interface.js.map +1 -1
  649. package/esm/series/interface/common.d.ts +56 -1
  650. package/esm/series/interface/common.js +24 -1
  651. package/esm/series/interface/common.js.map +1 -1
  652. package/esm/series/interface/series.d.ts +2 -1
  653. package/esm/series/interface/series.js.map +1 -1
  654. package/esm/series/line/line.d.ts +2 -0
  655. package/esm/series/line/line.js +9 -4
  656. package/esm/series/line/line.js.map +1 -1
  657. package/esm/series/link/interface.d.ts +4 -4
  658. package/esm/series/link/interface.js.map +1 -1
  659. package/esm/series/link/link.d.ts +4 -7
  660. package/esm/series/link/link.js +22 -15
  661. package/esm/series/link/link.js.map +1 -1
  662. package/esm/series/map/map.d.ts +2 -0
  663. package/esm/series/map/map.js +13 -6
  664. package/esm/series/map/map.js.map +1 -1
  665. package/esm/series/mixin/line-mixin.d.ts +4 -3
  666. package/esm/series/mixin/line-mixin.js +16 -4
  667. package/esm/series/mixin/line-mixin.js.map +1 -1
  668. package/esm/series/pie/interface.d.ts +7 -6
  669. package/esm/series/pie/interface.js.map +1 -1
  670. package/esm/series/pie/pie.d.ts +8 -3
  671. package/esm/series/pie/pie.js +60 -28
  672. package/esm/series/pie/pie.js.map +1 -1
  673. package/esm/series/progress/circular/circular.d.ts +2 -0
  674. package/esm/series/progress/circular/circular.js +16 -6
  675. package/esm/series/progress/circular/circular.js.map +1 -1
  676. package/esm/series/progress/circular/interface.d.ts +5 -4
  677. package/esm/series/progress/circular/interface.js.map +1 -1
  678. package/esm/series/progress/linear/interface.d.ts +6 -5
  679. package/esm/series/progress/linear/interface.js.map +1 -1
  680. package/esm/series/progress/linear/linear.d.ts +2 -0
  681. package/esm/series/progress/linear/linear.js +31 -20
  682. package/esm/series/progress/linear/linear.js.map +1 -1
  683. package/esm/series/radar/interface.d.ts +5 -4
  684. package/esm/series/radar/interface.js.map +1 -1
  685. package/esm/series/radar/radar.d.ts +2 -0
  686. package/esm/series/radar/radar.js +12 -5
  687. package/esm/series/radar/radar.js.map +1 -1
  688. package/esm/series/range-area/range-area.d.ts +2 -0
  689. package/esm/series/range-area/range-area.js +2 -4
  690. package/esm/series/range-area/range-area.js.map +1 -1
  691. package/esm/series/range-column/interface.d.ts +9 -8
  692. package/esm/series/range-column/interface.js.map +1 -1
  693. package/esm/series/range-column/rangeColumn.d.ts +2 -0
  694. package/esm/series/range-column/rangeColumn.js +28 -20
  695. package/esm/series/range-column/rangeColumn.js.map +1 -1
  696. package/esm/series/rose/interface.d.ts +3 -2
  697. package/esm/series/rose/interface.js.map +1 -1
  698. package/esm/series/rose/rose.d.ts +2 -0
  699. package/esm/series/rose/rose.js +16 -14
  700. package/esm/series/rose/rose.js.map +1 -1
  701. package/esm/series/sankey/animation.js.map +1 -1
  702. package/esm/series/sankey/interface.d.ts +7 -6
  703. package/esm/series/sankey/interface.js.map +1 -1
  704. package/esm/series/sankey/sankey.d.ts +2 -0
  705. package/esm/series/sankey/sankey.js +26 -23
  706. package/esm/series/sankey/sankey.js.map +1 -1
  707. package/esm/series/scatter/interface.d.ts +6 -5
  708. package/esm/series/scatter/interface.js.map +1 -1
  709. package/esm/series/scatter/scatter.d.ts +2 -0
  710. package/esm/series/scatter/scatter.js +15 -9
  711. package/esm/series/scatter/scatter.js.map +1 -1
  712. package/esm/series/sunburst/interface.d.ts +5 -4
  713. package/esm/series/sunburst/interface.js.map +1 -1
  714. package/esm/series/sunburst/sunburst.d.ts +3 -1
  715. package/esm/series/sunburst/sunburst.js +11 -4
  716. package/esm/series/sunburst/sunburst.js.map +1 -1
  717. package/esm/series/treemap/interface.d.ts +9 -8
  718. package/esm/series/treemap/interface.js.map +1 -1
  719. package/esm/series/treemap/treemap.d.ts +2 -0
  720. package/esm/series/treemap/treemap.js +21 -6
  721. package/esm/series/treemap/treemap.js.map +1 -1
  722. package/esm/series/waterfall/interface.d.ts +6 -5
  723. package/esm/series/waterfall/interface.js.map +1 -1
  724. package/esm/series/waterfall/waterfall.d.ts +2 -0
  725. package/esm/series/waterfall/waterfall.js +15 -6
  726. package/esm/series/waterfall/waterfall.js.map +1 -1
  727. package/esm/series/word-cloud/interface.d.ts +7 -6
  728. package/esm/series/word-cloud/interface.js.map +1 -1
  729. package/esm/series/word-cloud/word-cloud.d.ts +4 -3
  730. package/esm/series/word-cloud/word-cloud.js +24 -11
  731. package/esm/series/word-cloud/word-cloud.js.map +1 -1
  732. package/esm/theme/buildin-theme/config.d.ts +1 -4
  733. package/esm/theme/buildin-theme/config.js +1 -21
  734. package/esm/theme/buildin-theme/config.js.map +1 -1
  735. package/esm/theme/buildin-theme/dark.js.map +1 -1
  736. package/esm/theme/buildin-theme/light/color-scheme.js +14 -1
  737. package/esm/theme/buildin-theme/light/color-scheme.js.map +1 -1
  738. package/esm/theme/buildin-theme/light/component/axis/band-axis.d.ts +2 -0
  739. package/esm/theme/buildin-theme/light/component/axis/band-axis.js +18 -0
  740. package/esm/theme/buildin-theme/light/component/axis/band-axis.js.map +1 -0
  741. package/esm/theme/buildin-theme/light/component/{cartesian-axis.d.ts → axis/cartesian-axis.d.ts} +1 -1
  742. package/esm/theme/buildin-theme/light/component/{cartesian-axis.js → axis/cartesian-axis.js} +7 -9
  743. package/esm/theme/buildin-theme/light/component/axis/cartesian-axis.js.map +1 -0
  744. package/esm/theme/buildin-theme/light/component/axis/common-axis.d.ts +2 -0
  745. package/esm/theme/buildin-theme/light/component/{common-axis.js → axis/common-axis.js} +32 -14
  746. package/esm/theme/buildin-theme/light/component/axis/common-axis.js.map +1 -0
  747. package/esm/theme/buildin-theme/light/component/axis/linear-axis.d.ts +2 -0
  748. package/esm/theme/buildin-theme/light/component/axis/linear-axis.js +18 -0
  749. package/esm/theme/buildin-theme/light/component/axis/linear-axis.js.map +1 -0
  750. package/esm/theme/buildin-theme/light/component/{polar-axis.d.ts → axis/polar-axis.d.ts} +1 -1
  751. package/esm/theme/buildin-theme/light/component/{polar-axis.js → axis/polar-axis.js} +11 -3
  752. package/esm/theme/buildin-theme/light/component/axis/polar-axis.js.map +1 -0
  753. package/esm/theme/buildin-theme/light/component/crosshair.js +8 -4
  754. package/esm/theme/buildin-theme/light/component/crosshair.js.map +1 -1
  755. package/esm/theme/buildin-theme/light/component/index.d.ts +2 -0
  756. package/esm/theme/buildin-theme/light/component/index.js +62 -0
  757. package/esm/theme/buildin-theme/light/component/index.js.map +1 -0
  758. package/esm/theme/buildin-theme/light/component/legend/color-legend.d.ts +2 -0
  759. package/esm/theme/buildin-theme/light/component/{color-legend.js → legend/color-legend.js} +1 -1
  760. package/esm/theme/buildin-theme/light/component/legend/color-legend.js.map +1 -0
  761. package/esm/theme/buildin-theme/light/component/legend/continuous.d.ts +2 -0
  762. package/esm/theme/buildin-theme/light/component/legend/continuous.js +54 -0
  763. package/esm/theme/buildin-theme/light/component/legend/continuous.js.map +1 -0
  764. package/esm/theme/buildin-theme/light/component/legend/discrete-legend.d.ts +2 -0
  765. package/esm/theme/buildin-theme/light/component/{discrete-legend.js → legend/discrete-legend.js} +14 -5
  766. package/esm/theme/buildin-theme/light/component/legend/discrete-legend.js.map +1 -0
  767. package/esm/theme/buildin-theme/light/component/legend/size-legend.d.ts +2 -0
  768. package/esm/theme/buildin-theme/light/component/{size-legend.js → legend/size-legend.js} +1 -1
  769. package/esm/theme/buildin-theme/light/component/legend/size-legend.js.map +1 -0
  770. package/esm/theme/buildin-theme/light/component/map-label.d.ts +2 -0
  771. package/esm/{component/map-label/config.js → theme/buildin-theme/light/component/map-label.js} +5 -3
  772. package/esm/theme/buildin-theme/light/component/map-label.js.map +1 -0
  773. package/esm/theme/buildin-theme/light/component/player.js +20 -11
  774. package/esm/theme/buildin-theme/light/component/player.js.map +1 -1
  775. package/esm/theme/buildin-theme/light/component/title.js +16 -2
  776. package/esm/theme/buildin-theme/light/component/title.js.map +1 -1
  777. package/esm/theme/buildin-theme/light/component/tooltip.js +6 -2
  778. package/esm/theme/buildin-theme/light/component/tooltip.js.map +1 -1
  779. package/esm/theme/buildin-theme/light/constants.d.ts +2 -0
  780. package/esm/theme/buildin-theme/light/constants.js +10 -0
  781. package/esm/theme/buildin-theme/light/constants.js.map +1 -0
  782. package/esm/theme/buildin-theme/light/index.js +7 -50
  783. package/esm/theme/buildin-theme/light/index.js.map +1 -1
  784. package/esm/theme/buildin-theme/light/mark.d.ts +3 -0
  785. package/esm/theme/buildin-theme/light/mark.js +68 -0
  786. package/esm/theme/buildin-theme/light/mark.js.map +1 -0
  787. package/esm/theme/buildin-theme/light/series/area.js +2 -12
  788. package/esm/theme/buildin-theme/light/series/area.js.map +1 -1
  789. package/esm/theme/buildin-theme/light/series/bar.js +2 -2
  790. package/esm/theme/buildin-theme/light/series/bar.js.map +1 -1
  791. package/esm/theme/buildin-theme/light/series/bar3d.js +2 -2
  792. package/esm/theme/buildin-theme/light/series/bar3d.js.map +1 -1
  793. package/esm/theme/buildin-theme/light/series/box-plot.d.ts +2 -0
  794. package/esm/theme/buildin-theme/light/series/box-plot.js +8 -0
  795. package/esm/theme/buildin-theme/light/series/box-plot.js.map +1 -0
  796. package/esm/theme/buildin-theme/light/series/circular-progress.js +11 -1
  797. package/esm/theme/buildin-theme/light/series/circular-progress.js.map +1 -1
  798. package/esm/theme/buildin-theme/light/series/funnel.js +7 -2
  799. package/esm/theme/buildin-theme/light/series/funnel.js.map +1 -1
  800. package/esm/theme/buildin-theme/light/series/funnel3d.js +8 -3
  801. package/esm/theme/buildin-theme/light/series/funnel3d.js.map +1 -1
  802. package/esm/theme/buildin-theme/light/series/gauge.js +6 -1
  803. package/esm/theme/buildin-theme/light/series/gauge.js.map +1 -1
  804. package/esm/theme/buildin-theme/light/series/index.js +10 -1
  805. package/esm/theme/buildin-theme/light/series/index.js.map +1 -1
  806. package/esm/theme/buildin-theme/light/series/line.js +2 -7
  807. package/esm/theme/buildin-theme/light/series/line.js.map +1 -1
  808. package/esm/theme/buildin-theme/light/series/linear-progress.js +5 -0
  809. package/esm/theme/buildin-theme/light/series/linear-progress.js.map +1 -1
  810. package/esm/theme/buildin-theme/light/series/map.js +8 -4
  811. package/esm/theme/buildin-theme/light/series/map.js.map +1 -1
  812. package/esm/theme/buildin-theme/light/series/pie.js +9 -2
  813. package/esm/theme/buildin-theme/light/series/pie.js.map +1 -1
  814. package/esm/theme/buildin-theme/light/series/pie3d.js +4 -3
  815. package/esm/theme/buildin-theme/light/series/pie3d.js.map +1 -1
  816. package/esm/theme/buildin-theme/light/series/radar.js +2 -12
  817. package/esm/theme/buildin-theme/light/series/radar.js.map +1 -1
  818. package/esm/theme/buildin-theme/light/series/rangeColumn.js +2 -2
  819. package/esm/theme/buildin-theme/light/series/rangeColumn.js.map +1 -1
  820. package/esm/theme/buildin-theme/light/series/rose.d.ts +2 -0
  821. package/esm/theme/buildin-theme/light/series/rose.js +16 -0
  822. package/esm/theme/buildin-theme/light/series/rose.js.map +1 -0
  823. package/esm/theme/buildin-theme/light/series/sankey.d.ts +2 -0
  824. package/esm/theme/buildin-theme/light/series/sankey.js +10 -0
  825. package/esm/theme/buildin-theme/light/series/sankey.js.map +1 -0
  826. package/esm/theme/buildin-theme/light/series/scatter.js +10 -4
  827. package/esm/theme/buildin-theme/light/series/scatter.js.map +1 -1
  828. package/esm/theme/buildin-theme/light/series/treemap.js +3 -1
  829. package/esm/theme/buildin-theme/light/series/treemap.js.map +1 -1
  830. package/esm/theme/buildin-theme/light/series/waterfall.js +3 -1
  831. package/esm/theme/buildin-theme/light/series/waterfall.js.map +1 -1
  832. package/esm/theme/buildin-theme/light/series/word-cloud3d.js +1 -1
  833. package/esm/theme/buildin-theme/light/series/word-cloud3d.js.map +1 -1
  834. package/esm/theme/color-scheme/interface.d.ts +16 -8
  835. package/esm/theme/color-scheme/interface.js.map +1 -1
  836. package/esm/theme/color-scheme/util.d.ts +6 -3
  837. package/esm/theme/color-scheme/util.js +31 -7
  838. package/esm/theme/color-scheme/util.js.map +1 -1
  839. package/esm/theme/interface.d.ts +22 -38
  840. package/esm/theme/interface.js.map +1 -1
  841. package/esm/theme/theme-manager.d.ts +1 -0
  842. package/esm/theme/theme-manager.js +6 -1
  843. package/esm/theme/theme-manager.js.map +1 -1
  844. package/esm/typings/spec/chart.d.ts +1 -1
  845. package/esm/typings/spec/chart.js.map +1 -1
  846. package/esm/typings/visual.d.ts +13 -12
  847. package/esm/typings/visual.js.map +1 -1
  848. package/esm/util/color.d.ts +0 -3
  849. package/esm/util/color.js +0 -10
  850. package/esm/util/color.js.map +1 -1
  851. package/esm/util/scale.d.ts +12 -1
  852. package/esm/util/scale.js +6 -2
  853. package/esm/util/scale.js.map +1 -1
  854. package/esm/vchart-all.js +5 -5
  855. package/esm/vchart-all.js.map +1 -1
  856. package/package.json +1 -1
  857. package/cjs/chart/boxplot/boxPlot.js.map +0 -1
  858. package/cjs/chart/boxplot/index.js.map +0 -1
  859. package/cjs/chart/boxplot/interface.js.map +0 -1
  860. package/cjs/component/map-label/config.d.ts +0 -2
  861. package/cjs/component/map-label/config.js.map +0 -1
  862. package/cjs/mark/boxPlot.js.map +0 -1
  863. package/cjs/series/box-plot/boxPlot.js.map +0 -1
  864. package/cjs/theme/buildin-theme/light/component/cartesian-axis.js.map +0 -1
  865. package/cjs/theme/buildin-theme/light/component/color-legend.d.ts +0 -2
  866. package/cjs/theme/buildin-theme/light/component/color-legend.js.map +0 -1
  867. package/cjs/theme/buildin-theme/light/component/common-axis.d.ts +0 -2
  868. package/cjs/theme/buildin-theme/light/component/common-axis.js.map +0 -1
  869. package/cjs/theme/buildin-theme/light/component/discrete-legend.d.ts +0 -2
  870. package/cjs/theme/buildin-theme/light/component/discrete-legend.js.map +0 -1
  871. package/cjs/theme/buildin-theme/light/component/polar-axis.js +0 -19
  872. package/cjs/theme/buildin-theme/light/component/polar-axis.js.map +0 -1
  873. package/cjs/theme/buildin-theme/light/component/size-legend.d.ts +0 -2
  874. package/cjs/theme/buildin-theme/light/component/size-legend.js.map +0 -1
  875. package/esm/chart/boxplot/boxPlot.js.map +0 -1
  876. package/esm/chart/boxplot/index.js.map +0 -1
  877. package/esm/chart/boxplot/interface.js.map +0 -1
  878. package/esm/component/map-label/config.d.ts +0 -2
  879. package/esm/component/map-label/config.js.map +0 -1
  880. package/esm/series/box-plot/boxPlot.js.map +0 -1
  881. package/esm/theme/buildin-theme/light/component/cartesian-axis.js.map +0 -1
  882. package/esm/theme/buildin-theme/light/component/color-legend.d.ts +0 -2
  883. package/esm/theme/buildin-theme/light/component/color-legend.js.map +0 -1
  884. package/esm/theme/buildin-theme/light/component/common-axis.d.ts +0 -2
  885. package/esm/theme/buildin-theme/light/component/common-axis.js.map +0 -1
  886. package/esm/theme/buildin-theme/light/component/discrete-legend.d.ts +0 -2
  887. package/esm/theme/buildin-theme/light/component/discrete-legend.js.map +0 -1
  888. package/esm/theme/buildin-theme/light/component/polar-axis.js.map +0 -1
  889. package/esm/theme/buildin-theme/light/component/size-legend.d.ts +0 -2
  890. package/esm/theme/buildin-theme/light/component/size-legend.js.map +0 -1
  891. /package/cjs/chart/{boxplot/boxPlot.d.ts → box-plot/box-plot.d.ts} +0 -0
  892. /package/cjs/chart/{boxplot → box-plot}/interface.d.ts +0 -0
  893. /package/cjs/chart/{boxplot → box-plot}/interface.js +0 -0
  894. /package/esm/chart/{boxplot/boxPlot.d.ts → box-plot/box-plot.d.ts} +0 -0
  895. /package/esm/chart/{boxplot → box-plot}/interface.d.ts +0 -0
  896. /package/esm/chart/{boxplot → box-plot}/interface.js +0 -0
@@ -1,13 +1,14 @@
1
1
  import type { IEvent } from '../event/interface';
2
2
  import { LayoutItem } from './layout-item';
3
- import type { IEffect, IModel, IModelInitOption, IModelOption, IModelRenderOption, IModelEvaluateOption, IModelSpec, ILayoutRect } from './interface';
3
+ import type { IEffect, IModel, IModelInitOption, IModelOption, IModelRenderOption, IModelEvaluateOption, IModelSpec, ILayoutRect, IModelMarkInfo } from './interface';
4
4
  import type { CoordinateType } from '../typings/coordinate';
5
- import type { IMark, IMarkOption, IMarkRaw, IMarkStyle, MarkType } from '../mark/interface';
5
+ import type { IMark, IMarkOption, IMarkRaw, IMarkStyle } from '../mark/interface';
6
6
  import type { Datum, StateValueType, ConvertToMarkStyleSpec, ICommonSpec, StringOrNumber, IRect } from '../typings';
7
7
  import type { ITooltipHelper } from './tooltip-helper';
8
8
  import type { CompilableData } from '../compile/data/compilable-data';
9
9
  import { ModelStateManager } from './model-state-manager';
10
10
  import type { IElement, IGroupMark, IMark as IVGrammarMark } from '@visactor/vgrammar';
11
+ import { MarkSet } from '../mark/mark-set';
11
12
  export declare abstract class BaseModel extends LayoutItem implements IModel {
12
13
  readonly type: string;
13
14
  readonly modelType: string;
@@ -26,7 +27,11 @@ export declare abstract class BaseModel extends LayoutItem implements IModel {
26
27
  protected _option: IModelOption;
27
28
  getOption(): IModelOption;
28
29
  protected _sceneNodeMap: Map<string, IElement>;
29
- abstract getMarks(): IMark[];
30
+ protected _marks: MarkSet;
31
+ getMarks(): IMark[];
32
+ getMarkNameMap(): Record<string, IMark>;
33
+ getMarkSet(): MarkSet;
34
+ getMarkInfoList(): IModelMarkInfo[];
30
35
  getChart(): import("../chart/interface").IChart;
31
36
  state: ModelStateManager;
32
37
  getState(): {
@@ -58,8 +63,10 @@ export declare abstract class BaseModel extends LayoutItem implements IModel {
58
63
  reSize: boolean;
59
64
  reCompile: boolean;
60
65
  };
61
- reInit(): void;
66
+ reInit(theme?: any): void;
62
67
  protected _initTheme(theme?: any): void;
68
+ protected _mergeMarkTheme(): void;
69
+ protected _preprocessSpec(obj?: any): any;
63
70
  setCurrentTheme(theme: any, noRender?: boolean): void;
64
71
  updateLayoutAttribute(): void;
65
72
  setAttrFromSpec(): void;
@@ -73,6 +80,6 @@ export declare abstract class BaseModel extends LayoutItem implements IModel {
73
80
  bindSceneNode(node: IElement): void;
74
81
  getSceneNodes(): IElement[];
75
82
  getSceneNodeMarks(): IVGrammarMark[];
76
- protected _createMark<T extends IMark>(type: MarkType, name: string, option?: Partial<IMarkOption>): T;
83
+ protected _createMark<T extends IMark>(markInfo: IModelMarkInfo, option?: Partial<IMarkOption>): T;
77
84
  protected _getDataIdKey(): string | ((datum: Datum) => string) | undefined;
78
85
  }
@@ -1,19 +1,21 @@
1
- import { merge, createID, isValid, cloneDeepSpec } from "../util";
1
+ import { createID, isValid, cloneDeepSpec } from "../util";
2
2
 
3
3
  import { Event } from "../event/event";
4
4
 
5
5
  import { LayoutItem } from "./layout-item";
6
6
 
7
- import { findColor, isColorKey } from "../theme/color-scheme/util";
8
-
9
7
  import { ModelStateManager } from "./model-state-manager";
10
8
 
11
9
  import { PREFIX } from "../constant";
12
10
 
13
- import { isEqual } from "@visactor/vutils";
11
+ import { array, isArray, isEqual, isFunction, isNil, isObject, merge } from "@visactor/vutils";
14
12
 
15
13
  import { Factory } from "../core/factory";
16
14
 
15
+ import { getActualColor, isColorKey } from "../theme/color-scheme/util";
16
+
17
+ import { MarkSet } from "../mark/mark-set";
18
+
17
19
  export class BaseModel extends LayoutItem {
18
20
  getData() {
19
21
  return this._data;
@@ -27,6 +29,23 @@ export class BaseModel extends LayoutItem {
27
29
  getOption() {
28
30
  return this._option;
29
31
  }
32
+ getMarks() {
33
+ var _a, _b;
34
+ return null !== (_b = null === (_a = this._marks) || void 0 === _a ? void 0 : _a.getMarks()) && void 0 !== _b ? _b : [];
35
+ }
36
+ getMarkNameMap() {
37
+ var _a;
38
+ return null === (_a = this._marks) || void 0 === _a ? void 0 : _a.getMarkNameMap();
39
+ }
40
+ getMarkSet() {
41
+ return this._marks;
42
+ }
43
+ getMarkInfoList() {
44
+ return this.getMarks().map((mark => ({
45
+ type: mark.type,
46
+ name: mark.name
47
+ })));
48
+ }
30
49
  getChart() {
31
50
  return this._option.getChart();
32
51
  }
@@ -39,9 +58,9 @@ export class BaseModel extends LayoutItem {
39
58
  constructor(spec, option) {
40
59
  var _a, _b, _c;
41
60
  super(option), this.type = "null", this.modelType = "null", this.userId = void 0,
42
- this._data = null, this._specIndex = 0, this.specKey = "", this._lastLayoutRect = null,
43
- this._isLayout = !0, this.id = createID(), this._originalSpec = spec, this._spec = cloneDeepSpec(spec),
44
- this.userId = spec.id, this._specIndex = null !== (_a = option.specIndex) && void 0 !== _a ? _a : 0,
61
+ this._data = null, this._specIndex = 0, this.specKey = "", this._marks = new MarkSet,
62
+ this._lastLayoutRect = null, this._isLayout = !0, this.id = createID(), this._originalSpec = spec,
63
+ this._spec = cloneDeepSpec(spec), this.userId = spec.id, this._specIndex = null !== (_a = option.specIndex) && void 0 !== _a ? _a : 0,
45
64
  this.specKey = null !== (_b = option.specKey) && void 0 !== _b ? _b : "", this.effect = {},
46
65
  this.event = new Event(option.eventDispatcher, option.mode), null === (_c = option.map) || void 0 === _c || _c.set(this.id, this),
47
66
  this._sceneNodeMap = new Map, this.state = new ModelStateManager(Object.assign(Object.assign({}, option), {
@@ -77,7 +96,7 @@ export class BaseModel extends LayoutItem {
77
96
  var _a;
78
97
  this.releaseEvent(), this._originalSpec = {}, this._spec = {}, this.getMarks().forEach((m => m.release())),
79
98
  this.state.release(), null === (_a = this._data) || void 0 === _a || _a.release(),
80
- this._data = this._specIndex = this._sceneNodeMap = null, super.release();
99
+ this._data = this._specIndex = this._sceneNodeMap = null, this._marks.clear(), super.release();
81
100
  }
82
101
  updateSpec(spec) {
83
102
  this._originalSpec = spec, this._spec = cloneDeepSpec(spec);
@@ -89,37 +108,39 @@ export class BaseModel extends LayoutItem {
89
108
  reCompile: !1
90
109
  };
91
110
  }
92
- reInit() {
93
- this.setAttrFromSpec();
111
+ reInit(theme) {
112
+ this._initTheme(theme), this.setAttrFromSpec();
94
113
  }
95
114
  _initTheme(theme) {
115
+ this._theme = theme, this._mergeMarkTheme();
116
+ }
117
+ _mergeMarkTheme() {
96
118
  var _a, _b;
97
119
  const globalTheme = null === (_b = (_a = this._option).getTheme) || void 0 === _b ? void 0 : _b.call(_a);
98
- if (!isValid(globalTheme)) return;
99
- this._theme = theme;
100
- const {mark: markTheme} = globalTheme;
101
- isValid(markTheme) && this.getMarks().forEach((mark => {
102
- isValid(markTheme[mark.type]) && (this._theme[mark.name] = merge({}, markTheme[mark.type], this._theme[mark.name]));
120
+ if (isNil(globalTheme) || isNil(this._theme)) return;
121
+ const {mark: markThemeByType, markByName: markThemeByName} = globalTheme;
122
+ this.getMarkInfoList().forEach((({type: type, name: name}) => {
123
+ var _a, _b;
124
+ this._theme[name] = merge({}, null !== (_a = null == markThemeByType ? void 0 : markThemeByType[array(type)[0]]) && void 0 !== _a ? _a : {}, null !== (_b = null == markThemeByName ? void 0 : markThemeByName[name]) && void 0 !== _b ? _b : {}, this._theme[name]);
103
125
  }));
104
126
  }
127
+ _preprocessSpec(obj) {
128
+ if (arguments.length || (obj = this._spec), isArray(obj)) return obj.map((element => isObject(element) && !isFunction(element) ? this._preprocessSpec(element) : element));
129
+ const newObj = Object.assign({}, obj);
130
+ return Object.keys(newObj).forEach((key => {
131
+ var _a, _b, _c;
132
+ if (key.includes("data")) return;
133
+ const value = obj[key];
134
+ isObject(value) && !isFunction(value) && (isColorKey(value) ? newObj[key] = getActualColor(value, null === (_c = null === (_b = (_a = this._option).getTheme) || void 0 === _b ? void 0 : _b.call(_a)) || void 0 === _c ? void 0 : _c.colorScheme, "series" === this.modelType ? this.type : void 0) : newObj[key] = this._preprocessSpec(value));
135
+ })), arguments.length || (this._spec = newObj), newObj;
136
+ }
105
137
  setCurrentTheme(theme, noRender) {}
106
138
  updateLayoutAttribute() {}
107
139
  setAttrFromSpec() {
108
140
  super.setAttrFromSpec(this._spec, this._option.getChartViewRect());
109
141
  }
110
142
  _convertMarkStyle(style) {
111
- const newStyle = Object.assign({}, style);
112
- return Object.keys(newStyle).forEach((key => {
113
- var _a, _b;
114
- const value = style[key];
115
- if (isColorKey(value)) {
116
- const globalTheme = null === (_b = (_a = this._option).getTheme) || void 0 === _b ? void 0 : _b.call(_a);
117
- if (globalTheme) {
118
- const color = findColor(globalTheme.colorScheme, value, "series" === this.modelType ? this.type : void 0);
119
- color && (newStyle[key] = color);
120
- }
121
- }
122
- })), newStyle;
143
+ return Object.assign({}, style);
123
144
  }
124
145
  setMarkStyle(mark, style, state, level) {
125
146
  isValid(mark) && isValid(style) && mark.setStyle(this._convertMarkStyle(style), state, level);
@@ -160,8 +181,8 @@ export class BaseModel extends LayoutItem {
160
181
  getSceneNodeMarks() {
161
182
  return this.getSceneNodes().map((node => node.mark));
162
183
  }
163
- _createMark(type, name, option = {}) {
164
- const m = Factory.createMark(type, name, Object.assign({
184
+ _createMark(markInfo, option = {}) {
185
+ const {type: type, name: name} = markInfo, m = Factory.createMark(type, name, Object.assign({
165
186
  model: this,
166
187
  map: this._option.map,
167
188
  getCompiler: this.getCompiler,
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/model/base-model.ts"],"names":[],"mappings":"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","file":"base-model.js","sourcesContent":["import { merge, createID, isValid, cloneDeepSpec } from '../util';\nimport { Event } from '../event/event';\nimport type { IEvent } from '../event/interface';\nimport { LayoutItem } from './layout-item';\nimport type {\n IEffect,\n IModel,\n IModelInitOption,\n IModelOption,\n IModelRenderOption,\n IModelEvaluateOption,\n IModelSpec,\n ILayoutRect\n} from './interface';\nimport type { CoordinateType } from '../typings/coordinate';\nimport type { IMark, IMarkOption, IMarkRaw, IMarkStyle, MarkType } from '../mark/interface';\nimport { findColor, isColorKey } from '../theme/color-scheme/util';\nimport type { SeriesTypeEnum } from '../series/interface';\nimport type { Datum, StateValueType, ConvertToMarkStyleSpec, ICommonSpec, StringOrNumber, IRect } from '../typings';\nimport type { ITooltipHelper } from './tooltip-helper';\nimport type { CompilableData } from '../compile/data/compilable-data';\nimport { ModelStateManager } from './model-state-manager';\nimport { PREFIX } from '../constant';\nimport type { IElement, IGroupMark, IMark as IVGrammarMark } from '@visactor/vgrammar';\nimport { isEqual } from '@visactor/vutils';\nimport { Factory } from '../core/factory';\n\nexport abstract class BaseModel extends LayoutItem implements IModel {\n readonly type: string = 'null';\n readonly modelType: string = 'null';\n\n readonly id;\n\n userId: StringOrNumber | undefined = undefined;\n\n // 事件\n readonly event: IEvent;\n\n // 副作用\n readonly effect: IEffect;\n\n // 数据\n protected _data: CompilableData = null;\n getData() {\n return this._data;\n }\n\n protected declare _spec: any;\n getSpec(): any {\n return this._spec;\n }\n\n protected _specIndex: number = 0;\n getSpecIndex() {\n return this._specIndex;\n }\n\n readonly specKey: string = '';\n\n protected _originalSpec: any;\n\n protected declare _option: IModelOption;\n getOption() {\n return this._option;\n }\n\n protected _sceneNodeMap: Map<string, IElement>;\n\n abstract getMarks(): IMark[];\n\n getChart() {\n return this._option.getChart();\n }\n\n /** 状态管理器 */\n state: ModelStateManager;\n getState() {\n return this.state._stateMap;\n }\n\n protected _theme?: any; // 非全局 theme,是对应于具体 model 的 theme 对象\n\n /** for layout diff */\n protected _lastLayoutRect: ILayoutRect = null;\n\n protected _tooltipHelper: ITooltipHelper | undefined;\n get tooltipHelper() {\n return this._tooltipHelper;\n }\n\n // TODO: 有些hack,这个tag是为了避免布局逻辑中,轴的数据变化,又由数据变化触发重新布局\n protected _isLayout: boolean = true;\n\n constructor(spec: IModelSpec, option: IModelOption) {\n super(option);\n this.id = createID();\n this._originalSpec = spec;\n this._spec = cloneDeepSpec(spec);\n this.userId = spec.id;\n this._specIndex = option.specIndex ?? 0;\n this.specKey = option.specKey ?? '';\n this.effect = {};\n this.event = new Event(option.eventDispatcher, option.mode);\n option.map?.set(this.id, this);\n this._sceneNodeMap = new Map();\n this.state = new ModelStateManager({\n ...option,\n stateKeyToSignalName: this.stateKeyToSignalName.bind(this)\n });\n }\n coordinate?: CoordinateType;\n\n protected releaseEvent() {\n this.event.release();\n }\n\n created() {\n this._initTheme();\n this.setAttrFromSpec();\n }\n\n updateState(newState: Record<string, unknown>) {\n return this.state.updateState(newState);\n }\n\n init(option: IModelInitOption) {\n // do nothing\n }\n onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, ctx: any): void {\n super.onLayoutStart(layoutRect, viewRect, ctx);\n this._isLayout = true;\n }\n onLayoutEnd(ctx: any): void {\n // diff layoutRect\n const layoutRect = this.getLayoutRect();\n if (this._forceLayoutTag || !isEqual(this._lastLayoutRect, layoutRect)) {\n this.updateLayoutAttribute();\n }\n this._forceLayoutTag = false;\n this.getMarks().forEach(m => m.updateLayoutState(true, true));\n this._isLayout = false;\n }\n\n protected _forceLayout() {\n if (this._isLayout) {\n return;\n }\n this._forceLayoutTag = true;\n this._option.globalInstance.getChart()?.setLayoutTag(true);\n }\n\n onEvaluateEnd(ctx: IModelEvaluateOption) {\n // do nothing\n }\n abstract onRender(ctx: IModelRenderOption): void;\n\n onDataUpdate() {\n // do nothing\n }\n\n release() {\n this.releaseEvent();\n this._originalSpec = {};\n this._spec = {};\n this.getMarks().forEach(m => m.release());\n this.state.release();\n this._data?.release();\n this._data = this._specIndex = this._sceneNodeMap = null;\n super.release();\n }\n\n updateSpec(spec: any) {\n this._originalSpec = spec;\n this._spec = cloneDeepSpec(spec);\n const result = {\n change: false,\n reMake: false,\n reRender: false,\n reSize: false,\n reCompile: false\n };\n return result;\n }\n\n reInit() {\n this.setAttrFromSpec();\n }\n\n protected _initTheme(theme?: any) {\n const globalTheme = this._option.getTheme?.();\n if (!isValid(globalTheme)) {\n return;\n }\n\n this._theme = theme;\n\n // 将全局的 mark theme 合并进 model theme\n const { mark: markTheme } = globalTheme;\n if (isValid(markTheme)) {\n this.getMarks().forEach(mark => {\n if (isValid(markTheme[mark.type])) {\n this._theme[mark.name] = merge({}, markTheme[mark.type], this._theme[mark.name]);\n }\n });\n }\n }\n\n setCurrentTheme(theme: any, noRender?: boolean) {\n // do nothing\n }\n\n updateLayoutAttribute() {\n // do nothing\n }\n\n setAttrFromSpec() {\n super.setAttrFromSpec(this._spec, this._option.getChartViewRect());\n }\n\n /** mark style 内部转换逻辑,转换颜色、角度弧度等 */\n protected _convertMarkStyle<T extends ICommonSpec = ICommonSpec>(\n style: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>\n ): Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>> {\n const newStyle: any = {\n ...style\n };\n\n Object.keys(newStyle).forEach(key => {\n const value = style[key];\n\n // 查询语义化颜色\n if (isColorKey(value)) {\n const globalTheme = this._option.getTheme?.();\n if (globalTheme) {\n const color = findColor(\n globalTheme.colorScheme,\n value,\n this.modelType === 'series' ? (this.type as SeriesTypeEnum) : undefined\n );\n if (color) {\n newStyle[key] = color;\n }\n }\n }\n });\n\n return newStyle;\n }\n\n setMarkStyle<T extends ICommonSpec>(\n mark: IMarkRaw<T>,\n style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n state?: StateValueType,\n level?: number\n ) {\n if (!isValid(mark) || !isValid(style)) {\n return;\n }\n mark.setStyle(this._convertMarkStyle(style), state, level);\n }\n\n initMarkStyleWithSpec(mark?: IMark, spec?: any, key?: string) {\n if (!isValid(mark) || !isValid(spec)) {\n return;\n }\n const { style, state } = spec;\n const newSpec = {\n ...spec\n };\n\n if (style) {\n newSpec.style = this._convertMarkStyle(style);\n }\n if (state) {\n newSpec.state = {};\n Object.keys(state).forEach(key => {\n newSpec.state[key] = this._convertMarkStyle(state[key]);\n });\n }\n mark.initStyleWithSpec(newSpec, key);\n }\n\n protected stateKeyToSignalName(key: string, opt?: string) {\n let name = `${PREFIX}_${this.modelType}_${this.type}_${this.id}_${key}`;\n opt && (name += `_${opt}`);\n return name;\n }\n\n compileData() {\n this._data?.compile();\n }\n\n compileMarks(group?: string | IGroupMark) {\n this.getMarks().forEach(m => {\n m.compile({ group });\n });\n }\n\n compileSignal() {\n this.state?.compile();\n }\n\n bindSceneNode(node: IElement) {\n this._sceneNodeMap.set(node.mark.id(), node as IElement);\n }\n\n getSceneNodes() {\n return Array.from(this._sceneNodeMap.values());\n }\n\n getSceneNodeMarks() {\n return this.getSceneNodes().map(node => node.mark as IVGrammarMark);\n }\n\n protected _createMark<T extends IMark>(type: MarkType, name: string, option: Partial<IMarkOption> = {}): T {\n const m = Factory.createMark(type, name, {\n model: this,\n map: this._option.map,\n getCompiler: this.getCompiler,\n globalScale: this._option.globalScale,\n ...option\n }) as T;\n m?.created();\n return m;\n }\n\n /**\n * 数据唯一ID\n * 根据自身动画数据匹配需求设置返回值。\n * 默认返回 undefined 时,根据 VGrammar 默认数据 ID 进行索引和匹配。\n */\n protected _getDataIdKey(): string | ((datum: Datum) => string) | undefined {\n return undefined;\n }\n}\n"]}
1
+ {"version":3,"sources":["../src/model/base-model.ts"],"names":[],"mappings":"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","file":"base-model.js","sourcesContent":["import { createID, isValid, cloneDeepSpec } from '../util';\nimport { Event } from '../event/event';\nimport type { IEvent } from '../event/interface';\nimport { LayoutItem } from './layout-item';\nimport type {\n IEffect,\n IModel,\n IModelInitOption,\n IModelOption,\n IModelRenderOption,\n IModelEvaluateOption,\n IModelSpec,\n ILayoutRect,\n IModelMarkInfo\n} from './interface';\nimport type { CoordinateType } from '../typings/coordinate';\nimport type { IMark, IMarkOption, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';\nimport type { Datum, StateValueType, ConvertToMarkStyleSpec, ICommonSpec, StringOrNumber, IRect } from '../typings';\nimport type { ITooltipHelper } from './tooltip-helper';\nimport type { CompilableData } from '../compile/data/compilable-data';\nimport { ModelStateManager } from './model-state-manager';\nimport { PREFIX } from '../constant';\nimport type { IElement, IGroupMark, IMark as IVGrammarMark } from '@visactor/vgrammar';\nimport { array, isArray, isEqual, isFunction, isNil, isObject, merge } from '@visactor/vutils';\nimport { Factory } from '../core/factory';\nimport { getActualColor, isColorKey } from '../theme/color-scheme/util';\nimport type { SeriesTypeEnum } from '../series/interface';\nimport { MarkSet } from '../mark/mark-set';\n\nexport abstract class BaseModel extends LayoutItem implements IModel {\n readonly type: string = 'null';\n readonly modelType: string = 'null';\n\n readonly id;\n\n userId: StringOrNumber | undefined = undefined;\n\n // 事件\n readonly event: IEvent;\n\n // 副作用\n readonly effect: IEffect;\n\n // 数据\n protected _data: CompilableData = null;\n getData() {\n return this._data;\n }\n\n protected declare _spec: any;\n getSpec(): any {\n return this._spec;\n }\n\n protected _specIndex: number = 0;\n getSpecIndex() {\n return this._specIndex;\n }\n\n readonly specKey: string = '';\n\n protected _originalSpec: any;\n\n protected declare _option: IModelOption;\n getOption() {\n return this._option;\n }\n\n protected _sceneNodeMap: Map<string, IElement>;\n\n protected _marks: MarkSet = new MarkSet();\n getMarks(): IMark[] {\n return this._marks?.getMarks() ?? [];\n }\n getMarkNameMap() {\n return this._marks?.getMarkNameMap();\n }\n getMarkSet() {\n return this._marks;\n }\n getMarkInfoList(): IModelMarkInfo[] {\n return this.getMarks().map(mark => ({\n type: mark.type as MarkTypeEnum,\n name: mark.name\n }));\n }\n\n getChart() {\n return this._option.getChart();\n }\n\n /** 状态管理器 */\n state: ModelStateManager;\n getState() {\n return this.state._stateMap;\n }\n\n protected _theme?: any; // 非全局 theme,是对应于具体 model 的 theme 对象\n\n /** for layout diff */\n protected _lastLayoutRect: ILayoutRect = null;\n\n protected _tooltipHelper: ITooltipHelper | undefined;\n get tooltipHelper() {\n return this._tooltipHelper;\n }\n\n // TODO: 有些hack,这个tag是为了避免布局逻辑中,轴的数据变化,又由数据变化触发重新布局\n protected _isLayout: boolean = true;\n\n constructor(spec: IModelSpec, option: IModelOption) {\n super(option);\n this.id = createID();\n this._originalSpec = spec;\n this._spec = cloneDeepSpec(spec);\n this.userId = spec.id;\n this._specIndex = option.specIndex ?? 0;\n this.specKey = option.specKey ?? '';\n this.effect = {};\n this.event = new Event(option.eventDispatcher, option.mode);\n option.map?.set(this.id, this);\n this._sceneNodeMap = new Map();\n this.state = new ModelStateManager({\n ...option,\n stateKeyToSignalName: this.stateKeyToSignalName.bind(this)\n });\n }\n coordinate?: CoordinateType;\n\n protected releaseEvent() {\n this.event.release();\n }\n\n created() {\n this._initTheme();\n this.setAttrFromSpec();\n }\n\n updateState(newState: Record<string, unknown>) {\n return this.state.updateState(newState);\n }\n\n init(option: IModelInitOption) {\n // do nothing\n }\n onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, ctx: any): void {\n super.onLayoutStart(layoutRect, viewRect, ctx);\n this._isLayout = true;\n }\n onLayoutEnd(ctx: any): void {\n // diff layoutRect\n const layoutRect = this.getLayoutRect();\n if (this._forceLayoutTag || !isEqual(this._lastLayoutRect, layoutRect)) {\n this.updateLayoutAttribute();\n }\n this._forceLayoutTag = false;\n this.getMarks().forEach(m => m.updateLayoutState(true, true));\n this._isLayout = false;\n }\n\n protected _forceLayout() {\n if (this._isLayout) {\n return;\n }\n this._forceLayoutTag = true;\n this._option.globalInstance.getChart()?.setLayoutTag(true);\n }\n\n onEvaluateEnd(ctx: IModelEvaluateOption) {\n // do nothing\n }\n abstract onRender(ctx: IModelRenderOption): void;\n\n onDataUpdate() {\n // do nothing\n }\n\n release() {\n this.releaseEvent();\n this._originalSpec = {};\n this._spec = {};\n this.getMarks().forEach(m => m.release());\n this.state.release();\n this._data?.release();\n this._data = this._specIndex = this._sceneNodeMap = null;\n this._marks.clear();\n super.release();\n }\n\n updateSpec(spec: any) {\n this._originalSpec = spec;\n this._spec = cloneDeepSpec(spec);\n const result = {\n change: false,\n reMake: false,\n reRender: false,\n reSize: false,\n reCompile: false\n };\n return result;\n }\n\n reInit(theme?: any) {\n this._initTheme(theme);\n this.setAttrFromSpec();\n }\n\n protected _initTheme(theme?: any) {\n this._theme = theme;\n\n this._mergeMarkTheme();\n }\n\n /** 将全局的 mark theme 合并进 model theme */\n protected _mergeMarkTheme() {\n const globalTheme = this._option.getTheme?.();\n if (isNil(globalTheme) || isNil(this._theme)) {\n return;\n }\n\n const { mark: markThemeByType, markByName: markThemeByName } = globalTheme;\n this.getMarkInfoList().forEach(({ type, name }) => {\n this._theme[name] = merge(\n {},\n markThemeByType?.[array(type)[0]] ?? {},\n markThemeByName?.[name] ?? {},\n this._theme[name]\n );\n });\n }\n\n /** 对 spec 进行遍历和转换 */\n protected _preprocessSpec(obj?: any): any {\n if (!arguments.length) {\n obj = this._spec;\n }\n\n if (isArray(obj)) {\n return obj.map(element => {\n if (isObject(element) && !isFunction(element)) {\n return this._preprocessSpec(element);\n }\n return element;\n });\n }\n const newObj = { ...obj };\n Object.keys(newObj).forEach(key => {\n // 绕过 DataView 对象\n if (key.includes('data')) {\n return;\n }\n const value = obj[key];\n if (isObject(value) && !isFunction(value)) {\n // 查询、替换语义化颜色\n if (isColorKey(value)) {\n newObj[key] = getActualColor(\n value,\n this._option.getTheme?.()?.colorScheme,\n this.modelType === 'series' ? (this.type as SeriesTypeEnum) : undefined\n );\n } else {\n newObj[key] = this._preprocessSpec(value);\n }\n }\n });\n\n if (!arguments.length) {\n this._spec = newObj;\n }\n return newObj;\n }\n\n setCurrentTheme(theme: any, noRender?: boolean) {\n // do nothing\n }\n\n updateLayoutAttribute() {\n // do nothing\n }\n\n setAttrFromSpec() {\n super.setAttrFromSpec(this._spec, this._option.getChartViewRect());\n }\n\n /** mark style 内部转换逻辑,override 使用 */\n protected _convertMarkStyle<T extends ICommonSpec = ICommonSpec>(\n style: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>\n ): Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>> {\n const newStyle: any = { ...style };\n return newStyle;\n }\n\n setMarkStyle<T extends ICommonSpec>(\n mark: IMarkRaw<T>,\n style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n state?: StateValueType,\n level?: number\n ) {\n if (!isValid(mark) || !isValid(style)) {\n return;\n }\n mark.setStyle(this._convertMarkStyle(style), state, level);\n }\n\n initMarkStyleWithSpec(mark?: IMark, spec?: any, key?: string) {\n if (!isValid(mark) || !isValid(spec)) {\n return;\n }\n const { style, state } = spec;\n const newSpec = { ...spec };\n\n if (style) {\n newSpec.style = this._convertMarkStyle(style);\n }\n if (state) {\n newSpec.state = {};\n Object.keys(state).forEach(key => {\n newSpec.state[key] = this._convertMarkStyle(state[key]);\n });\n }\n mark.initStyleWithSpec(newSpec, key);\n }\n\n protected stateKeyToSignalName(key: string, opt?: string) {\n let name = `${PREFIX}_${this.modelType}_${this.type}_${this.id}_${key}`;\n opt && (name += `_${opt}`);\n return name;\n }\n\n compileData() {\n this._data?.compile();\n }\n\n compileMarks(group?: string | IGroupMark) {\n this.getMarks().forEach(m => {\n m.compile({ group });\n });\n }\n\n compileSignal() {\n this.state?.compile();\n }\n\n bindSceneNode(node: IElement) {\n this._sceneNodeMap.set(node.mark.id(), node as IElement);\n }\n\n getSceneNodes() {\n return Array.from(this._sceneNodeMap.values());\n }\n\n getSceneNodeMarks() {\n return this.getSceneNodes().map(node => node.mark as IVGrammarMark);\n }\n\n protected _createMark<T extends IMark>(markInfo: IModelMarkInfo, option: Partial<IMarkOption> = {}): T {\n const { type, name } = markInfo;\n const m = Factory.createMark(type as any, name, {\n model: this,\n map: this._option.map,\n getCompiler: this.getCompiler,\n globalScale: this._option.globalScale,\n ...option\n }) as T;\n m?.created();\n return m;\n }\n\n /**\n * 数据唯一ID\n * 根据自身动画数据匹配需求设置返回值。\n * 默认返回 undefined 时,根据 VGrammar 默认数据 ID 进行索引和匹配。\n */\n protected _getDataIdKey(): string | ((datum: Datum) => string) | undefined {\n return undefined;\n }\n}\n"]}
@@ -1,7 +1,7 @@
1
1
  import type { IBoundsLike } from '@visactor/vutils';
2
2
  import type { DataSet } from '@visactor/vdataset';
3
3
  import type { IEvent, IEventDispatcher } from '../event/interface';
4
- import type { IMark, IMarkRaw, IMarkStyle } from '../mark/interface';
4
+ import type { IMark, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';
5
5
  import type { RenderMode } from '../typings/spec/common';
6
6
  import type { VChart } from '../vchart-all';
7
7
  import type { IData, IElement, IMark as IVGrammarMark } from '@visactor/vgrammar';
@@ -127,11 +127,13 @@ export interface IModel extends ICompilable, ILayoutItem {
127
127
  setAttributeTag: (tag: boolean) => boolean;
128
128
  getOption: () => IModelOption;
129
129
  getMarks: () => IMark[];
130
+ getMarkNameMap: () => Record<string, IMark>;
131
+ getMarkInfoList: () => IModelMarkInfo[];
130
132
  getData: () => ICompilableData;
131
133
  getChart: () => IChart;
132
134
  created: () => void;
133
135
  init: (option: IModelInitOption) => void;
134
- reInit: () => void;
136
+ reInit: (theme?: any) => void;
135
137
  onLayoutStart: (layoutRect: IRect, viewRect: ILayoutRect, ctx: IModelLayoutOption) => void;
136
138
  onLayoutEnd: (ctx: IModelLayoutOption) => void;
137
139
  onEvaluateEnd: (ctx: IModelEvaluateOption) => void;
@@ -170,4 +172,8 @@ export type ILayoutModelState = ModelStateManager['_stateMap'];
170
172
  export type IModelSpec = ILayoutItemSpec & {
171
173
  id?: StringOrNumber;
172
174
  };
175
+ export interface IModelMarkInfo {
176
+ type: MarkTypeEnum | string | (MarkTypeEnum | string)[];
177
+ name: string;
178
+ }
173
179
  export {};
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/model/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\nimport type { DataSet } from '@visactor/vdataset';\nimport type { IEvent, IEventDispatcher } from '../event/interface';\nimport type { IMark, IMarkRaw, IMarkStyle } from '../mark/interface';\nimport type { RenderMode } from '../typings/spec/common';\nimport type { VChart } from '../vchart-all';\nimport type { IData, IElement, IMark as IVGrammarMark } from '@visactor/vgrammar';\nimport type {\n IOrientType,\n IPoint,\n IGroupMarkSpec,\n ConvertToMarkStyleSpec,\n CoordinateType,\n ICommonSpec,\n IRect,\n StringOrNumber\n} from '../typings';\nimport type { ITheme } from '../theme';\nimport type { StateValueType } from '../typings/spec';\nimport type { ITooltipHelper } from './tooltip-helper';\nimport type { ModelStateManager } from './model-state-manager';\nimport type { ICompilable, ICompilableInitOption } from '../compile/interface';\nimport type { ICompilableData } from '../compile/data';\nimport type { IGlobalScale } from '../scale/interface';\nimport type { IChart } from '../chart/interface';\n\nexport type ILayoutNumber = number | IPercent | ((layoutRect: ILayoutRect) => number);\n\nexport interface ILayoutPoint {\n x: number;\n y: number;\n}\n\nexport interface ILayoutRectLevel {\n width: number;\n height: number;\n}\nexport interface ILayoutRect {\n width: number;\n height: number;\n}\n\nexport type IPercent = `${number}%`;\n\nexport type ILayoutPercent = IPercent | number;\n\n/**\n * 相对布局和绝对布局\n * 在相对布局结束后进行二次的绝对布局\n * 绝对布局会只根据 chart 进行相对处理\n */\n\ntype ILayoutType = 'region-relative' | 'region' | 'normal' | 'absolute';\n\nexport type ILayoutOrientPadding = {\n left?: ILayoutNumber;\n right?: ILayoutNumber;\n top?: ILayoutNumber;\n bottom?: ILayoutNumber;\n};\n\n/** 布局 padding的配置 */\nexport type ILayoutPaddingSpec = ILayoutOrientPadding | ILayoutNumber | ILayoutNumber[];\n\n/**\n * 因为这些元素都会继承到各个模块,所以这里统一有前缀避免语意冲突\n */\nexport interface ILayoutItem {\n /**\n * 标记这个布局Item的方向(left->right, right->left, top->bottom, bottom->top)\n */\n directionStr?: 'l2r' | 'r2l' | 't2b' | 'b2t';\n layoutClip: boolean;\n layoutType: ILayoutType;\n layoutBindRegionID: number | number[];\n layoutOrient: IOrientType;\n\n layoutPaddingLeft: number;\n layoutPaddingTop: number;\n layoutPaddingRight: number;\n layoutPaddingBottom: number;\n\n layoutOffsetX: number;\n layoutOffsetY: number;\n\n // 越大越先处理\n layoutLevel: number;\n\n layoutZIndex: number;\n chartLayoutRect: ILayoutRect;\n\n /** 是否自动缩进 */\n getAutoIndent: () => boolean;\n getLayoutStartPoint: () => ILayoutPoint;\n getLayoutRect: () => ILayoutRect;\n getLastComputeOutBounds: () => IBoundsLike;\n\n getAttributeTag: () => boolean;\n setAttributeTag: (tag: boolean) => boolean;\n\n /**\n * 更新元素布局的 layoutRect 大小,用来更新指定布局空间\n */\n setLayoutRect: (rect: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRectLevel>) => void;\n /**\n * 基于元素内部逻辑计算占位空间,rect表示可用空间\n */\n computeBoundsInRect: (rect: ILayoutRect) => ILayoutRect;\n /**\n * 更新元素布局的起始点位置\n */\n setLayoutStartPosition: (pos: Partial<IPoint>) => void;\n /**\n * 更新绝对布局元素的位置信息\n */\n absoluteLayoutInRect: (rect: IRect) => void;\n /**\n * 元素内部布局信息更新\n */\n updateLayoutAttribute: () => void;\n}\n\nexport interface ILayoutItemSpec {\n /** 当前模块的布局类型,配置为 absolute 的话,当前元素会以图表左上角为原点进行绝对布局 */\n layoutType?: ILayoutType;\n /**\n * 布局顺序等级,等级越大的,越优先布局\n * 比如顶部同时有标题和图例的场景,期望标题先放在顶部,然后放置图例。\n */\n layoutLevel?: number;\n\n // 基础的布局配置\n /** 模块布局位置 */\n orient?: IOrientType;\n /** 模块的布局间距 */\n padding?: ILayoutPaddingSpec;\n /** 模块的布局大小:宽度 */\n width?: ILayoutNumber;\n /** 模块的布局最大宽度 */\n maxWidth?: ILayoutNumber;\n /** 模块的布局最小宽度 */\n minWidth?: ILayoutNumber;\n /** 模块的布局大小:高度 */\n height?: ILayoutNumber;\n /** 模块的布局最大高度 */\n maxHeight?: ILayoutNumber;\n /** 模块的布局最小高度 */\n minHeight?: ILayoutNumber;\n /** 模块的布局位置偏移:X */\n offsetX?: ILayoutNumber;\n /** 模块的布局位置偏移:Y */\n offsetY?: ILayoutNumber;\n\n /** 模块的展示层级,当2个模块重叠时,层级较大的展示在上方 */\n zIndex?: number;\n /** 模块是否裁剪超出布局区域外的绘图内容 */\n clip?: boolean;\n\n // 绝对布局下的对齐设置\n\n /** 模块绝对布局下,与图表左侧的距离。注意仅在 layoutType === 'absolute' 时生效 */\n left?: ILayoutNumber;\n /** 模块绝对布局下,与图表右侧的距离。注意仅在 layoutType === 'absolute' 时生效 */\n right?: ILayoutNumber;\n /** 模块绝对布局下,与图表顶部的距离。注意仅在 layoutType === 'absolute' 时生效 */\n top?: ILayoutNumber;\n /** 模块绝对布局下,与图表底部的距离。注意仅在 layoutType === 'absolute' 时生效 */\n bottom?: ILayoutNumber;\n /** 模块绝对布局下,元素将放置在图表的正中间。注意仅在 layoutType === 'absolute' 时生效,同时将忽略 padding 属性 */\n center?: boolean;\n}\n\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelInitOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelLayoutOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelEvaluateOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelRenderOption {}\n\nexport interface IEffect {\n [key: string]: (e?: any) => any;\n}\n\nexport interface IMarkTreeGroup extends Partial<IMarkStyle<IGroupMarkSpec>> {\n // 必须要有名字\n type: 'group';\n name: string;\n marks: (IMarkTreeGroup | IMark)[];\n // TODO: 这里要不要支持复杂场景,有图形组合的场景,用自定义mark?\n // from?: IData;\n}\n\nexport type IMarkTree = IMarkTreeGroup | IMark | (IMarkTreeGroup | IMark)[];\n\nexport interface IUpdateSpecResult {\n change: boolean;\n reMake: boolean;\n reRender?: boolean;\n reSize?: boolean;\n // TODO: compile 的判断应不应该出现在这里?\n reCompile?: boolean;\n}\n\nexport interface IModelProduct {\n srData: IData;\n}\n\nexport interface IModel extends ICompilable, ILayoutItem {\n readonly modelType: string;\n readonly type: string;\n readonly specKey: string;\n\n readonly id: number;\n\n readonly userId?: StringOrNumber;\n\n // 事件\n readonly event: IEvent;\n\n // 副作用\n readonly effect: IEffect;\n\n // state如果绑定到mark的更新?\n // 组件的 mark 要怎么样描述,才能正确的基于组件状态进行样式更新?\n // 方案1: 组件的 state 关联到 mark 的状态。\n // 方案2: 组件设置 mark 属性,mark自身属性变化时,自己去更新。\n // react state\n readonly state: ModelStateManager;\n getState: () => ModelStateManager['_stateMap'];\n\n coordinate?: CoordinateType;\n\n // 是否要 layout 的 tag\n getAttributeTag: () => boolean;\n setAttributeTag: (tag: boolean) => boolean;\n\n // 初始化参数\n getOption: () => IModelOption;\n\n getMarks: () => IMark[];\n\n getData: () => ICompilableData;\n\n getChart: () => IChart;\n\n //生命周期\n // 创建模块自身内容,设置自身属性\n created: () => void;\n // 用来处理与其他图表模块的联系\n init: (option: IModelInitOption) => void;\n // updateSpec 或者切换主题后,根据新 spec 执行的初始化过程\n reInit: () => void;\n\n onLayoutStart: (layoutRect: IRect, viewRect: ILayoutRect, ctx: IModelLayoutOption) => void;\n onLayoutEnd: (ctx: IModelLayoutOption) => void;\n onEvaluateEnd: (ctx: IModelEvaluateOption) => void;\n onRender: (ctx: IModelRenderOption) => void;\n onDataUpdate: () => void;\n\n updateSpec: (spec: any) => IUpdateSpecResult;\n getSpec?: () => any;\n getSpecIndex: () => number;\n\n setCurrentTheme: (theme: any, noRender?: boolean) => void;\n\n setMarkStyle: <T extends ICommonSpec>(\n mark?: IMarkRaw<T>,\n style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n state?: StateValueType,\n level?: number\n ) => void;\n\n initMarkStyleWithSpec: (mark?: IMark, spec?: any, key?: string) => void;\n\n // tooltip\n tooltipHelper: ITooltipHelper;\n\n /** 绑定场景结点 */\n bindSceneNode: (node: IElement) => void;\n /** 获取场景结点 */\n getSceneNodes: () => IElement[];\n /** 获取场景结点对应 mark */\n getSceneNodeMarks: () => IVGrammarMark[];\n}\n\nexport interface IModelOption extends ICompilableInitOption {\n eventDispatcher: IEventDispatcher;\n dataSet: DataSet;\n map: Map<StringOrNumber, IModel | IMark>;\n mode: RenderMode;\n globalInstance: VChart;\n specIndex?: number;\n specKey?: string;\n\n getTheme?: () => ITheme;\n\n getChartLayoutRect: () => IRect;\n getChartViewRect: () => ILayoutRect;\n\n getChart: () => IChart;\n\n globalScale: IGlobalScale;\n animation: boolean;\n}\n\nexport interface IModelConstructor {\n new (ctx: IModelOption): IModel;\n}\n\nexport type ILayoutModelState = ModelStateManager['_stateMap'];\n\n// TODO: 补充model共有配置\nexport type IModelSpec = ILayoutItemSpec & { id?: StringOrNumber };\n"]}
1
+ {"version":3,"sources":["../src/model/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\nimport type { DataSet } from '@visactor/vdataset';\nimport type { IEvent, IEventDispatcher } from '../event/interface';\nimport type { IMark, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';\nimport type { RenderMode } from '../typings/spec/common';\nimport type { VChart } from '../vchart-all';\nimport type { IData, IElement, IMark as IVGrammarMark } from '@visactor/vgrammar';\nimport type {\n IOrientType,\n IPoint,\n IGroupMarkSpec,\n ConvertToMarkStyleSpec,\n CoordinateType,\n ICommonSpec,\n IRect,\n StringOrNumber\n} from '../typings';\nimport type { ITheme } from '../theme';\nimport type { StateValueType } from '../typings/spec';\nimport type { ITooltipHelper } from './tooltip-helper';\nimport type { ModelStateManager } from './model-state-manager';\nimport type { ICompilable, ICompilableInitOption } from '../compile/interface';\nimport type { ICompilableData } from '../compile/data';\nimport type { IGlobalScale } from '../scale/interface';\nimport type { IChart } from '../chart/interface';\n\nexport type ILayoutNumber = number | IPercent | ((layoutRect: ILayoutRect) => number);\n\nexport interface ILayoutPoint {\n x: number;\n y: number;\n}\n\nexport interface ILayoutRectLevel {\n width: number;\n height: number;\n}\nexport interface ILayoutRect {\n width: number;\n height: number;\n}\n\nexport type IPercent = `${number}%`;\n\nexport type ILayoutPercent = IPercent | number;\n\n/**\n * 相对布局和绝对布局\n * 在相对布局结束后进行二次的绝对布局\n * 绝对布局会只根据 chart 进行相对处理\n */\n\ntype ILayoutType = 'region-relative' | 'region' | 'normal' | 'absolute';\n\nexport type ILayoutOrientPadding = {\n left?: ILayoutNumber;\n right?: ILayoutNumber;\n top?: ILayoutNumber;\n bottom?: ILayoutNumber;\n};\n\n/** 布局 padding的配置 */\nexport type ILayoutPaddingSpec = ILayoutOrientPadding | ILayoutNumber | ILayoutNumber[];\n\n/**\n * 因为这些元素都会继承到各个模块,所以这里统一有前缀避免语意冲突\n */\nexport interface ILayoutItem {\n /**\n * 标记这个布局Item的方向(left->right, right->left, top->bottom, bottom->top)\n */\n directionStr?: 'l2r' | 'r2l' | 't2b' | 'b2t';\n layoutClip: boolean;\n layoutType: ILayoutType;\n layoutBindRegionID: number | number[];\n layoutOrient: IOrientType;\n\n layoutPaddingLeft: number;\n layoutPaddingTop: number;\n layoutPaddingRight: number;\n layoutPaddingBottom: number;\n\n layoutOffsetX: number;\n layoutOffsetY: number;\n\n // 越大越先处理\n layoutLevel: number;\n\n layoutZIndex: number;\n chartLayoutRect: ILayoutRect;\n\n /** 是否自动缩进 */\n getAutoIndent: () => boolean;\n getLayoutStartPoint: () => ILayoutPoint;\n getLayoutRect: () => ILayoutRect;\n getLastComputeOutBounds: () => IBoundsLike;\n\n getAttributeTag: () => boolean;\n setAttributeTag: (tag: boolean) => boolean;\n\n /**\n * 更新元素布局的 layoutRect 大小,用来更新指定布局空间\n */\n setLayoutRect: (rect: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRectLevel>) => void;\n /**\n * 基于元素内部逻辑计算占位空间,rect表示可用空间\n */\n computeBoundsInRect: (rect: ILayoutRect) => ILayoutRect;\n /**\n * 更新元素布局的起始点位置\n */\n setLayoutStartPosition: (pos: Partial<IPoint>) => void;\n /**\n * 更新绝对布局元素的位置信息\n */\n absoluteLayoutInRect: (rect: IRect) => void;\n /**\n * 元素内部布局信息更新\n */\n updateLayoutAttribute: () => void;\n}\n\nexport interface ILayoutItemSpec {\n /** 当前模块的布局类型,配置为 absolute 的话,当前元素会以图表左上角为原点进行绝对布局 */\n layoutType?: ILayoutType;\n /**\n * 布局顺序等级,等级越大的,越优先布局\n * 比如顶部同时有标题和图例的场景,期望标题先放在顶部,然后放置图例。\n */\n layoutLevel?: number;\n\n // 基础的布局配置\n /** 模块布局位置 */\n orient?: IOrientType;\n /** 模块的布局间距 */\n padding?: ILayoutPaddingSpec;\n /** 模块的布局大小:宽度 */\n width?: ILayoutNumber;\n /** 模块的布局最大宽度 */\n maxWidth?: ILayoutNumber;\n /** 模块的布局最小宽度 */\n minWidth?: ILayoutNumber;\n /** 模块的布局大小:高度 */\n height?: ILayoutNumber;\n /** 模块的布局最大高度 */\n maxHeight?: ILayoutNumber;\n /** 模块的布局最小高度 */\n minHeight?: ILayoutNumber;\n /** 模块的布局位置偏移:X */\n offsetX?: ILayoutNumber;\n /** 模块的布局位置偏移:Y */\n offsetY?: ILayoutNumber;\n\n /** 模块的展示层级,当2个模块重叠时,层级较大的展示在上方 */\n zIndex?: number;\n /** 模块是否裁剪超出布局区域外的绘图内容 */\n clip?: boolean;\n\n // 绝对布局下的对齐设置\n\n /** 模块绝对布局下,与图表左侧的距离。注意仅在 layoutType === 'absolute' 时生效 */\n left?: ILayoutNumber;\n /** 模块绝对布局下,与图表右侧的距离。注意仅在 layoutType === 'absolute' 时生效 */\n right?: ILayoutNumber;\n /** 模块绝对布局下,与图表顶部的距离。注意仅在 layoutType === 'absolute' 时生效 */\n top?: ILayoutNumber;\n /** 模块绝对布局下,与图表底部的距离。注意仅在 layoutType === 'absolute' 时生效 */\n bottom?: ILayoutNumber;\n /** 模块绝对布局下,元素将放置在图表的正中间。注意仅在 layoutType === 'absolute' 时生效,同时将忽略 padding 属性 */\n center?: boolean;\n}\n\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelInitOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelLayoutOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelEvaluateOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelRenderOption {}\n\nexport interface IEffect {\n [key: string]: (e?: any) => any;\n}\n\nexport interface IMarkTreeGroup extends Partial<IMarkStyle<IGroupMarkSpec>> {\n // 必须要有名字\n type: 'group';\n name: string;\n marks: (IMarkTreeGroup | IMark)[];\n // TODO: 这里要不要支持复杂场景,有图形组合的场景,用自定义mark?\n // from?: IData;\n}\n\nexport type IMarkTree = IMarkTreeGroup | IMark | (IMarkTreeGroup | IMark)[];\n\nexport interface IUpdateSpecResult {\n change: boolean;\n reMake: boolean;\n reRender?: boolean;\n reSize?: boolean;\n // TODO: compile 的判断应不应该出现在这里?\n reCompile?: boolean;\n}\n\nexport interface IModelProduct {\n srData: IData;\n}\n\nexport interface IModel extends ICompilable, ILayoutItem {\n readonly modelType: string;\n readonly type: string;\n readonly specKey: string;\n\n readonly id: number;\n\n readonly userId?: StringOrNumber;\n\n // 事件\n readonly event: IEvent;\n\n // 副作用\n readonly effect: IEffect;\n\n // state如果绑定到mark的更新?\n // 组件的 mark 要怎么样描述,才能正确的基于组件状态进行样式更新?\n // 方案1: 组件的 state 关联到 mark 的状态。\n // 方案2: 组件设置 mark 属性,mark自身属性变化时,自己去更新。\n // react state\n readonly state: ModelStateManager;\n getState: () => ModelStateManager['_stateMap'];\n\n coordinate?: CoordinateType;\n\n // 是否要 layout 的 tag\n getAttributeTag: () => boolean;\n setAttributeTag: (tag: boolean) => boolean;\n\n // 初始化参数\n getOption: () => IModelOption;\n\n getMarks: () => IMark[];\n getMarkNameMap: () => Record<string, IMark>;\n getMarkInfoList: () => IModelMarkInfo[];\n\n getData: () => ICompilableData;\n\n getChart: () => IChart;\n\n //生命周期\n // 创建模块自身内容,设置自身属性\n created: () => void;\n // 用来处理与其他图表模块的联系\n init: (option: IModelInitOption) => void;\n // updateSpec 或者切换主题后,根据新 spec 执行的初始化过程\n reInit: (theme?: any) => void;\n\n onLayoutStart: (layoutRect: IRect, viewRect: ILayoutRect, ctx: IModelLayoutOption) => void;\n onLayoutEnd: (ctx: IModelLayoutOption) => void;\n onEvaluateEnd: (ctx: IModelEvaluateOption) => void;\n onRender: (ctx: IModelRenderOption) => void;\n onDataUpdate: () => void;\n\n updateSpec: (spec: any) => IUpdateSpecResult;\n getSpec?: () => any;\n getSpecIndex: () => number;\n\n setCurrentTheme: (theme: any, noRender?: boolean) => void;\n\n setMarkStyle: <T extends ICommonSpec>(\n mark?: IMarkRaw<T>,\n style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n state?: StateValueType,\n level?: number\n ) => void;\n\n initMarkStyleWithSpec: (mark?: IMark, spec?: any, key?: string) => void;\n\n // tooltip\n tooltipHelper: ITooltipHelper;\n\n /** 绑定场景结点 */\n bindSceneNode: (node: IElement) => void;\n /** 获取场景结点 */\n getSceneNodes: () => IElement[];\n /** 获取场景结点对应 mark */\n getSceneNodeMarks: () => IVGrammarMark[];\n}\n\nexport interface IModelOption extends ICompilableInitOption {\n eventDispatcher: IEventDispatcher;\n dataSet: DataSet;\n map: Map<StringOrNumber, IModel | IMark>;\n mode: RenderMode;\n globalInstance: VChart;\n specIndex?: number;\n specKey?: string;\n\n getTheme?: () => ITheme;\n\n getChartLayoutRect: () => IRect;\n getChartViewRect: () => ILayoutRect;\n\n getChart: () => IChart;\n\n globalScale: IGlobalScale;\n animation: boolean;\n}\n\nexport interface IModelConstructor {\n new (ctx: IModelOption): IModel;\n}\n\nexport type ILayoutModelState = ModelStateManager['_stateMap'];\n\n// TODO: 补充model共有配置\nexport type IModelSpec = ILayoutItemSpec & { id?: StringOrNumber };\n\nexport interface IModelMarkInfo {\n /** mark 类型 */\n type: MarkTypeEnum | string | (MarkTypeEnum | string)[];\n /** mark 名称 */\n name: string;\n}\n"]}
@@ -54,23 +54,25 @@ export class LayoutItem extends CompilableBase {
54
54
  return this._attributeTag = tag, this._attributeTag;
55
55
  }
56
56
  _setLayoutAttributeFromSpec(spec, chartViewRect) {
57
- const padding = normalizeLayoutPaddingSpec(spec.padding), paddingValue = calcPadding(padding, chartViewRect, chartViewRect);
58
- this.layoutPaddingLeft = paddingValue.left, this.layoutPaddingRight = paddingValue.right,
59
- this.layoutPaddingTop = paddingValue.top, this.layoutPaddingBottom = paddingValue.bottom,
60
- this._minHeight = isNil(spec.minHeight) ? null : calcLayoutNumber(spec.minHeight, chartViewRect.height, chartViewRect),
61
- this._maxHeight = isNil(spec.maxHeight) ? null : calcLayoutNumber(spec.maxHeight, chartViewRect.height, chartViewRect),
62
- this._minWidth = isNil(spec.minWidth) ? null : calcLayoutNumber(spec.minWidth, chartViewRect.width, chartViewRect),
63
- this._maxWidth = isNil(spec.maxWidth) ? null : calcLayoutNumber(spec.maxWidth, chartViewRect.width, chartViewRect),
64
- spec.width && this.setLayoutRect({
65
- width: calcLayoutNumber(spec.width, chartViewRect.width, chartViewRect)
66
- }, {
67
- width: USER_LAYOUT_RECT_LEVEL
68
- }), spec.height && this.setLayoutRect({
69
- height: calcLayoutNumber(spec.height, chartViewRect.height, chartViewRect)
70
- }, {
71
- height: USER_LAYOUT_RECT_LEVEL
72
- }), isNil(spec.offsetX) || (this.layoutOffsetX = calcLayoutNumber(spec.offsetX, chartViewRect.width, chartViewRect)),
73
- isNil(spec.offsetY) || (this.layoutOffsetY = calcLayoutNumber(spec.offsetY, chartViewRect.height, chartViewRect));
57
+ if (!1 !== this._spec.visible) {
58
+ const padding = normalizeLayoutPaddingSpec(spec.padding), paddingValue = calcPadding(padding, chartViewRect, chartViewRect);
59
+ this.layoutPaddingLeft = paddingValue.left, this.layoutPaddingRight = paddingValue.right,
60
+ this.layoutPaddingTop = paddingValue.top, this.layoutPaddingBottom = paddingValue.bottom,
61
+ this._minHeight = isNil(spec.minHeight) ? null : calcLayoutNumber(spec.minHeight, chartViewRect.height, chartViewRect),
62
+ this._maxHeight = isNil(spec.maxHeight) ? null : calcLayoutNumber(spec.maxHeight, chartViewRect.height, chartViewRect),
63
+ this._minWidth = isNil(spec.minWidth) ? null : calcLayoutNumber(spec.minWidth, chartViewRect.width, chartViewRect),
64
+ this._maxWidth = isNil(spec.maxWidth) ? null : calcLayoutNumber(spec.maxWidth, chartViewRect.width, chartViewRect),
65
+ spec.width && this.setLayoutRect({
66
+ width: calcLayoutNumber(spec.width, chartViewRect.width, chartViewRect)
67
+ }, {
68
+ width: USER_LAYOUT_RECT_LEVEL
69
+ }), spec.height && this.setLayoutRect({
70
+ height: calcLayoutNumber(spec.height, chartViewRect.height, chartViewRect)
71
+ }, {
72
+ height: USER_LAYOUT_RECT_LEVEL
73
+ }), isNil(spec.offsetX) || (this.layoutOffsetX = calcLayoutNumber(spec.offsetX, chartViewRect.width, chartViewRect)),
74
+ isNil(spec.offsetY) || (this.layoutOffsetY = calcLayoutNumber(spec.offsetY, chartViewRect.height, chartViewRect));
75
+ }
74
76
  }
75
77
  setAttrFromSpec(spec, chartViewRect) {
76
78
  var _a, _b, _c, _d, _e;
@@ -1 +1 @@
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 } from '@visactor/vutils';\nimport { isValidNumber, calcLayoutNumber, calcPadding, normalizeLayoutPaddingSpec, boundsInRect } from '../util';\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 extends CompilableBase implements ILayoutItem {\n protected _spec: ILayoutItemSpec;\n getSpec(): any {\n return this._spec;\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 private _minWidth: number | null = null;\n private _maxWidth: number | null = null;\n private _minHeight: number | null = null;\n private _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 protected _attributeTag: boolean = true;\n getAttributeTag(): boolean {\n return this._attributeTag;\n }\n setAttributeTag(tag: boolean): boolean {\n this._attributeTag = tag;\n return this._attributeTag;\n }\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 private _setLayoutAttributeFromSpec(spec: ILayoutItemSpec, chartViewRect: ILayoutRect) {\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 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) ? null : calcLayoutNumber(spec.minWidth, chartViewRect.width, chartViewRect);\n this._maxWidth = isNil(spec.maxWidth) ? null : 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 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 private _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 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"]}
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 } from '@visactor/vutils';\nimport { isValidNumber, calcLayoutNumber, calcPadding, normalizeLayoutPaddingSpec, boundsInRect } from '../util';\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 extends CompilableBase implements ILayoutItem {\n protected _spec: ILayoutItemSpec;\n getSpec(): any {\n return this._spec;\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 private _minWidth: number | null = null;\n private _maxWidth: number | null = null;\n private _minHeight: number | null = null;\n private _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 protected _attributeTag: boolean = true;\n getAttributeTag(): boolean {\n return this._attributeTag;\n }\n setAttributeTag(tag: boolean): boolean {\n this._attributeTag = tag;\n return this._attributeTag;\n }\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 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 private _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 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"]}
@@ -8,7 +8,6 @@ import type { IGroupMark } from '../mark/group';
8
8
  import type { IInteraction, ITrigger } from '../interaction/interface';
9
9
  import type { IRectMark } from '../mark/rect';
10
10
  import type { IAnimate } from '../animation/interface';
11
- import { MarkSet } from '../mark/mark-set';
12
11
  import type { StringOrNumber } from '../typings';
13
12
  export declare class Region extends BaseModel implements IRegion {
14
13
  static type: string;
@@ -19,8 +18,6 @@ export declare class Region extends BaseModel implements IRegion {
19
18
  layoutZIndex: number;
20
19
  animate?: IAnimate;
21
20
  interaction: IInteraction;
22
- protected _marks: MarkSet;
23
- getMarks(): import("../mark/interface").IMark[];
24
21
  protected _groupMark: IGroupMark;
25
22
  getGroupMark(): IGroupMark;
26
23
  protected _backgroundMark?: IRectMark;
@@ -41,7 +38,7 @@ export declare class Region extends BaseModel implements IRegion {
41
38
  reSize: boolean;
42
39
  reCompile: boolean;
43
40
  };
44
- reInit(): void;
41
+ reInit(theme?: any): void;
45
42
  addSeries(s: ISeries): void;
46
43
  removeSeries(s: ISeries): void;
47
44
  getSeries(opt?: {
@@ -16,12 +16,7 @@ import { array, isValid, log } from "../util";
16
16
 
17
17
  import { AnimateManager } from "../animation/animate-manager";
18
18
 
19
- import { MarkSet } from "../mark/mark-set";
20
-
21
19
  export class Region extends BaseModel {
22
- getMarks() {
23
- return this._marks.getMarks();
24
- }
25
20
  getGroupMark() {
26
21
  return this._groupMark;
27
22
  }
@@ -29,7 +24,7 @@ export class Region extends BaseModel {
29
24
  var _a;
30
25
  super(spec, ctx), this.modelType = "region", this.type = Region.type, this._series = [],
31
26
  this.layoutType = "region", this.layoutZIndex = LayoutZIndex.Region, this.interaction = new Interaction,
32
- this._marks = new MarkSet, this.seriesDataFilterOver = () => {
27
+ this.seriesDataFilterOver = () => {
33
28
  this.event.emit(ChartEvent.regionSeriesDataFilterOver, {
34
29
  model: this
35
30
  }), this._series.forEach((s => s.reTransformViewData()));
@@ -45,8 +40,10 @@ export class Region extends BaseModel {
45
40
  }
46
41
  created() {
47
42
  var _a, _b, _c, _d, _e, _f;
48
- super.created(), this._groupMark = this._createMark(MarkTypeEnum.group, "regionGroup"),
49
- this._groupMark.setUserId(this.userId), this._groupMark.setZIndex(this.layoutZIndex);
43
+ super.created(), this._groupMark = this._createMark({
44
+ type: MarkTypeEnum.group,
45
+ name: "regionGroup"
46
+ }), this._groupMark.setUserId(this.userId), this._groupMark.setZIndex(this.layoutZIndex);
50
47
  const clip = null !== (_a = this._spec.clip) && void 0 !== _a ? _a : this._getClipDefaultValue();
51
48
  this.setMarkStyle(this._groupMark, {
52
49
  x: () => this.getLayoutStartPoint().x,
@@ -60,8 +57,13 @@ export class Region extends BaseModel {
60
57
  cornerRadiusTopRight: null === (_d = this._spec.style) || void 0 === _d ? void 0 : _d.cornerRadiusTopRight,
61
58
  cornerRadiusBottomLeft: null === (_e = this._spec.style) || void 0 === _e ? void 0 : _e.cornerRadiusBottomLeft,
62
59
  cornerRadiusBottomRight: null === (_f = this._spec.style) || void 0 === _f ? void 0 : _f.cornerRadiusBottomRight
63
- }, "normal", AttributeLevel.User_Mark), this._marks.addMark(this._groupMark), this._spec.style && (this._backgroundMark = this._createMark("rect", "regionBackground"),
64
- clip && (this._foregroundMark = this._createMark("rect", "regionForeground")), [ this._backgroundMark, this._foregroundMark ].forEach((mark => {
60
+ }, "normal", AttributeLevel.User_Mark), this._marks.addMark(this._groupMark), this._spec.style && (this._backgroundMark = this._createMark({
61
+ type: MarkTypeEnum.rect,
62
+ name: "regionBackground"
63
+ }), clip && (this._foregroundMark = this._createMark({
64
+ type: MarkTypeEnum.rect,
65
+ name: "regionForeground"
66
+ })), [ this._backgroundMark, this._foregroundMark ].forEach((mark => {
65
67
  mark && (mark.created(), this.setMarkStyle(mark, {
66
68
  width: () => this.getLayoutRect().width,
67
69
  height: () => this.getLayoutRect().height
@@ -94,8 +96,8 @@ export class Region extends BaseModel {
94
96
  return originalSpec.style && !(null == spec ? void 0 : spec.style) || !originalSpec.style && (null == spec ? void 0 : spec.style) ? (result.reMake = !0,
95
97
  result) : result;
96
98
  }
97
- reInit() {
98
- super.reInit(), this._initBackgroundMarkStyle(), this._initForegroundMarkStyle();
99
+ reInit(theme) {
100
+ super.reInit(theme), this._initBackgroundMarkStyle(), this._initForegroundMarkStyle();
99
101
  }
100
102
  addSeries(s) {
101
103
  s && (this._series.includes(s) || this._series.push(s));
@@ -147,7 +149,7 @@ export class Region extends BaseModel {
147
149
  this._option.dataSet.multipleDataViewAddListener(viewDataFilters, "change", this.seriesDataFilterOver);
148
150
  }
149
151
  release() {
150
- super.release(), this._series = [], this._marks.clear();
152
+ super.release(), this._series = [];
151
153
  }
152
154
  createTrigger() {
153
155
  const triggerOptions = Object.assign(Object.assign({}, this._option), {