• 1
    Merge branch 'release' into merge-release-to-next · dd3d83cc
    100pah 提交于
    # Conflicts:
    #	src/chart/bar/BarView.js
    #	src/chart/helper/EffectSymbol.js
    #	src/chart/helper/LineDraw.js
    #	src/chart/helper/Symbol.js
    #	src/chart/helper/createClipPathFromCoordSys.ts
    #	src/chart/line/LineView.ts
    #	src/chart/map/MapSeries.ts
    #	src/chart/pie/PieView.js
    #	src/chart/sankey/sankeyLayout.ts
    #	src/chart/sunburst/SunburstPiece.js
    #	src/chart/sunburst/SunburstSeries.js
    #	src/chart/sunburst/SunburstView.ts
    #	src/chart/tree/TreeSeries.js
    #	src/chart/treemap/TreemapSeries.ts
    #	src/chart/treemap/TreemapView.ts
    #	src/component/helper/MapDraw.js
    #	src/component/title.ts
    #	src/component/toolbox/ToolboxView.js
    #	src/component/toolbox/feature/MagicType.js
    #	src/component/toolbox/feature/SaveAsImage.js
    #	src/component/tooltip/TooltipView.ts
    #	src/component/visualMap/PiecewiseModel.ts
    #	src/coord/axisHelper.ts
    #	src/coord/calendar/Calendar.js
    #	src/coord/geo/geoJSONLoader.ts
    #	src/coord/geo/geoSourceManager.ts
    #	src/coord/geo/parseGeoJson.ts
    #	src/coord/radar/Radar.js
    #	src/data/Tree.js
    #	src/echarts.js
    #	src/layout/barGrid.ts
    #	src/loading/default.ts
    #	src/model/Series.js
    #	src/util/format.ts
    #	src/util/graphic.js
    #	src/visual/symbol.js
    dd3d83cc
geoJSONLoader.ts 3.0 KB