You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by su...@apache.org on 2019/10/15 11:19:40 UTC
[incubator-echarts-doc] 01/01: Merge branch 'release'
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git
commit 127aad3a6e30290de87f14d96c0e3b0ac11bf098
Merge: 1a1c8e7 86e873d
Author: SHUANG SU <su...@gmail.com>
AuthorDate: Tue Oct 15 19:19:37 2019 +0800
Merge branch 'release'
# Conflicts:
# build.js
# public/documents/en/api.json
# public/documents/en/option-gl.json
# public/documents/en/option.json
# public/documents/en/tutorial.json
# public/documents/zh/api.json
# public/documents/zh/option-gl.json
# public/documents/zh/option.json
# public/documents/zh/tutorial.json
# public/en/documents/en/changelog.html
build.js | 31 +-
cn/option/partial/clip.md | 15 +
cn/option/partial/version.md | 3 +
en/api/graphic.md | 88 +
en/changelog.md | 60 +-
en/option/partial/clip.md | 15 +
en/option/partial/version.md | 3 +
en/option/series/bar.md | 4 +
en/option/series/custom.md | 5 +
en/option/series/line.md | 5 +-
en/option/series/lines.md | 4 +
en/option/series/scatter.md | 4 +
public/documents/en/api.json | 2 +-
public/documents/en/option-gl.json | 2 +-
public/documents/en/option.json | 2 +-
public/documents/en/tutorial.json | 2 +-
public/documents/zh/api.json | 2 +-
public/documents/zh/option-gl.json | 2 +-
public/documents/zh/option.json | 2 +-
public/documents/zh/tutorial.json | 2 +-
public/en/404.html | 2 +-
public/en/api.html | 8 +-
public/en/builder.html | 2 +-
.../en/builder/src/echarts/chart/bar/BarSeries.js | 5 +
public/en/builder/src/echarts/chart/bar/BarView.js | 106 +-
.../echarts/chart/candlestick/candlestickLayout.js | 4 +-
public/en/builder/src/echarts/chart/custom.js | 42 +-
.../src/echarts/chart/helper/EffectSymbol.js | 9 +-
.../src/echarts/chart/helper/LargeSymbolDraw.js | 27 +-
.../chart/helper/createClipPathFromCoordSys.js | 96 +
.../builder/src/echarts/chart/line/LineSeries.js | 2 +-
.../en/builder/src/echarts/chart/line/LineView.js | 159 +-
.../builder/src/echarts/chart/lines/LinesSeries.js | 3 +
.../builder/src/echarts/chart/lines/LinesView.js | 9 +
.../en/builder/src/echarts/chart/pie/PieSeries.js | 4 +-
public/en/builder/src/echarts/chart/pie/PieView.js | 74 +-
.../src/echarts/chart/sankey/sankeyAction.js | 2 +-
.../src/echarts/chart/scatter/ScatterSeries.js | 7 +-
.../src/echarts/chart/scatter/ScatterView.js | 17 +-
.../src/echarts/chart/sunburst/sunburstLayout.js | 18 +-
.../builder/src/echarts/chart/tree/TreeSeries.js | 2 +-
.../en/builder/src/echarts/chart/tree/TreeView.js | 18 +-
.../src/echarts/component/dataZoom/AxisProxy.js | 2 +-
.../echarts/component/dataZoom/DataZoomModel.js | 101 +-
.../component/dataZoom/dataZoomProcessor.js | 4 +-
public/en/builder/src/echarts/component/graphic.js | 55 +-
.../src/echarts/component/helper/MapDraw.js | 49 +-
public/en/builder/src/echarts/component/legend.js | 2 +-
.../src/echarts/component/legend/LegendModel.js | 101 +-
.../src/echarts/component/legend/LegendView.js | 155 +-
.../component/legend/ScrollableLegendModel.js | 9 -
.../component/legend/ScrollableLegendView.js | 54 +-
.../src/echarts/component/legend/legendAction.js | 8 +-
.../src/echarts/component/marker/MarkerModel.js | 16 +-
.../echarts/component/toolbox/feature/DataZoom.js | 3 +
.../component/tooltip/TooltipContentManager.js | 0
.../src/echarts/coord/cartesian/Cartesian2D.js | 33 +-
.../en/builder/src/echarts/coord/geo/GeoModel.js | 2 +-
public/en/builder/src/echarts/coord/polar/Polar.js | 33 +
public/en/builder/src/echarts/coord/radar/Radar.js | 2 +-
public/en/builder/src/echarts/echarts.js | 90 +-
public/en/builder/src/echarts/export.js | 2 +-
public/en/builder/src/echarts/lang.js | 10 +
public/en/builder/src/echarts/langEN.js | 10 +
public/en/builder/src/echarts/langES.js | 10 +
public/en/builder/src/echarts/langFI.js | 10 +
public/en/builder/src/echarts/langTH.js | 10 +
public/en/builder/src/echarts/layout/barGrid.js | 19 +-
public/en/builder/src/echarts/model/Global.js | 4 +-
public/en/builder/src/echarts/model/Series.js | 5 +
.../builder/src/echarts/model/mixin/dataFormat.js | 2 +
.../builder/src/echarts/model/mixin/lineStyle.js | 10 +-
.../src/echarts/preprocessor/backwardCompat.js | 10 +-
.../en/builder/src/echarts/processor/dataStack.js | 2 +-
public/en/builder/src/echarts/util/graphic.js | 83 +-
public/en/builder/src/echarts/util/number.js | 2 +-
public/en/builder/src/echarts/visual/dataColor.js | 22 +-
.../en/builder/src/echarts/visual/seriesColor.js | 10 +-
public/en/builder/src/zrender/Layer.js | 6 +-
public/en/builder/src/zrender/Painter.js | 8 +-
public/en/builder/src/zrender/animation/track.js | 0
public/en/builder/src/zrender/config.js | 7 +-
public/en/builder/src/zrender/core/PathProxy.js | 11 +-
public/en/builder/src/zrender/core/env.js | 2 +
public/en/builder/src/zrender/core/log.js | 16 +-
public/en/builder/src/zrender/core/matrix.js | 2 +
public/en/builder/src/zrender/core/timsort.js | 4 +-
public/en/builder/src/zrender/core/util.js | 8 +-
public/en/builder/src/zrender/core/vector.js | 1 +
public/en/builder/src/zrender/graphic/States.js | 3 +
public/en/builder/src/zrender/graphic/Style.js | 4 +-
.../en/builder/src/zrender/graphic/helper/text.js | 3 +-
public/en/builder/src/zrender/mixin/Animatable.js | 4 +-
public/en/builder/src/zrender/svg/Painter.js | 15 +-
public/en/builder/src/zrender/svg/graphic.js | 9 +-
.../src/zrender/svg/helper/GradientManager.js | 6 +-
.../src/zrender/svg/helper/ShadowManager.js | 5 +-
public/en/builder/src/zrender/vml/Painter.js | 4 +-
public/en/builder/src/zrender/zrender.js | 2 +-
public/en/changelog.html | 71 +-
public/en/cheat-sheet.html | 2 +-
public/en/coding-standard.html | 2 +-
public/en/committers.html | 4 +-
public/en/css/ecOption.css | 22 +-
public/en/css/main.css | 2 +-
public/en/css/spreadsheet.css | 16 -
public/en/dependencies.html | 2 +-
public/en/dist/echarts-en.common.js | 1551 ++++++++++++----
public/en/dist/echarts-en.common.min.js | 2 +-
public/en/dist/echarts-en.js | 1851 +++++++++++++++-----
public/en/dist/echarts-en.js.map | 2 +-
public/en/dist/echarts-en.min.js | 2 +-
public/en/dist/echarts-en.simple.js | 866 ++++++---
public/en/dist/echarts-en.simple.min.js | 2 +-
public/en/dist/echarts.common.js | 1551 ++++++++++++----
public/en/dist/echarts.common.min.js | 2 +-
public/en/dist/echarts.js | 1851 +++++++++++++++-----
public/en/dist/echarts.js.map | 2 +-
public/en/dist/echarts.min.js | 2 +-
public/en/dist/echarts.simple.js | 866 ++++++---
public/en/dist/echarts.simple.min.js | 2 +-
public/en/dist/extension/bmap.js | 17 +
public/en/dist/extension/bmap.js.map | 2 +-
public/en/dist/extension/bmap.min.js | 2 +-
public/en/dist/extension/dataTool.js | 17 +-
public/en/dist/extension/dataTool.js.map | 2 +-
public/en/dist/extension/dataTool.min.js | 2 +-
public/en/documents/en/changelog.html | 59 +-
public/en/documents/zh/changelog.html | 47 +-
public/en/download-extension.html | 2 +-
public/en/download-map.html | 2 +-
public/en/download-theme.html | 2 +-
public/en/download.html | 4 +-
public/en/faq.html | 2 +-
public/en/feature.html | 2 +-
public/en/images/company/company1.jpg | Bin 10003 -> 11324 bytes
public/en/images/company/company10.jpg | Bin 10815 -> 7953 bytes
public/en/images/company/company11.jpg | Bin 10948 -> 8823 bytes
public/en/images/company/company12.jpg | Bin 6647 -> 9716 bytes
public/en/images/company/company13.jpg | Bin 7396 -> 7639 bytes
public/en/images/company/company14.jpg | Bin 7136 -> 7003 bytes
public/en/images/company/company15.jpg | Bin 7150 -> 10120 bytes
public/en/images/company/company16.jpg | Bin 5899 -> 10401 bytes
public/en/images/company/company17.jpg | Bin 8680 -> 9665 bytes
public/en/images/company/company17.png | Bin 37432 -> 32161 bytes
public/en/images/company/company18.jpg | Bin 8590 -> 11317 bytes
public/en/images/company/company19.jpg | Bin 6425 -> 11519 bytes
public/en/images/company/company2.jpg | Bin 11482 -> 10556 bytes
public/en/images/company/company20.jpg | Bin 7178 -> 11313 bytes
public/en/images/company/company21.jpg | Bin 5760 -> 6808 bytes
public/en/images/company/company22.jpg | Bin 7825 -> 8389 bytes
public/en/images/company/company23.jpg | Bin 7382 -> 9652 bytes
public/en/images/company/company24.jpg | Bin 8602 -> 9962 bytes
public/en/images/company/company3.jpg | Bin 7722 -> 14135 bytes
public/en/images/company/company4.jpg | Bin 7510 -> 9337 bytes
public/en/images/company/company5.jpg | Bin 8923 -> 11358 bytes
public/en/images/company/company6.jpg | Bin 7918 -> 10886 bytes
public/en/images/company/company7.jpg | Bin 7919 -> 10223 bytes
public/en/images/company/company8.jpg | Bin 5779 -> 8969 bytes
public/en/images/company/company9.jpg | Bin 9989 -> 6736 bytes
public/en/images/people/company23.png | Bin 0 -> 21862 bytes
public/en/images/people/dave.jpg | Bin 0 -> 16282 bytes
public/en/images/people/shengwu.jpg | Bin 0 -> 21227 bytes
public/en/images/people/tedliu.jpg | Bin 0 -> 20061 bytes
public/en/images/people/weizhi.jpg | Bin 7060 -> 2755 bytes
public/en/index.html | 4 +-
public/en/js/docTool/main.js | 16 +-
public/en/js/download.js | 2 +-
public/en/js/spreadsheet/spreadsheet.js | 50 +-
public/en/maillist.html | 2 +-
public/en/option-gl.html | 8 +-
public/en/option.html | 8 +-
public/en/option3.html | 2 +-
public/en/tutorial.html | 8 +-
public/zh/404.html | 2 +-
public/zh/api.html | 8 +-
public/zh/builder.html | 2 +-
.../zh/builder/src/echarts/chart/bar/BarSeries.js | 5 +
public/zh/builder/src/echarts/chart/bar/BarView.js | 106 +-
.../echarts/chart/candlestick/candlestickLayout.js | 4 +-
public/zh/builder/src/echarts/chart/custom.js | 42 +-
.../src/echarts/chart/helper/EffectSymbol.js | 9 +-
.../src/echarts/chart/helper/LargeSymbolDraw.js | 27 +-
.../chart/helper/createClipPathFromCoordSys.js | 96 +
.../builder/src/echarts/chart/line/LineSeries.js | 2 +-
.../zh/builder/src/echarts/chart/line/LineView.js | 159 +-
.../builder/src/echarts/chart/lines/LinesSeries.js | 3 +
.../builder/src/echarts/chart/lines/LinesView.js | 9 +
.../zh/builder/src/echarts/chart/pie/PieSeries.js | 4 +-
public/zh/builder/src/echarts/chart/pie/PieView.js | 74 +-
.../src/echarts/chart/sankey/sankeyAction.js | 2 +-
.../src/echarts/chart/scatter/ScatterSeries.js | 7 +-
.../src/echarts/chart/scatter/ScatterView.js | 17 +-
.../src/echarts/chart/sunburst/sunburstLayout.js | 18 +-
.../builder/src/echarts/chart/tree/TreeSeries.js | 2 +-
.../zh/builder/src/echarts/chart/tree/TreeView.js | 18 +-
.../src/echarts/component/dataZoom/AxisProxy.js | 2 +-
.../echarts/component/dataZoom/DataZoomModel.js | 101 +-
.../component/dataZoom/dataZoomProcessor.js | 4 +-
public/zh/builder/src/echarts/component/graphic.js | 55 +-
.../src/echarts/component/helper/MapDraw.js | 49 +-
public/zh/builder/src/echarts/component/legend.js | 2 +-
.../src/echarts/component/legend/LegendModel.js | 101 +-
.../src/echarts/component/legend/LegendView.js | 155 +-
.../component/legend/ScrollableLegendModel.js | 9 -
.../component/legend/ScrollableLegendView.js | 54 +-
.../src/echarts/component/legend/legendAction.js | 8 +-
.../src/echarts/component/marker/MarkerModel.js | 16 +-
.../echarts/component/toolbox/feature/DataZoom.js | 3 +
.../component/tooltip/TooltipContentManager.js | 0
.../src/echarts/coord/cartesian/Cartesian2D.js | 33 +-
.../zh/builder/src/echarts/coord/geo/GeoModel.js | 2 +-
public/zh/builder/src/echarts/coord/polar/Polar.js | 33 +
public/zh/builder/src/echarts/coord/radar/Radar.js | 2 +-
public/zh/builder/src/echarts/echarts.js | 90 +-
public/zh/builder/src/echarts/export.js | 2 +-
public/zh/builder/src/echarts/lang.js | 10 +
public/zh/builder/src/echarts/langEN.js | 10 +
public/zh/builder/src/echarts/langES.js | 10 +
public/zh/builder/src/echarts/langFI.js | 10 +
public/zh/builder/src/echarts/langTH.js | 10 +
public/zh/builder/src/echarts/layout/barGrid.js | 19 +-
public/zh/builder/src/echarts/model/Global.js | 4 +-
public/zh/builder/src/echarts/model/Series.js | 5 +
.../builder/src/echarts/model/mixin/dataFormat.js | 2 +
.../builder/src/echarts/model/mixin/lineStyle.js | 10 +-
.../src/echarts/preprocessor/backwardCompat.js | 10 +-
.../zh/builder/src/echarts/processor/dataStack.js | 2 +-
public/zh/builder/src/echarts/util/graphic.js | 83 +-
public/zh/builder/src/echarts/util/number.js | 2 +-
public/zh/builder/src/echarts/visual/dataColor.js | 22 +-
.../zh/builder/src/echarts/visual/seriesColor.js | 10 +-
public/zh/builder/src/zrender/Layer.js | 6 +-
public/zh/builder/src/zrender/Painter.js | 8 +-
public/zh/builder/src/zrender/animation/track.js | 0
public/zh/builder/src/zrender/config.js | 7 +-
public/zh/builder/src/zrender/core/PathProxy.js | 11 +-
public/zh/builder/src/zrender/core/env.js | 2 +
public/zh/builder/src/zrender/core/log.js | 16 +-
public/zh/builder/src/zrender/core/matrix.js | 2 +
public/zh/builder/src/zrender/core/timsort.js | 4 +-
public/zh/builder/src/zrender/core/util.js | 8 +-
public/zh/builder/src/zrender/core/vector.js | 1 +
public/zh/builder/src/zrender/graphic/States.js | 3 +
public/zh/builder/src/zrender/graphic/Style.js | 4 +-
.../zh/builder/src/zrender/graphic/helper/text.js | 3 +-
public/zh/builder/src/zrender/mixin/Animatable.js | 4 +-
public/zh/builder/src/zrender/svg/Painter.js | 15 +-
public/zh/builder/src/zrender/svg/graphic.js | 9 +-
.../src/zrender/svg/helper/GradientManager.js | 6 +-
.../src/zrender/svg/helper/ShadowManager.js | 5 +-
public/zh/builder/src/zrender/vml/Painter.js | 4 +-
public/zh/builder/src/zrender/zrender.js | 2 +-
public/zh/builder3.html | 2 +-
public/zh/changelog.html | 49 +-
public/zh/cheat-sheet.html | 2 +-
public/zh/coding-standard.html | 2 +-
public/zh/committers.html | 4 +-
public/zh/css/ecOption.css | 22 +-
public/zh/css/main.css | 2 +-
public/zh/css/spreadsheet.css | 16 -
public/zh/demo.html | 2 +-
public/zh/dependencies.html | 2 +-
public/zh/dist/echarts-en.common.js | 1551 ++++++++++++----
public/zh/dist/echarts-en.common.min.js | 2 +-
public/zh/dist/echarts-en.js | 1851 +++++++++++++++-----
public/zh/dist/echarts-en.js.map | 2 +-
public/zh/dist/echarts-en.min.js | 2 +-
public/zh/dist/echarts-en.simple.js | 866 ++++++---
public/zh/dist/echarts-en.simple.min.js | 2 +-
public/zh/dist/echarts.common.js | 1551 ++++++++++++----
public/zh/dist/echarts.common.min.js | 2 +-
public/zh/dist/echarts.js | 1851 +++++++++++++++-----
public/zh/dist/echarts.js.map | 2 +-
public/zh/dist/echarts.min.js | 2 +-
public/zh/dist/echarts.simple.js | 866 ++++++---
public/zh/dist/echarts.simple.min.js | 2 +-
public/zh/dist/extension/bmap.js | 17 +
public/zh/dist/extension/bmap.js.map | 2 +-
public/zh/dist/extension/bmap.min.js | 2 +-
public/zh/dist/extension/dataTool.js | 17 +-
public/zh/dist/extension/dataTool.js.map | 2 +-
public/zh/dist/extension/dataTool.min.js | 2 +-
public/zh/documents/en/api.json | 2 +-
public/zh/documents/en/changelog.html | 69 +-
public/zh/documents/en/option-gl.json | 2 +-
public/zh/documents/zh/changelog.html | 47 +-
public/zh/download-extension.html | 2 +-
public/zh/download-map.html | 2 +-
public/zh/download-theme.html | 2 +-
public/zh/download.html | 4 +-
public/zh/download3.html | 4 +-
public/zh/examples.html | 2 +-
public/zh/faq.html | 2 +-
public/zh/feature.html | 2 +-
public/zh/images/company/company1.jpg | Bin 10003 -> 11324 bytes
public/zh/images/company/company10.jpg | Bin 10815 -> 7953 bytes
public/zh/images/company/company11.jpg | Bin 10948 -> 8823 bytes
public/zh/images/company/company12.jpg | Bin 6647 -> 9716 bytes
public/zh/images/company/company13.jpg | Bin 7396 -> 7639 bytes
public/zh/images/company/company14.jpg | Bin 7136 -> 7003 bytes
public/zh/images/company/company15.jpg | Bin 7150 -> 10120 bytes
public/zh/images/company/company16.jpg | Bin 5899 -> 10401 bytes
public/zh/images/company/company17.jpg | Bin 8680 -> 9665 bytes
public/zh/images/company/company17.png | Bin 37432 -> 32161 bytes
public/zh/images/company/company18.jpg | Bin 8590 -> 11317 bytes
public/zh/images/company/company19.jpg | Bin 6425 -> 11519 bytes
public/zh/images/company/company2.jpg | Bin 11482 -> 10556 bytes
public/zh/images/company/company20.jpg | Bin 7178 -> 11313 bytes
public/zh/images/company/company21.jpg | Bin 5760 -> 6808 bytes
public/zh/images/company/company22.jpg | Bin 7825 -> 8389 bytes
public/zh/images/company/company23.jpg | Bin 7382 -> 9652 bytes
public/zh/images/company/company24.jpg | Bin 8602 -> 9962 bytes
public/zh/images/company/company3.jpg | Bin 7722 -> 14135 bytes
public/zh/images/company/company4.jpg | Bin 7510 -> 9337 bytes
public/zh/images/company/company5.jpg | Bin 8923 -> 11358 bytes
public/zh/images/company/company6.jpg | Bin 7918 -> 10886 bytes
public/zh/images/company/company7.jpg | Bin 7919 -> 10223 bytes
public/zh/images/company/company8.jpg | Bin 5779 -> 8969 bytes
public/zh/images/company/company9.jpg | Bin 9989 -> 6736 bytes
public/zh/images/people/company23.png | Bin 0 -> 21862 bytes
public/zh/images/people/dave.jpg | Bin 0 -> 16282 bytes
public/zh/images/people/shengwu.jpg | Bin 0 -> 21227 bytes
public/zh/images/people/tedliu.jpg | Bin 0 -> 20061 bytes
public/zh/images/people/weizhi.jpg | Bin 7060 -> 2755 bytes
public/zh/index.html | 4 +-
public/zh/js/docTool/main.js | 16 +-
public/zh/js/download.js | 2 +-
public/zh/js/spreadsheet/spreadsheet.js | 50 +-
public/zh/maillist.html | 2 +-
public/zh/option-gl.html | 8 +-
public/zh/option.html | 8 +-
public/zh/option3.html | 8 +-
public/zh/spreadsheet.html | 8 +-
public/zh/tutorial.html | 8 +-
release.sh | 2 +-
zh/api/graphic.md | 89 +
zh/changelog.md | 44 +-
zh/option/series/bar.md | 4 +
zh/option/series/custom.md | 5 +
zh/option/series/line.md | 5 +-
zh/option/series/lines.md | 4 +
zh/option/series/scatter.md | 4 +
343 files changed, 16204 insertions(+), 5444 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org