echarts 4.0.1 → 4.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.jshintrc-dist +70 -0
- package/KEYS +74 -0
- package/LICENSE +223 -29
- package/NOTICE +5 -0
- package/README.md +22 -8
- package/build/addHeader.js +113 -0
- package/build/amd2common.js +19 -0
- package/build/build.js +19 -0
- package/build/config.js +25 -1
- package/build/mangleString.js +19 -0
- package/build/optimize.js +19 -0
- package/build/pre-publish.js +26 -3
- package/build/preamble.js +20 -0
- package/build/rollup-plugin-ec-lang.js +20 -0
- package/build/rollup-plugin-ec-remove-dev.js +19 -0
- package/dist/echarts-en.common.js +7106 -1621
- package/dist/echarts-en.common.min.js +21 -1
- package/dist/echarts-en.js +13949 -4217
- package/dist/echarts-en.js.map +1 -1
- package/dist/echarts-en.min.js +21 -1
- package/dist/echarts-en.simple.js +5206 -1375
- package/dist/echarts-en.simple.min.js +21 -1
- package/dist/echarts.common.js +7106 -1621
- package/dist/echarts.common.min.js +21 -1
- package/dist/echarts.js +13949 -4217
- package/dist/echarts.js.map +1 -1
- package/dist/echarts.min.js +21 -1
- package/dist/echarts.simple.js +5206 -1375
- package/dist/echarts.simple.min.js +21 -1
- package/dist/extension/bmap.js +76 -0
- package/dist/extension/bmap.js.map +1 -1
- package/dist/extension/bmap.min.js +20 -0
- package/dist/extension/dataTool.js +95 -0
- package/dist/extension/dataTool.js.map +1 -1
- package/dist/extension/dataTool.min.js +20 -0
- package/echarts.all.js +19 -0
- package/echarts.blank.js +19 -0
- package/echarts.common.js +19 -0
- package/echarts.simple.js +19 -0
- package/extension/bmap/BMapCoordSys.js +19 -0
- package/extension/bmap/BMapModel.js +18 -0
- package/extension/bmap/BMapView.js +18 -0
- package/extension/bmap/bmap.js +19 -0
- package/extension/dataTool/gexf.js +18 -0
- package/extension/dataTool/index.js +19 -0
- package/extension/dataTool/prepareBoxplotData.js +19 -0
- package/extension/dataTool/quantile.js +19 -0
- package/extension/echarts.js +19 -0
- package/extension/webpack.config.js +19 -0
- package/extension-src/bmap/BMapCoordSys.js +19 -0
- package/extension-src/bmap/BMapModel.js +19 -0
- package/extension-src/bmap/BMapView.js +19 -0
- package/extension-src/bmap/bmap.js +19 -0
- package/extension-src/dataTool/gexf.js +19 -0
- package/extension-src/dataTool/index.js +19 -0
- package/extension-src/dataTool/prepareBoxplotData.js +19 -0
- package/extension-src/dataTool/quantile.js +19 -0
- package/index.common.js +19 -0
- package/index.js +19 -0
- package/index.simple.js +19 -0
- package/lib/CoordinateSystem.js +18 -0
- package/lib/ExtensionAPI.js +18 -0
- package/lib/action/createDataSelectAction.js +18 -0
- package/lib/action/geoRoam.js +19 -0
- package/lib/action/roamHelper.js +19 -0
- package/lib/chart/bar/BarSeries.js +42 -1
- package/lib/chart/bar/BarView.js +120 -15
- package/lib/chart/bar/BaseBarSeries.js +22 -0
- package/lib/chart/bar/PictorialBarSeries.js +18 -0
- package/lib/chart/bar/PictorialBarView.js +19 -0
- package/lib/chart/bar/barItemStyle.js +18 -0
- package/lib/chart/bar/helper.js +18 -0
- package/lib/chart/bar.js +28 -7
- package/lib/chart/boxplot/BoxplotSeries.js +35 -1
- package/lib/chart/boxplot/BoxplotView.js +128 -21
- package/lib/chart/boxplot/boxplotLayout.js +70 -63
- package/lib/chart/boxplot/boxplotVisual.js +18 -0
- package/lib/chart/boxplot.js +18 -0
- package/lib/chart/candlestick/CandlestickSeries.js +38 -4
- package/lib/chart/candlestick/CandlestickView.js +236 -22
- package/lib/chart/candlestick/candlestickLayout.js +143 -83
- package/lib/chart/candlestick/candlestickVisual.js +59 -14
- package/lib/chart/candlestick/preprocessor.js +18 -0
- package/lib/chart/candlestick.js +18 -0
- package/lib/chart/chord/ChordSeries.js +18 -0
- package/lib/chart/chord/ChordView.js +18 -0
- package/lib/chart/chord/Ribbon.js +18 -0
- package/lib/chart/chord/chordCircularLayout.js +19 -0
- package/lib/chart/chord.js +18 -0
- package/lib/chart/custom.js +20 -2
- package/lib/chart/effectScatter/EffectScatterSeries.js +18 -0
- package/lib/chart/effectScatter/EffectScatterView.js +18 -0
- package/lib/chart/effectScatter.js +18 -0
- package/lib/chart/funnel/FunnelSeries.js +19 -0
- package/lib/chart/funnel/FunnelView.js +19 -0
- package/lib/chart/funnel/funnelLayout.js +18 -0
- package/lib/chart/funnel.js +18 -0
- package/lib/chart/gauge/GaugeSeries.js +18 -0
- package/lib/chart/gauge/GaugeView.js +18 -0
- package/lib/chart/gauge/PointerPath.js +18 -0
- package/lib/chart/graph/GraphSeries.js +25 -1
- package/lib/chart/graph/GraphView.js +18 -0
- package/lib/chart/graph/adjustEdge.js +18 -0
- package/lib/chart/graph/backwardCompat.js +18 -0
- package/lib/chart/graph/categoryFilter.js +18 -0
- package/lib/chart/graph/categoryVisual.js +18 -0
- package/lib/chart/graph/circularLayout.js +18 -0
- package/lib/chart/graph/circularLayoutHelper.js +18 -0
- package/lib/chart/graph/createView.js +18 -0
- package/lib/chart/graph/edgeVisual.js +18 -0
- package/lib/chart/graph/forceHelper.js +18 -0
- package/lib/chart/graph/forceLayout.js +18 -0
- package/lib/chart/graph/graphAction.js +19 -0
- package/lib/chart/graph/simpleLayout.js +18 -0
- package/lib/chart/graph/simpleLayoutHelper.js +18 -0
- package/lib/chart/graph.js +18 -0
- package/lib/chart/heatmap/HeatmapLayer.js +19 -0
- package/lib/chart/heatmap/HeatmapSeries.js +21 -1
- package/lib/chart/heatmap/HeatmapView.js +18 -0
- package/lib/chart/helper/EffectLine.js +19 -0
- package/lib/chart/helper/EffectPolyline.js +19 -0
- package/lib/chart/helper/EffectSymbol.js +19 -0
- package/lib/chart/helper/LargeLineDraw.js +18 -0
- package/lib/chart/helper/LargeSymbolDraw.js +18 -0
- package/lib/chart/helper/Line.js +31 -13
- package/lib/chart/helper/LineDraw.js +26 -1
- package/lib/chart/helper/LinePath.js +19 -0
- package/lib/chart/helper/Polyline.js +19 -0
- package/lib/chart/helper/Symbol.js +63 -12
- package/lib/chart/helper/SymbolDraw.js +65 -18
- package/lib/chart/helper/createGraphFromNodeEdge.js +27 -3
- package/lib/chart/helper/createGraphFromNodeMatrix.js +19 -0
- package/lib/chart/helper/createListFromArray.js +33 -8
- package/lib/chart/helper/createListSimply.js +19 -0
- package/lib/chart/helper/createRenderPlanner.js +22 -3
- package/lib/chart/helper/labelHelper.js +19 -0
- package/lib/chart/helper/treeHelper.js +18 -0
- package/lib/chart/helper/whiskerBoxCommon.js +20 -21
- package/lib/chart/line/LineSeries.js +32 -11
- package/lib/chart/line/LineView.js +165 -102
- package/lib/chart/line/helper.js +117 -0
- package/lib/chart/line/lineAnimationDiff.js +31 -32
- package/lib/chart/line/poly.js +136 -0
- package/lib/chart/line.js +18 -0
- package/lib/chart/lines/LinesSeries.js +25 -6
- package/lib/chart/lines/LinesView.js +20 -1
- package/lib/chart/lines/linesLayout.js +19 -1
- package/lib/chart/lines/linesVisual.js +18 -0
- package/lib/chart/lines.js +18 -0
- package/lib/chart/map/MapSeries.js +45 -8
- package/lib/chart/map/MapView.js +18 -0
- package/lib/chart/map/backwardCompat.js +18 -0
- package/lib/chart/map/mapDataStatistic.js +18 -0
- package/lib/chart/map/mapSymbolLayout.js +18 -0
- package/lib/chart/map/mapVisual.js +18 -0
- package/lib/chart/map.js +18 -0
- package/lib/chart/parallel/ParallelSeries.js +20 -7
- package/lib/chart/parallel/ParallelView.js +86 -55
- package/lib/chart/parallel/parallelVisual.js +38 -15
- package/lib/chart/parallel.js +18 -0
- package/lib/chart/pictorialBar.js +18 -0
- package/lib/chart/pie/PieSeries.js +39 -2
- package/lib/chart/pie/PieView.js +19 -0
- package/lib/chart/pie/labelLayout.js +18 -0
- package/lib/chart/pie/pieLayout.js +19 -1
- package/lib/chart/pie.js +18 -0
- package/lib/chart/radar/RadarSeries.js +21 -2
- package/lib/chart/radar/RadarView.js +18 -0
- package/lib/chart/radar/backwardCompat.js +18 -0
- package/lib/chart/radar/radarLayout.js +19 -1
- package/lib/chart/radar.js +18 -0
- package/lib/chart/sankey/SankeySeries.js +26 -0
- package/lib/chart/sankey/SankeyView.js +62 -10
- package/lib/chart/sankey/sankeyAction.js +34 -0
- package/lib/chart/sankey/sankeyLayout.js +68 -19
- package/lib/chart/sankey/sankeyVisual.js +49 -19
- package/lib/chart/sankey.js +20 -0
- package/lib/chart/scatter/ScatterSeries.js +20 -2
- package/lib/chart/scatter/ScatterView.js +18 -0
- package/lib/chart/scatter.js +18 -0
- package/lib/chart/sunburst/SunburstPiece.js +70 -19
- package/lib/chart/sunburst/SunburstSeries.js +18 -0
- package/lib/chart/sunburst/SunburstView.js +39 -20
- package/lib/chart/sunburst/sunburstAction.js +19 -0
- package/lib/chart/sunburst/sunburstLayout.js +18 -0
- package/lib/chart/sunburst.js +18 -0
- package/lib/chart/themeRiver/ThemeRiverSeries.js +19 -1
- package/lib/chart/themeRiver/ThemeRiverView.js +19 -0
- package/lib/chart/themeRiver/themeRiverLayout.js +19 -0
- package/lib/chart/themeRiver/themeRiverVisual.js +19 -0
- package/lib/chart/themeRiver.js +18 -0
- package/lib/chart/tree/TreeSeries.js +40 -3
- package/lib/chart/tree/TreeView.js +32 -6
- package/lib/chart/tree/layoutHelper.js +19 -0
- package/lib/chart/tree/traversalHelper.js +19 -0
- package/lib/chart/tree/treeAction.js +18 -0
- package/lib/chart/tree/treeLayout.js +137 -0
- package/lib/chart/tree.js +20 -5
- package/lib/chart/treemap/Breadcrumb.js +19 -0
- package/lib/chart/treemap/TreemapSeries.js +18 -0
- package/lib/chart/treemap/TreemapView.js +18 -0
- package/lib/chart/treemap/helper.js +18 -0
- package/lib/chart/treemap/treemapAction.js +19 -0
- package/lib/chart/treemap/treemapLayout.js +18 -0
- package/lib/chart/treemap/treemapVisual.js +18 -0
- package/lib/chart/treemap.js +18 -0
- package/lib/component/axis/AngleAxisView.js +59 -27
- package/lib/component/axis/AxisBuilder.js +59 -73
- package/lib/component/axis/AxisView.js +19 -0
- package/lib/component/axis/CartesianAxisView.js +71 -39
- package/lib/component/axis/ParallelAxisView.js +18 -0
- package/lib/component/axis/RadiusAxisView.js +26 -4
- package/lib/component/axis/SingleAxisView.js +25 -14
- package/lib/component/axis/parallelAxisAction.js +19 -0
- package/lib/component/axisPointer/AxisPointerModel.js +18 -0
- package/lib/component/axisPointer/AxisPointerView.js +18 -0
- package/lib/component/axisPointer/BaseAxisPointer.js +19 -0
- package/lib/component/axisPointer/CartesianAxisPointer.js +20 -2
- package/lib/component/axisPointer/PolarAxisPointer.js +19 -1
- package/lib/component/axisPointer/SingleAxisPointer.js +19 -1
- package/lib/component/axisPointer/axisTrigger.js +20 -1
- package/lib/component/axisPointer/findPointFromSeries.js +19 -0
- package/lib/component/axisPointer/globalListener.js +19 -0
- package/lib/component/axisPointer/modelHelper.js +20 -1
- package/lib/component/axisPointer/viewHelper.js +20 -0
- package/lib/component/axisPointer.js +18 -0
- package/lib/component/brush/BrushModel.js +25 -1
- package/lib/component/brush/BrushView.js +23 -0
- package/lib/component/brush/brushAction.js +19 -0
- package/lib/component/brush/preprocessor.js +18 -0
- package/lib/component/brush/selector.js +18 -0
- package/lib/component/brush/visualEncoding.js +18 -0
- package/lib/component/brush.js +19 -0
- package/lib/component/calendar/CalendarView.js +18 -0
- package/lib/component/dataZoom/AxisProxy.js +42 -23
- package/lib/component/dataZoom/DataZoomModel.js +18 -0
- package/lib/component/dataZoom/DataZoomView.js +18 -0
- package/lib/component/dataZoom/InsideZoomModel.js +18 -0
- package/lib/component/dataZoom/InsideZoomView.js +36 -13
- package/lib/component/dataZoom/SelectZoomModel.js +18 -0
- package/lib/component/dataZoom/SelectZoomView.js +18 -0
- package/lib/component/dataZoom/SliderZoomModel.js +18 -0
- package/lib/component/dataZoom/SliderZoomView.js +29 -6
- package/lib/component/dataZoom/dataZoomAction.js +18 -0
- package/lib/component/dataZoom/dataZoomProcessor.js +23 -1
- package/lib/component/dataZoom/helper.js +18 -0
- package/lib/component/dataZoom/history.js +18 -0
- package/lib/component/dataZoom/roams.js +19 -18
- package/lib/component/dataZoom/typeDefaulter.js +18 -0
- package/lib/component/dataset.js +56 -3
- package/lib/component/geo/GeoView.js +18 -0
- package/lib/component/geo.js +18 -0
- package/lib/component/graphic.js +18 -0
- package/lib/component/gridSimple.js +18 -0
- package/lib/component/helper/BrushController.js +18 -0
- package/lib/component/helper/BrushTargetManager.js +18 -0
- package/lib/component/helper/MapDraw.js +18 -0
- package/lib/component/helper/RoamController.js +19 -0
- package/lib/component/helper/brushHelper.js +18 -0
- package/lib/component/helper/cursorHelper.js +18 -0
- package/lib/component/helper/interactionMutex.js +18 -0
- package/lib/component/helper/listComponent.js +19 -0
- package/lib/component/helper/roamHelper.js +19 -0
- package/lib/component/helper/selectableMixin.js +21 -16
- package/lib/component/helper/sliderMove.js +19 -0
- package/lib/component/legend/LegendModel.js +25 -6
- package/lib/component/legend/LegendView.js +41 -12
- package/lib/component/legend/ScrollableLegendModel.js +19 -0
- package/lib/component/legend/ScrollableLegendView.js +19 -0
- package/lib/component/legend/legendAction.js +18 -0
- package/lib/component/legend/legendFilter.js +18 -0
- package/lib/component/legend/scrollableLegendAction.js +19 -0
- package/lib/component/legend.js +18 -0
- package/lib/component/markArea.js +18 -0
- package/lib/component/markLine.js +18 -0
- package/lib/component/markPoint.js +18 -0
- package/lib/component/marker/MarkAreaModel.js +18 -0
- package/lib/component/marker/MarkAreaView.js +20 -2
- package/lib/component/marker/MarkLineModel.js +18 -0
- package/lib/component/marker/MarkLineView.js +20 -2
- package/lib/component/marker/MarkPointModel.js +18 -0
- package/lib/component/marker/MarkPointView.js +20 -4
- package/lib/component/marker/MarkerModel.js +19 -1
- package/lib/component/marker/MarkerView.js +18 -0
- package/lib/component/marker/markerHelper.js +58 -17
- package/lib/component/parallel.js +18 -0
- package/lib/component/polar.js +18 -0
- package/lib/component/radar/RadarView.js +22 -4
- package/lib/component/singleAxis.js +18 -0
- package/lib/component/timeline/SliderTimelineModel.js +18 -0
- package/lib/component/timeline/SliderTimelineView.js +42 -33
- package/lib/component/timeline/TimelineAxis.js +24 -35
- package/lib/component/timeline/TimelineModel.js +18 -0
- package/lib/component/timeline/TimelineView.js +18 -0
- package/lib/component/timeline/preprocessor.js +18 -0
- package/lib/component/timeline/timelineAction.js +18 -0
- package/lib/component/timeline/typeDefaulter.js +18 -0
- package/lib/component/timeline.js +19 -0
- package/lib/component/title.js +19 -0
- package/lib/component/toolbox/ToolboxModel.js +20 -2
- package/lib/component/toolbox/ToolboxView.js +18 -0
- package/lib/component/toolbox/feature/Brush.js +18 -0
- package/lib/component/toolbox/feature/DataView.js +18 -0
- package/lib/component/toolbox/feature/DataZoom.js +22 -1
- package/lib/component/toolbox/feature/MagicType.js +18 -0
- package/lib/component/toolbox/feature/Restore.js +18 -0
- package/lib/component/toolbox/feature/SaveAsImage.js +18 -0
- package/lib/component/toolbox/featureManager.js +18 -0
- package/lib/component/tooltip/TooltipContent.js +18 -0
- package/lib/component/tooltip/TooltipModel.js +18 -0
- package/lib/component/tooltip/TooltipView.js +19 -1
- package/lib/component/tooltip.js +18 -0
- package/lib/component/visualMap/ContinuousModel.js +19 -1
- package/lib/component/visualMap/ContinuousView.js +18 -0
- package/lib/component/visualMap/PiecewiseModel.js +20 -1
- package/lib/component/visualMap/PiecewiseView.js +18 -0
- package/lib/component/visualMap/VisualMapModel.js +32 -1
- package/lib/component/visualMap/VisualMapView.js +18 -0
- package/lib/component/visualMap/helper.js +19 -0
- package/lib/component/visualMap/preprocessor.js +18 -0
- package/lib/component/visualMap/typeDefaulter.js +18 -0
- package/lib/component/visualMap/visualEncoding.js +21 -1
- package/lib/component/visualMap/visualMapAction.js +18 -0
- package/lib/component/visualMapContinuous.js +19 -0
- package/lib/component/visualMapPiecewise.js +19 -0
- package/lib/config.js +18 -0
- package/lib/coord/Axis.js +166 -87
- package/lib/coord/View.js +19 -0
- package/lib/coord/axisDefault.js +52 -42
- package/lib/coord/axisHelper.js +136 -89
- package/lib/coord/axisModelCommonMixin.js +18 -8
- package/lib/coord/axisModelCreator.js +26 -3
- package/lib/coord/axisTickLabelBuilder.js +350 -0
- package/lib/coord/calendar/Calendar.js +20 -2
- package/lib/coord/calendar/CalendarModel.js +19 -0
- package/lib/coord/calendar/prepareCustom.js +18 -0
- package/lib/coord/cartesian/Axis2D.js +24 -16
- package/lib/coord/cartesian/AxisModel.js +18 -0
- package/lib/coord/cartesian/Cartesian.js +19 -0
- package/lib/coord/cartesian/Cartesian2D.js +26 -4
- package/lib/coord/cartesian/Grid.js +71 -79
- package/lib/coord/cartesian/GridModel.js +18 -0
- package/lib/{component/axis → coord/cartesian}/cartesianAxisHelper.js +29 -9
- package/lib/coord/cartesian/prepareCustom.js +18 -0
- package/lib/coord/geo/Geo.js +18 -0
- package/lib/coord/geo/GeoModel.js +18 -0
- package/lib/coord/geo/Region.js +19 -0
- package/lib/coord/geo/fix/diaoyuIsland.js +18 -0
- package/lib/coord/geo/fix/geoCoord.js +18 -0
- package/lib/coord/geo/fix/nanhai.js +18 -0
- package/lib/coord/geo/fix/textCoord.js +18 -0
- package/lib/coord/geo/geoCreator.js +19 -0
- package/lib/coord/geo/parseGeoJson.js +19 -0
- package/lib/coord/geo/prepareCustom.js +23 -3
- package/lib/coord/parallel/AxisModel.js +31 -4
- package/lib/coord/parallel/Parallel.js +35 -12
- package/lib/coord/parallel/ParallelAxis.js +19 -0
- package/lib/coord/parallel/ParallelModel.js +18 -0
- package/lib/coord/parallel/parallelCreator.js +19 -0
- package/lib/coord/parallel/parallelPreprocessor.js +18 -0
- package/lib/coord/polar/AngleAxis.js +18 -0
- package/lib/coord/polar/AxisModel.js +18 -0
- package/lib/coord/polar/Polar.js +19 -0
- package/lib/coord/polar/PolarModel.js +18 -0
- package/lib/coord/polar/RadiusAxis.js +18 -0
- package/lib/coord/polar/polarCreator.js +24 -3
- package/lib/coord/polar/prepareCustom.js +18 -0
- package/lib/coord/radar/IndicatorAxis.js +18 -0
- package/lib/coord/radar/Radar.js +18 -0
- package/lib/coord/radar/RadarModel.js +18 -0
- package/lib/coord/single/AxisModel.js +18 -0
- package/lib/coord/single/Single.js +19 -0
- package/lib/coord/single/SingleAxis.js +19 -5
- package/lib/coord/single/prepareCustom.js +18 -0
- package/lib/{component/axis → coord/single}/singleAxisHelper.js +20 -2
- package/lib/coord/single/singleCreator.js +19 -0
- package/lib/data/DataDiffer.js +18 -0
- package/lib/data/Graph.js +19 -0
- package/lib/data/List.js +413 -201
- package/lib/data/OrdinalMeta.js +19 -0
- package/lib/data/Source.js +19 -0
- package/lib/data/Tree.js +19 -0
- package/lib/data/helper/completeDimensions.js +63 -22
- package/lib/data/helper/createDimensions.js +23 -4
- package/lib/data/helper/dataProvider.js +63 -6
- package/lib/data/helper/dataStackHelper.js +162 -0
- package/lib/data/helper/dimensionHelper.js +46 -10
- package/lib/data/helper/linkList.js +19 -0
- package/lib/data/helper/sourceHelper.js +19 -0
- package/lib/data/helper/sourceType.js +18 -0
- package/lib/echarts.js +128 -118
- package/lib/export.js +19 -0
- package/lib/helper.js +41 -0
- package/lib/lang.js +18 -0
- package/lib/langEN.js +18 -0
- package/lib/langFI.js +18 -0
- package/lib/langTH.js +18 -0
- package/lib/layout/barGrid.js +178 -53
- package/lib/layout/barPolar.js +88 -71
- package/lib/layout/points.js +39 -4
- package/lib/loading/default.js +18 -0
- package/lib/model/Component.js +19 -0
- package/lib/model/Global.js +30 -2
- package/lib/model/Model.js +19 -0
- package/lib/model/OptionManager.js +19 -0
- package/lib/model/Series.js +23 -5
- package/lib/model/globalDefault.js +21 -5
- package/lib/model/mixin/areaStyle.js +18 -0
- package/lib/model/mixin/boxLayout.js +18 -0
- package/lib/model/mixin/colorPalette.js +27 -0
- package/lib/model/mixin/dataFormat.js +20 -1
- package/lib/model/mixin/itemStyle.js +18 -0
- package/lib/model/mixin/lineStyle.js +18 -0
- package/lib/model/mixin/makeStyleMapper.js +18 -0
- package/lib/model/mixin/textStyle.js +18 -0
- package/lib/model/referHelper.js +19 -0
- package/lib/preprocessor/backwardCompat.js +18 -0
- package/lib/preprocessor/helper/compatStyle.js +42 -15
- package/lib/processor/dataFilter.js +19 -1
- package/lib/processor/dataSample.js +27 -5
- package/lib/processor/dataStack.js +118 -0
- package/lib/scale/Interval.js +19 -14
- package/lib/scale/Log.js +22 -3
- package/lib/scale/Ordinal.js +27 -2
- package/lib/scale/Scale.js +27 -16
- package/lib/scale/Time.js +18 -0
- package/lib/scale/helper.js +19 -0
- package/lib/stream/Scheduler.js +123 -37
- package/lib/stream/task.js +165 -14
- package/lib/theme/dark.js +18 -0
- package/lib/theme/light.js +18 -0
- package/lib/util/KDTree.js +19 -0
- package/lib/util/animation.js +19 -0
- package/lib/util/array/nest.js +19 -0
- package/lib/util/clazz.js +18 -0
- package/lib/util/component.js +19 -0
- package/lib/util/format.js +36 -11
- package/lib/util/graphic.js +19 -0
- package/lib/util/layout.js +18 -0
- package/lib/util/model.js +33 -6
- package/lib/util/number.js +18 -0
- package/lib/util/quickSelect.js +19 -0
- package/lib/util/symbol.js +18 -0
- package/lib/util/throttle.js +26 -1
- package/lib/view/Chart.js +44 -7
- package/lib/view/Component.js +18 -0
- package/lib/visual/VisualMapping.js +28 -0
- package/lib/visual/aria.js +18 -0
- package/lib/visual/dataColor.js +19 -1
- package/lib/visual/seriesColor.js +19 -1
- package/lib/visual/symbol.js +28 -2
- package/lib/visual/visualDefault.js +19 -0
- package/lib/visual/visualSolution.js +24 -3
- package/licenses/LICENSE-d3 +27 -0
- package/licenses/LICENSE-zrender +29 -0
- package/map/js/china-contour.js +19 -0
- package/map/js/china.js +19 -0
- package/map/js/province/anhui.js +19 -0
- package/map/js/province/aomen.js +19 -0
- package/map/js/province/beijing.js +19 -0
- package/map/js/province/chongqing.js +19 -0
- package/map/js/province/fujian.js +19 -0
- package/map/js/province/gansu.js +19 -0
- package/map/js/province/guangdong.js +19 -0
- package/map/js/province/guangxi.js +19 -0
- package/map/js/province/guizhou.js +19 -0
- package/map/js/province/hainan.js +19 -0
- package/map/js/province/hebei.js +19 -0
- package/map/js/province/heilongjiang.js +19 -0
- package/map/js/province/henan.js +19 -0
- package/map/js/province/hubei.js +19 -0
- package/map/js/province/hunan.js +19 -0
- package/map/js/province/jiangsu.js +19 -0
- package/map/js/province/jiangxi.js +19 -0
- package/map/js/province/jilin.js +19 -0
- package/map/js/province/liaoning.js +19 -0
- package/map/js/province/neimenggu.js +19 -0
- package/map/js/province/ningxia.js +19 -0
- package/map/js/province/qinghai.js +19 -0
- package/map/js/province/shandong.js +19 -0
- package/map/js/province/shanghai.js +19 -0
- package/map/js/province/shanxi.js +19 -0
- package/map/js/province/shanxi1.js +19 -0
- package/map/js/province/sichuan.js +19 -0
- package/map/js/province/taiwan.js +19 -0
- package/map/js/province/tianjin.js +19 -0
- package/map/js/province/xianggang.js +19 -0
- package/map/js/province/xinjiang.js +19 -0
- package/map/js/province/xizang.js +19 -0
- package/map/js/province/yunnan.js +19 -0
- package/map/js/province/zhejiang.js +19 -0
- package/map/js/world.js +19 -0
- package/package.json +3 -3
- package/src/CoordinateSystem.js +19 -0
- package/src/ExtensionAPI.js +19 -0
- package/src/action/createDataSelectAction.js +19 -0
- package/src/action/geoRoam.js +19 -0
- package/src/action/roamHelper.js +19 -0
- package/src/chart/bar/BarSeries.js +44 -1
- package/src/chart/bar/BarView.js +128 -17
- package/src/chart/bar/BaseBarSeries.js +24 -0
- package/src/chart/bar/PictorialBarSeries.js +19 -0
- package/src/chart/bar/PictorialBarView.js +19 -0
- package/src/chart/bar/barItemStyle.js +19 -0
- package/src/chart/bar/helper.js +20 -1
- package/src/chart/bar.js +28 -7
- package/src/chart/boxplot/BoxplotSeries.js +26 -1
- package/src/chart/boxplot/BoxplotView.js +152 -21
- package/src/chart/boxplot/boxplotLayout.js +75 -71
- package/src/chart/boxplot/boxplotVisual.js +19 -0
- package/src/chart/boxplot.js +19 -0
- package/src/chart/candlestick/CandlestickSeries.js +35 -4
- package/src/chart/candlestick/CandlestickView.js +272 -24
- package/src/chart/candlestick/candlestickLayout.js +151 -97
- package/src/chart/candlestick/candlestickVisual.js +66 -17
- package/src/chart/candlestick/preprocessor.js +19 -0
- package/src/chart/candlestick.js +19 -0
- package/src/chart/chord/ChordSeries.js +19 -0
- package/src/chart/chord/ChordView.js +19 -0
- package/src/chart/chord/Ribbon.js +19 -0
- package/src/chart/chord/chordCircularLayout.js +19 -0
- package/src/chart/chord.js +19 -0
- package/src/chart/custom.js +23 -6
- package/src/chart/effectScatter/EffectScatterSeries.js +19 -0
- package/src/chart/effectScatter/EffectScatterView.js +19 -0
- package/src/chart/effectScatter.js +19 -0
- package/src/chart/funnel/FunnelSeries.js +19 -0
- package/src/chart/funnel/FunnelView.js +19 -0
- package/src/chart/funnel/funnelLayout.js +19 -0
- package/src/chart/funnel.js +19 -0
- package/src/chart/gauge/GaugeSeries.js +19 -0
- package/src/chart/gauge/GaugeView.js +19 -0
- package/src/chart/gauge/PointerPath.js +19 -0
- package/src/chart/gauge.js +19 -0
- package/src/chart/graph/GraphSeries.js +27 -0
- package/src/chart/graph/GraphView.js +19 -0
- package/src/chart/graph/adjustEdge.js +19 -0
- package/src/chart/graph/backwardCompat.js +19 -0
- package/src/chart/graph/categoryFilter.js +19 -0
- package/src/chart/graph/categoryVisual.js +19 -0
- package/src/chart/graph/circularLayout.js +19 -0
- package/src/chart/graph/circularLayoutHelper.js +19 -0
- package/src/chart/graph/createView.js +19 -0
- package/src/chart/graph/edgeVisual.js +19 -0
- package/src/chart/graph/forceHelper.js +19 -0
- package/src/chart/graph/forceLayout.js +19 -0
- package/src/chart/graph/graphAction.js +19 -0
- package/src/chart/graph/simpleLayout.js +19 -0
- package/src/chart/graph/simpleLayoutHelper.js +19 -0
- package/src/chart/graph.js +19 -0
- package/src/chart/heatmap/HeatmapLayer.js +19 -0
- package/src/chart/heatmap/HeatmapSeries.js +22 -1
- package/src/chart/heatmap/HeatmapView.js +19 -0
- package/src/chart/heatmap.js +19 -0
- package/src/chart/helper/EffectLine.js +19 -0
- package/src/chart/helper/EffectPolyline.js +19 -0
- package/src/chart/helper/EffectSymbol.js +19 -0
- package/src/chart/helper/LargeLineDraw.js +20 -0
- package/src/chart/helper/LargeSymbolDraw.js +19 -0
- package/src/chart/helper/Line.js +38 -16
- package/src/chart/helper/LineDraw.js +27 -0
- package/src/chart/helper/LinePath.js +19 -0
- package/src/chart/helper/Polyline.js +19 -0
- package/src/chart/helper/Symbol.js +68 -15
- package/src/chart/helper/SymbolDraw.js +61 -18
- package/src/chart/helper/createGraphFromNodeEdge.js +29 -6
- package/src/chart/helper/createGraphFromNodeMatrix.js +19 -0
- package/src/chart/helper/createListFromArray.js +32 -7
- package/src/chart/helper/createListSimply.js +19 -0
- package/src/chart/helper/createRenderPlanner.js +22 -3
- package/src/chart/helper/labelHelper.js +19 -0
- package/src/chart/helper/treeHelper.js +19 -0
- package/src/chart/helper/whiskerBoxCommon.js +19 -24
- package/src/chart/line/LineSeries.js +35 -11
- package/src/chart/line/LineView.js +174 -105
- package/src/chart/line/helper.js +106 -0
- package/src/chart/line/lineAnimationDiff.js +32 -39
- package/src/chart/line/poly.js +149 -0
- package/src/chart/line.js +19 -0
- package/src/chart/lines/LinesSeries.js +27 -7
- package/src/chart/lines/LinesView.js +21 -1
- package/src/chart/lines/linesLayout.js +20 -1
- package/src/chart/lines/linesVisual.js +19 -0
- package/src/chart/lines.js +19 -0
- package/src/chart/map/MapSeries.js +42 -5
- package/src/chart/map/MapView.js +19 -0
- package/src/chart/map/backwardCompat.js +19 -0
- package/src/chart/map/mapDataStatistic.js +19 -0
- package/src/chart/map/mapSymbolLayout.js +19 -0
- package/src/chart/map/mapVisual.js +19 -0
- package/src/chart/map.js +19 -0
- package/src/chart/parallel/ParallelSeries.js +21 -7
- package/src/chart/parallel/ParallelView.js +90 -58
- package/src/chart/parallel/parallelVisual.js +39 -14
- package/src/chart/parallel.js +19 -0
- package/src/chart/pictorialBar.js +19 -0
- package/src/chart/pie/PieSeries.js +37 -2
- package/src/chart/pie/PieView.js +19 -0
- package/src/chart/pie/labelLayout.js +19 -0
- package/src/chart/pie/pieLayout.js +20 -1
- package/src/chart/pie.js +19 -0
- package/src/chart/radar/RadarSeries.js +21 -2
- package/src/chart/radar/RadarView.js +19 -0
- package/src/chart/radar/backwardCompat.js +19 -0
- package/src/chart/radar/radarLayout.js +20 -1
- package/src/chart/radar.js +19 -0
- package/src/chart/sankey/SankeySeries.js +28 -0
- package/src/chart/sankey/SankeyView.js +62 -11
- package/src/chart/sankey/sankeyAction.js +31 -0
- package/src/chart/sankey/sankeyLayout.js +71 -17
- package/src/chart/sankey/sankeyVisual.js +49 -25
- package/src/chart/sankey.js +20 -0
- package/src/chart/scatter/ScatterSeries.js +21 -2
- package/src/chart/scatter/ScatterView.js +19 -0
- package/src/chart/scatter.js +19 -0
- package/src/chart/sunburst/SunburstPiece.js +72 -20
- package/src/chart/sunburst/SunburstSeries.js +19 -0
- package/src/chart/sunburst/SunburstView.js +39 -17
- package/src/chart/sunburst/sunburstAction.js +19 -0
- package/src/chart/sunburst/sunburstLayout.js +19 -0
- package/src/chart/sunburst.js +19 -0
- package/src/chart/themeRiver/ThemeRiverSeries.js +19 -1
- package/src/chart/themeRiver/ThemeRiverView.js +19 -0
- package/src/chart/themeRiver/themeRiverLayout.js +19 -0
- package/src/chart/themeRiver/themeRiverVisual.js +19 -0
- package/src/chart/themeRiver.js +19 -0
- package/src/chart/tree/TreeSeries.js +38 -2
- package/src/chart/tree/TreeView.js +31 -5
- package/src/chart/tree/layoutHelper.js +19 -0
- package/src/chart/tree/traversalHelper.js +19 -0
- package/src/chart/tree/treeAction.js +19 -0
- package/src/chart/tree/treeLayout.js +128 -0
- package/src/chart/tree.js +21 -4
- package/src/chart/treemap/Breadcrumb.js +19 -0
- package/src/chart/treemap/TreemapSeries.js +19 -0
- package/src/chart/treemap/TreemapView.js +19 -0
- package/src/chart/treemap/helper.js +19 -0
- package/src/chart/treemap/treemapAction.js +19 -0
- package/src/chart/treemap/treemapLayout.js +19 -0
- package/src/chart/treemap/treemapVisual.js +19 -0
- package/src/chart/treemap.js +19 -0
- package/src/component/angleAxis.js +19 -0
- package/src/component/axis/AngleAxisView.js +62 -25
- package/src/component/axis/AxisBuilder.js +68 -94
- package/src/component/axis/AxisView.js +19 -0
- package/src/component/axis/CartesianAxisView.js +69 -54
- package/src/component/axis/ParallelAxisView.js +19 -0
- package/src/component/axis/RadiusAxisView.js +26 -4
- package/src/component/axis/SingleAxisView.js +26 -18
- package/src/component/axis/parallelAxisAction.js +19 -0
- package/src/component/axis.js +19 -0
- package/src/component/axisPointer/AxisPointerModel.js +19 -0
- package/src/component/axisPointer/AxisPointerView.js +19 -0
- package/src/component/axisPointer/BaseAxisPointer.js +19 -0
- package/src/component/axisPointer/CartesianAxisPointer.js +21 -2
- package/src/component/axisPointer/PolarAxisPointer.js +20 -1
- package/src/component/axisPointer/SingleAxisPointer.js +20 -1
- package/src/component/axisPointer/axisTrigger.js +21 -1
- package/src/component/axisPointer/findPointFromSeries.js +19 -0
- package/src/component/axisPointer/globalListener.js +19 -0
- package/src/component/axisPointer/modelHelper.js +21 -1
- package/src/component/axisPointer/viewHelper.js +20 -0
- package/src/component/axisPointer.js +19 -0
- package/src/component/brush/BrushModel.js +26 -1
- package/src/component/brush/BrushView.js +24 -0
- package/src/component/brush/brushAction.js +19 -0
- package/src/component/brush/preprocessor.js +19 -0
- package/src/component/brush/selector.js +19 -0
- package/src/component/brush/visualEncoding.js +19 -0
- package/src/component/brush.js +19 -0
- package/src/component/calendar/CalendarView.js +19 -0
- package/src/component/calendar.js +19 -0
- package/src/component/dataZoom/AxisProxy.js +42 -20
- package/src/component/dataZoom/DataZoomModel.js +19 -0
- package/src/component/dataZoom/DataZoomView.js +19 -0
- package/src/component/dataZoom/InsideZoomModel.js +19 -0
- package/src/component/dataZoom/InsideZoomView.js +37 -10
- package/src/component/dataZoom/SelectZoomModel.js +19 -0
- package/src/component/dataZoom/SelectZoomView.js +19 -0
- package/src/component/dataZoom/SliderZoomModel.js +19 -0
- package/src/component/dataZoom/SliderZoomView.js +30 -5
- package/src/component/dataZoom/dataZoomAction.js +19 -0
- package/src/component/dataZoom/dataZoomProcessor.js +24 -1
- package/src/component/dataZoom/helper.js +19 -0
- package/src/component/dataZoom/history.js +19 -0
- package/src/component/dataZoom/roams.js +20 -15
- package/src/component/dataZoom/typeDefaulter.js +19 -0
- package/src/component/dataZoom.js +19 -0
- package/src/component/dataZoomInside.js +19 -0
- package/src/component/dataZoomSelect.js +19 -0
- package/src/component/dataset.js +63 -3
- package/src/component/geo/GeoView.js +19 -0
- package/src/component/geo.js +19 -0
- package/src/component/graphic.js +19 -0
- package/src/component/grid.js +19 -0
- package/src/component/gridSimple.js +19 -0
- package/src/component/helper/BrushController.js +19 -0
- package/src/component/helper/BrushTargetManager.js +19 -0
- package/src/component/helper/MapDraw.js +19 -0
- package/src/component/helper/RoamController.js +19 -0
- package/src/component/helper/brushHelper.js +19 -0
- package/src/component/helper/cursorHelper.js +19 -0
- package/src/component/helper/interactionMutex.js +19 -0
- package/src/component/helper/listComponent.js +19 -0
- package/src/component/helper/roamHelper.js +19 -0
- package/src/component/helper/selectableMixin.js +22 -12
- package/src/component/helper/sliderMove.js +19 -0
- package/src/component/legend/LegendModel.js +25 -6
- package/src/component/legend/LegendView.js +51 -13
- package/src/component/legend/ScrollableLegendModel.js +19 -0
- package/src/component/legend/ScrollableLegendView.js +19 -0
- package/src/component/legend/legendAction.js +19 -0
- package/src/component/legend/legendFilter.js +19 -0
- package/src/component/legend/scrollableLegendAction.js +19 -0
- package/src/component/legend.js +19 -0
- package/src/component/legendScroll.js +19 -0
- package/src/component/markArea.js +19 -0
- package/src/component/markLine.js +19 -0
- package/src/component/markPoint.js +19 -0
- package/src/component/marker/MarkAreaModel.js +19 -0
- package/src/component/marker/MarkAreaView.js +22 -3
- package/src/component/marker/MarkLineModel.js +19 -0
- package/src/component/marker/MarkLineView.js +22 -3
- package/src/component/marker/MarkPointModel.js +19 -0
- package/src/component/marker/MarkPointView.js +21 -3
- package/src/component/marker/MarkerModel.js +20 -1
- package/src/component/marker/MarkerView.js +19 -0
- package/src/component/marker/markerHelper.js +60 -20
- package/src/component/parallel.js +19 -0
- package/src/component/parallelAxis.js +19 -0
- package/src/component/polar.js +19 -0
- package/src/component/radar/RadarView.js +23 -4
- package/src/component/radar.js +19 -0
- package/src/component/radiusAxis.js +19 -0
- package/src/component/singleAxis.js +19 -0
- package/src/component/timeline/SliderTimelineModel.js +19 -0
- package/src/component/timeline/SliderTimelineView.js +41 -33
- package/src/component/timeline/TimelineAxis.js +25 -43
- package/src/component/timeline/TimelineModel.js +19 -0
- package/src/component/timeline/TimelineView.js +19 -0
- package/src/component/timeline/preprocessor.js +19 -0
- package/src/component/timeline/timelineAction.js +19 -0
- package/src/component/timeline/typeDefaulter.js +19 -0
- package/src/component/timeline.js +19 -0
- package/src/component/title.js +19 -0
- package/src/component/toolbox/ToolboxModel.js +21 -2
- package/src/component/toolbox/ToolboxView.js +19 -0
- package/src/component/toolbox/feature/Brush.js +19 -0
- package/src/component/toolbox/feature/DataView.js +19 -0
- package/src/component/toolbox/feature/DataZoom.js +22 -0
- package/src/component/toolbox/feature/MagicType.js +19 -0
- package/src/component/toolbox/feature/Restore.js +19 -0
- package/src/component/toolbox/feature/SaveAsImage.js +19 -0
- package/src/component/toolbox/featureManager.js +19 -0
- package/src/component/toolbox.js +19 -0
- package/src/component/tooltip/TooltipContent.js +19 -0
- package/src/component/tooltip/TooltipModel.js +19 -0
- package/src/component/tooltip/TooltipView.js +20 -1
- package/src/component/tooltip.js +19 -0
- package/src/component/visualMap/ContinuousModel.js +20 -1
- package/src/component/visualMap/ContinuousView.js +19 -0
- package/src/component/visualMap/PiecewiseModel.js +20 -1
- package/src/component/visualMap/PiecewiseView.js +19 -0
- package/src/component/visualMap/VisualMapModel.js +31 -3
- package/src/component/visualMap/VisualMapView.js +19 -0
- package/src/component/visualMap/helper.js +19 -0
- package/src/component/visualMap/preprocessor.js +19 -0
- package/src/component/visualMap/typeDefaulter.js +19 -0
- package/src/component/visualMap/visualEncoding.js +23 -1
- package/src/component/visualMap/visualMapAction.js +19 -0
- package/src/component/visualMap.js +19 -0
- package/src/component/visualMapContinuous.js +19 -0
- package/src/component/visualMapPiecewise.js +19 -0
- package/src/config.js +19 -0
- package/src/coord/Axis.js +159 -100
- package/src/coord/View.js +19 -0
- package/src/coord/axisDefault.js +68 -41
- package/src/coord/axisHelper.js +142 -93
- package/src/coord/axisModelCommonMixin.js +19 -11
- package/src/coord/axisModelCreator.js +25 -2
- package/src/coord/axisTickLabelBuilder.js +369 -0
- package/src/coord/calendar/Calendar.js +24 -2
- package/src/coord/calendar/CalendarModel.js +19 -0
- package/src/coord/calendar/prepareCustom.js +20 -1
- package/src/coord/cartesian/Axis2D.js +25 -18
- package/src/coord/cartesian/AxisModel.js +19 -0
- package/src/coord/cartesian/Cartesian.js +19 -0
- package/src/coord/cartesian/Cartesian2D.js +27 -4
- package/src/coord/cartesian/Grid.js +65 -76
- package/src/coord/cartesian/GridModel.js +19 -0
- package/src/{component/axis → coord/cartesian}/cartesianAxisHelper.js +28 -9
- package/src/coord/cartesian/prepareCustom.js +19 -0
- package/src/coord/geo/Geo.js +19 -0
- package/src/coord/geo/GeoModel.js +19 -0
- package/src/coord/geo/Region.js +19 -0
- package/src/coord/geo/fix/diaoyuIsland.js +19 -0
- package/src/coord/geo/fix/geoCoord.js +19 -0
- package/src/coord/geo/fix/nanhai.js +19 -0
- package/src/coord/geo/fix/textCoord.js +19 -0
- package/src/coord/geo/geoCreator.js +19 -0
- package/src/coord/geo/parseGeoJson.js +19 -0
- package/src/coord/geo/prepareCustom.js +24 -3
- package/src/coord/parallel/AxisModel.js +32 -3
- package/src/coord/parallel/Parallel.js +38 -12
- package/src/coord/parallel/ParallelAxis.js +19 -0
- package/src/coord/parallel/ParallelModel.js +19 -0
- package/src/coord/parallel/parallelCreator.js +19 -0
- package/src/coord/parallel/parallelPreprocessor.js +19 -0
- package/src/coord/polar/AngleAxis.js +19 -0
- package/src/coord/polar/AxisModel.js +19 -0
- package/src/coord/polar/Polar.js +19 -0
- package/src/coord/polar/PolarModel.js +19 -0
- package/src/coord/polar/RadiusAxis.js +19 -0
- package/src/coord/polar/polarCreator.js +26 -3
- package/src/coord/polar/prepareCustom.js +19 -0
- package/src/coord/radar/IndicatorAxis.js +19 -0
- package/src/coord/radar/Radar.js +19 -0
- package/src/coord/radar/RadarModel.js +19 -0
- package/src/coord/single/AxisModel.js +19 -0
- package/src/coord/single/Single.js +19 -0
- package/src/coord/single/SingleAxis.js +19 -5
- package/src/coord/single/prepareCustom.js +19 -0
- package/src/{component/axis → coord/single}/singleAxisHelper.js +21 -4
- package/src/coord/single/singleCreator.js +19 -0
- package/src/data/DataDiffer.js +19 -0
- package/src/data/Graph.js +20 -1
- package/src/data/List.js +412 -207
- package/src/data/OrdinalMeta.js +19 -0
- package/src/data/Source.js +19 -0
- package/src/data/Tree.js +19 -0
- package/src/data/helper/completeDimensions.js +62 -29
- package/src/data/helper/createDimensions.js +23 -4
- package/src/data/helper/dataProvider.js +61 -6
- package/src/data/helper/dataStackHelper.js +162 -0
- package/src/data/helper/dimensionHelper.js +49 -10
- package/src/data/helper/linkList.js +19 -0
- package/src/data/helper/sourceHelper.js +19 -0
- package/src/data/helper/sourceType.js +19 -0
- package/src/echarts.js +127 -114
- package/src/export.js +19 -0
- package/src/helper.js +30 -1
- package/src/lang.js +19 -0
- package/src/langEN.js +19 -0
- package/src/langFI.js +19 -0
- package/src/langTH.js +19 -0
- package/src/layout/barGrid.js +174 -64
- package/src/layout/barPolar.js +81 -66
- package/src/layout/points.js +32 -4
- package/src/loading/default.js +19 -0
- package/src/model/Component.js +19 -0
- package/src/model/Global.js +29 -2
- package/src/model/Model.js +19 -0
- package/src/model/OptionManager.js +19 -0
- package/src/model/Series.js +23 -5
- package/src/model/globalDefault.js +23 -5
- package/src/model/mixin/areaStyle.js +19 -0
- package/src/model/mixin/boxLayout.js +19 -0
- package/src/model/mixin/colorPalette.js +26 -0
- package/src/model/mixin/dataFormat.js +20 -1
- package/src/model/mixin/itemStyle.js +19 -0
- package/src/model/mixin/lineStyle.js +19 -0
- package/src/model/mixin/makeStyleMapper.js +19 -0
- package/src/model/mixin/textStyle.js +19 -0
- package/src/model/referHelper.js +19 -0
- package/src/preprocessor/backwardCompat.js +19 -0
- package/src/preprocessor/helper/compatStyle.js +45 -15
- package/src/processor/dataFilter.js +20 -1
- package/src/processor/dataSample.js +29 -3
- package/src/processor/dataStack.js +129 -0
- package/src/scale/Interval.js +19 -12
- package/src/scale/Log.js +22 -3
- package/src/scale/Ordinal.js +28 -2
- package/src/scale/Scale.js +27 -13
- package/src/scale/Time.js +19 -0
- package/src/scale/helper.js +19 -0
- package/src/stream/Scheduler.js +124 -32
- package/src/stream/task.js +166 -16
- package/src/theme/dark.js +19 -0
- package/src/theme/light.js +19 -0
- package/src/util/KDTree.js +19 -0
- package/src/util/animation.js +19 -0
- package/src/util/array/nest.js +19 -0
- package/src/util/clazz.js +19 -0
- package/src/util/component.js +19 -0
- package/src/util/format.js +47 -20
- package/src/util/graphic.js +19 -0
- package/src/util/layout.js +19 -0
- package/src/util/model.js +33 -5
- package/src/util/number.js +19 -0
- package/src/util/quickSelect.js +19 -0
- package/src/util/symbol.js +19 -0
- package/src/util/throttle.js +27 -0
- package/src/view/Chart.js +48 -10
- package/src/view/Component.js +19 -0
- package/src/visual/VisualMapping.js +29 -0
- package/src/visual/aria.js +19 -0
- package/src/visual/dataColor.js +21 -1
- package/src/visual/seriesColor.js +20 -1
- package/src/visual/symbol.js +34 -2
- package/src/visual/visualDefault.js +19 -0
- package/src/visual/visualSolution.js +23 -3
- package/theme/dark.js +19 -0
- package/theme/infographic.js +19 -0
- package/theme/macarons.js +19 -0
- package/theme/roma.js +19 -0
- package/theme/shine.js +19 -0
- package/theme/vintage.js +19 -0
- package/build/rollup-plugin-ec-dev.js +0 -38
- package/lib/chart/helper/WhiskerBoxDraw.js +0 -201
- package/lib/chart/tree/commonLayout.js +0 -108
- package/lib/chart/tree/orthogonalLayout.js +0 -9
- package/lib/chart/tree/radialLayout.js +0 -9
- package/lib/component/dataset/DatasetModel.js +0 -29
- package/src/chart/helper/WhiskerBoxDraw.js +0 -213
- package/src/chart/tree/commonLayout.js +0 -96
- package/src/chart/tree/orthogonalLayout.js +0 -7
- package/src/chart/tree/radialLayout.js +0 -7
- package/src/component/dataset/DatasetModel.js +0 -31
package/src/layout/barGrid.js
CHANGED
|
@@ -1,7 +1,31 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Licensed to the Apache Software Foundation (ASF) under one
|
|
3
|
+
* or more contributor license agreements. See the NOTICE file
|
|
4
|
+
* distributed with this work for additional information
|
|
5
|
+
* regarding copyright ownership. The ASF licenses this file
|
|
6
|
+
* to you under the Apache License, Version 2.0 (the
|
|
7
|
+
* "License"); you may not use this file except in compliance
|
|
8
|
+
* with the License. You may obtain a copy of the License at
|
|
9
|
+
*
|
|
10
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
11
|
+
*
|
|
12
|
+
* Unless required by applicable law or agreed to in writing,
|
|
13
|
+
* software distributed under the License is distributed on an
|
|
14
|
+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
15
|
+
* KIND, either express or implied. See the License for the
|
|
16
|
+
* specific language governing permissions and limitations
|
|
17
|
+
* under the License.
|
|
18
|
+
*/
|
|
19
|
+
|
|
1
20
|
import * as zrUtil from 'zrender/src/core/util';
|
|
2
21
|
import {parsePercent} from '../util/number';
|
|
22
|
+
import {isDimensionStacked} from '../data/helper/dataStackHelper';
|
|
23
|
+
import createRenderPlanner from '../chart/helper/createRenderPlanner';
|
|
3
24
|
|
|
4
25
|
var STACK_PREFIX = '__ec_stack_';
|
|
26
|
+
var LARGE_BAR_MIN_WIDTH = 0.5;
|
|
27
|
+
|
|
28
|
+
var LargeArr = typeof Float32Array !== 'undefined' ? Float32Array : Array;
|
|
5
29
|
|
|
6
30
|
function getSeriesStackId(seriesModel) {
|
|
7
31
|
return seriesModel.get('stack') || STACK_PREFIX + seriesModel.seriesIndex;
|
|
@@ -21,7 +45,7 @@ function getAxisKey(axis) {
|
|
|
21
45
|
* @param {number} [opt.barCategoryGap]
|
|
22
46
|
* @return {Object} {width, offset, offsetCenter} If axis.type is not 'category', return undefined.
|
|
23
47
|
*/
|
|
24
|
-
export function getLayoutOnAxis(opt
|
|
48
|
+
export function getLayoutOnAxis(opt) {
|
|
25
49
|
var params = [];
|
|
26
50
|
var baseAxis = opt.axis;
|
|
27
51
|
var axisKey = 'axis0';
|
|
@@ -38,7 +62,7 @@ export function getLayoutOnAxis(opt, api) {
|
|
|
38
62
|
stackId: STACK_PREFIX + i
|
|
39
63
|
}, opt));
|
|
40
64
|
}
|
|
41
|
-
var widthAndOffsets = doCalBarWidthAndOffset(params
|
|
65
|
+
var widthAndOffsets = doCalBarWidthAndOffset(params);
|
|
42
66
|
|
|
43
67
|
var result = [];
|
|
44
68
|
for (var i = 0; i < opt.count; i++) {
|
|
@@ -50,8 +74,20 @@ export function getLayoutOnAxis(opt, api) {
|
|
|
50
74
|
return result;
|
|
51
75
|
}
|
|
52
76
|
|
|
53
|
-
export function
|
|
54
|
-
var
|
|
77
|
+
export function prepareLayoutBarSeries(seriesType, ecModel) {
|
|
78
|
+
var seriesModels = [];
|
|
79
|
+
ecModel.eachSeriesByType(seriesType, function (seriesModel) {
|
|
80
|
+
// Check series coordinate, do layout for cartesian2d only
|
|
81
|
+
if (isOnCartesian(seriesModel) && !isInLargeMode(seriesModel)) {
|
|
82
|
+
seriesModels.push(seriesModel);
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
return seriesModels;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
export function makeColumnLayout(barSeries) {
|
|
89
|
+
var seriesInfoList = [];
|
|
90
|
+
zrUtil.each(barSeries, function (seriesModel) {
|
|
55
91
|
var data = seriesModel.getData();
|
|
56
92
|
var cartesian = seriesModel.coordinateSystem;
|
|
57
93
|
var baseAxis = cartesian.getBaseAxis();
|
|
@@ -69,7 +105,7 @@ export function calBarWidthAndOffset(barSeries, api) {
|
|
|
69
105
|
var barGap = seriesModel.get('barGap');
|
|
70
106
|
var barCategoryGap = seriesModel.get('barCategoryGap');
|
|
71
107
|
|
|
72
|
-
|
|
108
|
+
seriesInfoList.push({
|
|
73
109
|
bandWidth: bandWidth,
|
|
74
110
|
barWidth: barWidth,
|
|
75
111
|
barMaxWidth: barMaxWidth,
|
|
@@ -77,13 +113,13 @@ export function calBarWidthAndOffset(barSeries, api) {
|
|
|
77
113
|
barCategoryGap: barCategoryGap,
|
|
78
114
|
axisKey: getAxisKey(baseAxis),
|
|
79
115
|
stackId: getSeriesStackId(seriesModel)
|
|
80
|
-
};
|
|
116
|
+
});
|
|
81
117
|
});
|
|
82
118
|
|
|
83
|
-
return doCalBarWidthAndOffset(seriesInfoList
|
|
119
|
+
return doCalBarWidthAndOffset(seriesInfoList);
|
|
84
120
|
}
|
|
85
121
|
|
|
86
|
-
function doCalBarWidthAndOffset(seriesInfoList
|
|
122
|
+
function doCalBarWidthAndOffset(seriesInfoList) {
|
|
87
123
|
// Columns info on each category axis. Key is cartesian name
|
|
88
124
|
var columnsMap = {};
|
|
89
125
|
|
|
@@ -196,33 +232,35 @@ function doCalBarWidthAndOffset(seriesInfoList, api) {
|
|
|
196
232
|
return result;
|
|
197
233
|
}
|
|
198
234
|
|
|
235
|
+
/**
|
|
236
|
+
* @param {Object} barWidthAndOffset The result of makeColumnLayout
|
|
237
|
+
* @param {module:echarts/coord/Axis} axis
|
|
238
|
+
* @param {module:echarts/model/Series} [seriesModel] If not provided, return all.
|
|
239
|
+
* @return {Object} {stackId: {offset, width}} or {offset, width} if seriesModel provided.
|
|
240
|
+
*/
|
|
241
|
+
export function retrieveColumnLayout(barWidthAndOffset, axis, seriesModel) {
|
|
242
|
+
if (barWidthAndOffset && axis) {
|
|
243
|
+
var result = barWidthAndOffset[getAxisKey(axis)];
|
|
244
|
+
if (result != null && seriesModel != null) {
|
|
245
|
+
result = result[getSeriesStackId(seriesModel)];
|
|
246
|
+
}
|
|
247
|
+
return result;
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
|
|
199
251
|
/**
|
|
200
252
|
* @param {string} seriesType
|
|
201
253
|
* @param {module:echarts/model/Global} ecModel
|
|
202
|
-
* @param {module:echarts/ExtensionAPI} api
|
|
203
254
|
*/
|
|
204
|
-
export function layout(seriesType, ecModel
|
|
205
|
-
|
|
206
|
-
var
|
|
207
|
-
|
|
208
|
-
ecModel.getSeriesByType(seriesType),
|
|
209
|
-
function (seriesModel) {
|
|
210
|
-
return !ecModel.isSeriesFiltered(seriesModel)
|
|
211
|
-
&& seriesModel.coordinateSystem
|
|
212
|
-
&& seriesModel.coordinateSystem.type === 'cartesian2d';
|
|
213
|
-
}
|
|
214
|
-
)
|
|
215
|
-
);
|
|
255
|
+
export function layout(seriesType, ecModel) {
|
|
256
|
+
|
|
257
|
+
var seriesModels = prepareLayoutBarSeries(seriesType, ecModel);
|
|
258
|
+
var barWidthAndOffset = makeColumnLayout(seriesModels);
|
|
216
259
|
|
|
217
260
|
var lastStackCoords = {};
|
|
218
261
|
var lastStackCoordsOrigin = {};
|
|
219
262
|
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
// Check series coordinate, do layout for cartesian2d only
|
|
223
|
-
if (seriesModel.coordinateSystem.type !== 'cartesian2d') {
|
|
224
|
-
return;
|
|
225
|
-
}
|
|
263
|
+
zrUtil.each(seriesModels, function (seriesModel) {
|
|
226
264
|
|
|
227
265
|
var data = seriesModel.getData();
|
|
228
266
|
var cartesian = seriesModel.coordinateSystem;
|
|
@@ -236,18 +274,6 @@ export function layout(seriesType, ecModel, api) {
|
|
|
236
274
|
|
|
237
275
|
var barMinHeight = seriesModel.get('barMinHeight') || 0;
|
|
238
276
|
|
|
239
|
-
var valueAxisStart = baseAxis.onZero
|
|
240
|
-
? valueAxis.toGlobalCoord(valueAxis.dataToCoord(0))
|
|
241
|
-
: valueAxis.getGlobalExtent()[0];
|
|
242
|
-
|
|
243
|
-
var coordDims = [
|
|
244
|
-
data.mapDimension('x'),
|
|
245
|
-
data.mapDimension('y')
|
|
246
|
-
];
|
|
247
|
-
var coords = data.mapArray(coordDims, function (x, y) {
|
|
248
|
-
return cartesian.dataToPoint([x, y]);
|
|
249
|
-
}, true);
|
|
250
|
-
|
|
251
277
|
lastStackCoords[stackId] = lastStackCoords[stackId] || [];
|
|
252
278
|
lastStackCoordsOrigin[stackId] = lastStackCoordsOrigin[stackId] || []; // Fix #4243
|
|
253
279
|
|
|
@@ -256,54 +282,67 @@ export function layout(seriesType, ecModel, api) {
|
|
|
256
282
|
size: columnWidth
|
|
257
283
|
});
|
|
258
284
|
|
|
259
|
-
data.
|
|
285
|
+
var valueDim = data.mapDimension(valueAxis.dim);
|
|
286
|
+
var baseDim = data.mapDimension(baseAxis.dim);
|
|
287
|
+
var stacked = isDimensionStacked(data, valueDim /*, baseDim*/);
|
|
288
|
+
var isValueAxisH = valueAxis.isHorizontal();
|
|
289
|
+
|
|
290
|
+
var valueAxisStart = getValueAxisStart(baseAxis, valueAxis, stacked);
|
|
291
|
+
|
|
292
|
+
for (var idx = 0, len = data.count(); idx < len; idx++) {
|
|
293
|
+
var value = data.get(valueDim, idx);
|
|
294
|
+
var baseValue = data.get(baseDim, idx);
|
|
295
|
+
|
|
260
296
|
if (isNaN(value)) {
|
|
261
|
-
|
|
297
|
+
continue;
|
|
262
298
|
}
|
|
263
299
|
|
|
264
|
-
if (!lastStackCoords[stackId][idx]) {
|
|
265
|
-
lastStackCoords[stackId][idx] = {
|
|
266
|
-
p: valueAxisStart, // Positive stack
|
|
267
|
-
n: valueAxisStart // Negative stack
|
|
268
|
-
};
|
|
269
|
-
lastStackCoordsOrigin[stackId][idx] = {
|
|
270
|
-
p: valueAxisStart, // Positive stack
|
|
271
|
-
n: valueAxisStart // Negative stack
|
|
272
|
-
};
|
|
273
|
-
}
|
|
274
300
|
var sign = value >= 0 ? 'p' : 'n';
|
|
275
|
-
var
|
|
276
|
-
|
|
277
|
-
|
|
301
|
+
var baseCoord = valueAxisStart;
|
|
302
|
+
|
|
303
|
+
// Because of the barMinHeight, we can not use the value in
|
|
304
|
+
// stackResultDimension directly.
|
|
305
|
+
if (stacked) {
|
|
306
|
+
// Only ordinal axis can be stacked.
|
|
307
|
+
if (!lastStackCoords[stackId][baseValue]) {
|
|
308
|
+
lastStackCoords[stackId][baseValue] = {
|
|
309
|
+
p: valueAxisStart, // Positive stack
|
|
310
|
+
n: valueAxisStart // Negative stack
|
|
311
|
+
};
|
|
312
|
+
}
|
|
313
|
+
// Should also consider #4243
|
|
314
|
+
baseCoord = lastStackCoords[stackId][baseValue][sign];
|
|
315
|
+
}
|
|
316
|
+
|
|
278
317
|
var x;
|
|
279
318
|
var y;
|
|
280
319
|
var width;
|
|
281
320
|
var height;
|
|
282
321
|
|
|
283
|
-
if (
|
|
284
|
-
|
|
322
|
+
if (isValueAxisH) {
|
|
323
|
+
var coord = cartesian.dataToPoint([value, baseValue]);
|
|
324
|
+
x = baseCoord;
|
|
285
325
|
y = coord[1] + columnOffset;
|
|
286
|
-
width = coord[0] -
|
|
326
|
+
width = coord[0] - valueAxisStart;
|
|
287
327
|
height = columnWidth;
|
|
288
328
|
|
|
289
|
-
lastStackCoordsOrigin[stackId][idx][sign] += width;
|
|
290
329
|
if (Math.abs(width) < barMinHeight) {
|
|
291
330
|
width = (width < 0 ? -1 : 1) * barMinHeight;
|
|
292
331
|
}
|
|
293
|
-
lastStackCoords[stackId][
|
|
332
|
+
stacked && (lastStackCoords[stackId][baseValue][sign] += width);
|
|
294
333
|
}
|
|
295
334
|
else {
|
|
335
|
+
var coord = cartesian.dataToPoint([baseValue, value]);
|
|
296
336
|
x = coord[0] + columnOffset;
|
|
297
|
-
y =
|
|
337
|
+
y = baseCoord;
|
|
298
338
|
width = columnWidth;
|
|
299
|
-
height = coord[1] -
|
|
339
|
+
height = coord[1] - valueAxisStart;
|
|
300
340
|
|
|
301
|
-
lastStackCoordsOrigin[stackId][idx][sign] += height;
|
|
302
341
|
if (Math.abs(height) < barMinHeight) {
|
|
303
342
|
// Include zero to has a positive bar
|
|
304
343
|
height = (height <= 0 ? -1 : 1) * barMinHeight;
|
|
305
344
|
}
|
|
306
|
-
lastStackCoords[stackId][
|
|
345
|
+
stacked && (lastStackCoords[stackId][baseValue][sign] += height);
|
|
307
346
|
}
|
|
308
347
|
|
|
309
348
|
data.setItemLayout(idx, {
|
|
@@ -312,9 +351,80 @@ export function layout(seriesType, ecModel, api) {
|
|
|
312
351
|
width: width,
|
|
313
352
|
height: height
|
|
314
353
|
});
|
|
315
|
-
}
|
|
354
|
+
}
|
|
316
355
|
|
|
317
356
|
}, this);
|
|
318
357
|
}
|
|
319
358
|
|
|
359
|
+
// TODO: Do not support stack in large mode yet.
|
|
360
|
+
export var largeLayout = {
|
|
361
|
+
|
|
362
|
+
seriesType: 'bar',
|
|
363
|
+
|
|
364
|
+
plan: createRenderPlanner(),
|
|
365
|
+
|
|
366
|
+
reset: function (seriesModel) {
|
|
367
|
+
if (!isOnCartesian(seriesModel) || !isInLargeMode(seriesModel)) {
|
|
368
|
+
return;
|
|
369
|
+
}
|
|
370
|
+
|
|
371
|
+
var data = seriesModel.getData();
|
|
372
|
+
var cartesian = seriesModel.coordinateSystem;
|
|
373
|
+
var baseAxis = cartesian.getBaseAxis();
|
|
374
|
+
var valueAxis = cartesian.getOtherAxis(baseAxis);
|
|
375
|
+
var valueDim = data.mapDimension(valueAxis.dim);
|
|
376
|
+
var baseDim = data.mapDimension(baseAxis.dim);
|
|
377
|
+
var valueAxisHorizontal = valueAxis.isHorizontal();
|
|
378
|
+
var valueDimIdx = valueAxisHorizontal ? 0 : 1;
|
|
379
|
+
|
|
380
|
+
var barWidth = retrieveColumnLayout(
|
|
381
|
+
makeColumnLayout([seriesModel]), baseAxis, seriesModel
|
|
382
|
+
).width;
|
|
383
|
+
if (!(barWidth > LARGE_BAR_MIN_WIDTH)) { // jshint ignore:line
|
|
384
|
+
barWidth = LARGE_BAR_MIN_WIDTH;
|
|
385
|
+
}
|
|
320
386
|
|
|
387
|
+
return {progress: progress};
|
|
388
|
+
|
|
389
|
+
function progress(params, data) {
|
|
390
|
+
var largePoints = new LargeArr(params.count * 2);
|
|
391
|
+
var dataIndex;
|
|
392
|
+
var coord = [];
|
|
393
|
+
var valuePair = [];
|
|
394
|
+
var offset = 0;
|
|
395
|
+
|
|
396
|
+
while ((dataIndex = params.next()) != null) {
|
|
397
|
+
valuePair[valueDimIdx] = data.get(valueDim, dataIndex);
|
|
398
|
+
valuePair[1 - valueDimIdx] = data.get(baseDim, dataIndex);
|
|
399
|
+
|
|
400
|
+
coord = cartesian.dataToPoint(valuePair, null, coord);
|
|
401
|
+
largePoints[offset++] = coord[0];
|
|
402
|
+
largePoints[offset++] = coord[1];
|
|
403
|
+
}
|
|
404
|
+
|
|
405
|
+
data.setLayout({
|
|
406
|
+
largePoints: largePoints,
|
|
407
|
+
barWidth: barWidth,
|
|
408
|
+
valueAxisStart: getValueAxisStart(baseAxis, valueAxis, false),
|
|
409
|
+
valueAxisHorizontal: valueAxisHorizontal
|
|
410
|
+
});
|
|
411
|
+
}
|
|
412
|
+
}
|
|
413
|
+
};
|
|
414
|
+
|
|
415
|
+
function isOnCartesian(seriesModel) {
|
|
416
|
+
return seriesModel.coordinateSystem && seriesModel.coordinateSystem.type === 'cartesian2d';
|
|
417
|
+
}
|
|
418
|
+
|
|
419
|
+
function isInLargeMode(seriesModel) {
|
|
420
|
+
return seriesModel.pipelineContext && seriesModel.pipelineContext.large;
|
|
421
|
+
}
|
|
422
|
+
|
|
423
|
+
function getValueAxisStart(baseAxis, valueAxis, stacked) {
|
|
424
|
+
return (
|
|
425
|
+
zrUtil.indexOf(baseAxis.getAxesOnZeroOf(), valueAxis) >= 0
|
|
426
|
+
|| stacked
|
|
427
|
+
)
|
|
428
|
+
? valueAxis.toGlobalCoord(valueAxis.dataToCoord(0))
|
|
429
|
+
: valueAxis.getGlobalExtent()[0];
|
|
430
|
+
}
|
package/src/layout/barPolar.js
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Licensed to the Apache Software Foundation (ASF) under one
|
|
3
|
+
* or more contributor license agreements. See the NOTICE file
|
|
4
|
+
* distributed with this work for additional information
|
|
5
|
+
* regarding copyright ownership. The ASF licenses this file
|
|
6
|
+
* to you under the Apache License, Version 2.0 (the
|
|
7
|
+
* "License"); you may not use this file except in compliance
|
|
8
|
+
* with the License. You may obtain a copy of the License at
|
|
9
|
+
*
|
|
10
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
11
|
+
*
|
|
12
|
+
* Unless required by applicable law or agreed to in writing,
|
|
13
|
+
* software distributed under the License is distributed on an
|
|
14
|
+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
15
|
+
* KIND, either express or implied. See the License for the
|
|
16
|
+
* specific language governing permissions and limitations
|
|
17
|
+
* under the License.
|
|
18
|
+
*/
|
|
19
|
+
|
|
1
20
|
import * as zrUtil from 'zrender/src/core/util';
|
|
2
21
|
import {parsePercent} from '../util/number';
|
|
22
|
+
import {isDimensionStacked} from '../data/helper/dataStackHelper';
|
|
3
23
|
|
|
4
24
|
function getSeriesStackId(seriesModel) {
|
|
5
25
|
return seriesModel.get('stack')
|
|
@@ -21,7 +41,6 @@ function barLayoutPolar(seriesType, ecModel, api) {
|
|
|
21
41
|
var height = api.getHeight();
|
|
22
42
|
|
|
23
43
|
var lastStackCoords = {};
|
|
24
|
-
var lastStackCoordsOrigin = {};
|
|
25
44
|
|
|
26
45
|
var barWidthAndOffset = calRadialBar(
|
|
27
46
|
zrUtil.filter(
|
|
@@ -42,7 +61,6 @@ function barLayoutPolar(seriesType, ecModel, api) {
|
|
|
42
61
|
|
|
43
62
|
var data = seriesModel.getData();
|
|
44
63
|
var polar = seriesModel.coordinateSystem;
|
|
45
|
-
var angleAxis = polar.getAngleAxis();
|
|
46
64
|
var baseAxis = polar.getBaseAxis();
|
|
47
65
|
|
|
48
66
|
var stackId = getSeriesStackId(seriesModel);
|
|
@@ -59,91 +77,86 @@ function barLayoutPolar(seriesType, ecModel, api) {
|
|
|
59
77
|
var barMinHeight = seriesModel.get('barMinHeight') || 0;
|
|
60
78
|
var barMinAngle = seriesModel.get('barMinAngle') || 0;
|
|
61
79
|
|
|
62
|
-
|
|
63
|
-
var valueMax = valueAxis.model.get('max');
|
|
64
|
-
var valueMin = valueAxis.model.get('min');
|
|
80
|
+
lastStackCoords[stackId] = lastStackCoords[stackId] || [];
|
|
65
81
|
|
|
66
|
-
var
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
];
|
|
70
|
-
var coords = data.mapArray(coordDims, function (radius, angle) {
|
|
71
|
-
return polar.dataToPoint([radius, angle]);
|
|
72
|
-
}, true);
|
|
82
|
+
var valueDim = data.mapDimension(valueAxis.dim);
|
|
83
|
+
var baseDim = data.mapDimension(baseAxis.dim);
|
|
84
|
+
var stacked = isDimensionStacked(data, valueDim /*, baseDim*/);
|
|
73
85
|
|
|
74
|
-
|
|
75
|
-
|
|
86
|
+
var valueAxisStart = valueAxis.getExtent()[0];
|
|
87
|
+
|
|
88
|
+
for (var idx = 0, len = data.count(); idx < len; idx++) {
|
|
89
|
+
var value = data.get(valueDim, idx);
|
|
90
|
+
var baseValue = data.get(baseDim, idx);
|
|
76
91
|
|
|
77
|
-
data.each(data.mapDimension(valueAxis.dim), function (value, idx) {
|
|
78
92
|
if (isNaN(value)) {
|
|
79
|
-
|
|
93
|
+
continue;
|
|
80
94
|
}
|
|
81
95
|
|
|
82
|
-
if (!lastStackCoords[stackId][idx]) {
|
|
83
|
-
lastStackCoords[stackId][idx] = {
|
|
84
|
-
p: valueAxisStart, // Positive stack
|
|
85
|
-
n: valueAxisStart // Negative stack
|
|
86
|
-
};
|
|
87
|
-
lastStackCoordsOrigin[stackId][idx] = {
|
|
88
|
-
p: valueAxisStart, // Positive stack
|
|
89
|
-
n: valueAxisStart // Negative stack
|
|
90
|
-
};
|
|
91
|
-
}
|
|
92
96
|
var sign = value >= 0 ? 'p' : 'n';
|
|
93
|
-
var
|
|
97
|
+
var baseCoord = valueAxisStart;
|
|
98
|
+
|
|
99
|
+
// Because of the barMinHeight, we can not use the value in
|
|
100
|
+
// stackResultDimension directly.
|
|
101
|
+
// Only ordinal axis can be stacked.
|
|
102
|
+
if (stacked) {
|
|
103
|
+
if (!lastStackCoords[stackId][baseValue]) {
|
|
104
|
+
lastStackCoords[stackId][baseValue] = {
|
|
105
|
+
p: valueAxisStart, // Positive stack
|
|
106
|
+
n: valueAxisStart // Negative stack
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
// Should also consider #4243
|
|
110
|
+
baseCoord = lastStackCoords[stackId][baseValue][sign];
|
|
111
|
+
}
|
|
94
112
|
|
|
95
|
-
var lastCoordOrigin = lastStackCoordsOrigin[stackId][idx][sign];
|
|
96
113
|
var r0;
|
|
97
114
|
var r;
|
|
98
115
|
var startAngle;
|
|
99
116
|
var endAngle;
|
|
100
117
|
|
|
118
|
+
// radial sector
|
|
101
119
|
if (valueAxis.dim === 'radius') {
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
if (Math.abs(r) < barMinHeight) {
|
|
109
|
-
r = r0 + (r < 0 ? -1 : 1) * barMinHeight;
|
|
120
|
+
var radiusSpan = valueAxis.dataToRadius(value) - valueAxisStart;
|
|
121
|
+
var angle = baseAxis.dataToAngle(baseValue);
|
|
122
|
+
|
|
123
|
+
if (Math.abs(radiusSpan) < barMinHeight) {
|
|
124
|
+
radiusSpan = (radiusSpan < 0 ? -1 : 1) * barMinHeight;
|
|
110
125
|
}
|
|
111
126
|
|
|
112
|
-
|
|
127
|
+
r0 = baseCoord;
|
|
128
|
+
r = baseCoord + radiusSpan;
|
|
129
|
+
startAngle = angle - columnOffset;
|
|
130
|
+
endAngle = startAngle - columnWidth;
|
|
131
|
+
|
|
132
|
+
stacked && (lastStackCoords[stackId][baseValue][sign] = r);
|
|
113
133
|
}
|
|
134
|
+
// tangential sector
|
|
114
135
|
else {
|
|
115
|
-
//
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
// clamp data if min or max is defined for valueAxis
|
|
120
|
-
if (valueMax != null) {
|
|
121
|
-
value = Math.min(value, valueMax);
|
|
122
|
-
}
|
|
123
|
-
if (valueMin != null) {
|
|
124
|
-
value = Math.max(value, valueMin);
|
|
125
|
-
}
|
|
136
|
+
// angleAxis must be clamped.
|
|
137
|
+
var angleSpan = valueAxis.dataToAngle(value, true) - valueAxisStart;
|
|
138
|
+
var radius = baseAxis.dataToRadius(baseValue);
|
|
126
139
|
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
angle = lastCoordOrigin - (value < 0 ? -1 : 1)
|
|
130
|
-
* barMinAngle;
|
|
140
|
+
if (Math.abs(angleSpan) < barMinAngle) {
|
|
141
|
+
angleSpan = (angleSpan < 0 ? -1 : 1) * barMinAngle;
|
|
131
142
|
}
|
|
132
143
|
|
|
133
|
-
|
|
134
|
-
|
|
144
|
+
r0 = radius + columnOffset;
|
|
145
|
+
r = r0 + columnWidth;
|
|
146
|
+
startAngle = baseCoord;
|
|
147
|
+
endAngle = baseCoord + angleSpan;
|
|
135
148
|
|
|
136
149
|
// if the previous stack is at the end of the ring,
|
|
137
150
|
// add a round to differentiate it from origin
|
|
138
|
-
var extent = angleAxis.getExtent();
|
|
139
|
-
var stackCoord = angle;
|
|
140
|
-
if (stackCoord === extent[0] && value > 0) {
|
|
141
|
-
|
|
142
|
-
}
|
|
143
|
-
else if (stackCoord === extent[1] && value < 0) {
|
|
144
|
-
|
|
145
|
-
}
|
|
146
|
-
|
|
151
|
+
// var extent = angleAxis.getExtent();
|
|
152
|
+
// var stackCoord = angle;
|
|
153
|
+
// if (stackCoord === extent[0] && value > 0) {
|
|
154
|
+
// stackCoord = extent[1];
|
|
155
|
+
// }
|
|
156
|
+
// else if (stackCoord === extent[1] && value < 0) {
|
|
157
|
+
// stackCoord = extent[0];
|
|
158
|
+
// }
|
|
159
|
+
stacked && (lastStackCoords[stackId][baseValue][sign] = endAngle);
|
|
147
160
|
}
|
|
148
161
|
|
|
149
162
|
data.setItemLayout(idx, {
|
|
@@ -151,11 +164,13 @@ function barLayoutPolar(seriesType, ecModel, api) {
|
|
|
151
164
|
cy: cy,
|
|
152
165
|
r0: r0,
|
|
153
166
|
r: r,
|
|
154
|
-
|
|
155
|
-
|
|
167
|
+
// Consider that positive angle is anti-clockwise,
|
|
168
|
+
// while positive radian of sector is clockwise
|
|
169
|
+
startAngle: -startAngle * Math.PI / 180,
|
|
170
|
+
endAngle: -endAngle * Math.PI / 180
|
|
156
171
|
});
|
|
157
172
|
|
|
158
|
-
}
|
|
173
|
+
}
|
|
159
174
|
|
|
160
175
|
}, this);
|
|
161
176
|
|
package/src/layout/points.js
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Licensed to the Apache Software Foundation (ASF) under one
|
|
3
|
+
* or more contributor license agreements. See the NOTICE file
|
|
4
|
+
* distributed with this work for additional information
|
|
5
|
+
* regarding copyright ownership. The ASF licenses this file
|
|
6
|
+
* to you under the Apache License, Version 2.0 (the
|
|
7
|
+
* "License"); you may not use this file except in compliance
|
|
8
|
+
* with the License. You may obtain a copy of the License at
|
|
9
|
+
*
|
|
10
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
11
|
+
*
|
|
12
|
+
* Unless required by applicable law or agreed to in writing,
|
|
13
|
+
* software distributed under the License is distributed on an
|
|
14
|
+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
15
|
+
* KIND, either express or implied. See the License for the
|
|
16
|
+
* specific language governing permissions and limitations
|
|
17
|
+
* under the License.
|
|
18
|
+
*/
|
|
19
|
+
|
|
1
20
|
import {map} from 'zrender/src/core/util';
|
|
2
21
|
import createRenderPlanner from '../chart/helper/createRenderPlanner';
|
|
22
|
+
import {isDimensionStacked} from '../data/helper/dataStackHelper';
|
|
3
23
|
|
|
4
24
|
export default function (seriesType) {
|
|
5
25
|
return {
|
|
@@ -18,10 +38,18 @@ export default function (seriesType) {
|
|
|
18
38
|
}
|
|
19
39
|
|
|
20
40
|
var dims = map(coordSys.dimensions, function (dim) {
|
|
21
|
-
return data.
|
|
41
|
+
return data.mapDimension(dim);
|
|
22
42
|
}).slice(0, 2);
|
|
23
43
|
var dimLen = dims.length;
|
|
24
44
|
|
|
45
|
+
var stackResultDim = data.getCalculationInfo('stackResultDimension');
|
|
46
|
+
if (isDimensionStacked(data, dims[0] /*, dims[1]*/)) {
|
|
47
|
+
dims[0] = stackResultDim;
|
|
48
|
+
}
|
|
49
|
+
if (isDimensionStacked(data, dims[1] /*, dims[0]*/)) {
|
|
50
|
+
dims[1] = stackResultDim;
|
|
51
|
+
}
|
|
52
|
+
|
|
25
53
|
function progress(params, data) {
|
|
26
54
|
var segCount = params.end - params.start;
|
|
27
55
|
var points = isLargeRender && new Float32Array(segCount * dimLen);
|
|
@@ -30,12 +58,12 @@ export default function (seriesType) {
|
|
|
30
58
|
var point;
|
|
31
59
|
|
|
32
60
|
if (dimLen === 1) {
|
|
33
|
-
var x = data.get(dims[0], i
|
|
61
|
+
var x = data.get(dims[0], i);
|
|
34
62
|
point = !isNaN(x) && coordSys.dataToPoint(x, null, tmpOut);
|
|
35
63
|
}
|
|
36
64
|
else {
|
|
37
|
-
var x = tmpIn[0] = data.get(dims[0], i
|
|
38
|
-
var y = tmpIn[1] = data.get(dims[1], i
|
|
65
|
+
var x = tmpIn[0] = data.get(dims[0], i);
|
|
66
|
+
var y = tmpIn[1] = data.get(dims[1], i);
|
|
39
67
|
// Also {Array.<number>}, not undefined to avoid if...else... statement
|
|
40
68
|
point = !isNaN(x) && !isNaN(y) && coordSys.dataToPoint(tmpIn, null, tmpOut);
|
|
41
69
|
}
|
package/src/loading/default.js
CHANGED
|
@@ -1,3 +1,22 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Licensed to the Apache Software Foundation (ASF) under one
|
|
3
|
+
* or more contributor license agreements. See the NOTICE file
|
|
4
|
+
* distributed with this work for additional information
|
|
5
|
+
* regarding copyright ownership. The ASF licenses this file
|
|
6
|
+
* to you under the Apache License, Version 2.0 (the
|
|
7
|
+
* "License"); you may not use this file except in compliance
|
|
8
|
+
* with the License. You may obtain a copy of the License at
|
|
9
|
+
*
|
|
10
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
11
|
+
*
|
|
12
|
+
* Unless required by applicable law or agreed to in writing,
|
|
13
|
+
* software distributed under the License is distributed on an
|
|
14
|
+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
15
|
+
* KIND, either express or implied. See the License for the
|
|
16
|
+
* specific language governing permissions and limitations
|
|
17
|
+
* under the License.
|
|
18
|
+
*/
|
|
19
|
+
|
|
1
20
|
import * as zrUtil from 'zrender/src/core/util';
|
|
2
21
|
import * as graphic from '../util/graphic';
|
|
3
22
|
|
package/src/model/Component.js
CHANGED
|
@@ -1,3 +1,22 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Licensed to the Apache Software Foundation (ASF) under one
|
|
3
|
+
* or more contributor license agreements. See the NOTICE file
|
|
4
|
+
* distributed with this work for additional information
|
|
5
|
+
* regarding copyright ownership. The ASF licenses this file
|
|
6
|
+
* to you under the Apache License, Version 2.0 (the
|
|
7
|
+
* "License"); you may not use this file except in compliance
|
|
8
|
+
* with the License. You may obtain a copy of the License at
|
|
9
|
+
*
|
|
10
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
11
|
+
*
|
|
12
|
+
* Unless required by applicable law or agreed to in writing,
|
|
13
|
+
* software distributed under the License is distributed on an
|
|
14
|
+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
15
|
+
* KIND, either express or implied. See the License for the
|
|
16
|
+
* specific language governing permissions and limitations
|
|
17
|
+
* under the License.
|
|
18
|
+
*/
|
|
19
|
+
|
|
1
20
|
/**
|
|
2
21
|
* Component model
|
|
3
22
|
*
|