npm - @visactor/vchart - Versions diffs - 1.6.7 → 1.7.0-alpha.1 - Mend

@visactor/vchart 1.6.7 → 1.7.0-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (993) hide show

package/build/es5/index.js +1 -1
package/build/index.js +44570 -43966
package/build/index.min.js +1 -1
package/build/tsconfig.tsbuildinfo +1 -1
package/cjs/animation/utils.d.ts +2 -2
package/cjs/chart/area/area.js +2 -1
package/cjs/chart/area/area.js.map +1 -1
package/cjs/chart/base-chart.d.ts +13 -16
package/cjs/chart/base-chart.js +68 -68
package/cjs/chart/base-chart.js.map +1 -1
package/cjs/chart/interface/chart.d.ts +4 -6
package/cjs/chart/interface/chart.js.map +1 -1
package/cjs/chart/line/line.js +2 -1
package/cjs/chart/line/line.js.map +1 -1
package/cjs/chart/sequence/sequence.d.ts +1 -1
package/cjs/chart/sequence/sequence.js +1 -1
package/cjs/chart/sequence/sequence.js.map +1 -1
package/cjs/compile/compiler.js +1 -2
package/cjs/compile/grammar-item.js +2 -1
package/cjs/compile/mark/compilable-mark.d.ts +10 -6
package/cjs/compile/mark/compilable-mark.js +22 -11
package/cjs/compile/mark/compilable-mark.js.map +1 -1
package/cjs/compile/mark/interface.d.ts +6 -4
package/cjs/compile/mark/interface.js.map +1 -1
package/cjs/compile/mark/util.d.ts +1 -3
package/cjs/compile/mark/util.js +1 -37
package/cjs/compile/mark/util.js.map +1 -1
package/cjs/component/axis/base-axis.d.ts +2 -4
package/cjs/component/axis/base-axis.js +20 -35
package/cjs/component/axis/base-axis.js.map +1 -1
package/cjs/component/axis/cartesian/axis.d.ts +12 -22
package/cjs/component/axis/cartesian/axis.js +51 -67
package/cjs/component/axis/cartesian/axis.js.map +1 -1
package/cjs/component/axis/cartesian/band-axis.d.ts +0 -7
package/cjs/component/axis/cartesian/band-axis.js +0 -1
package/cjs/component/axis/cartesian/band-axis.js.map +1 -1
package/cjs/component/axis/cartesian/interface/common.d.ts +0 -6
package/cjs/component/axis/cartesian/interface/common.js.map +1 -1
package/cjs/component/axis/cartesian/interface/theme.d.ts +1 -1
package/cjs/component/axis/cartesian/interface/theme.js.map +1 -1
package/cjs/component/axis/interface/common.d.ts +0 -1
package/cjs/component/axis/interface/common.js.map +1 -1
package/cjs/component/axis/interface/spec.js.map +1 -1
package/cjs/component/axis/mixin/band-axis-mixin.d.ts +0 -1
package/cjs/component/axis/mixin/band-axis-mixin.js +2 -2
package/cjs/component/axis/mixin/band-axis-mixin.js.map +1 -1
package/cjs/component/axis/mixin/linear-axis-mixin.d.ts +0 -1
package/cjs/component/axis/mixin/linear-axis-mixin.js +4 -3
package/cjs/component/axis/mixin/linear-axis-mixin.js.map +1 -1
package/cjs/component/axis/polar/axis.d.ts +3 -4
package/cjs/component/axis/polar/axis.js +13 -15
package/cjs/component/axis/polar/axis.js.map +1 -1
package/cjs/component/base/base-component.d.ts +12 -4
package/cjs/component/base/base-component.js +21 -11
package/cjs/component/base/base-component.js.map +1 -1
package/cjs/component/base/util.js +16 -12
package/cjs/component/base/util.js.map +1 -1
package/cjs/component/brush/brush.d.ts +2 -4
package/cjs/component/brush/brush.js +4 -6
package/cjs/component/brush/brush.js.map +1 -1
package/cjs/component/crosshair/base.d.ts +3 -4
package/cjs/component/crosshair/base.js +1 -1
package/cjs/component/crosshair/base.js.map +1 -1
package/cjs/component/crosshair/cartesian.d.ts +2 -0
package/cjs/component/crosshair/cartesian.js +6 -8
package/cjs/component/crosshair/cartesian.js.map +1 -1
package/cjs/component/crosshair/interface/spec.d.ts +1 -1
package/cjs/component/crosshair/interface/spec.js.map +1 -1
package/cjs/component/crosshair/polar.d.ts +2 -0
package/cjs/component/crosshair/polar.js +5 -8
package/cjs/component/crosshair/polar.js.map +1 -1
package/cjs/component/custom-mark/custom-mark.d.ts +2 -3
package/cjs/component/custom-mark/custom-mark.js +2 -3
package/cjs/component/custom-mark/custom-mark.js.map +1 -1
package/cjs/component/data-zoom/data-filter-base-component.d.ts +8 -8
package/cjs/component/data-zoom/data-filter-base-component.js +60 -38
package/cjs/component/data-zoom/data-filter-base-component.js.map +1 -1
package/cjs/component/data-zoom/data-zoom/data-zoom.d.ts +4 -2
package/cjs/component/data-zoom/data-zoom/data-zoom.js +47 -44
package/cjs/component/data-zoom/data-zoom/data-zoom.js.map +1 -1
package/cjs/component/data-zoom/data-zoom/interface.d.ts +6 -1
package/cjs/component/data-zoom/data-zoom/interface.js.map +1 -1
package/cjs/component/data-zoom/scroll-bar/interface.d.ts +6 -2
package/cjs/component/data-zoom/scroll-bar/interface.js.map +1 -1
package/cjs/component/data-zoom/scroll-bar/scroll-bar.d.ts +3 -0
package/cjs/component/data-zoom/scroll-bar/scroll-bar.js +24 -23
package/cjs/component/data-zoom/scroll-bar/scroll-bar.js.map +1 -1
package/cjs/component/data-zoom/util.d.ts +4 -0
package/cjs/component/data-zoom/util.js +11 -2
package/cjs/component/data-zoom/util.js.map +1 -1
package/cjs/component/geo/geo-coordinate.d.ts +3 -2
package/cjs/component/geo/geo-coordinate.js +4 -4
package/cjs/component/geo/geo-coordinate.js.map +1 -1
package/cjs/component/index.d.ts +3 -2
package/cjs/component/index.js.map +1 -1
package/cjs/component/indicator/indicator.d.ts +1 -3
package/cjs/component/indicator/indicator.js +4 -5
package/cjs/component/indicator/indicator.js.map +1 -1
package/cjs/component/indicator/interface.d.ts +1 -1
package/cjs/component/indicator/interface.js.map +1 -1
package/cjs/component/interface/common.d.ts +3 -3
package/cjs/component/interface/common.js.map +1 -1
package/cjs/component/interface/theme.d.ts +2 -1
package/cjs/component/interface/theme.js.map +1 -1
package/cjs/component/label/base-label.d.ts +2 -4
package/cjs/component/label/base-label.js +1 -3
package/cjs/component/label/base-label.js.map +1 -1
package/cjs/component/label/interface.d.ts +4 -0
package/cjs/component/label/interface.js.map +1 -1
package/cjs/component/label/label.d.ts +5 -7
package/cjs/component/label/label.js +15 -11
package/cjs/component/label/label.js.map +1 -1
package/cjs/component/label/totalLabel.d.ts +1 -3
package/cjs/component/label/totalLabel.js +4 -4
package/cjs/component/label/totalLabel.js.map +1 -1
package/cjs/component/label/util.d.ts +9 -2
package/cjs/component/label/util.js +20 -5
package/cjs/component/label/util.js.map +1 -1
package/cjs/component/legend/base-legend.d.ts +6 -9
package/cjs/component/legend/base-legend.js +3 -9
package/cjs/component/legend/base-legend.js.map +1 -1
package/cjs/component/legend/continuous/legend.d.ts +4 -1
package/cjs/component/legend/continuous/legend.js +7 -7
package/cjs/component/legend/continuous/legend.js.map +1 -1
package/cjs/component/legend/discrete/legend.d.ts +4 -1
package/cjs/component/legend/discrete/legend.js +6 -7
package/cjs/component/legend/discrete/legend.js.map +1 -1
package/cjs/component/legend/discrete/util.d.ts +1 -1
package/cjs/component/legend/discrete/util.js.map +1 -1
package/cjs/component/legend/util.d.ts +2 -2
package/cjs/component/map-label/component.d.ts +1 -3
package/cjs/component/map-label/component.js +2 -3
package/cjs/component/map-label/component.js.map +1 -1
package/cjs/component/marker/base-marker.d.ts +7 -3
package/cjs/component/marker/base-marker.js +43 -19
package/cjs/component/marker/base-marker.js.map +1 -1
package/cjs/component/marker/interface.d.ts +15 -4
package/cjs/component/marker/interface.js.map +1 -1
package/cjs/component/marker/mark-area/interface/spec.d.ts +1 -1
package/cjs/component/marker/mark-area/interface/spec.js.map +1 -1
package/cjs/component/marker/mark-area/mark-area.d.ts +1 -3
package/cjs/component/marker/mark-area/mark-area.js +32 -20
package/cjs/component/marker/mark-area/mark-area.js.map +1 -1
package/cjs/component/marker/mark-line/interface/spec.d.ts +3 -4
package/cjs/component/marker/mark-line/interface/spec.js.map +1 -1
package/cjs/component/marker/mark-line/mark-line.d.ts +1 -3
package/cjs/component/marker/mark-line/mark-line.js +36 -22
package/cjs/component/marker/mark-line/mark-line.js.map +1 -1
package/cjs/component/marker/mark-line/util.d.ts +3 -3
package/cjs/component/marker/mark-line/util.js.map +1 -1
package/cjs/component/marker/mark-point/interface/spec.d.ts +5 -4
package/cjs/component/marker/mark-point/interface/spec.js.map +1 -1
package/cjs/component/marker/mark-point/interface/theme.d.ts +5 -5
package/cjs/component/marker/mark-point/interface/theme.js.map +1 -1
package/cjs/component/marker/mark-point/mark-point.d.ts +1 -3
package/cjs/component/marker/mark-point/mark-point.js +17 -13
package/cjs/component/marker/mark-point/mark-point.js.map +1 -1
package/cjs/component/marker/utils.d.ts +3 -4
package/cjs/component/marker/utils.js +44 -25
package/cjs/component/marker/utils.js.map +1 -1
package/cjs/component/player/interface/theme.d.ts +1 -1
package/cjs/component/player/interface/theme.js.map +1 -1
package/cjs/component/player/player.d.ts +6 -7
package/cjs/component/player/player.js +4 -7
package/cjs/component/player/player.js.map +1 -1
package/cjs/component/title/interface/theme.d.ts +1 -1
package/cjs/component/title/interface/theme.js.map +1 -1
package/cjs/component/title/title.d.ts +6 -9
package/cjs/component/title/title.js +13 -24
package/cjs/component/title/title.js.map +1 -1
package/cjs/component/tooltip/handler/base.js +6 -6
package/cjs/component/tooltip/handler/base.js.map +1 -1
package/cjs/component/tooltip/handler/dom/util.js +3 -2
package/cjs/component/tooltip/handler/dom/util.js.map +1 -1
package/cjs/component/tooltip/handler/utils/attribute.d.ts +3 -3
package/cjs/component/tooltip/handler/utils/attribute.js.map +1 -1
package/cjs/component/tooltip/handler/utils/common.js.map +1 -1
package/cjs/component/tooltip/interface/spec.d.ts +1 -1
package/cjs/component/tooltip/interface/spec.js.map +1 -1
package/cjs/component/tooltip/interface/theme.d.ts +10 -11
package/cjs/component/tooltip/interface/theme.js.map +1 -1
package/cjs/component/tooltip/tooltip.d.ts +3 -2
package/cjs/component/tooltip/tooltip.js +7 -11
package/cjs/component/tooltip/tooltip.js.map +1 -1
package/cjs/component/util.d.ts +1 -3
package/cjs/component/util.js +2 -2
package/cjs/component/util.js.map +1 -1
package/cjs/constant/index.js +2 -1
package/cjs/constant/layout.d.ts +1 -0
package/cjs/constant/layout.js +2 -2
package/cjs/constant/layout.js.map +1 -1
package/cjs/constant/scatter.js +1 -2
package/cjs/core/expression-function.d.ts +12 -0
package/cjs/core/expression-function.js +30 -0
package/cjs/core/expression-function.js.map +1 -0
package/cjs/core/factory.d.ts +5 -2
package/cjs/core/factory.js +6 -3
package/cjs/core/factory.js.map +1 -1
package/cjs/core/index.d.ts +2 -1
package/cjs/core/index.js +3 -2
package/cjs/core/index.js.map +1 -1
package/cjs/core/interface.d.ts +5 -0
package/cjs/core/interface.js.map +1 -1
package/cjs/core/vchart.d.ts +9 -1
package/cjs/core/vchart.js +94 -68
package/cjs/core/vchart.js.map +1 -1
package/cjs/data/initialize.js +7 -6
package/cjs/data/initialize.js.map +1 -1
package/cjs/data/transforms/aggregation.d.ts +4 -3
package/cjs/data/transforms/aggregation.js +4 -4
package/cjs/data/transforms/aggregation.js.map +1 -1
package/cjs/data/transforms/dimension-statistics.js +14 -4
package/cjs/data/transforms/dimension-statistics.js.map +1 -1
package/cjs/event/bubble.js +1 -2
package/cjs/event/event.js +2 -1
package/cjs/event/events/base.d.ts +16 -0
package/cjs/event/events/base.js +23 -0
package/cjs/event/events/base.js.map +1 -0
package/cjs/event/events/dimension/util/cartesian.d.ts +1 -1
package/cjs/event/events/dimension/util/cartesian.js.map +1 -1
package/cjs/event/events/dimension/util/common.d.ts +1 -2
package/cjs/event/events/dimension/util/common.js +1 -1
package/cjs/event/events/dimension/util/common.js.map +1 -1
package/cjs/event/events/dimension/util/polar.d.ts +1 -1
package/cjs/event/events/dimension/util/polar.js.map +1 -1
package/cjs/event/interface.d.ts +2 -2
package/cjs/event/interface.js.map +1 -1
package/cjs/index-wx-simple.d.ts +4 -0
package/cjs/index-wx-simple.js +35 -0
package/cjs/index-wx-simple.js.map +1 -0
package/cjs/interaction/trigger.js +1 -1
package/cjs/interaction/zoom/zoomable.d.ts +1 -0
package/cjs/interaction/zoom/zoomable.js +6 -5
package/cjs/interaction/zoom/zoomable.js.map +1 -1
package/cjs/layout/base-layout.d.ts +3 -5
package/cjs/layout/base-layout.js +9 -9
package/cjs/layout/base-layout.js.map +1 -1
package/cjs/layout/grid-layout/grid-layout.d.ts +1 -2
package/cjs/layout/grid-layout/grid-layout.js +6 -4
package/cjs/layout/grid-layout/grid-layout.js.map +1 -1
package/cjs/layout/interface.d.ts +74 -6
package/cjs/layout/interface.js.map +1 -1
package/cjs/{model → layout}/layout-item.d.ts +35 -23
package/cjs/{model → layout}/layout-item.js +98 -64
package/cjs/layout/layout-item.js.map +1 -0
package/cjs/layout/layout3d/index.d.ts +2 -4
package/cjs/layout/layout3d/index.js +6 -6
package/cjs/layout/layout3d/index.js.map +1 -1
package/cjs/layout/util.d.ts +1 -1
package/cjs/layout/util.js.map +1 -1
package/cjs/mark/arc.js +2 -2
package/cjs/mark/arc.js.map +1 -1
package/cjs/mark/base/base-mark.d.ts +2 -2
package/cjs/mark/base/base-mark.js +62 -40
package/cjs/mark/base/base-mark.js.map +1 -1
package/cjs/mark/label.js +1 -4
package/cjs/mark/label.js.map +1 -1
package/cjs/model/base-model.d.ts +10 -8
package/cjs/model/base-model.js +27 -31
package/cjs/model/base-model.js.map +1 -1
package/cjs/model/interface.d.ts +21 -89
package/cjs/model/interface.js.map +1 -1
package/cjs/model/layout-model.d.ts +41 -0
package/cjs/model/layout-model.js +86 -0
package/cjs/model/layout-model.js.map +1 -0
package/cjs/region/interface.d.ts +3 -2
package/cjs/region/interface.js.map +1 -1
package/cjs/region/region.d.ts +12 -7
package/cjs/region/region.js +18 -10
package/cjs/region/region.js.map +1 -1
package/cjs/series/area/area.d.ts +1 -1
package/cjs/series/area/area.js +5 -6
package/cjs/series/area/area.js.map +1 -1
package/cjs/series/area/interface.d.ts +4 -0
package/cjs/series/area/interface.js.map +1 -1
package/cjs/series/bar/bar.js +2 -4
package/cjs/series/bar/bar.js.map +1 -1
package/cjs/series/base/base-series.d.ts +14 -4
package/cjs/series/base/base-series.js +40 -15
package/cjs/series/base/base-series.js.map +1 -1
package/cjs/series/cartesian/cartesian.d.ts +3 -0
package/cjs/series/cartesian/cartesian.js +16 -4
package/cjs/series/cartesian/cartesian.js.map +1 -1
package/cjs/series/correlation/correlation.js +3 -7
package/cjs/series/correlation/correlation.js.map +1 -1
package/cjs/series/funnel/funnel-3d.js +1 -1
package/cjs/series/funnel/funnel-3d.js.map +1 -1
package/cjs/series/funnel/funnel.js +2 -6
package/cjs/series/funnel/funnel.js.map +1 -1
package/cjs/series/funnel/interface.d.ts +1 -2
package/cjs/series/funnel/interface.js.map +1 -1
package/cjs/series/gauge/gauge.d.ts +0 -1
package/cjs/series/gauge/gauge.js +3 -8
package/cjs/series/gauge/gauge.js.map +1 -1
package/cjs/series/heatmap/heatmap.js +2 -4
package/cjs/series/heatmap/heatmap.js.map +1 -1
package/cjs/series/index.d.ts +2 -2
package/cjs/series/index.js.map +1 -1
package/cjs/series/interface/common.d.ts +2 -2
package/cjs/series/interface/common.js.map +1 -1
package/cjs/series/interface/series.d.ts +4 -2
package/cjs/series/interface/series.js.map +1 -1
package/cjs/series/interface/type.d.ts +3 -1
package/cjs/series/interface/type.js +2 -1
package/cjs/series/interface/type.js.map +1 -1
package/cjs/series/line/interface.d.ts +4 -0
package/cjs/series/line/interface.js.map +1 -1
package/cjs/series/line/line.d.ts +1 -1
package/cjs/series/line/line.js.map +1 -1
package/cjs/series/map/map.js +2 -4
package/cjs/series/map/map.js.map +1 -1
package/cjs/series/mixin/line-mixin.d.ts +5 -2
package/cjs/series/mixin/line-mixin.js +16 -10
package/cjs/series/mixin/line-mixin.js.map +1 -1
package/cjs/series/pie/pie.js +1 -4
package/cjs/series/pie/pie.js.map +1 -1
package/cjs/series/polar/progress-like/progress-like.js +4 -4
package/cjs/series/polar/progress-like/progress-like.js.map +1 -1
package/cjs/series/radar/animation.js.map +1 -1
package/cjs/series/range-column/range-column.js +2 -2
package/cjs/series/range-column/range-column.js.map +1 -1
package/cjs/series/rose/rose.d.ts +2 -1
package/cjs/series/rose/rose.js +2 -4
package/cjs/series/rose/rose.js.map +1 -1
package/cjs/series/scatter/scatter.js +2 -4
package/cjs/series/scatter/scatter.js.map +1 -1
package/cjs/series/waterfall/waterfall.js +1 -1
package/cjs/series/waterfall/waterfall.js.map +1 -1
package/cjs/series/word-cloud/base.d.ts +1 -0
package/cjs/series/word-cloud/base.js +33 -33
package/cjs/series/word-cloud/base.js.map +1 -1
package/cjs/series/word-cloud/word-cloud-3d.js +32 -32
package/cjs/series/word-cloud/word-cloud-3d.js.map +1 -1
package/cjs/theme/builtin/common/component/axis/cartesian-axis.js +2 -2
package/cjs/theme/builtin/common/component/axis/cartesian-axis.js.map +1 -1
package/cjs/theme/builtin/common/component/axis/common-axis.js +1 -1
package/cjs/theme/builtin/common/component/axis/common-axis.js.map +1 -1
package/cjs/theme/builtin/common/component/crosshair.js +5 -5
package/cjs/theme/builtin/common/component/crosshair.js.map +1 -1
package/cjs/theme/builtin/common/component/data-zoom.js +10 -10
package/cjs/theme/builtin/common/component/data-zoom.js.map +1 -1
package/cjs/theme/builtin/common/component/indicator.js +1 -1
package/cjs/theme/builtin/common/component/indicator.js.map +1 -1
package/cjs/theme/builtin/common/component/legend/color-legend.js +3 -4
package/cjs/theme/builtin/common/component/legend/color-legend.js.map +1 -1
package/cjs/theme/builtin/common/component/legend/discrete-legend.js +2 -2
package/cjs/theme/builtin/common/component/legend/discrete-legend.js.map +1 -1
package/cjs/theme/builtin/common/component/legend/size-legend.js +6 -6
package/cjs/theme/builtin/common/component/legend/size-legend.js.map +1 -1
package/cjs/theme/builtin/common/component/map-label.js.map +1 -1
package/cjs/theme/builtin/common/component/mark-area.js.map +1 -1
package/cjs/theme/builtin/common/component/mark-line.js +9 -9
package/cjs/theme/builtin/common/component/mark-line.js.map +1 -1
package/cjs/theme/builtin/common/component/mark-point.js +15 -3
package/cjs/theme/builtin/common/component/mark-point.js.map +1 -1
package/cjs/theme/builtin/common/component/player.js +7 -7
package/cjs/theme/builtin/common/component/player.js.map +1 -1
package/cjs/theme/builtin/common/component/poptip.js +3 -4
package/cjs/theme/builtin/common/component/poptip.js.map +1 -1
package/cjs/theme/builtin/common/component/scroll-bar.js +20 -7
package/cjs/theme/builtin/common/component/scroll-bar.js.map +1 -1
package/cjs/theme/builtin/common/component/title.js +1 -1
package/cjs/theme/builtin/common/component/title.js.map +1 -1
package/cjs/theme/builtin/common/component/tooltip.d.ts +2 -1
package/cjs/theme/builtin/common/component/tooltip.js +3 -4
package/cjs/theme/builtin/common/component/tooltip.js.map +1 -1
package/cjs/theme/builtin/common/component/total-label.js.map +1 -1
package/cjs/theme/builtin/common/mark.js.map +1 -1
package/cjs/theme/builtin/common/series/rangeColumn.js +1 -1
package/cjs/theme/builtin/common/series/rangeColumn.js.map +1 -1
package/cjs/theme/builtin/common-mobile/component/axis/band-axis.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/axis/band-axis.js +22 -0
package/cjs/theme/builtin/common-mobile/component/axis/band-axis.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/axis/cartesian-axis.d.ts +3 -0
package/cjs/theme/builtin/common-mobile/component/axis/cartesian-axis.js +36 -0
package/cjs/theme/builtin/common-mobile/component/axis/cartesian-axis.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/axis/common-axis.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/axis/common-axis.js +42 -0
package/cjs/theme/builtin/common-mobile/component/axis/common-axis.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/axis/linear-axis.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/axis/linear-axis.js +22 -0
package/cjs/theme/builtin/common-mobile/component/axis/linear-axis.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/axis/polar-axis.d.ts +3 -0
package/cjs/theme/builtin/common-mobile/component/axis/polar-axis.js +25 -0
package/cjs/theme/builtin/common-mobile/component/axis/polar-axis.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/crosshair.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/crosshair.js +39 -0
package/cjs/theme/builtin/common-mobile/component/crosshair.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/data-zoom.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/data-zoom.js +40 -0
package/cjs/theme/builtin/common-mobile/component/data-zoom.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/index.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/index.js +33 -0
package/cjs/theme/builtin/common-mobile/component/index.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/indicator.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/indicator.js +23 -0
package/cjs/theme/builtin/common-mobile/component/indicator.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/legend/color-legend.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/legend/color-legend.js +23 -0
package/cjs/theme/builtin/common-mobile/component/legend/color-legend.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/legend/continuous.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/legend/continuous.js +44 -0
package/cjs/theme/builtin/common-mobile/component/legend/continuous.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/legend/discrete-legend.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/legend/discrete-legend.js +39 -0
package/cjs/theme/builtin/common-mobile/component/legend/discrete-legend.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/legend/size-legend.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/legend/size-legend.js +23 -0
package/cjs/theme/builtin/common-mobile/component/legend/size-legend.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/map-label.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/map-label.js +39 -0
package/cjs/theme/builtin/common-mobile/component/map-label.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/mark-area.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/mark-area.js +24 -0
package/cjs/theme/builtin/common-mobile/component/mark-area.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/mark-line.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/mark-line.js +33 -0
package/cjs/theme/builtin/common-mobile/component/mark-line.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/mark-point.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/mark-point.js +19 -0
package/cjs/theme/builtin/common-mobile/component/mark-point.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/player.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/player.js +51 -0
package/cjs/theme/builtin/common-mobile/component/player.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/poptip.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/poptip.js +25 -0
package/cjs/theme/builtin/common-mobile/component/poptip.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/title.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/title.js +23 -0
package/cjs/theme/builtin/common-mobile/component/title.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/tooltip.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/tooltip.js +43 -0
package/cjs/theme/builtin/common-mobile/component/tooltip.js.map +1 -0
package/cjs/theme/builtin/common-mobile/component/total-label.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/component/total-label.js +16 -0
package/cjs/theme/builtin/common-mobile/component/total-label.js.map +1 -0
package/cjs/theme/builtin/common-mobile/constants.d.ts +2 -0
package/cjs/theme/builtin/common-mobile/constants.js +23 -0
package/cjs/theme/builtin/common-mobile/constants.js.map +1 -0
package/cjs/theme/builtin/common-mobile/mark.d.ts +3 -0
package/cjs/theme/builtin/common-mobile/mark.js +35 -0
package/cjs/theme/builtin/common-mobile/mark.js.map +1 -0
package/cjs/theme/builtin/dark/color-scheme.js +20 -11
package/cjs/theme/builtin/dark/color-scheme.js.map +1 -1
package/cjs/theme/builtin/dark-mobile/index.d.ts +2 -0
package/cjs/theme/builtin/dark-mobile/index.js +18 -0
package/cjs/theme/builtin/dark-mobile/index.js.map +1 -0
package/cjs/theme/builtin/index.d.ts +2 -4
package/cjs/theme/builtin/index.js +17 -20
package/cjs/theme/builtin/index.js.map +1 -1
package/cjs/theme/builtin/light/color-scheme.js +19 -10
package/cjs/theme/builtin/light/color-scheme.js.map +1 -1
package/cjs/theme/builtin/light-mobile/index.d.ts +2 -0
package/cjs/theme/builtin/light-mobile/index.js +18 -0
package/cjs/theme/builtin/light-mobile/index.js.map +1 -0
package/cjs/theme/color-scheme/builtin/interface.d.ts +16 -7
package/cjs/theme/color-scheme/builtin/interface.js.map +1 -1
package/cjs/theme/color-scheme/legacy.js +18 -2
package/cjs/theme/color-scheme/legacy.js.map +1 -1
package/cjs/theme/color-scheme/util.js +2 -2
package/cjs/theme/color-scheme/util.js.map +1 -1
package/cjs/theme/interface.d.ts +1 -2
package/cjs/theme/interface.js.map +1 -1
package/cjs/theme/theme-manager.d.ts +1 -1
package/cjs/theme/theme-manager.js +2 -2
package/cjs/theme/theme-manager.js.map +1 -1
package/cjs/typings/index.d.ts +1 -0
package/cjs/typings/index.js +2 -1
package/cjs/typings/index.js.map +1 -1
package/cjs/typings/layout.d.ts +23 -0
package/cjs/typings/layout.js +6 -0
package/cjs/typings/layout.js.map +1 -0
package/cjs/typings/spec/common.d.ts +2 -4
package/cjs/typings/spec/common.js.map +1 -1
package/cjs/typings/visual.d.ts +1 -1
package/cjs/typings/visual.js.map +1 -1
package/cjs/util/space.d.ts +1 -1
package/cjs/util/space.js.map +1 -1
package/cjs/util/spec/background.js +8 -14
package/cjs/util/spec/background.js.map +1 -1
package/cjs/util/spec/common.d.ts +1 -1
package/cjs/util/spec/common.js +2 -2
package/cjs/util/spec/common.js.map +1 -1
package/cjs/util/spec/preprocess.d.ts +1 -1
package/cjs/util/spec/preprocess.js +7 -17
package/cjs/util/spec/preprocess.js.map +1 -1
package/cjs/util/spec/transform.d.ts +2 -0
package/cjs/util/spec/transform.js +18 -2
package/cjs/util/spec/transform.js.map +1 -1
package/cjs/vchart-all.js +2 -3
package/cjs/vchart-all.js.map +1 -1
package/cjs/vchart-simple.d.ts +1 -0
package/cjs/vchart-simple.js +4 -4
package/cjs/vchart-simple.js.map +1 -1
package/esm/animation/utils.d.ts +2 -2
package/esm/chart/area/area.js +2 -1
package/esm/chart/area/area.js.map +1 -1
package/esm/chart/base-chart.d.ts +13 -16
package/esm/chart/base-chart.js +66 -67
package/esm/chart/base-chart.js.map +1 -1
package/esm/chart/interface/chart.d.ts +4 -6
package/esm/chart/interface/chart.js.map +1 -1
package/esm/chart/line/line.js +2 -1
package/esm/chart/line/line.js.map +1 -1
package/esm/chart/sequence/sequence.d.ts +1 -1
package/esm/chart/sequence/sequence.js +1 -1
package/esm/chart/sequence/sequence.js.map +1 -1
package/esm/compile/compiler.js +1 -2
package/esm/compile/grammar-item.js +2 -1
package/esm/compile/mark/compilable-mark.d.ts +10 -6
package/esm/compile/mark/compilable-mark.js +23 -12
package/esm/compile/mark/compilable-mark.js.map +1 -1
package/esm/compile/mark/interface.d.ts +6 -4
package/esm/compile/mark/interface.js.map +1 -1
package/esm/compile/mark/util.d.ts +1 -3
package/esm/compile/mark/util.js +0 -34
package/esm/compile/mark/util.js.map +1 -1
package/esm/component/axis/base-axis.d.ts +2 -4
package/esm/component/axis/base-axis.js +19 -36
package/esm/component/axis/base-axis.js.map +1 -1
package/esm/component/axis/cartesian/axis.d.ts +12 -22
package/esm/component/axis/cartesian/axis.js +49 -63
package/esm/component/axis/cartesian/axis.js.map +1 -1
package/esm/component/axis/cartesian/band-axis.d.ts +0 -7
package/esm/component/axis/cartesian/band-axis.js +0 -1
package/esm/component/axis/cartesian/band-axis.js.map +1 -1
package/esm/component/axis/cartesian/interface/common.d.ts +0 -6
package/esm/component/axis/cartesian/interface/common.js.map +1 -1
package/esm/component/axis/cartesian/interface/theme.d.ts +1 -1
package/esm/component/axis/cartesian/interface/theme.js.map +1 -1
package/esm/component/axis/interface/common.d.ts +0 -1
package/esm/component/axis/interface/common.js.map +1 -1
package/esm/component/axis/interface/spec.js.map +1 -1
package/esm/component/axis/mixin/band-axis-mixin.d.ts +0 -1
package/esm/component/axis/mixin/band-axis-mixin.js +2 -2
package/esm/component/axis/mixin/band-axis-mixin.js.map +1 -1
package/esm/component/axis/mixin/linear-axis-mixin.d.ts +0 -1
package/esm/component/axis/mixin/linear-axis-mixin.js +4 -3
package/esm/component/axis/mixin/linear-axis-mixin.js.map +1 -1
package/esm/component/axis/polar/axis.d.ts +3 -4
package/esm/component/axis/polar/axis.js +12 -14
package/esm/component/axis/polar/axis.js.map +1 -1
package/esm/component/base/base-component.d.ts +12 -4
package/esm/component/base/base-component.js +22 -14
package/esm/component/base/base-component.js.map +1 -1
package/esm/component/base/util.js +7 -3
package/esm/component/base/util.js.map +1 -1
package/esm/component/brush/brush.d.ts +2 -4
package/esm/component/brush/brush.js +4 -6
package/esm/component/brush/brush.js.map +1 -1
package/esm/component/crosshair/base.d.ts +3 -4
package/esm/component/crosshair/base.js +1 -1
package/esm/component/crosshair/base.js.map +1 -1
package/esm/component/crosshair/cartesian.d.ts +2 -0
package/esm/component/crosshair/cartesian.js +5 -8
package/esm/component/crosshair/cartesian.js.map +1 -1
package/esm/component/crosshair/interface/spec.d.ts +1 -1
package/esm/component/crosshair/interface/spec.js.map +1 -1
package/esm/component/crosshair/polar.d.ts +2 -0
package/esm/component/crosshair/polar.js +5 -8
package/esm/component/crosshair/polar.js.map +1 -1
package/esm/component/custom-mark/custom-mark.d.ts +2 -3
package/esm/component/custom-mark/custom-mark.js +2 -3
package/esm/component/custom-mark/custom-mark.js.map +1 -1
package/esm/component/data-zoom/data-filter-base-component.d.ts +8 -8
package/esm/component/data-zoom/data-filter-base-component.js +60 -37
package/esm/component/data-zoom/data-filter-base-component.js.map +1 -1
package/esm/component/data-zoom/data-zoom/data-zoom.d.ts +4 -2
package/esm/component/data-zoom/data-zoom/data-zoom.js +47 -44
package/esm/component/data-zoom/data-zoom/data-zoom.js.map +1 -1
package/esm/component/data-zoom/data-zoom/interface.d.ts +6 -1
package/esm/component/data-zoom/data-zoom/interface.js.map +1 -1
package/esm/component/data-zoom/scroll-bar/interface.d.ts +6 -2
package/esm/component/data-zoom/scroll-bar/interface.js.map +1 -1
package/esm/component/data-zoom/scroll-bar/scroll-bar.d.ts +3 -0
package/esm/component/data-zoom/scroll-bar/scroll-bar.js +24 -23
package/esm/component/data-zoom/scroll-bar/scroll-bar.js.map +1 -1
package/esm/component/data-zoom/util.d.ts +4 -0
package/esm/component/data-zoom/util.js +13 -1
package/esm/component/data-zoom/util.js.map +1 -1
package/esm/component/geo/geo-coordinate.d.ts +3 -2
package/esm/component/geo/geo-coordinate.js +3 -1
package/esm/component/geo/geo-coordinate.js.map +1 -1
package/esm/component/index.d.ts +3 -2
package/esm/component/index.js.map +1 -1
package/esm/component/indicator/indicator.d.ts +1 -3
package/esm/component/indicator/indicator.js +4 -5
package/esm/component/indicator/indicator.js.map +1 -1
package/esm/component/indicator/interface.d.ts +1 -1
package/esm/component/indicator/interface.js.map +1 -1
package/esm/component/interface/common.d.ts +3 -3
package/esm/component/interface/common.js.map +1 -1
package/esm/component/interface/theme.d.ts +2 -1
package/esm/component/interface/theme.js.map +1 -1
package/esm/component/label/base-label.d.ts +2 -4
package/esm/component/label/base-label.js +1 -3
package/esm/component/label/base-label.js.map +1 -1
package/esm/component/label/interface.d.ts +4 -0
package/esm/component/label/interface.js.map +1 -1
package/esm/component/label/label.d.ts +5 -7
package/esm/component/label/label.js +16 -11
package/esm/component/label/label.js.map +1 -1
package/esm/component/label/totalLabel.d.ts +1 -3
package/esm/component/label/totalLabel.js +4 -4
package/esm/component/label/totalLabel.js.map +1 -1
package/esm/component/label/util.d.ts +9 -2
package/esm/component/label/util.js +17 -3
package/esm/component/label/util.js.map +1 -1
package/esm/component/legend/base-legend.d.ts +6 -9
package/esm/component/legend/base-legend.js +3 -9
package/esm/component/legend/base-legend.js.map +1 -1
package/esm/component/legend/continuous/legend.d.ts +4 -1
package/esm/component/legend/continuous/legend.js +6 -7
package/esm/component/legend/continuous/legend.js.map +1 -1
package/esm/component/legend/discrete/legend.d.ts +4 -1
package/esm/component/legend/discrete/legend.js +6 -7
package/esm/component/legend/discrete/legend.js.map +1 -1
package/esm/component/legend/discrete/util.d.ts +1 -1
package/esm/component/legend/discrete/util.js.map +1 -1
package/esm/component/legend/util.d.ts +2 -2
package/esm/component/map-label/component.d.ts +1 -3
package/esm/component/map-label/component.js +2 -2
package/esm/component/map-label/component.js.map +1 -1
package/esm/component/marker/base-marker.d.ts +7 -3
package/esm/component/marker/base-marker.js +41 -18
package/esm/component/marker/base-marker.js.map +1 -1
package/esm/component/marker/interface.d.ts +15 -4
package/esm/component/marker/interface.js.map +1 -1
package/esm/component/marker/mark-area/interface/spec.d.ts +1 -1
package/esm/component/marker/mark-area/interface/spec.js.map +1 -1
package/esm/component/marker/mark-area/mark-area.d.ts +1 -3
package/esm/component/marker/mark-area/mark-area.js +29 -18
package/esm/component/marker/mark-area/mark-area.js.map +1 -1
package/esm/component/marker/mark-line/interface/spec.d.ts +3 -4
package/esm/component/marker/mark-line/interface/spec.js.map +1 -1
package/esm/component/marker/mark-line/mark-line.d.ts +1 -3
package/esm/component/marker/mark-line/mark-line.js +36 -18
package/esm/component/marker/mark-line/mark-line.js.map +1 -1
package/esm/component/marker/mark-line/util.d.ts +3 -3
package/esm/component/marker/mark-line/util.js.map +1 -1
package/esm/component/marker/mark-point/interface/spec.d.ts +5 -4
package/esm/component/marker/mark-point/interface/spec.js.map +1 -1
package/esm/component/marker/mark-point/interface/theme.d.ts +5 -5
package/esm/component/marker/mark-point/interface/theme.js.map +1 -1
package/esm/component/marker/mark-point/mark-point.d.ts +1 -3
package/esm/component/marker/mark-point/mark-point.js +17 -12
package/esm/component/marker/mark-point/mark-point.js.map +1 -1
package/esm/component/marker/utils.d.ts +3 -4
package/esm/component/marker/utils.js +43 -23
package/esm/component/marker/utils.js.map +1 -1
package/esm/component/player/interface/theme.d.ts +1 -1
package/esm/component/player/interface/theme.js.map +1 -1
package/esm/component/player/player.d.ts +6 -7
package/esm/component/player/player.js +4 -7
package/esm/component/player/player.js.map +1 -1
package/esm/component/title/interface/theme.d.ts +1 -1
package/esm/component/title/interface/theme.js.map +1 -1
package/esm/component/title/title.d.ts +6 -9
package/esm/component/title/title.js +12 -22
package/esm/component/title/title.js.map +1 -1
package/esm/component/tooltip/handler/base.js +5 -7
package/esm/component/tooltip/handler/base.js.map +1 -1
package/esm/component/tooltip/handler/dom/util.js +3 -1
package/esm/component/tooltip/handler/dom/util.js.map +1 -1
package/esm/component/tooltip/handler/utils/attribute.d.ts +3 -3
package/esm/component/tooltip/handler/utils/attribute.js.map +1 -1
package/esm/component/tooltip/handler/utils/common.js.map +1 -1
package/esm/component/tooltip/interface/spec.d.ts +1 -1
package/esm/component/tooltip/interface/spec.js.map +1 -1
package/esm/component/tooltip/interface/theme.d.ts +10 -11
package/esm/component/tooltip/interface/theme.js.map +1 -1
package/esm/component/tooltip/tooltip.d.ts +3 -2
package/esm/component/tooltip/tooltip.js +7 -10
package/esm/component/tooltip/tooltip.js.map +1 -1
package/esm/component/util.d.ts +1 -3
package/esm/component/util.js +2 -2
package/esm/component/util.js.map +1 -1
package/esm/constant/index.js +2 -1
package/esm/constant/layout.d.ts +1 -0
package/esm/constant/layout.js +2 -0
package/esm/constant/layout.js.map +1 -1
package/esm/constant/scatter.js +1 -2
package/esm/core/expression-function.d.ts +12 -0
package/esm/core/expression-function.js +22 -0
package/esm/core/expression-function.js.map +1 -0
package/esm/core/factory.d.ts +5 -2
package/esm/core/factory.js +6 -3
package/esm/core/factory.js.map +1 -1
package/esm/core/index.d.ts +2 -1
package/esm/core/index.js +3 -1
package/esm/core/index.js.map +1 -1
package/esm/core/interface.d.ts +5 -0
package/esm/core/interface.js.map +1 -1
package/esm/core/vchart.d.ts +9 -1
package/esm/core/vchart.js +62 -41
package/esm/core/vchart.js.map +1 -1
package/esm/data/initialize.js +7 -7
package/esm/data/initialize.js.map +1 -1
package/esm/data/transforms/aggregation.d.ts +4 -3
package/esm/data/transforms/aggregation.js +6 -6
package/esm/data/transforms/aggregation.js.map +1 -1
package/esm/data/transforms/dimension-statistics.js +14 -4
package/esm/data/transforms/dimension-statistics.js.map +1 -1
package/esm/event/bubble.js +1 -2
package/esm/event/event.js +2 -1
package/esm/event/events/base.d.ts +16 -0
package/esm/event/events/base.js +15 -0
package/esm/event/events/base.js.map +1 -0
package/esm/event/events/dimension/util/cartesian.d.ts +1 -1
package/esm/event/events/dimension/util/cartesian.js.map +1 -1
package/esm/event/events/dimension/util/common.d.ts +1 -2
package/esm/event/events/dimension/util/common.js +1 -1
package/esm/event/events/dimension/util/common.js.map +1 -1
package/esm/event/events/dimension/util/polar.d.ts +1 -1
package/esm/event/events/dimension/util/polar.js.map +1 -1
package/esm/event/interface.d.ts +2 -2
package/esm/event/interface.js.map +1 -1
package/esm/index-wx-simple.d.ts +4 -0
package/esm/index-wx-simple.js +35 -0
package/esm/index-wx-simple.js.map +1 -0
package/esm/interaction/trigger.js +1 -1
package/esm/interaction/zoom/zoomable.d.ts +1 -0
package/esm/interaction/zoom/zoomable.js +6 -5
package/esm/interaction/zoom/zoomable.js.map +1 -1
package/esm/layout/base-layout.d.ts +3 -5
package/esm/layout/base-layout.js +9 -9
package/esm/layout/base-layout.js.map +1 -1
package/esm/layout/grid-layout/grid-layout.d.ts +1 -2
package/esm/layout/grid-layout/grid-layout.js +6 -4
package/esm/layout/grid-layout/grid-layout.js.map +1 -1
package/esm/layout/interface.d.ts +74 -6
package/esm/layout/interface.js.map +1 -1
package/esm/{model → layout}/layout-item.d.ts +35 -23
package/esm/{model → layout}/layout-item.js +93 -63
package/esm/layout/layout-item.js.map +1 -0
package/esm/layout/layout3d/index.d.ts +2 -4
package/esm/layout/layout3d/index.js +5 -5
package/esm/layout/layout3d/index.js.map +1 -1
package/esm/layout/util.d.ts +1 -1
package/esm/layout/util.js.map +1 -1
package/esm/mark/arc.js +2 -2
package/esm/mark/arc.js.map +1 -1
package/esm/mark/base/base-mark.d.ts +2 -2
package/esm/mark/base/base-mark.js +59 -38
package/esm/mark/base/base-mark.js.map +1 -1
package/esm/mark/label.js +1 -4
package/esm/mark/label.js.map +1 -1
package/esm/model/base-model.d.ts +10 -8
package/esm/model/base-model.js +27 -35
package/esm/model/base-model.js.map +1 -1
package/esm/model/interface.d.ts +21 -89
package/esm/model/interface.js.map +1 -1
package/esm/model/layout-model.d.ts +41 -0
package/esm/model/layout-model.js +80 -0
package/esm/model/layout-model.js.map +1 -0
package/esm/region/interface.d.ts +3 -2
package/esm/region/interface.js.map +1 -1
package/esm/region/region.d.ts +12 -7
package/esm/region/region.js +19 -11
package/esm/region/region.js.map +1 -1
package/esm/series/area/area.d.ts +1 -1
package/esm/series/area/area.js +5 -6
package/esm/series/area/area.js.map +1 -1
package/esm/series/area/interface.d.ts +4 -0
package/esm/series/area/interface.js.map +1 -1
package/esm/series/bar/bar.js +1 -5
package/esm/series/bar/bar.js.map +1 -1
package/esm/series/base/base-series.d.ts +14 -4
package/esm/series/base/base-series.js +38 -16
package/esm/series/base/base-series.js.map +1 -1
package/esm/series/cartesian/cartesian.d.ts +3 -0
package/esm/series/cartesian/cartesian.js +16 -4
package/esm/series/cartesian/cartesian.js.map +1 -1
package/esm/series/correlation/correlation.js +2 -8
package/esm/series/correlation/correlation.js.map +1 -1
package/esm/series/funnel/funnel-3d.js +1 -1
package/esm/series/funnel/funnel-3d.js.map +1 -1
package/esm/series/funnel/funnel.js +3 -7
package/esm/series/funnel/funnel.js.map +1 -1
package/esm/series/funnel/interface.d.ts +1 -2
package/esm/series/funnel/interface.js.map +1 -1
package/esm/series/gauge/gauge.d.ts +0 -1
package/esm/series/gauge/gauge.js +2 -9
package/esm/series/gauge/gauge.js.map +1 -1
package/esm/series/heatmap/heatmap.js +1 -5
package/esm/series/heatmap/heatmap.js.map +1 -1
package/esm/series/index.d.ts +2 -2
package/esm/series/index.js.map +1 -1
package/esm/series/interface/common.d.ts +2 -2
package/esm/series/interface/common.js.map +1 -1
package/esm/series/interface/series.d.ts +4 -2
package/esm/series/interface/series.js.map +1 -1
package/esm/series/interface/type.d.ts +3 -1
package/esm/series/interface/type.js +2 -1
package/esm/series/interface/type.js.map +1 -1
package/esm/series/line/interface.d.ts +4 -0
package/esm/series/line/interface.js.map +1 -1
package/esm/series/line/line.d.ts +1 -1
package/esm/series/line/line.js.map +1 -1
package/esm/series/map/map.js +1 -5
package/esm/series/map/map.js.map +1 -1
package/esm/series/mixin/line-mixin.d.ts +5 -2
package/esm/series/mixin/line-mixin.js +15 -10
package/esm/series/mixin/line-mixin.js.map +1 -1
package/esm/series/pie/pie.js +1 -4
package/esm/series/pie/pie.js.map +1 -1
package/esm/series/polar/progress-like/progress-like.js +3 -4
package/esm/series/polar/progress-like/progress-like.js.map +1 -1
package/esm/series/radar/animation.js.map +1 -1
package/esm/series/range-column/range-column.js +1 -3
package/esm/series/range-column/range-column.js.map +1 -1
package/esm/series/rose/rose.d.ts +2 -1
package/esm/series/rose/rose.js +1 -5
package/esm/series/rose/rose.js.map +1 -1
package/esm/series/scatter/scatter.js +1 -5
package/esm/series/scatter/scatter.js.map +1 -1
package/esm/series/waterfall/waterfall.js +1 -1
package/esm/series/waterfall/waterfall.js.map +1 -1
package/esm/series/word-cloud/base.d.ts +1 -0
package/esm/series/word-cloud/base.js +33 -33
package/esm/series/word-cloud/base.js.map +1 -1
package/esm/series/word-cloud/word-cloud-3d.js +32 -32
package/esm/series/word-cloud/word-cloud-3d.js.map +1 -1
package/esm/theme/builtin/common/component/axis/cartesian-axis.js +2 -2
package/esm/theme/builtin/common/component/axis/cartesian-axis.js.map +1 -1
package/esm/theme/builtin/common/component/axis/common-axis.js +1 -1
package/esm/theme/builtin/common/component/axis/common-axis.js.map +1 -1
package/esm/theme/builtin/common/component/crosshair.js +5 -5
package/esm/theme/builtin/common/component/crosshair.js.map +1 -1
package/esm/theme/builtin/common/component/data-zoom.js +10 -10
package/esm/theme/builtin/common/component/data-zoom.js.map +1 -1
package/esm/theme/builtin/common/component/indicator.js +1 -1
package/esm/theme/builtin/common/component/indicator.js.map +1 -1
package/esm/theme/builtin/common/component/legend/color-legend.js +3 -4
package/esm/theme/builtin/common/component/legend/color-legend.js.map +1 -1
package/esm/theme/builtin/common/component/legend/discrete-legend.js +2 -2
package/esm/theme/builtin/common/component/legend/discrete-legend.js.map +1 -1
package/esm/theme/builtin/common/component/legend/size-legend.js +6 -6
package/esm/theme/builtin/common/component/legend/size-legend.js.map +1 -1
package/esm/theme/builtin/common/component/map-label.js.map +1 -1
package/esm/theme/builtin/common/component/mark-area.js.map +1 -1
package/esm/theme/builtin/common/component/mark-line.js +9 -9
package/esm/theme/builtin/common/component/mark-line.js.map +1 -1
package/esm/theme/builtin/common/component/mark-point.js +15 -3
package/esm/theme/builtin/common/component/mark-point.js.map +1 -1
package/esm/theme/builtin/common/component/player.js +7 -7
package/esm/theme/builtin/common/component/player.js.map +1 -1
package/esm/theme/builtin/common/component/poptip.js +3 -4
package/esm/theme/builtin/common/component/poptip.js.map +1 -1
package/esm/theme/builtin/common/component/scroll-bar.js +20 -7
package/esm/theme/builtin/common/component/scroll-bar.js.map +1 -1
package/esm/theme/builtin/common/component/title.js +1 -1
package/esm/theme/builtin/common/component/title.js.map +1 -1
package/esm/theme/builtin/common/component/tooltip.d.ts +2 -1
package/esm/theme/builtin/common/component/tooltip.js +3 -4
package/esm/theme/builtin/common/component/tooltip.js.map +1 -1
package/esm/theme/builtin/common/component/total-label.js.map +1 -1
package/esm/theme/builtin/common/mark.js.map +1 -1
package/esm/theme/builtin/common/series/rangeColumn.js +1 -1
package/esm/theme/builtin/common/series/rangeColumn.js.map +1 -1
package/esm/theme/builtin/common-mobile/component/axis/band-axis.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/axis/band-axis.js +18 -0
package/esm/theme/builtin/common-mobile/component/axis/band-axis.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/axis/cartesian-axis.d.ts +3 -0
package/esm/theme/builtin/common-mobile/component/axis/cartesian-axis.js +32 -0
package/esm/theme/builtin/common-mobile/component/axis/cartesian-axis.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/axis/common-axis.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/axis/common-axis.js +36 -0
package/esm/theme/builtin/common-mobile/component/axis/common-axis.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/axis/linear-axis.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/axis/linear-axis.js +18 -0
package/esm/theme/builtin/common-mobile/component/axis/linear-axis.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/axis/polar-axis.d.ts +3 -0
package/esm/theme/builtin/common-mobile/component/axis/polar-axis.js +23 -0
package/esm/theme/builtin/common-mobile/component/axis/polar-axis.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/crosshair.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/crosshair.js +35 -0
package/esm/theme/builtin/common-mobile/component/crosshair.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/data-zoom.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/data-zoom.js +34 -0
package/esm/theme/builtin/common-mobile/component/data-zoom.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/index.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/index.js +65 -0
package/esm/theme/builtin/common-mobile/component/index.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/indicator.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/indicator.js +17 -0
package/esm/theme/builtin/common-mobile/component/indicator.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/legend/color-legend.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/legend/color-legend.js +17 -0
package/esm/theme/builtin/common-mobile/component/legend/color-legend.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/legend/continuous.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/legend/continuous.js +38 -0
package/esm/theme/builtin/common-mobile/component/legend/continuous.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/legend/discrete-legend.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/legend/discrete-legend.js +33 -0
package/esm/theme/builtin/common-mobile/component/legend/discrete-legend.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/legend/size-legend.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/legend/size-legend.js +17 -0
package/esm/theme/builtin/common-mobile/component/legend/size-legend.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/map-label.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/map-label.js +33 -0
package/esm/theme/builtin/common-mobile/component/map-label.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/mark-area.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/mark-area.js +18 -0
package/esm/theme/builtin/common-mobile/component/mark-area.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/mark-line.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/mark-line.js +27 -0
package/esm/theme/builtin/common-mobile/component/mark-line.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/mark-point.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/mark-point.js +15 -0
package/esm/theme/builtin/common-mobile/component/mark-point.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/player.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/player.js +47 -0
package/esm/theme/builtin/common-mobile/component/player.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/poptip.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/poptip.js +19 -0
package/esm/theme/builtin/common-mobile/component/poptip.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/title.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/title.js +17 -0
package/esm/theme/builtin/common-mobile/component/title.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/tooltip.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/tooltip.js +37 -0
package/esm/theme/builtin/common-mobile/component/tooltip.js.map +1 -0
package/esm/theme/builtin/common-mobile/component/total-label.d.ts +2 -0
package/esm/theme/builtin/common-mobile/component/total-label.js +10 -0
package/esm/theme/builtin/common-mobile/component/total-label.js.map +1 -0
package/esm/theme/builtin/common-mobile/constants.d.ts +2 -0
package/esm/theme/builtin/common-mobile/constants.js +19 -0
package/esm/theme/builtin/common-mobile/constants.js.map +1 -0
package/esm/theme/builtin/common-mobile/mark.d.ts +3 -0
package/esm/theme/builtin/common-mobile/mark.js +31 -0
package/esm/theme/builtin/common-mobile/mark.js.map +1 -0
package/esm/theme/builtin/dark/color-scheme.js +20 -11
package/esm/theme/builtin/dark/color-scheme.js.map +1 -1
package/esm/theme/builtin/dark-mobile/index.d.ts +2 -0
package/esm/theme/builtin/dark-mobile/index.js +16 -0
package/esm/theme/builtin/dark-mobile/index.js.map +1 -0
package/esm/theme/builtin/index.d.ts +2 -4
package/esm/theme/builtin/index.js +16 -23
package/esm/theme/builtin/index.js.map +1 -1
package/esm/theme/builtin/light/color-scheme.js +19 -10
package/esm/theme/builtin/light/color-scheme.js.map +1 -1
package/esm/theme/builtin/light-mobile/index.d.ts +2 -0
package/esm/theme/builtin/light-mobile/index.js +16 -0
package/esm/theme/builtin/light-mobile/index.js.map +1 -0
package/esm/theme/color-scheme/builtin/interface.d.ts +16 -7
package/esm/theme/color-scheme/builtin/interface.js.map +1 -1
package/esm/theme/color-scheme/legacy.js +18 -2
package/esm/theme/color-scheme/legacy.js.map +1 -1
package/esm/theme/color-scheme/util.js +2 -2
package/esm/theme/color-scheme/util.js.map +1 -1
package/esm/theme/interface.d.ts +1 -2
package/esm/theme/interface.js.map +1 -1
package/esm/theme/theme-manager.d.ts +1 -1
package/esm/theme/theme-manager.js +2 -2
package/esm/theme/theme-manager.js.map +1 -1
package/esm/typings/index.d.ts +1 -0
package/esm/typings/index.js +2 -0
package/esm/typings/index.js.map +1 -1
package/esm/typings/layout.d.ts +23 -0
package/esm/typings/layout.js +2 -0
package/esm/typings/layout.js.map +1 -0
package/esm/typings/spec/common.d.ts +2 -4
package/esm/typings/spec/common.js.map +1 -1
package/esm/typings/visual.d.ts +1 -1
package/esm/typings/visual.js.map +1 -1
package/esm/util/space.d.ts +1 -1
package/esm/util/space.js.map +1 -1
package/esm/util/spec/background.js +3 -11
package/esm/util/spec/background.js.map +1 -1
package/esm/util/spec/common.d.ts +1 -1
package/esm/util/spec/common.js +2 -2
package/esm/util/spec/common.js.map +1 -1
package/esm/util/spec/preprocess.d.ts +1 -1
package/esm/util/spec/preprocess.js +5 -18
package/esm/util/spec/preprocess.js.map +1 -1
package/esm/util/spec/transform.d.ts +2 -0
package/esm/util/spec/transform.js +17 -1
package/esm/util/spec/transform.js.map +1 -1
package/esm/vchart-all.js +1 -4
package/esm/vchart-all.js.map +1 -1
package/esm/vchart-simple.d.ts +1 -0
package/esm/vchart-simple.js +15 -14
package/esm/vchart-simple.js.map +1 -1
package/package.json +18 -19
package/cjs/model/layout-item.js.map +0 -1
package/cjs/theme/util.d.ts +0 -5
package/cjs/theme/util.js +0 -35
package/cjs/theme/util.js.map +0 -1
package/esm/model/layout-item.js.map +0 -1
package/esm/theme/util.d.ts +0 -5
package/esm/theme/util.js +0 -37
package/esm/theme/util.js.map +0 -1

package/cjs/series/bar/bar.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/series/bar/bar.ts"],"names":[],"mappings":"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","file":"bar.js","sourcesContent":["import { PREFIX } from './../../constant/index';\n/* eslint-disable no-duplicate-imports /\nimport { isContinuous } from '@visactor/vscale';\nimport { Direction } from '../../typings/space';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport type { IMark, IMarkProgressiveConfig } from '../../mark/interface';\nimport { MarkTypeEnum } from '../../mark/interface/type';\nimport { AttributeLevel } from '../../constant';\nimport type { Maybe, Datum, DirectionType } from '../../typings';\nimport { mergeSpec } from '../../util/spec/merge-spec';\nimport { valueInScaleRange } from '../../util/scale';\nimport { getRegionStackGroup } from '../../util/data';\nimport { getActualNumValue } from '../../util/space';\nimport { registerBarAnimation, type BarAppearPreset, type IBarAnimationParams } from './animation';\nimport { animationConfig, shouldMarkDoMorph, userAnimationConfig } from '../../animation/utils';\nimport type { IBarSeriesSpec, IBarSeriesTheme } from './interface';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport type { IRectMark } from '../../mark/rect';\nimport type { IModelInitOption } from '../../model/interface';\nimport type { ITextMark } from '../../mark/text';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport { RectMark } from '../../mark/rect';\nimport { array, isValid, last } from '@visactor/vutils';\nimport { barSeriesMark } from './constant';\nimport { stackWithMinHeight } from '../util/stack';\nimport { Factory } from '../../core/factory';\nimport { registerDataSetInstanceTransform } from '../../data/register';\nimport { SeriesData } from '../base/series-data';\nimport { DataView } from '@visactor/vdataset';\nimport { addVChartProperty } from '../../data/transforms/add-property';\nimport { addDataKey, initKeyMap } from '../../data/transforms/data-key';\nimport { registerSampleTransform } from '@visactor/vgrammar-core';\n\nexport const DefaultBandWidth = 6; // 默认的bandWidth，避免连续轴没有bandWidth\nconst RECT_X = `${PREFIX}_rect_x`;\nconst RECT_X1 = `${PREFIX}_rect_x1`;\nconst RECT_Y = `${PREFIX}_rect_y`;\nconst RECT_Y1 = `${PREFIX}_rect_y1`;\n\nexport class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extends CartesianSeries<T> {\n static readonly type: string = SeriesTypeEnum.bar;\n type = SeriesTypeEnum.bar;\n protected _barMarkName: SeriesMarkNameEnum = SeriesMarkNameEnum.bar;\n protected _barMarkType: MarkTypeEnum = MarkTypeEnum.rect;\n\n static readonly mark: SeriesMarkMap = barSeriesMark;\n\n protected declare _theme: Maybe<IBarSeriesTheme>;\n\n protected _supportStack: boolean = true;\n protected _bandPosition = 0;\n protected _barMark!: IRectMark;\n protected _barBackgroundMark!: IRectMark;\n\n protected _barBackgroundViewData: SeriesData;\n\n initMark(): void {\n const progressive = {\n progressiveStep: this._spec.progressiveStep,\n progressiveThreshold: this._spec.progressiveThreshold,\n large: this._spec.large,\n largeThreshold: this._spec.largeThreshold\n };\n\n this._initBarBackgroundMark(progressive);\n\n this._barMark = this._createMark(\n {\n ...BarSeries.mark.bar,\n name: this._barMarkName,\n type: this._barMarkType\n },\n {\n morph: shouldMarkDoMorph(this._spec, this._barMarkName),\n defaultMorphElementKey: this.getDimensionField()[0],\n groupKey: this._seriesField,\n isSeriesMark: true,\n label: mergeSpec({ animation: this._spec.animation }, this._spec.label),\n progressive\n }\n ) as IRectMark;\n }\n\n protected _initBarBackgroundMark(progressive?: IMarkProgressiveConfig): void {\n if (this._spec.barBackground?.visible) {\n this._barBackgroundMark = this._createMark(BarSeries.mark.barBackground, {\n dataView: this._barBackgroundViewData.getDataView(),\n dataProductId: this._barBackgroundViewData.getProductId(),\n progressive\n }) as IRectMark;\n }\n }\n\n initMarkStyle(): void {\n if (this._barMark) {\n this.setMarkStyle(\n this._barMark,\n {\n fill: this.getColorAttribute()\n },\n 'normal',\n AttributeLevel.Series\n );\n\n this._trigger.registerMark(this._barMark);\n }\n }\n\n initLabelMarkStyle(textMark: ITextMark) {\n if (!textMark) {\n return;\n }\n this.setMarkStyle(textMark, {\n fill: this.getColorAttribute(),\n text: (datum: Datum) => {\n return datum[this.getStackValueField()];\n },\n z: this._fieldZ ? this.dataToPositionZ.bind(this) : null\n });\n }\n\n protected initTooltip() {\n super.initTooltip();\n\n this._barMark && this._tooltipHelper.activeTriggerSet.mark.add(this._barMark);\n }\n\n protected _statisticViewData(): void {\n super._statisticViewData();\n\n if (!this._spec.barBackground?.visible) {\n return;\n }\n\n /\n @description 准备 barBackground 数据\n /\n const dimensionItems = ([data]: DataView[], op: string) => {\n let dataCollect: any[] = [{}];\n const fields = this.getDimensionField();\n // 将维度轴的所有层级 field 的对应数据做笛卡尔积\n for (let i = 0; i < fields.length; i++) {\n const field = fields[i];\n const values = data.latestData[field]?.values;\n if (!values?.length) {\n continue;\n }\n const newDataCollect: any[] = [];\n for (let j = 0; j < values.length; j++) {\n for (let k = 0; k < dataCollect.length; k++) {\n newDataCollect.push({\n ...dataCollect[k],\n [field]: values[j]\n });\n }\n }\n dataCollect = newDataCollect;\n }\n return dataCollect;\n };\n\n registerDataSetInstanceTransform(this._option.dataSet, 'addVChartProperty', addVChartProperty);\n registerDataSetInstanceTransform(this._option.dataSet, 'dimensionItems', dimensionItems);\n\n const barBackgroundData = new DataView(this._option.dataSet)\n .parse([this._viewDataStatistics], {\n type: 'dataview'\n })\n .transform(\n {\n type: 'dimensionItems'\n },\n false\n )\n .transform(\n {\n type: 'addVChartProperty',\n options: {\n beforeCall: initKeyMap.bind(this),\n call: addDataKey\n }\n },\n false\n );\n\n this._viewDataStatistics?.target.addListener('change', barBackgroundData.reRunAllTransform);\n this._barBackgroundViewData = new SeriesData(this._option, barBackgroundData);\n }\n\n init(option: IModelInitOption): void {\n super.init(option);\n if (this.direction === 'vertical') {\n this._xAxisHelper?.getScale(0).type === 'band' ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle();\n } else {\n this._yAxisHelper?.getScale(0).type === 'band' ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle();\n }\n }\n\n private _shouldDoPreCalculate() {\n const region = this.getRegion();\n return (\n this._stack && region.getSeries().filter(s => s.type === SeriesTypeEnum.bar && s.getSpec().barMinHeight).length\n );\n }\n\n private _calculateStackRectPosition(isVertical: boolean) {\n const region = this.getRegion();\n\n // @ts-ignore\n if (region._bar_series_position_calculated) {\n return;\n }\n // @ts-ignore\n region._bar_series_position_calculated = true; // 因为是 region 内堆叠矩形的计算，所以加一个 hack 标识位用于避免重复计算\n let start: string;\n let end: string;\n let startMethod: string;\n let endMethod: string;\n let axisHelper: string;\n if (isVertical) {\n start = RECT_Y1;\n end = RECT_Y;\n startMethod = 'dataToPositionY1';\n endMethod = 'dataToPositionY';\n axisHelper = '_yAxisHelper';\n } else {\n start = RECT_X1;\n end = RECT_X;\n startMethod = 'dataToPositionX1';\n endMethod = 'dataToPositionX';\n axisHelper = '_xAxisHelper';\n }\n\n // only reCompute bar\n const stackValueGroup = getRegionStackGroup(region, false, s => s.type === SeriesTypeEnum.bar);\n\n // 按照堆积逻辑重新计算一次图形的堆积位置并设置到数据上\n for (const stackValue in stackValueGroup) {\n for (const key in stackValueGroup[stackValue].nodes) {\n stackWithMinHeight(stackValueGroup[stackValue].nodes[key], region.getStackInverse(), {\n isVertical,\n start,\n end,\n startMethod,\n endMethod,\n axisHelper\n });\n }\n }\n }\n\n private _calculateRectPosition(datum: Datum, isVertical: boolean) {\n let startMethod: string;\n let endMethod: string;\n let axisHelper: string;\n if (isVertical) {\n startMethod = 'dataToPositionY1';\n endMethod = 'dataToPositionY';\n axisHelper = '_yAxisHelper';\n } else {\n startMethod = 'dataToPositionX1';\n endMethod = 'dataToPositionX';\n axisHelper = '_xAxisHelper';\n }\n\n const seriesScale = this[axisHelper].getScale?.(0);\n const inverse = this[axisHelper].isInverse();\n const barMinHeight = this._spec.barMinHeight;\n const y1 = valueInScaleRange(this[startMethod](datum), seriesScale);\n const y = valueInScaleRange(this[endMethod](datum), seriesScale);\n\n let height = Math.abs(y1 - y);\n if (height < barMinHeight) {\n height = barMinHeight;\n }\n\n let flag = 1;\n if (y < y1) {\n flag = -1;\n } else if (y === y1) {\n flag = isVertical ? (inverse ? 1 : -1) : inverse ? -1 : 1;\n }\n return y1 + flag height;\n }\n\n initBandRectMarkStyle() {\n const xScale = this._xAxisHelper?.getScale?.(0);\n const yScale = this._yAxisHelper?.getScale?.(0);\n\n // guess the direction which the user want\n if (this.direction === Direction.horizontal) {\n this.setMarkStyle(\n this._barMark,\n {\n x: (datum: Datum) => {\n if (this._shouldDoPreCalculate()) {\n this._calculateStackRectPosition(false);\n return datum[RECT_X];\n }\n\n if (this._spec.barMinHeight) {\n return this._calculateRectPosition(datum, false);\n }\n\n return valueInScaleRange(this.dataToPositionX(datum), xScale);\n },\n x1: (datum: Datum) => {\n if (this._shouldDoPreCalculate()) {\n this._calculateStackRectPosition(false);\n return datum[RECT_X1];\n }\n\n return valueInScaleRange(this.dataToPositionX1(datum), xScale);\n },\n y: (datum: Datum) => this._getPosition(this.direction, datum),\n height: () => this._getBarWidth(this._yAxisHelper)\n },\n 'normal',\n AttributeLevel.Series\n );\n } else {\n this.setMarkStyle(\n this._barMark,\n {\n x: (datum: Datum) => this._getPosition(this.direction, datum),\n y: (datum: Datum, ctx, opt, dataView) => {\n if (this._shouldDoPreCalculate()) {\n this._calculateStackRectPosition(true);\n return datum[RECT_Y];\n }\n\n if (this._spec.barMinHeight) {\n return this._calculateRectPosition(datum, true);\n }\n\n return valueInScaleRange(this.dataToPositionY(datum), yScale);\n },\n y1: (datum: Datum) => {\n if (this._shouldDoPreCalculate()) {\n this._calculateStackRectPosition(true);\n return datum[RECT_Y1];\n }\n return valueInScaleRange(this.dataToPositionY1(datum), yScale);\n },\n width: () => {\n return this._getBarWidth(this._xAxisHelper);\n }\n },\n 'normal',\n AttributeLevel.Series\n );\n }\n this._initBarBackgroundMarkStyle();\n }\n\n protected _initBarBackgroundMarkStyle() {\n if (!this._barBackgroundMark) {\n return;\n }\n\n const xScale = this._xAxisHelper?.getScale?.(0);\n const yScale = this._yAxisHelper?.getScale?.(0);\n\n // guess the direction which the user want\n if (this.direction === Direction.horizontal) {\n this.setMarkStyle(\n this._barBackgroundMark,\n {\n x: () => {\n const range = xScale.range();\n const min = Math.min(range[0], range[range.length - 1]);\n return min;\n },\n x1: () => {\n const range = xScale.range();\n const max = Math.max(range[0], range[range.length - 1]);\n return max;\n },\n y: (datum: Datum) => this._getPosition(this.direction, datum),\n height: () => this._getBarWidth(this._yAxisHelper)\n },\n 'normal',\n AttributeLevel.Series\n );\n } else {\n this.setMarkStyle(\n this._barBackgroundMark,\n {\n x: (datum: Datum) => this._getPosition(this.direction, datum),\n y: () => {\n const range = yScale.range();\n const min = Math.min(range[0], range[range.length - 1]);\n return min;\n },\n y1: () => {\n const range = yScale.range();\n const max = Math.max(range[0], range[range.length - 1]);\n return max;\n },\n width: () => {\n return this._getBarWidth(this._xAxisHelper);\n }\n },\n 'normal',\n AttributeLevel.Series\n );\n }\n }\n\n initLinearRectMarkStyle() {\n const xScale = this._xAxisHelper?.getScale?.(0);\n const yScale = this._yAxisHelper?.getScale?.(0);\n\n if (this.direction === Direction.vertical) {\n this.setMarkStyle(\n this._barMark,\n {\n x: (datum: Datum) => valueInScaleRange(this.dataToPositionX(datum), xScale),\n x1: (datum: Datum) => valueInScaleRange(this.dataToPositionX1(datum), xScale),\n y: (datum: Datum, ctx, opt, dataView) => {\n if (this._shouldDoPreCalculate()) {\n this._calculateStackRectPosition(true);\n return datum[RECT_Y];\n }\n\n if (this._spec.barMinHeight) {\n return this._calculateRectPosition(datum, true);\n }\n\n return valueInScaleRange(this.dataToPositionY(datum), yScale);\n },\n y1: (datum: Datum) => {\n if (this._shouldDoPreCalculate()) {\n this._calculateStackRectPosition(true);\n return datum[RECT_Y1];\n }\n return valueInScaleRange(this.dataToPositionY1(datum), yScale);\n }\n },\n 'normal',\n AttributeLevel.Series\n );\n } else {\n this.setMarkStyle(\n this._barMark,\n {\n x: (datum: Datum) => {\n if (this._shouldDoPreCalculate()) {\n this._calculateStackRectPosition(false);\n\n return datum[RECT_X];\n }\n\n if (this._spec.barMinHeight) {\n return this._calculateRectPosition(datum, false);\n }\n\n return valueInScaleRange(this.dataToPositionX(datum), xScale);\n },\n x1: (datum: Datum) => {\n if (this._shouldDoPreCalculate()) {\n this._calculateStackRectPosition(false);\n return datum[RECT_X1];\n }\n return valueInScaleRange(this.dataToPositionX1(datum), xScale);\n },\n y: (datum: Datum) => valueInScaleRange(this.dataToPositionY(datum), yScale),\n y1: (datum: Datum) => valueInScaleRange(this.dataToPositionY1(datum), yScale)\n },\n 'normal',\n AttributeLevel.Series\n );\n }\n }\n\n initAnimation() {\n // 这个数据在这个时候拿不到，因为组件还没创建结束，统计和筛选也还没添加。\n // 而且这个值理论上是动态的，建议监听 viewDataStatisticsUpdate 消息动态更新\n const animationParams: IBarAnimationParams = {\n yField: this._fieldY[0],\n xField: this._fieldX[0],\n direction: this.direction,\n growFrom: () =>\n this.direction === 'horizontal'\n ? this._xAxisHelper?.getScale(0).scale(0)\n : this._yAxisHelper?.getScale(0).scale(0)\n };\n const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<BarAppearPreset>)?.preset;\n // 分组数据的dataIndex应该与x轴顺序一致，而非data[DEFAULT_DATA_INDEX]顺序\n const dataIndex = (datum: any) => {\n const xValue = datum?.[this._fieldX[0]];\n const xIndex = this.getViewDataStatistics()?.latestData?.[this._fieldX[0]]?.values.indexOf(xValue);\n // 不应该出现xIndex === -1 \|\| undefined的情况\n return xIndex \|\| 0;\n };\n\n this._barMark.setAnimationConfig(\n animationConfig(\n Factory.getAnimationInKey('bar')?.(animationParams, appearPreset),\n userAnimationConfig(this._barMarkName, this._spec, this._markAttributeContext),\n { dataIndex }\n )\n );\n }\n\n protected _getBarWidth(axisHelper: IAxisHelper) {\n const hasBarWidth = this._spec.barWidth !== undefined;\n const bandWidth = axisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ?? DefaultBandWidth;\n\n if (hasBarWidth) {\n return getActualNumValue(this._spec.barWidth, bandWidth);\n }\n const hasBarMinWidth = this._spec.barMinWidth !== undefined;\n const hasBarMaxWidth = this._spec.barMaxWidth !== undefined;\n let width = bandWidth;\n if (hasBarMinWidth) {\n width = Math.max(width, getActualNumValue(this._spec.barMinWidth, bandWidth));\n }\n if (hasBarMaxWidth) {\n width = Math.min(width, getActualNumValue(this._spec.barMaxWidth, bandWidth));\n }\n return width;\n }\n\n protected _getPosition(direction: DirectionType, datum: Datum) {\n let axisHelper;\n let sizeAttribute;\n let dataToPosition;\n if (direction === Direction.horizontal) {\n axisHelper = this.getYAxisHelper();\n sizeAttribute = 'height';\n dataToPosition = this.dataToPositionY.bind(this);\n } else {\n axisHelper = this.getXAxisHelper();\n sizeAttribute = 'width';\n dataToPosition = this.dataToPositionX.bind(this);\n }\n const scale = axisHelper.getScale(0);\n const size = this._barMark.getAttribute(sizeAttribute, datum) as number;\n const bandWidth = axisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ?? DefaultBandWidth;\n if (this._groups?.fields?.length > 1 && isValid(this._spec.barGapInGroup)) {\n // 自里向外计算，沿着第一层分组的中心点进行位置调整\n const groupFields = this._groups.fields;\n const barInGroup = array(this._spec.barGapInGroup);\n let totalWidth: number = 0;\n let offSet: number = 0;\n\n for (let index = groupFields.length - 1; index >= 1; index--) {\n const groupField = groupFields[index];\n const groupValues = this.getViewDataStatistics()?.latestData?.[groupField]?.values ?? [];\n const groupCount = groupValues.length;\n const gap = getActualNumValue(barInGroup[index - 1] ?? last(barInGroup), bandWidth);\n const i = groupValues.indexOf(datum[groupField]);\n if (index === groupFields.length - 1) {\n totalWidth += groupCount * size + (groupCount - 1) * gap;\n offSet += i * (size + gap);\n } else {\n offSet += i * (totalWidth + gap);\n totalWidth += totalWidth + (groupCount - 1) * gap;\n }\n }\n\n const center = scale.scale(datum[groupFields[0]]) + axisHelper.getBandwidth(0) / 2;\n return center - totalWidth / 2 + offSet;\n }\n\n const continuous = isContinuous(scale.type \|\| 'band');\n const pos = dataToPosition(datum);\n return pos + (bandWidth - size) * 0.5 + (continuous ? -bandWidth / 2 : 0);\n }\n\n onLayoutEnd(ctx: any): void {\n super.onLayoutEnd(ctx);\n const region = this.getRegion();\n // @ts-ignore\n region._bar_series_position_calculated = false;\n if (this._spec.sampling) {\n this.compile();\n }\n }\n\n compile(): void {\n super.compile();\n\n if (this._spec.sampling) {\n const { width, height } = this._region.getLayoutRect();\n const samplingTrans = [];\n const fieldsY = this._fieldY;\n const fieldsX = this._fieldX;\n\n samplingTrans.push({\n type: 'sampling',\n size: this._direction === Direction.vertical ? width : height,\n factor: this._spec.samplingFactor,\n yfield: this._direction === Direction.vertical ? fieldsY[0] : fieldsX[0],\n groupBy: this._seriesField,\n mode: this._spec.sampling\n });\n this._data.getProduct().transform(samplingTrans);\n }\n }\n\n getDefaultShapeType(): string {\n return 'square';\n }\n\n getActiveMarks(): IMark[] {\n return [this._barMark];\n }\n\n compileData() {\n super.compileData();\n this._barBackgroundViewData?.compile();\n }\n\n fillData() {\n super.fillData();\n this._barBackgroundViewData?.getDataView()?.reRunAllTransform();\n }\n\n viewDataUpdate(d: DataView): void {\n super.viewDataUpdate(d);\n this._barBackgroundViewData?.getDataView()?.reRunAllTransform();\n this._barBackgroundViewData?.updateData();\n }\n\n release() {\n super.release();\n this._barBackgroundViewData?.release();\n this._barBackgroundViewData = null;\n }\n}\n\nexport const registerBarSeries = () => {\n registerSampleTransform();\n Factory.registerMark(RectMark.type, RectMark);\n Factory.registerSeries(BarSeries.type, BarSeries);\n registerBarAnimation();\n};\n"]}
1	+ {"version":3,"sources":["../src/series/bar/bar.ts"],"names":[],"mappings":"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","file":"bar.js","sourcesContent":["import { PREFIX } from './../../constant/index';\n/* eslint-disable no-duplicate-imports /\nimport { isContinuous } from '@visactor/vscale';\nimport { Direction } from '../../typings/space';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport type { IMark, IMarkProgressiveConfig } from '../../mark/interface';\nimport { MarkTypeEnum } from '../../mark/interface/type';\nimport { AttributeLevel } from '../../constant';\nimport type { Maybe, Datum, DirectionType } from '../../typings';\nimport { mergeSpec } from '../../util/spec/merge-spec';\nimport { valueInScaleRange } from '../../util/scale';\nimport { getRegionStackGroup } from '../../util/data';\nimport { getActualNumValue } from '../../util/space';\nimport { registerBarAnimation, type BarAppearPreset, type IBarAnimationParams } from './animation';\nimport { animationConfig, shouldMarkDoMorph, userAnimationConfig } from '../../animation/utils';\nimport type { IBarSeriesSpec, IBarSeriesTheme } from './interface';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport type { IRectMark } from '../../mark/rect';\nimport type { IModelInitOption } from '../../model/interface';\nimport type { ITextMark } from '../../mark/text';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport { RectMark } from '../../mark/rect';\nimport { array, isValid, last } from '@visactor/vutils';\nimport { barSeriesMark } from './constant';\nimport { stackWithMinHeight } from '../util/stack';\nimport { Factory } from '../../core/factory';\nimport { registerDataSetInstanceTransform } from '../../data/register';\nimport { SeriesData } from '../base/series-data';\nimport { DataView } from '@visactor/vdataset';\nimport { addVChartProperty } from '../../data/transforms/add-property';\nimport { addDataKey, initKeyMap } from '../../data/transforms/data-key';\nimport { registerSampleTransform } from '@visactor/vgrammar-core';\nimport type { ILabelSpec } from '../../component';\n\nexport const DefaultBandWidth = 6; // 默认的bandWidth，避免连续轴没有bandWidth\nconst RECT_X = `${PREFIX}_rect_x`;\nconst RECT_X1 = `${PREFIX}_rect_x1`;\nconst RECT_Y = `${PREFIX}_rect_y`;\nconst RECT_Y1 = `${PREFIX}_rect_y1`;\n\nexport class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extends CartesianSeries<T> {\n static readonly type: string = SeriesTypeEnum.bar;\n type = SeriesTypeEnum.bar;\n protected _barMarkName: SeriesMarkNameEnum = SeriesMarkNameEnum.bar;\n protected _barMarkType: MarkTypeEnum = MarkTypeEnum.rect;\n\n static readonly mark: SeriesMarkMap = barSeriesMark;\n\n protected declare _theme: Maybe<IBarSeriesTheme>;\n\n protected _supportStack: boolean = true;\n protected _bandPosition = 0;\n protected _barMark!: IRectMark;\n protected _barBackgroundMark!: IRectMark;\n\n protected _barBackgroundViewData: SeriesData;\n\n initMark(): void {\n const progressive = {\n progressiveStep: this._spec.progressiveStep,\n progressiveThreshold: this._spec.progressiveThreshold,\n large: this._spec.large,\n largeThreshold: this._spec.largeThreshold\n };\n\n this._initBarBackgroundMark(progressive);\n\n this._barMark = this._createMark(\n {\n ...BarSeries.mark.bar,\n name: this._barMarkName,\n type: this._barMarkType\n },\n {\n morph: shouldMarkDoMorph(this._spec, this._barMarkName),\n defaultMorphElementKey: this.getDimensionField()[0],\n groupKey: this._seriesField,\n isSeriesMark: true,\n label: this._preprocessLabelSpec(this._spec.label as ILabelSpec),\n progressive\n }\n ) as IRectMark;\n }\n\n protected _initBarBackgroundMark(progressive?: IMarkProgressiveConfig): void {\n if (this._spec.barBackground?.visible) {\n this._barBackgroundMark = this._createMark(BarSeries.mark.barBackground, {\n dataView: this._barBackgroundViewData.getDataView(),\n dataProductId: this._barBackgroundViewData.getProductId(),\n progressive\n }) as IRectMark;\n }\n }\n\n initMarkStyle(): void {\n if (this._barMark) {\n this.setMarkStyle(\n this._barMark,\n {\n fill: this.getColorAttribute()\n },\n 'normal',\n AttributeLevel.Series\n );\n\n this._trigger.registerMark(this._barMark);\n }\n }\n\n initLabelMarkStyle(textMark: ITextMark) {\n if (!textMark) {\n return;\n }\n this.setMarkStyle(textMark, {\n fill: this.getColorAttribute(),\n text: (datum: Datum) => {\n return datum[this.getStackValueField()];\n },\n z: this._fieldZ ? this.dataToPositionZ.bind(this) : null\n });\n }\n\n protected initTooltip() {\n super.initTooltip();\n\n this._barMark && this._tooltipHelper.activeTriggerSet.mark.add(this._barMark);\n }\n\n protected _statisticViewData(): void {\n super._statisticViewData();\n\n if (!this._spec.barBackground?.visible) {\n return;\n }\n\n /\n @description 准备 barBackground 数据\n /\n const dimensionItems = ([data]: DataView[], op: string) => {\n let dataCollect: any[] = [{}];\n const fields = this.getDimensionField();\n // 将维度轴的所有层级 field 的对应数据做笛卡尔积\n for (let i = 0; i < fields.length; i++) {\n const field = fields[i];\n const values = data.latestData[field]?.values;\n if (!values?.length) {\n continue;\n }\n const newDataCollect: any[] = [];\n for (let j = 0; j < values.length; j++) {\n for (let k = 0; k < dataCollect.length; k++) {\n newDataCollect.push({\n ...dataCollect[k],\n [field]: values[j]\n });\n }\n }\n dataCollect = newDataCollect;\n }\n return dataCollect;\n };\n\n registerDataSetInstanceTransform(this._option.dataSet, 'addVChartProperty', addVChartProperty);\n registerDataSetInstanceTransform(this._option.dataSet, 'dimensionItems', dimensionItems);\n\n const barBackgroundData = new DataView(this._option.dataSet)\n .parse([this._viewDataStatistics], {\n type: 'dataview'\n })\n .transform(\n {\n type: 'dimensionItems'\n },\n false\n )\n .transform(\n {\n type: 'addVChartProperty',\n options: {\n beforeCall: initKeyMap.bind(this),\n call: addDataKey\n }\n },\n false\n );\n\n this._viewDataStatistics?.target.addListener('change', barBackgroundData.reRunAllTransform);\n this._barBackgroundViewData = new SeriesData(this._option, barBackgroundData);\n }\n\n init(option: IModelInitOption): void {\n super.init(option);\n if (this.direction === 'vertical') {\n this._xAxisHelper?.getScale(0).type === 'band' ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle();\n } else {\n this._yAxisHelper?.getScale(0).type === 'band' ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle();\n }\n }\n\n private _shouldDoPreCalculate() {\n const region = this.getRegion();\n return (\n this._stack && region.getSeries().filter(s => s.type === SeriesTypeEnum.bar && s.getSpec().barMinHeight).length\n );\n }\n\n private _calculateStackRectPosition(isVertical: boolean) {\n const region = this.getRegion();\n\n // @ts-ignore\n if (region._bar_series_position_calculated) {\n return;\n }\n // @ts-ignore\n region._bar_series_position_calculated = true; // 因为是 region 内堆叠矩形的计算，所以加一个 hack 标识位用于避免重复计算\n let start: string;\n let end: string;\n let startMethod: string;\n let endMethod: string;\n let axisHelper: string;\n if (isVertical) {\n start = RECT_Y1;\n end = RECT_Y;\n startMethod = 'dataToPositionY1';\n endMethod = 'dataToPositionY';\n axisHelper = '_yAxisHelper';\n } else {\n start = RECT_X1;\n end = RECT_X;\n startMethod = 'dataToPositionX1';\n endMethod = 'dataToPositionX';\n axisHelper = '_xAxisHelper';\n }\n\n // only reCompute bar\n const stackValueGroup = getRegionStackGroup(region, false, s => s.type === SeriesTypeEnum.bar);\n\n // 按照堆积逻辑重新计算一次图形的堆积位置并设置到数据上\n for (const stackValue in stackValueGroup) {\n for (const key in stackValueGroup[stackValue].nodes) {\n stackWithMinHeight(stackValueGroup[stackValue].nodes[key], region.getStackInverse(), {\n isVertical,\n start,\n end,\n startMethod,\n endMethod,\n axisHelper\n });\n }\n }\n }\n\n private _calculateRectPosition(datum: Datum, isVertical: boolean) {\n let startMethod: string;\n let endMethod: string;\n let axisHelper: string;\n if (isVertical) {\n startMethod = 'dataToPositionY1';\n endMethod = 'dataToPositionY';\n axisHelper = '_yAxisHelper';\n } else {\n startMethod = 'dataToPositionX1';\n endMethod = 'dataToPositionX';\n axisHelper = '_xAxisHelper';\n }\n\n const seriesScale = this[axisHelper].getScale?.(0);\n const inverse = this[axisHelper].isInverse();\n const barMinHeight = this._spec.barMinHeight;\n const y1 = valueInScaleRange(this[startMethod](datum), seriesScale);\n const y = valueInScaleRange(this[endMethod](datum), seriesScale);\n\n let height = Math.abs(y1 - y);\n if (height < barMinHeight) {\n height = barMinHeight;\n }\n\n let flag = 1;\n if (y < y1) {\n flag = -1;\n } else if (y === y1) {\n flag = isVertical ? (inverse ? 1 : -1) : inverse ? -1 : 1;\n }\n return y1 + flag height;\n }\n\n initBandRectMarkStyle() {\n const xScale = this._xAxisHelper?.getScale?.(0);\n const yScale = this._yAxisHelper?.getScale?.(0);\n\n // guess the direction which the user want\n if (this.direction === Direction.horizontal) {\n this.setMarkStyle(\n this._barMark,\n {\n x: (datum: Datum) => {\n if (this._shouldDoPreCalculate()) {\n this._calculateStackRectPosition(false);\n return datum[RECT_X];\n }\n\n if (this._spec.barMinHeight) {\n return this._calculateRectPosition(datum, false);\n }\n\n return valueInScaleRange(this.dataToPositionX(datum), xScale);\n },\n x1: (datum: Datum) => {\n if (this._shouldDoPreCalculate()) {\n this._calculateStackRectPosition(false);\n return datum[RECT_X1];\n }\n\n return valueInScaleRange(this.dataToPositionX1(datum), xScale);\n },\n y: (datum: Datum) => this._getPosition(this.direction, datum),\n height: () => this._getBarWidth(this._yAxisHelper)\n },\n 'normal',\n AttributeLevel.Series\n );\n } else {\n this.setMarkStyle(\n this._barMark,\n {\n x: (datum: Datum) => this._getPosition(this.direction, datum),\n y: (datum: Datum, ctx, opt, dataView) => {\n if (this._shouldDoPreCalculate()) {\n this._calculateStackRectPosition(true);\n return datum[RECT_Y];\n }\n\n if (this._spec.barMinHeight) {\n return this._calculateRectPosition(datum, true);\n }\n\n return valueInScaleRange(this.dataToPositionY(datum), yScale);\n },\n y1: (datum: Datum) => {\n if (this._shouldDoPreCalculate()) {\n this._calculateStackRectPosition(true);\n return datum[RECT_Y1];\n }\n return valueInScaleRange(this.dataToPositionY1(datum), yScale);\n },\n width: () => {\n return this._getBarWidth(this._xAxisHelper);\n }\n },\n 'normal',\n AttributeLevel.Series\n );\n }\n this._initBarBackgroundMarkStyle();\n }\n\n protected _initBarBackgroundMarkStyle() {\n if (!this._barBackgroundMark) {\n return;\n }\n\n const xScale = this._xAxisHelper?.getScale?.(0);\n const yScale = this._yAxisHelper?.getScale?.(0);\n\n // guess the direction which the user want\n if (this.direction === Direction.horizontal) {\n this.setMarkStyle(\n this._barBackgroundMark,\n {\n x: () => {\n const range = xScale.range();\n const min = Math.min(range[0], range[range.length - 1]);\n return min;\n },\n x1: () => {\n const range = xScale.range();\n const max = Math.max(range[0], range[range.length - 1]);\n return max;\n },\n y: (datum: Datum) => this._getPosition(this.direction, datum),\n height: () => this._getBarWidth(this._yAxisHelper)\n },\n 'normal',\n AttributeLevel.Series\n );\n } else {\n this.setMarkStyle(\n this._barBackgroundMark,\n {\n x: (datum: Datum) => this._getPosition(this.direction, datum),\n y: () => {\n const range = yScale.range();\n const min = Math.min(range[0], range[range.length - 1]);\n return min;\n },\n y1: () => {\n const range = yScale.range();\n const max = Math.max(range[0], range[range.length - 1]);\n return max;\n },\n width: () => {\n return this._getBarWidth(this._xAxisHelper);\n }\n },\n 'normal',\n AttributeLevel.Series\n );\n }\n }\n\n initLinearRectMarkStyle() {\n const xScale = this._xAxisHelper?.getScale?.(0);\n const yScale = this._yAxisHelper?.getScale?.(0);\n\n if (this.direction === Direction.vertical) {\n this.setMarkStyle(\n this._barMark,\n {\n x: (datum: Datum) => valueInScaleRange(this.dataToPositionX(datum), xScale),\n x1: (datum: Datum) => valueInScaleRange(this.dataToPositionX1(datum), xScale),\n y: (datum: Datum, ctx, opt, dataView) => {\n if (this._shouldDoPreCalculate()) {\n this._calculateStackRectPosition(true);\n return datum[RECT_Y];\n }\n\n if (this._spec.barMinHeight) {\n return this._calculateRectPosition(datum, true);\n }\n\n return valueInScaleRange(this.dataToPositionY(datum), yScale);\n },\n y1: (datum: Datum) => {\n if (this._shouldDoPreCalculate()) {\n this._calculateStackRectPosition(true);\n return datum[RECT_Y1];\n }\n return valueInScaleRange(this.dataToPositionY1(datum), yScale);\n }\n },\n 'normal',\n AttributeLevel.Series\n );\n } else {\n this.setMarkStyle(\n this._barMark,\n {\n x: (datum: Datum) => {\n if (this._shouldDoPreCalculate()) {\n this._calculateStackRectPosition(false);\n\n return datum[RECT_X];\n }\n\n if (this._spec.barMinHeight) {\n return this._calculateRectPosition(datum, false);\n }\n\n return valueInScaleRange(this.dataToPositionX(datum), xScale);\n },\n x1: (datum: Datum) => {\n if (this._shouldDoPreCalculate()) {\n this._calculateStackRectPosition(false);\n return datum[RECT_X1];\n }\n return valueInScaleRange(this.dataToPositionX1(datum), xScale);\n },\n y: (datum: Datum) => valueInScaleRange(this.dataToPositionY(datum), yScale),\n y1: (datum: Datum) => valueInScaleRange(this.dataToPositionY1(datum), yScale)\n },\n 'normal',\n AttributeLevel.Series\n );\n }\n }\n\n initAnimation() {\n // 这个数据在这个时候拿不到，因为组件还没创建结束，统计和筛选也还没添加。\n // 而且这个值理论上是动态的，建议监听 viewDataStatisticsUpdate 消息动态更新\n const animationParams: IBarAnimationParams = {\n yField: this._fieldY[0],\n xField: this._fieldX[0],\n direction: this.direction,\n growFrom: () =>\n this.direction === 'horizontal'\n ? this._xAxisHelper?.getScale(0).scale(0)\n : this._yAxisHelper?.getScale(0).scale(0)\n };\n const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<BarAppearPreset>)?.preset;\n // 分组数据的dataIndex应该与x轴顺序一致，而非data[DEFAULT_DATA_INDEX]顺序\n const dataIndex = (datum: any) => {\n const xValue = datum?.[this._fieldX[0]];\n const xIndex = this.getViewDataStatistics()?.latestData?.[this._fieldX[0]]?.values.indexOf(xValue);\n // 不应该出现xIndex === -1 \|\| undefined的情况\n return xIndex \|\| 0;\n };\n\n this._barMark.setAnimationConfig(\n animationConfig(\n Factory.getAnimationInKey('bar')?.(animationParams, appearPreset),\n userAnimationConfig(this._barMarkName, this._spec, this._markAttributeContext),\n { dataIndex }\n )\n );\n }\n\n protected _getBarWidth(axisHelper: IAxisHelper) {\n const hasBarWidth = this._spec.barWidth !== undefined;\n const bandWidth = axisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ?? DefaultBandWidth;\n\n if (hasBarWidth) {\n return getActualNumValue(this._spec.barWidth, bandWidth);\n }\n const hasBarMinWidth = this._spec.barMinWidth !== undefined;\n const hasBarMaxWidth = this._spec.barMaxWidth !== undefined;\n let width = bandWidth;\n if (hasBarMinWidth) {\n width = Math.max(width, getActualNumValue(this._spec.barMinWidth, bandWidth));\n }\n if (hasBarMaxWidth) {\n width = Math.min(width, getActualNumValue(this._spec.barMaxWidth, bandWidth));\n }\n return width;\n }\n\n protected _getPosition(direction: DirectionType, datum: Datum) {\n let axisHelper;\n let sizeAttribute;\n let dataToPosition;\n if (direction === Direction.horizontal) {\n axisHelper = this.getYAxisHelper();\n sizeAttribute = 'height';\n dataToPosition = this.dataToPositionY.bind(this);\n } else {\n axisHelper = this.getXAxisHelper();\n sizeAttribute = 'width';\n dataToPosition = this.dataToPositionX.bind(this);\n }\n const scale = axisHelper.getScale(0);\n const size = this._barMark.getAttribute(sizeAttribute, datum) as number;\n const bandWidth = axisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ?? DefaultBandWidth;\n if (this._groups?.fields?.length > 1 && isValid(this._spec.barGapInGroup)) {\n // 自里向外计算，沿着第一层分组的中心点进行位置调整\n const groupFields = this._groups.fields;\n const barInGroup = array(this._spec.barGapInGroup);\n let totalWidth: number = 0;\n let offSet: number = 0;\n\n for (let index = groupFields.length - 1; index >= 1; index--) {\n const groupField = groupFields[index];\n const groupValues = this.getViewDataStatistics()?.latestData?.[groupField]?.values ?? [];\n const groupCount = groupValues.length;\n const gap = getActualNumValue(barInGroup[index - 1] ?? last(barInGroup), bandWidth);\n const i = groupValues.indexOf(datum[groupField]);\n if (index === groupFields.length - 1) {\n totalWidth += groupCount * size + (groupCount - 1) * gap;\n offSet += i * (size + gap);\n } else {\n offSet += i * (totalWidth + gap);\n totalWidth += totalWidth + (groupCount - 1) * gap;\n }\n }\n\n const center = scale.scale(datum[groupFields[0]]) + axisHelper.getBandwidth(0) / 2;\n return center - totalWidth / 2 + offSet;\n }\n\n const continuous = isContinuous(scale.type \|\| 'band');\n const pos = dataToPosition(datum);\n return pos + (bandWidth - size) * 0.5 + (continuous ? -bandWidth / 2 : 0);\n }\n\n onLayoutEnd(ctx: any): void {\n super.onLayoutEnd(ctx);\n const region = this.getRegion();\n // @ts-ignore\n region._bar_series_position_calculated = false;\n if (this._spec.sampling) {\n this.compile();\n }\n }\n\n compile(): void {\n super.compile();\n\n if (this._spec.sampling) {\n const { width, height } = this._region.getLayoutRect();\n const samplingTrans = [];\n const fieldsY = this._fieldY;\n const fieldsX = this._fieldX;\n\n samplingTrans.push({\n type: 'sampling',\n size: this._direction === Direction.vertical ? width : height,\n factor: this._spec.samplingFactor,\n yfield: this._direction === Direction.vertical ? fieldsY[0] : fieldsX[0],\n groupBy: this._seriesField,\n mode: this._spec.sampling\n });\n this._data.getProduct().transform(samplingTrans);\n }\n }\n\n getDefaultShapeType(): string {\n return 'square';\n }\n\n getActiveMarks(): IMark[] {\n return [this._barMark];\n }\n\n compileData() {\n super.compileData();\n this._barBackgroundViewData?.compile();\n }\n\n fillData() {\n super.fillData();\n this._barBackgroundViewData?.getDataView()?.reRunAllTransform();\n }\n\n viewDataUpdate(d: DataView): void {\n super.viewDataUpdate(d);\n this._barBackgroundViewData?.getDataView()?.reRunAllTransform();\n this._barBackgroundViewData?.updateData();\n }\n\n release() {\n super.release();\n this._barBackgroundViewData?.release();\n this._barBackgroundViewData = null;\n }\n}\n\nexport const registerBarSeries = () => {\n registerSampleTransform();\n Factory.registerMark(RectMark.type, RectMark);\n Factory.registerSeries(BarSeries.type, BarSeries);\n registerBarAnimation();\n};\n"]}

package/cjs/series/base/base-series.d.ts CHANGED Viewed

@@ -2,20 +2,23 @@ import { DataView } from '@visactor/vdataset';
 import type { DataSet, ITransformOptions } from '@visactor/vdataset';
 import type { IRegion } from '../../region/interface';
 import type { IMark } from '../../mark/interface';
-import type { CoordinateType, IInvalidType, IPoint, DataKeyType, Datum, Maybe, ISeriesSpec, IGroup } from '../../typings';
+import type { CoordinateType, IInvalidType, IPoint, DataKeyType, Datum, Maybe, ISeriesSpec, IGroup, ILayoutType, ILayoutPoint, ILayoutRect } from '../../typings';
 import { BaseModel } from '../../model/base-model';
 import type { ISeriesOption, ISeries, ISeriesMarkInitOption, ISeriesStackData, ISeriesTooltipHelper, SeriesMarkMap, ISeriesMarkInfo } from '../interface';
 import type { IModelEvaluateOption, IModelRenderOption } from '../../model/interface';
 import type { AddVChartPropertyContext } from '../../data/transforms/add-property';
 import type { ITrigger } from '../../interaction/interface';
-import type { LayoutItem } from '../../model/layout-item';
 import type { StatisticOperations } from '../../data/transforms/dimension-statistics';
 import { SeriesData } from './series-data';
 import type { IGroupMark } from '../../mark/group';
 import type { ISeriesMarkAttributeContext } from '../../compile/mark';
+import type { ILabelSpec } from '../../component';
+import type { ILabelMark } from '../../mark/label';
+import type { TransformedLabelSpec } from '../../component/label';
 export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseModel<T> implements ISeries {
+    readonly specKey: string;
     readonly type: string;
-    layoutType: LayoutItem['layoutType'];
+    layoutType: ILayoutType;
     readonly modelType: string;
     readonly name: string | undefined;
     static readonly mark: SeriesMarkMap;
@@ -25,6 +28,10 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     readonly coordinate: CoordinateType;
     protected _region: IRegion;
     getRegion(): IRegion;
+    private _layoutStartPoint;
+    getLayoutStartPoint(): ILayoutPoint;
+    private _layoutRect;
+    getLayoutRect: () => ILayoutRect;
     protected _rootMark: IGroupMark;
     getRootMark(): IGroupMark;
     protected _seriesMark: Maybe<IMark>;
@@ -63,6 +70,7 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     protected _dataSet: DataSet;
     protected _tooltipHelper: ISeriesTooltipHelper | undefined;
     get tooltipHelper(): ISeriesTooltipHelper;
+    layoutZIndex: number;
     protected _invalidType: IInvalidType;
     getInvalidType(): IInvalidType;
     setInvalidType(t: IInvalidType): void;
@@ -143,7 +151,8 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     onEvaluateEnd(ctx: IModelEvaluateOption): void;
     onRender(ctx: IModelRenderOption): void;
     release(): void;
-    onLayoutEnd(ctx: any): void;
+    setLayoutStartPosition(pos: Partial<IPoint>): void;
+    setLayoutRect({ width, height }: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRect>): void;
     getSeriesKeys(): string[];
     getSeriesStyle(datum: Datum): (attribute: string) => unknown;
     protected _getSeriesInfo(field: string, keys: string[]): {
@@ -186,4 +195,5 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     getMarkInfoList(): import("../../model/interface").IModelMarkInfo[];
     protected _getInvalidConnectType(): "none" | "zero" | "connect";
     protected _getInvalidDefined: (datum: Datum) => boolean;
+    protected _preprocessLabelSpec(spec: ILabelSpec, styleHandler?: (mark: ILabelMark) => void, hasAnimation?: boolean): TransformedLabelSpec;
 }

package/cjs/series/base/base-series.js CHANGED Viewed

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseSeries = void 0;
-const event_1 = require("../../constant/event"), index_1 = require("../../constant/index"), theme_1 = require("../interface/theme"), vdataset_1 = require("@visactor/vdataset"), type_1 = require("../../mark/interface/type"), base_model_1 = require("../../model/base-model"), initialize_1 = require("../../data/initialize"), data_1 = require("../../util/data"), type_2 = require("../../util/type"), merge_spec_1 = require("../../util/spec/merge-spec"), preprocess_1 = require("../../util/spec/preprocess"), add_property_1 = require("../../data/transforms/add-property"), trigger_1 = require("../../interaction/trigger"), register_1 = require("../../data/register"), tooltip_helper_1 = require("./tooltip-helper"), dimension_statistics_1 = require("../../data/transforms/dimension-statistics"), invalid_travel_1 = require("../../data/transforms/invalid-travel"), util_1 = require("../../theme/color-scheme/util"), series_data_1 = require("./series-data"), data_key_1 = require("../../data/transforms/data-key"), vutils_1 = require("@visactor/vutils"), util_2 = require("../../theme/util"), spec_1 = require("../util/spec"), color_ordinal_scale_1 = require("../../scale/color-ordinal-scale"), constant_1 = require("./constant"), utils_1 = require("../../animation/utils");
+const event_1 = require("../../constant/event"), index_1 = require("../../constant/index"), theme_1 = require("../interface/theme"), vdataset_1 = require("@visactor/vdataset"), type_1 = require("../../mark/interface/type"), base_model_1 = require("../../model/base-model"), initialize_1 = require("../../data/initialize"), data_1 = require("../../util/data"), type_2 = require("../../util/type"), merge_spec_1 = require("../../util/spec/merge-spec"), add_property_1 = require("../../data/transforms/add-property"), trigger_1 = require("../../interaction/trigger"), register_1 = require("../../data/register"), tooltip_helper_1 = require("./tooltip-helper"), dimension_statistics_1 = require("../../data/transforms/dimension-statistics"), invalid_travel_1 = require("../../data/transforms/invalid-travel"), util_1 = require("../../theme/color-scheme/util"), series_data_1 = require("./series-data"), data_key_1 = require("../../data/transforms/data-key"), vutils_1 = require("@visactor/vutils"), spec_1 = require("../util/spec"), color_ordinal_scale_1 = require("../../scale/color-ordinal-scale"), constant_1 = require("./constant"), utils_1 = require("../../animation/utils"), merge_theme_1 = require("../../util/spec/merge-theme");
 class BaseSeries extends base_model_1.BaseModel {
     getTrigger() {
@@ -13,6 +13,9 @@ class BaseSeries extends base_model_1.BaseModel {
     getRegion() {
         return this._region;
     }
+    getLayoutStartPoint() {
+        return this._region.getLayoutStartPoint();
+    }
     getRootMark() {
         return this._rootMark;
     }
@@ -72,12 +75,25 @@ class BaseSeries extends base_model_1.BaseModel {
     }
     constructor(spec, options) {
         var _a;
-        super(spec, Object.assign({}, options)), this.type = "series", this.layoutType = "absolute",
-        this.modelType = "series", this.name = void 0, this.coordinate = "none", this._region = null,
-        this._rootMark = null, this._seriesMark = null, this._viewDataMap = new Map, this._viewDataFilter = null,
-        this._data = null, this._percent = !1, this._stackOffsetSilhouette = !1, this._invalidType = "break",
-        this._getInvalidDefined = datum => (0, type_2.couldBeValidNumber)(datum[this.getStackValueField()]),
-        this._region = options.region, this._dataSet = options.dataSet, (null === (_a = this._spec) || void 0 === _a ? void 0 : _a.name) && (this.name = this._spec.name);
+        super(spec, Object.assign({}, options)), this.specKey = "series", this.type = "series",
+        this.layoutType = "absolute", this.modelType = "series", this.name = void 0, this.coordinate = "none",
+        this._region = null, this._layoutStartPoint = {
+            x: 0,
+            y: 0
+        }, this._layoutRect = {
+            width: null,
+            height: null
+        }, this.getLayoutRect = () => {
+            var _a, _b;
+            return {
+                width: null !== (_a = this._layoutRect.width) && void 0 !== _a ? _a : this._region.getLayoutRect().width,
+                height: null !== (_b = this._layoutRect.height) && void 0 !== _b ? _b : this._region.getLayoutRect().height
+            };
+        }, this._rootMark = null, this._seriesMark = null, this._viewDataMap = new Map,
+        this._viewDataFilter = null, this._data = null, this._percent = !1, this._stackOffsetSilhouette = !1,
+        this.layoutZIndex = 0, this._invalidType = "break", this._getInvalidDefined = datum => (0,
+        type_2.couldBeValidNumber)(datum[this.getStackValueField()]), this._region = options.region,
+        this._dataSet = options.dataSet, (null === (_a = this._spec) || void 0 === _a ? void 0 : _a.name) && (this.name = this._spec.name);
     }
     created() {
         super.created(), this._buildMarkAttributeContext(), this.initData(), this.initGroups(),
@@ -450,10 +466,11 @@ class BaseSeries extends base_model_1.BaseModel {
         transformIndex >= 0 && this._rawData.transformsArr.splice(transformIndex, 1), null === (_a = this._data) || void 0 === _a || _a.release(),
         this._dataSet = this._data = this._rawData = this._rawDataStatistics = this._spec = this._region = this._viewDataStatistics = this._viewStackData = null;
     }
-    onLayoutEnd(ctx) {
-        const region = this.getRegion();
-        this.setLayoutRect(region.getLayoutRect()), this.setLayoutStartPosition(region.getLayoutStartPoint()),
-        super.onLayoutEnd(ctx);
+    setLayoutStartPosition(pos) {
+        (0, vutils_1.isValidNumber)(pos.x) && (this._layoutStartPoint.x = pos.x), (0, vutils_1.isValidNumber)(pos.y) && (this._layoutStartPoint.y = pos.y);
+    }
+    setLayoutRect({width: width, height: height}, levelMap) {
+        (0, vutils_1.isValidNumber)(width) && (this._layoutRect.width = width), (0, vutils_1.isValidNumber)(height) && (this._layoutRect.height = height);
     }
     getSeriesKeys() {
         var _a, _b;
@@ -513,10 +530,11 @@ class BaseSeries extends base_model_1.BaseModel {
     }
     onMarkTreePositionUpdate(marks) {}
     _getTheme() {
-        const direction = (0, spec_1.getDirectionFromSeriesSpec)(this._spec), theme = (0,
-        util_2.getThemeFromOption)(`series.${this.type}`, this._option), themeWithDirection = (0,
-        util_2.getThemeFromOption)(`series.${this.type}_${direction}`, this._option);
-        return (0, preprocess_1.preprocessSpecOrTheme)("theme", (0, merge_spec_1.mergeSpec)({}, theme, themeWithDirection), this.getColorScheme(), this._spec);
+        var _a;
+        const direction = (0, spec_1.getDirectionFromSeriesSpec)(this._spec), chartTheme = null === (_a = this._option) || void 0 === _a ? void 0 : _a.getTheme(), {markByName: markByName, mark: mark} = chartTheme, theme = (0,
+        merge_theme_1.transformSeriesThemeToMerge)((0, vutils_1.get)(chartTheme, `series.${this.type}`), this.type, mark, markByName), themeWithDirection = (0,
+        merge_theme_1.transformSeriesThemeToMerge)((0, vutils_1.get)(chartTheme, `series.${this.type}_${direction}`), `${this.type}_${direction}`, mark, markByName);
+        return (0, merge_spec_1.mergeSpec)({}, theme, themeWithDirection);
     }
     _createMark(markInfo, option = {}) {
         var _a, _b, _c, _d;
@@ -588,6 +606,13 @@ class BaseSeries extends base_model_1.BaseModel {
     _getInvalidConnectType() {
         return "zero" === this._invalidType ? "zero" : "link" === this._invalidType ? "connect" : "none";
     }
+    _preprocessLabelSpec(spec, styleHandler, hasAnimation) {
+        return Object.assign(Object.assign({
+            animation: null != hasAnimation ? hasAnimation : this._spec.animation
+        }, spec), {
+            styleHandler: null != styleHandler ? styleHandler : this.initLabelMarkStyle
+        });
+    }
 }
 exports.BaseSeries = BaseSeries, BaseSeries.mark = constant_1.baseSeriesMark;