echarts 4.0.4 → 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 +1 -1
- package/KEYS +74 -0
- package/LICENSE +223 -29
- package/NOTICE +5 -0
- package/README.md +8 -1
- 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 +5624 -1049
- package/dist/echarts-en.common.min.js +21 -1
- package/dist/echarts-en.js +10720 -1979
- package/dist/echarts-en.js.map +1 -1
- package/dist/echarts-en.min.js +21 -1
- package/dist/echarts-en.simple.js +3835 -869
- package/dist/echarts-en.simple.min.js +21 -1
- package/dist/echarts.common.js +5624 -1049
- package/dist/echarts.common.min.js +21 -1
- package/dist/echarts.js +10720 -1979
- package/dist/echarts.js.map +1 -1
- package/dist/echarts.min.js +21 -1
- package/dist/echarts.simple.js +3835 -869
- 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 +112 -14
- 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 +18 -0
- 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 +18 -0
- 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 +53 -12
- package/lib/chart/helper/SymbolDraw.js +22 -2
- package/lib/chart/helper/createGraphFromNodeEdge.js +27 -3
- package/lib/chart/helper/createGraphFromNodeMatrix.js +19 -0
- package/lib/chart/helper/createListFromArray.js +19 -0
- package/lib/chart/helper/createListSimply.js +19 -0
- package/lib/chart/helper/createRenderPlanner.js +21 -2
- package/lib/chart/helper/labelHelper.js +19 -0
- package/lib/chart/helper/treeHelper.js +18 -0
- package/lib/chart/helper/whiskerBoxCommon.js +20 -27
- package/lib/chart/line/LineSeries.js +25 -10
- package/lib/chart/line/LineView.js +122 -41
- package/lib/chart/line/helper.js +39 -4
- package/lib/chart/line/lineAnimationDiff.js +18 -0
- package/lib/chart/line/poly.js +62 -36
- package/lib/chart/line.js +18 -0
- package/lib/chart/lines/LinesSeries.js +25 -4
- 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 +18 -0
- 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 +19 -0
- package/lib/chart/pie/PieView.js +19 -0
- package/lib/chart/pie/labelLayout.js +18 -0
- package/lib/chart/pie/pieLayout.js +18 -0
- package/lib/chart/pie.js +18 -0
- package/lib/chart/radar/RadarSeries.js +19 -0
- 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 +24 -0
- package/lib/chart/sunburst/SunburstSeries.js +18 -0
- package/lib/chart/sunburst/SunburstView.js +27 -9
- 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 +39 -69
- 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 +18 -0
- package/lib/component/axisPointer/findPointFromSeries.js +19 -0
- package/lib/component/axisPointer/globalListener.js +19 -0
- package/lib/component/axisPointer/modelHelper.js +18 -0
- 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 +18 -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 +18 -0
- 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 +19 -0
- package/lib/component/helper/sliderMove.js +19 -0
- package/lib/component/legend/LegendModel.js +19 -0
- 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 +18 -0
- package/lib/component/marker/MarkerModel.js +19 -1
- package/lib/component/marker/MarkerView.js +18 -0
- package/lib/component/marker/markerHelper.js +25 -1
- 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 +41 -31
- 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 +18 -0
- package/lib/component/visualMap/ContinuousView.js +18 -0
- package/lib/component/visualMap/PiecewiseModel.js +19 -0
- package/lib/component/visualMap/PiecewiseView.js +18 -0
- package/lib/component/visualMap/VisualMapModel.js +18 -0
- 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 +164 -85
- package/lib/coord/View.js +19 -0
- package/lib/coord/axisDefault.js +52 -42
- package/lib/coord/axisHelper.js +120 -85
- 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 +19 -1
- 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 +18 -0
- 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 +184 -121
- 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 +26 -2
- package/lib/data/helper/createDimensions.js +19 -0
- package/lib/data/helper/dataProvider.js +22 -4
- package/lib/data/helper/dataStackHelper.js +50 -5
- package/lib/data/helper/dimensionHelper.js +26 -1
- 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 +38 -16
- package/lib/export.js +19 -0
- package/lib/helper.js +21 -1
- 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 +139 -22
- package/lib/layout/barPolar.js +21 -1
- package/lib/layout/points.js +30 -7
- package/lib/loading/default.js +18 -0
- package/lib/model/Component.js +19 -0
- package/lib/model/Global.js +19 -1
- package/lib/model/Model.js +19 -0
- package/lib/model/OptionManager.js +19 -0
- package/lib/model/Series.js +21 -2
- package/lib/model/globalDefault.js +18 -0
- package/lib/model/mixin/areaStyle.js +18 -0
- package/lib/model/mixin/boxLayout.js +18 -0
- package/lib/model/mixin/colorPalette.js +19 -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 +20 -0
- package/lib/processor/dataFilter.js +18 -0
- package/lib/processor/dataSample.js +27 -5
- package/lib/processor/dataStack.js +18 -0
- package/lib/scale/Interval.js +19 -14
- package/lib/scale/Log.js +19 -0
- package/lib/scale/Ordinal.js +26 -1
- package/lib/scale/Scale.js +26 -15
- package/lib/scale/Time.js +18 -0
- package/lib/scale/helper.js +19 -0
- package/lib/stream/Scheduler.js +110 -37
- package/lib/stream/task.js +104 -11
- 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 +30 -1
- package/lib/util/graphic.js +19 -0
- package/lib/util/layout.js +18 -0
- package/lib/util/model.js +19 -0
- 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 +20 -2
- 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 +18 -0
- package/lib/visual/seriesColor.js +18 -0
- package/lib/visual/symbol.js +28 -2
- package/lib/visual/visualDefault.js +19 -0
- package/lib/visual/visualSolution.js +22 -1
- 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 +120 -16
- 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 +19 -0
- 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 +19 -0
- 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 +60 -14
- package/src/chart/helper/SymbolDraw.js +23 -2
- package/src/chart/helper/createGraphFromNodeEdge.js +29 -6
- package/src/chart/helper/createGraphFromNodeMatrix.js +19 -0
- package/src/chart/helper/createListFromArray.js +19 -0
- package/src/chart/helper/createListSimply.js +19 -0
- package/src/chart/helper/createRenderPlanner.js +21 -2
- package/src/chart/helper/labelHelper.js +19 -0
- package/src/chart/helper/treeHelper.js +19 -0
- package/src/chart/helper/whiskerBoxCommon.js +19 -32
- package/src/chart/line/LineSeries.js +28 -10
- package/src/chart/line/LineView.js +127 -38
- package/src/chart/line/helper.js +31 -5
- package/src/chart/line/lineAnimationDiff.js +19 -0
- package/src/chart/line/poly.js +64 -39
- package/src/chart/line.js +19 -0
- package/src/chart/lines/LinesSeries.js +27 -4
- 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 +19 -0
- 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 +19 -0
- package/src/chart/pie/PieView.js +19 -0
- package/src/chart/pie/labelLayout.js +19 -0
- package/src/chart/pie/pieLayout.js +19 -0
- package/src/chart/pie.js +19 -0
- package/src/chart/radar/RadarSeries.js +19 -0
- 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 +24 -0
- package/src/chart/sunburst/SunburstSeries.js +19 -0
- package/src/chart/sunburst/SunburstView.js +28 -9
- 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 +43 -88
- 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 +19 -0
- package/src/component/axisPointer/findPointFromSeries.js +19 -0
- package/src/component/axisPointer/globalListener.js +19 -0
- package/src/component/axisPointer/modelHelper.js +19 -0
- 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 +19 -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 +19 -0
- 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 +19 -0
- package/src/component/helper/sliderMove.js +19 -0
- package/src/component/legend/LegendModel.js +19 -0
- 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 +19 -0
- package/src/component/marker/MarkerModel.js +20 -1
- package/src/component/marker/MarkerView.js +19 -0
- package/src/component/marker/markerHelper.js +24 -1
- 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 +40 -31
- 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 +19 -0
- package/src/component/visualMap/ContinuousView.js +19 -0
- package/src/component/visualMap/PiecewiseModel.js +19 -0
- package/src/component/visualMap/PiecewiseView.js +19 -0
- package/src/component/visualMap/VisualMapModel.js +19 -0
- 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 +157 -98
- package/src/coord/View.js +19 -0
- package/src/coord/axisDefault.js +68 -41
- package/src/coord/axisHelper.js +127 -86
- 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 +23 -1
- package/src/coord/calendar/CalendarModel.js +19 -0
- package/src/coord/calendar/prepareCustom.js +19 -0
- 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 +19 -0
- 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 +163 -87
- 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 +24 -2
- package/src/data/helper/createDimensions.js +19 -0
- package/src/data/helper/dataProvider.js +23 -4
- package/src/data/helper/dataStackHelper.js +46 -9
- package/src/data/helper/dimensionHelper.js +26 -1
- 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 +37 -20
- package/src/export.js +19 -0
- package/src/helper.js +26 -2
- 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 +135 -23
- package/src/layout/barPolar.js +20 -1
- package/src/layout/points.js +27 -7
- package/src/loading/default.js +19 -0
- package/src/model/Component.js +19 -0
- package/src/model/Global.js +19 -2
- package/src/model/Model.js +19 -0
- package/src/model/OptionManager.js +19 -0
- package/src/model/Series.js +21 -2
- package/src/model/globalDefault.js +19 -0
- package/src/model/mixin/areaStyle.js +19 -0
- package/src/model/mixin/boxLayout.js +19 -0
- package/src/model/mixin/colorPalette.js +19 -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 +22 -0
- package/src/processor/dataFilter.js +19 -0
- package/src/processor/dataSample.js +29 -3
- package/src/processor/dataStack.js +19 -0
- package/src/scale/Interval.js +19 -12
- package/src/scale/Log.js +19 -0
- package/src/scale/Ordinal.js +27 -1
- package/src/scale/Scale.js +26 -12
- package/src/scale/Time.js +19 -0
- package/src/scale/helper.js +19 -0
- package/src/stream/Scheduler.js +110 -34
- package/src/stream/task.js +105 -11
- 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 +34 -6
- package/src/util/graphic.js +19 -0
- package/src/util/layout.js +19 -0
- package/src/util/model.js +20 -0
- 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 +21 -2
- 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 +19 -0
- package/src/visual/seriesColor.js +19 -0
- package/src/visual/symbol.js +34 -2
- package/src/visual/visualDefault.js +19 -0
- package/src/visual/visualSolution.js +21 -1
- 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 -222
- 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 -233
- 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
|
@@ -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 {retrieve, defaults, extend, each} from 'zrender/src/core/util';
|
|
2
21
|
import * as formatUtil from '../../util/format';
|
|
3
22
|
import * as graphic from '../../util/graphic';
|
|
@@ -53,8 +72,6 @@ function makeAxisEventDataBase(axisModel) {
|
|
|
53
72
|
* @param {string} [opt.axisName] default get from axisModel.
|
|
54
73
|
* @param {number} [opt.axisNameAvailableWidth]
|
|
55
74
|
* @param {number} [opt.labelRotate] by degree, default get from axisModel.
|
|
56
|
-
* @param {number} [opt.labelInterval] Default label interval when label
|
|
57
|
-
* interval from model is null or 'auto'.
|
|
58
75
|
* @param {number} [opt.strokeContainThreshold] Default label interval when label
|
|
59
76
|
* @param {number} [opt.nameTruncateMaxWidth]
|
|
60
77
|
*/
|
|
@@ -542,48 +559,6 @@ function isNameLocationCenter(nameLocation) {
|
|
|
542
559
|
return nameLocation === 'middle' || nameLocation === 'center';
|
|
543
560
|
}
|
|
544
561
|
|
|
545
|
-
/**
|
|
546
|
-
* @static
|
|
547
|
-
*/
|
|
548
|
-
var ifIgnoreOnTick = AxisBuilder.ifIgnoreOnTick = function (
|
|
549
|
-
axis,
|
|
550
|
-
i,
|
|
551
|
-
interval,
|
|
552
|
-
ticksCnt,
|
|
553
|
-
showMinLabel,
|
|
554
|
-
showMaxLabel
|
|
555
|
-
) {
|
|
556
|
-
if (i === 0 && showMinLabel || i === ticksCnt - 1 && showMaxLabel) {
|
|
557
|
-
return false;
|
|
558
|
-
}
|
|
559
|
-
|
|
560
|
-
// FIXME
|
|
561
|
-
// Have not consider label overlap (if label is too long) yet.
|
|
562
|
-
|
|
563
|
-
var rawTick;
|
|
564
|
-
var scale = axis.scale;
|
|
565
|
-
return scale.type === 'ordinal'
|
|
566
|
-
&& (
|
|
567
|
-
typeof interval === 'function'
|
|
568
|
-
? (
|
|
569
|
-
rawTick = scale.getTicks()[i],
|
|
570
|
-
!interval(rawTick, scale.getLabel(rawTick))
|
|
571
|
-
)
|
|
572
|
-
: i % (interval + 1)
|
|
573
|
-
);
|
|
574
|
-
};
|
|
575
|
-
|
|
576
|
-
/**
|
|
577
|
-
* @static
|
|
578
|
-
*/
|
|
579
|
-
var getInterval = AxisBuilder.getInterval = function (model, labelInterval) {
|
|
580
|
-
var interval = model.get('interval');
|
|
581
|
-
if (interval == null || interval == 'auto') {
|
|
582
|
-
interval = labelInterval;
|
|
583
|
-
}
|
|
584
|
-
return interval;
|
|
585
|
-
};
|
|
586
|
-
|
|
587
562
|
function buildAxisTick(axisBuilder, axisModel, opt) {
|
|
588
563
|
var axis = axisModel.axis;
|
|
589
564
|
|
|
@@ -596,14 +571,7 @@ function buildAxisTick(axisBuilder, axisModel, opt) {
|
|
|
596
571
|
var lineStyleModel = tickModel.getModel('lineStyle');
|
|
597
572
|
var tickLen = tickModel.get('length');
|
|
598
573
|
|
|
599
|
-
var
|
|
600
|
-
var ticksCoords = axis.getTicksCoords(tickModel.get('alignWithLabel'));
|
|
601
|
-
// FIXME
|
|
602
|
-
// Corresponds to ticksCoords ?
|
|
603
|
-
var ticks = axis.scale.getTicks();
|
|
604
|
-
|
|
605
|
-
var showMinLabel = axisModel.get('axisLabel.showMinLabel');
|
|
606
|
-
var showMaxLabel = axisModel.get('axisLabel.showMaxLabel');
|
|
574
|
+
var ticksCoords = axis.getTicksCoords();
|
|
607
575
|
|
|
608
576
|
var pt1 = [];
|
|
609
577
|
var pt2 = [];
|
|
@@ -611,17 +579,8 @@ function buildAxisTick(axisBuilder, axisModel, opt) {
|
|
|
611
579
|
|
|
612
580
|
var tickEls = [];
|
|
613
581
|
|
|
614
|
-
var
|
|
615
|
-
|
|
616
|
-
// Only ordinal scale support tick interval
|
|
617
|
-
if (ifIgnoreOnTick(
|
|
618
|
-
axis, i, tickInterval, ticksCnt,
|
|
619
|
-
showMinLabel, showMaxLabel
|
|
620
|
-
)) {
|
|
621
|
-
continue;
|
|
622
|
-
}
|
|
623
|
-
|
|
624
|
-
var tickCoord = ticksCoords[i];
|
|
582
|
+
for (var i = 0; i < ticksCoords.length; i++) {
|
|
583
|
+
var tickCoord = ticksCoords[i].coord;
|
|
625
584
|
|
|
626
585
|
pt1[0] = tickCoord;
|
|
627
586
|
pt1[1] = 0;
|
|
@@ -635,7 +594,7 @@ function buildAxisTick(axisBuilder, axisModel, opt) {
|
|
|
635
594
|
// Tick line, Not use group transform to have better line draw
|
|
636
595
|
var tickEl = new graphic.Line(graphic.subPixelOptimizeLine({
|
|
637
596
|
// Id for animation
|
|
638
|
-
anid: 'tick_' +
|
|
597
|
+
anid: 'tick_' + ticksCoords[i].tickValue,
|
|
639
598
|
|
|
640
599
|
shape: {
|
|
641
600
|
x1: pt1[0],
|
|
@@ -669,8 +628,7 @@ function buildAxisLabel(axisBuilder, axisModel, opt) {
|
|
|
669
628
|
|
|
670
629
|
var labelModel = axisModel.getModel('axisLabel');
|
|
671
630
|
var labelMargin = labelModel.get('margin');
|
|
672
|
-
var
|
|
673
|
-
var labels = axisModel.getFormattedLabels();
|
|
631
|
+
var labels = axis.getViewLabels();
|
|
674
632
|
|
|
675
633
|
// Special label rotate.
|
|
676
634
|
var labelRotation = (
|
|
@@ -678,43 +636,36 @@ function buildAxisLabel(axisBuilder, axisModel, opt) {
|
|
|
678
636
|
) * PI / 180;
|
|
679
637
|
|
|
680
638
|
var labelLayout = innerTextLayout(opt.rotation, labelRotation, opt.labelDirection);
|
|
681
|
-
var
|
|
639
|
+
var rawCategoryData = axisModel.getCategories(true);
|
|
682
640
|
|
|
683
641
|
var labelEls = [];
|
|
684
642
|
var silent = isSilent(axisModel);
|
|
685
643
|
var triggerEvent = axisModel.get('triggerEvent');
|
|
686
644
|
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
if (ifIgnoreOnTick(
|
|
692
|
-
axis, index, opt.labelInterval, ticks.length,
|
|
693
|
-
showMinLabel, showMaxLabel
|
|
694
|
-
)) {
|
|
695
|
-
return;
|
|
696
|
-
}
|
|
645
|
+
each(labels, function (labelItem, index) {
|
|
646
|
+
var tickValue = labelItem.tickValue;
|
|
647
|
+
var formattedLabel = labelItem.formattedLabel;
|
|
648
|
+
var rawLabel = labelItem.rawLabel;
|
|
697
649
|
|
|
698
650
|
var itemLabelModel = labelModel;
|
|
699
|
-
if (
|
|
651
|
+
if (rawCategoryData && rawCategoryData[tickValue] && rawCategoryData[tickValue].textStyle) {
|
|
700
652
|
itemLabelModel = new Model(
|
|
701
|
-
|
|
653
|
+
rawCategoryData[tickValue].textStyle, labelModel, axisModel.ecModel
|
|
702
654
|
);
|
|
703
655
|
}
|
|
704
656
|
|
|
705
657
|
var textColor = itemLabelModel.getTextColor()
|
|
706
658
|
|| axisModel.get('axisLine.lineStyle.color');
|
|
707
659
|
|
|
708
|
-
var tickCoord = axis.dataToCoord(
|
|
660
|
+
var tickCoord = axis.dataToCoord(tickValue);
|
|
709
661
|
var pos = [
|
|
710
662
|
tickCoord,
|
|
711
663
|
opt.labelOffset + opt.labelDirection * labelMargin
|
|
712
664
|
];
|
|
713
|
-
var labelStr = axis.scale.getLabel(tickVal);
|
|
714
665
|
|
|
715
666
|
var textEl = new graphic.Text({
|
|
716
667
|
// Id for animation
|
|
717
|
-
anid: 'label_' +
|
|
668
|
+
anid: 'label_' + tickValue,
|
|
718
669
|
position: pos,
|
|
719
670
|
rotation: labelLayout.rotation,
|
|
720
671
|
silent: silent,
|
|
@@ -722,7 +673,7 @@ function buildAxisLabel(axisBuilder, axisModel, opt) {
|
|
|
722
673
|
});
|
|
723
674
|
|
|
724
675
|
graphic.setTextStyle(textEl.style, itemLabelModel, {
|
|
725
|
-
text:
|
|
676
|
+
text: formattedLabel,
|
|
726
677
|
textAlign: itemLabelModel.getShallow('align', true)
|
|
727
678
|
|| labelLayout.textAlign,
|
|
728
679
|
textVerticalAlign: itemLabelModel.getShallow('verticalAlign', true)
|
|
@@ -733,11 +684,15 @@ function buildAxisLabel(axisBuilder, axisModel, opt) {
|
|
|
733
684
|
// (1) In category axis with data zoom, tick is not the original
|
|
734
685
|
// index of axis.data. So tick should not be exposed to user
|
|
735
686
|
// in category axis.
|
|
736
|
-
// (2) Compatible with previous version, which always
|
|
737
|
-
// But in interval scale
|
|
738
|
-
// user repalce ','. So we modify it to return original val but remain
|
|
687
|
+
// (2) Compatible with previous version, which always use formatted label as
|
|
688
|
+
// input. But in interval scale the formatted label is like '223,445', which
|
|
689
|
+
// maked user repalce ','. So we modify it to return original val but remain
|
|
739
690
|
// it as 'string' to avoid error in replacing.
|
|
740
|
-
axis.type === 'category'
|
|
691
|
+
axis.type === 'category'
|
|
692
|
+
? rawLabel
|
|
693
|
+
: axis.type === 'value'
|
|
694
|
+
? tickValue + ''
|
|
695
|
+
: tickValue,
|
|
741
696
|
index
|
|
742
697
|
)
|
|
743
698
|
: textColor
|
|
@@ -747,7 +702,7 @@ function buildAxisLabel(axisBuilder, axisModel, opt) {
|
|
|
747
702
|
if (triggerEvent) {
|
|
748
703
|
textEl.eventData = makeAxisEventDataBase(axisModel);
|
|
749
704
|
textEl.eventData.targetType = 'axisLabel';
|
|
750
|
-
textEl.eventData.value =
|
|
705
|
+
textEl.eventData.value = rawLabel;
|
|
751
706
|
}
|
|
752
707
|
|
|
753
708
|
// FIXME
|
|
@@ -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 {__DEV__} from '../../config';
|
|
2
21
|
import * as echarts from '../../echarts';
|
|
3
22
|
import * as axisPointerModelHelper from '../axisPointer/modelHelper';
|
|
@@ -1,11 +1,27 @@
|
|
|
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
|
import AxisBuilder from './AxisBuilder';
|
|
4
23
|
import AxisView from './AxisView';
|
|
5
|
-
import * as cartesianAxisHelper from '
|
|
6
|
-
|
|
7
|
-
var ifIgnoreOnTick = AxisBuilder.ifIgnoreOnTick;
|
|
8
|
-
var getInterval = AxisBuilder.getInterval;
|
|
24
|
+
import * as cartesianAxisHelper from '../../coord/cartesian/cartesianAxisHelper';
|
|
9
25
|
|
|
10
26
|
var axisBuilderAttrs = [
|
|
11
27
|
'axisLine', 'axisTickLabel', 'axisName'
|
|
@@ -56,7 +72,7 @@ var CartesianAxisView = AxisView.extend({
|
|
|
56
72
|
|
|
57
73
|
zrUtil.each(selfBuilderAttrs, function (name) {
|
|
58
74
|
if (axisModel.get(name + '.show')) {
|
|
59
|
-
this['_' + name](axisModel, gridModel
|
|
75
|
+
this['_' + name](axisModel, gridModel);
|
|
60
76
|
}
|
|
61
77
|
}, this);
|
|
62
78
|
|
|
@@ -65,13 +81,16 @@ var CartesianAxisView = AxisView.extend({
|
|
|
65
81
|
CartesianAxisView.superCall(this, 'render', axisModel, ecModel, api, payload);
|
|
66
82
|
},
|
|
67
83
|
|
|
84
|
+
remove: function () {
|
|
85
|
+
this._splitAreaColors = null;
|
|
86
|
+
},
|
|
87
|
+
|
|
68
88
|
/**
|
|
69
89
|
* @param {module:echarts/coord/cartesian/AxisModel} axisModel
|
|
70
90
|
* @param {module:echarts/coord/cartesian/GridModel} gridModel
|
|
71
|
-
* @param {number|Function} labelInterval
|
|
72
91
|
* @private
|
|
73
92
|
*/
|
|
74
|
-
_splitLine: function (axisModel, gridModel
|
|
93
|
+
_splitLine: function (axisModel, gridModel) {
|
|
75
94
|
var axis = axisModel.axis;
|
|
76
95
|
|
|
77
96
|
if (axis.scale.isBlank()) {
|
|
@@ -82,8 +101,6 @@ var CartesianAxisView = AxisView.extend({
|
|
|
82
101
|
var lineStyleModel = splitLineModel.getModel('lineStyle');
|
|
83
102
|
var lineColors = lineStyleModel.get('color');
|
|
84
103
|
|
|
85
|
-
var lineInterval = getInterval(splitLineModel, labelInterval);
|
|
86
|
-
|
|
87
104
|
lineColors = zrUtil.isArray(lineColors) ? lineColors : [lineColors];
|
|
88
105
|
|
|
89
106
|
var gridRect = gridModel.coordinateSystem.getRect();
|
|
@@ -91,28 +108,18 @@ var CartesianAxisView = AxisView.extend({
|
|
|
91
108
|
|
|
92
109
|
var lineCount = 0;
|
|
93
110
|
|
|
94
|
-
var ticksCoords = axis.getTicksCoords(
|
|
95
|
-
|
|
96
|
-
);
|
|
97
|
-
var ticks = axis.scale.getTicks();
|
|
98
|
-
|
|
99
|
-
var showMinLabel = axisModel.get('axisLabel.showMinLabel');
|
|
100
|
-
var showMaxLabel = axisModel.get('axisLabel.showMaxLabel');
|
|
111
|
+
var ticksCoords = axis.getTicksCoords({
|
|
112
|
+
tickModel: splitLineModel
|
|
113
|
+
});
|
|
101
114
|
|
|
102
115
|
var p1 = [];
|
|
103
116
|
var p2 = [];
|
|
117
|
+
|
|
104
118
|
// Simple optimization
|
|
105
119
|
// Batching the lines if color are the same
|
|
106
120
|
var lineStyle = lineStyleModel.getLineStyle();
|
|
107
121
|
for (var i = 0; i < ticksCoords.length; i++) {
|
|
108
|
-
|
|
109
|
-
axis, i, lineInterval, ticksCoords.length,
|
|
110
|
-
showMinLabel, showMaxLabel
|
|
111
|
-
)) {
|
|
112
|
-
continue;
|
|
113
|
-
}
|
|
114
|
-
|
|
115
|
-
var tickCoord = axis.toGlobalCoord(ticksCoords[i]);
|
|
122
|
+
var tickCoord = axis.toGlobalCoord(ticksCoords[i].coord);
|
|
116
123
|
|
|
117
124
|
if (isHorizontal) {
|
|
118
125
|
p1[0] = tickCoord;
|
|
@@ -128,9 +135,9 @@ var CartesianAxisView = AxisView.extend({
|
|
|
128
135
|
}
|
|
129
136
|
|
|
130
137
|
var colorIndex = (lineCount++) % lineColors.length;
|
|
138
|
+
var tickValue = ticksCoords[i].tickValue;
|
|
131
139
|
this._axisGroup.add(new graphic.Line(graphic.subPixelOptimizeLine({
|
|
132
|
-
anid: 'line_' +
|
|
133
|
-
|
|
140
|
+
anid: tickValue != null ? 'line_' + ticksCoords[i].tickValue : null,
|
|
134
141
|
shape: {
|
|
135
142
|
x1: p1[0],
|
|
136
143
|
y1: p1[1],
|
|
@@ -148,10 +155,9 @@ var CartesianAxisView = AxisView.extend({
|
|
|
148
155
|
/**
|
|
149
156
|
* @param {module:echarts/coord/cartesian/AxisModel} axisModel
|
|
150
157
|
* @param {module:echarts/coord/cartesian/GridModel} gridModel
|
|
151
|
-
* @param {number|Function} labelInterval
|
|
152
158
|
* @private
|
|
153
159
|
*/
|
|
154
|
-
_splitArea: function (axisModel, gridModel
|
|
160
|
+
_splitArea: function (axisModel, gridModel) {
|
|
155
161
|
var axis = axisModel.axis;
|
|
156
162
|
|
|
157
163
|
if (axis.scale.isBlank()) {
|
|
@@ -164,55 +170,63 @@ var CartesianAxisView = AxisView.extend({
|
|
|
164
170
|
|
|
165
171
|
var gridRect = gridModel.coordinateSystem.getRect();
|
|
166
172
|
|
|
167
|
-
var ticksCoords = axis.getTicksCoords(
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
173
|
+
var ticksCoords = axis.getTicksCoords({
|
|
174
|
+
tickModel: splitAreaModel,
|
|
175
|
+
clamp: true
|
|
176
|
+
});
|
|
171
177
|
|
|
172
|
-
|
|
173
|
-
|
|
178
|
+
if (!ticksCoords.length) {
|
|
179
|
+
return;
|
|
180
|
+
}
|
|
174
181
|
|
|
175
|
-
|
|
182
|
+
// For Making appropriate splitArea animation, the color and anid
|
|
183
|
+
// should be corresponding to previous one if possible.
|
|
184
|
+
var areaColorsLen = areaColors.length;
|
|
185
|
+
var lastSplitAreaColors = this._splitAreaColors;
|
|
186
|
+
var newSplitAreaColors = zrUtil.createHashMap();
|
|
187
|
+
var colorIndex = 0;
|
|
188
|
+
if (lastSplitAreaColors) {
|
|
189
|
+
for (var i = 0; i < ticksCoords.length; i++) {
|
|
190
|
+
var cIndex = lastSplitAreaColors.get(ticksCoords[i].tickValue);
|
|
191
|
+
if (cIndex != null) {
|
|
192
|
+
colorIndex = (cIndex + (areaColorsLen - 1) * i) % areaColorsLen;
|
|
193
|
+
break;
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
}
|
|
176
197
|
|
|
177
|
-
var
|
|
198
|
+
var prev = axis.toGlobalCoord(ticksCoords[0].coord);
|
|
178
199
|
|
|
179
200
|
var areaStyle = areaStyleModel.getAreaStyle();
|
|
180
201
|
areaColors = zrUtil.isArray(areaColors) ? areaColors : [areaColors];
|
|
181
202
|
|
|
182
|
-
var showMinLabel = axisModel.get('axisLabel.showMinLabel');
|
|
183
|
-
var showMaxLabel = axisModel.get('axisLabel.showMaxLabel');
|
|
184
|
-
|
|
185
203
|
for (var i = 1; i < ticksCoords.length; i++) {
|
|
186
|
-
|
|
187
|
-
axis, i, areaInterval, ticksCoords.length,
|
|
188
|
-
showMinLabel, showMaxLabel
|
|
189
|
-
) && (i < ticksCoords.length - 1)) {
|
|
190
|
-
continue;
|
|
191
|
-
}
|
|
192
|
-
|
|
193
|
-
var tickCoord = axis.toGlobalCoord(ticksCoords[i]);
|
|
204
|
+
var tickCoord = axis.toGlobalCoord(ticksCoords[i].coord);
|
|
194
205
|
|
|
195
206
|
var x;
|
|
196
207
|
var y;
|
|
197
208
|
var width;
|
|
198
209
|
var height;
|
|
199
210
|
if (axis.isHorizontal()) {
|
|
200
|
-
x =
|
|
211
|
+
x = prev;
|
|
201
212
|
y = gridRect.y;
|
|
202
213
|
width = tickCoord - x;
|
|
203
214
|
height = gridRect.height;
|
|
215
|
+
prev = x + width;
|
|
204
216
|
}
|
|
205
217
|
else {
|
|
206
218
|
x = gridRect.x;
|
|
207
|
-
y =
|
|
219
|
+
y = prev;
|
|
208
220
|
width = gridRect.width;
|
|
209
221
|
height = tickCoord - y;
|
|
222
|
+
prev = y + height;
|
|
210
223
|
}
|
|
211
224
|
|
|
212
|
-
var
|
|
213
|
-
|
|
214
|
-
anid: 'area_' + ticks[i],
|
|
225
|
+
var tickValue = ticksCoords[i - 1].tickValue;
|
|
226
|
+
tickValue != null && newSplitAreaColors.set(tickValue, colorIndex);
|
|
215
227
|
|
|
228
|
+
this._axisGroup.add(new graphic.Rect({
|
|
229
|
+
anid: tickValue != null ? 'area_' + tickValue : null,
|
|
216
230
|
shape: {
|
|
217
231
|
x: x,
|
|
218
232
|
y: y,
|
|
@@ -225,9 +239,10 @@ var CartesianAxisView = AxisView.extend({
|
|
|
225
239
|
silent: true
|
|
226
240
|
}));
|
|
227
241
|
|
|
228
|
-
|
|
229
|
-
prevY = y + height;
|
|
242
|
+
colorIndex = (colorIndex + 1) % areaColorsLen;
|
|
230
243
|
}
|
|
244
|
+
|
|
245
|
+
this._splitAreaColors = newSplitAreaColors;
|
|
231
246
|
}
|
|
232
247
|
});
|
|
233
248
|
|
|
@@ -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 echarts from '../../echarts';
|
|
2
21
|
import * as zrUtil from 'zrender/src/core/util';
|
|
3
22
|
import AxisBuilder from './AxisBuilder';
|
|
@@ -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
|
import AxisBuilder from './AxisBuilder';
|
|
@@ -60,7 +79,7 @@ export default AxisView.extend({
|
|
|
60
79
|
shape: {
|
|
61
80
|
cx: polar.cx,
|
|
62
81
|
cy: polar.cy,
|
|
63
|
-
r: ticksCoords[i]
|
|
82
|
+
r: ticksCoords[i].coord
|
|
64
83
|
},
|
|
65
84
|
silent: true
|
|
66
85
|
}));
|
|
@@ -83,6 +102,9 @@ export default AxisView.extend({
|
|
|
83
102
|
* @private
|
|
84
103
|
*/
|
|
85
104
|
_splitArea: function (radiusAxisModel, polar, axisAngle, radiusExtent, ticksCoords) {
|
|
105
|
+
if (!ticksCoords.length) {
|
|
106
|
+
return;
|
|
107
|
+
}
|
|
86
108
|
|
|
87
109
|
var splitAreaModel = radiusAxisModel.getModel('splitArea');
|
|
88
110
|
var areaStyleModel = splitAreaModel.getModel('areaStyle');
|
|
@@ -93,7 +115,7 @@ export default AxisView.extend({
|
|
|
93
115
|
|
|
94
116
|
var splitAreas = [];
|
|
95
117
|
|
|
96
|
-
var prevRadius = ticksCoords[0];
|
|
118
|
+
var prevRadius = ticksCoords[0].coord;
|
|
97
119
|
for (var i = 1; i < ticksCoords.length; i++) {
|
|
98
120
|
var colorIndex = (lineCount++) % areaColors.length;
|
|
99
121
|
splitAreas[colorIndex] = splitAreas[colorIndex] || [];
|
|
@@ -102,13 +124,13 @@ export default AxisView.extend({
|
|
|
102
124
|
cx: polar.cx,
|
|
103
125
|
cy: polar.cy,
|
|
104
126
|
r0: prevRadius,
|
|
105
|
-
r: ticksCoords[i],
|
|
127
|
+
r: ticksCoords[i].coord,
|
|
106
128
|
startAngle: 0,
|
|
107
129
|
endAngle: Math.PI * 2
|
|
108
130
|
},
|
|
109
131
|
silent: true
|
|
110
132
|
}));
|
|
111
|
-
prevRadius = ticksCoords[i];
|
|
133
|
+
prevRadius = ticksCoords[i].coord;
|
|
112
134
|
}
|
|
113
135
|
|
|
114
136
|
// Simple optimization
|
|
@@ -1,13 +1,29 @@
|
|
|
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
|
import * as zrUtil from 'zrender/src/core/util';
|
|
3
22
|
import AxisBuilder from './AxisBuilder';
|
|
4
23
|
import * as graphic from '../../util/graphic';
|
|
5
|
-
import * as singleAxisHelper from '
|
|
24
|
+
import * as singleAxisHelper from '../../coord/single/singleAxisHelper';
|
|
6
25
|
import AxisView from './AxisView';
|
|
7
26
|
|
|
8
|
-
var getInterval = AxisBuilder.getInterval;
|
|
9
|
-
var ifIgnoreOnTick = AxisBuilder.ifIgnoreOnTick;
|
|
10
|
-
|
|
11
27
|
var axisBuilderAttrs = [
|
|
12
28
|
'axisLine', 'axisTickLabel', 'axisName'
|
|
13
29
|
];
|
|
@@ -35,13 +51,13 @@ var SingleAxisView = AxisView.extend({
|
|
|
35
51
|
group.add(axisBuilder.getGroup());
|
|
36
52
|
|
|
37
53
|
if (axisModel.get(selfBuilderAttr + '.show')) {
|
|
38
|
-
this['_' + selfBuilderAttr](axisModel
|
|
54
|
+
this['_' + selfBuilderAttr](axisModel);
|
|
39
55
|
}
|
|
40
56
|
|
|
41
57
|
SingleAxisView.superCall(this, 'render', axisModel, ecModel, api, payload);
|
|
42
58
|
},
|
|
43
59
|
|
|
44
|
-
_splitLine: function(axisModel
|
|
60
|
+
_splitLine: function(axisModel) {
|
|
45
61
|
var axis = axisModel.axis;
|
|
46
62
|
|
|
47
63
|
if (axis.scale.isBlank()) {
|
|
@@ -52,7 +68,6 @@ var SingleAxisView = AxisView.extend({
|
|
|
52
68
|
var lineStyleModel = splitLineModel.getModel('lineStyle');
|
|
53
69
|
var lineWidth = lineStyleModel.get('width');
|
|
54
70
|
var lineColors = lineStyleModel.get('color');
|
|
55
|
-
var lineInterval = getInterval(splitLineModel, labelInterval);
|
|
56
71
|
|
|
57
72
|
lineColors = lineColors instanceof Array ? lineColors : [lineColors];
|
|
58
73
|
|
|
@@ -62,22 +77,15 @@ var SingleAxisView = AxisView.extend({
|
|
|
62
77
|
var splitLines = [];
|
|
63
78
|
var lineCount = 0;
|
|
64
79
|
|
|
65
|
-
var ticksCoords = axis.getTicksCoords(
|
|
80
|
+
var ticksCoords = axis.getTicksCoords({
|
|
81
|
+
tickModel: splitLineModel
|
|
82
|
+
});
|
|
66
83
|
|
|
67
84
|
var p1 = [];
|
|
68
85
|
var p2 = [];
|
|
69
86
|
|
|
70
|
-
var showMinLabel = axisModel.get('axisLabel.showMinLabel');
|
|
71
|
-
var showMaxLabel = axisModel.get('axisLabel.showMaxLabel');
|
|
72
|
-
|
|
73
87
|
for (var i = 0; i < ticksCoords.length; ++i) {
|
|
74
|
-
|
|
75
|
-
axis, i, lineInterval, ticksCoords.length,
|
|
76
|
-
showMinLabel, showMaxLabel
|
|
77
|
-
)) {
|
|
78
|
-
continue;
|
|
79
|
-
}
|
|
80
|
-
var tickCoord = axis.toGlobalCoord(ticksCoords[i]);
|
|
88
|
+
var tickCoord = axis.toGlobalCoord(ticksCoords[i].coord);
|
|
81
89
|
if (isHorizontal) {
|
|
82
90
|
p1[0] = tickCoord;
|
|
83
91
|
p1[1] = gridRect.y;
|
|
@@ -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 echarts from '../../echarts';
|
|
2
21
|
|
|
3
22
|
/**
|