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/09/30 10:43:51 UTC

[incubator-echarts-website] branch asf-site updated (c05ae3b -> 61c684b)

This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-website.git.


    from c05ae3b  update website
     new 263f710  build 4.4.0-rc.1
     new 61c684b  fix

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 documents/en/api.json                              |    2 +-
 documents/en/changelog.html                        |   69 +-
 documents/en/option-gl.json                        |    2 +-
 documents/zh/changelog.html                        |   47 +-
 en/404.html                                        |    2 +-
 en/api.html                                        |    8 +-
 en/builder.html                                    |    2 +-
 en/builder/src/echarts/chart/bar/BarSeries.js      |    5 +
 en/builder/src/echarts/chart/bar/BarView.js        |  106 +-
 .../echarts/chart/candlestick/candlestickLayout.js |    4 +-
 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 +
 en/builder/src/echarts/chart/line/LineSeries.js    |    2 +-
 en/builder/src/echarts/chart/line/LineView.js      |  159 +-
 en/builder/src/echarts/chart/lines/LinesSeries.js  |    3 +
 en/builder/src/echarts/chart/lines/LinesView.js    |    9 +
 en/builder/src/echarts/chart/pie/PieSeries.js      |    4 +-
 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 +-
 en/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 +-
 en/builder/src/echarts/component/graphic.js        |   55 +-
 en/builder/src/echarts/component/helper/MapDraw.js |   49 +-
 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 +-
 en/builder/src/echarts/coord/polar/Polar.js        |   33 +
 en/builder/src/echarts/coord/radar/Radar.js        |    2 +-
 en/builder/src/echarts/echarts.js                  |   90 +-
 en/builder/src/echarts/export.js                   |    2 +-
 en/builder/src/echarts/lang.js                     |   10 +
 en/builder/src/echarts/langEN.js                   |   10 +
 en/builder/src/echarts/langES.js                   |   10 +
 en/builder/src/echarts/langFI.js                   |   10 +
 en/builder/src/echarts/langTH.js                   |   10 +
 en/builder/src/echarts/layout/barGrid.js           |   19 +-
 en/builder/src/echarts/model/Global.js             |    4 +-
 en/builder/src/echarts/model/Series.js             |    5 +
 en/builder/src/echarts/model/mixin/dataFormat.js   |    2 +
 en/builder/src/echarts/model/mixin/lineStyle.js    |   10 +-
 .../src/echarts/preprocessor/backwardCompat.js     |   10 +-
 en/builder/src/echarts/processor/dataStack.js      |    2 +-
 en/builder/src/echarts/util/graphic.js             |   83 +-
 en/builder/src/echarts/util/number.js              |    2 +-
 en/builder/src/echarts/visual/dataColor.js         |   22 +-
 en/builder/src/echarts/visual/seriesColor.js       |   10 +-
 en/builder/src/zrender/Layer.js                    |    6 +-
 en/builder/src/zrender/Painter.js                  |    8 +-
 en/builder/src/zrender/animation/track.js          |    0
 en/builder/src/zrender/config.js                   |    7 +-
 en/builder/src/zrender/core/PathProxy.js           |   11 +-
 en/builder/src/zrender/core/env.js                 |    2 +
 en/builder/src/zrender/core/log.js                 |   16 +-
 en/builder/src/zrender/core/matrix.js              |    2 +
 en/builder/src/zrender/core/timsort.js             |    4 +-
 en/builder/src/zrender/core/util.js                |    8 +-
 en/builder/src/zrender/core/vector.js              |    1 +
 en/builder/src/zrender/graphic/States.js           |    3 +
 en/builder/src/zrender/graphic/Style.js            |    4 +-
 en/builder/src/zrender/graphic/helper/text.js      |    3 +-
 en/builder/src/zrender/mixin/Animatable.js         |    4 +-
 en/builder/src/zrender/svg/Painter.js              |   15 +-
 en/builder/src/zrender/svg/graphic.js              |    9 +-
 .../src/zrender/svg/helper/GradientManager.js      |    6 +-
 en/builder/src/zrender/svg/helper/ShadowManager.js |    5 +-
 en/builder/src/zrender/vml/Painter.js              |    4 +-
 en/builder/src/zrender/zrender.js                  |    2 +-
 en/changelog.html                                  |   71 +-
 en/cheat-sheet.html                                |    2 +-
 en/coding-standard.html                            |    2 +-
 en/committers.html                                 |    4 +-
 en/css/ecOption.css                                |   22 +-
 en/css/main.css                                    |    2 +-
 en/css/spreadsheet.css                             |   16 -
 en/dependencies.html                               |    2 +-
 en/dist/echarts-en.common.js                       | 1551 ++++++++++++----
 en/dist/echarts-en.common.min.js                   |    2 +-
 en/dist/echarts-en.js                              | 1851 +++++++++++++++-----
 en/dist/echarts-en.js.map                          |    2 +-
 en/dist/echarts-en.min.js                          |    2 +-
 en/dist/echarts-en.simple.js                       |  866 ++++++---
 en/dist/echarts-en.simple.min.js                   |    2 +-
 en/dist/echarts.common.js                          | 1551 ++++++++++++----
 en/dist/echarts.common.min.js                      |    2 +-
 en/dist/echarts.js                                 | 1851 +++++++++++++++-----
 en/dist/echarts.js.map                             |    2 +-
 en/dist/echarts.min.js                             |    2 +-
 en/dist/echarts.simple.js                          |  866 ++++++---
 en/dist/echarts.simple.min.js                      |    2 +-
 en/dist/extension/bmap.js                          |   17 +
 en/dist/extension/bmap.js.map                      |    2 +-
 en/dist/extension/bmap.min.js                      |    2 +-
 en/dist/extension/dataTool.js                      |   17 +-
 en/dist/extension/dataTool.js.map                  |    2 +-
 en/dist/extension/dataTool.min.js                  |    2 +-
 en/documents/en/api.json                           |    2 +-
 en/documents/en/changelog.html                     |   69 +-
 en/documents/en/option-gl.json                     |    2 +-
 en/documents/zh/changelog.html                     |   47 +-
 en/download-extension.html                         |    2 +-
 en/download-map.html                               |    2 +-
 en/download-theme.html                             |    2 +-
 en/download.html                                   |    4 +-
 en/faq.html                                        |    2 +-
 en/feature.html                                    |    2 +-
 en/images/company/company1.jpg                     |  Bin 10003 -> 11324 bytes
 en/images/company/company10.jpg                    |  Bin 10815 -> 7953 bytes
 en/images/company/company11.jpg                    |  Bin 10948 -> 8823 bytes
 en/images/company/company12.jpg                    |  Bin 6647 -> 9716 bytes
 en/images/company/company13.jpg                    |  Bin 7396 -> 7639 bytes
 en/images/company/company14.jpg                    |  Bin 7136 -> 7003 bytes
 en/images/company/company15.jpg                    |  Bin 7150 -> 10120 bytes
 en/images/company/company16.jpg                    |  Bin 5899 -> 10401 bytes
 en/images/company/company17.jpg                    |  Bin 8680 -> 9665 bytes
 en/images/company/company17.png                    |  Bin 37432 -> 32161 bytes
 en/images/company/company18.jpg                    |  Bin 8590 -> 11317 bytes
 en/images/company/company19.jpg                    |  Bin 6425 -> 11519 bytes
 en/images/company/company2.jpg                     |  Bin 11482 -> 10556 bytes
 en/images/company/company20.jpg                    |  Bin 7178 -> 11313 bytes
 en/images/company/company21.jpg                    |  Bin 5760 -> 6808 bytes
 en/images/company/company22.jpg                    |  Bin 7825 -> 8389 bytes
 en/images/company/company23.jpg                    |  Bin 7382 -> 9652 bytes
 en/images/company/company24.jpg                    |  Bin 8602 -> 9962 bytes
 en/images/company/company3.jpg                     |  Bin 7722 -> 14135 bytes
 en/images/company/company4.jpg                     |  Bin 7510 -> 9337 bytes
 en/images/company/company5.jpg                     |  Bin 8923 -> 11358 bytes
 en/images/company/company6.jpg                     |  Bin 7918 -> 10886 bytes
 en/images/company/company7.jpg                     |  Bin 7919 -> 10223 bytes
 en/images/company/company8.jpg                     |  Bin 5779 -> 8969 bytes
 en/images/company/company9.jpg                     |  Bin 9989 -> 6736 bytes
 en/images/people/company23.png                     |  Bin 0 -> 21862 bytes
 en/images/people/dave.jpg                          |  Bin 0 -> 16282 bytes
 en/images/people/shengwu.jpg                       |  Bin 0 -> 21227 bytes
 en/images/people/tedliu.jpg                        |  Bin 0 -> 20061 bytes
 en/images/people/weizhi.jpg                        |  Bin 7060 -> 2755 bytes
 en/index.html                                      |    4 +-
 en/js/docTool/main.js                              |   16 +-
 en/js/spreadsheet/spreadsheet.js                   |   50 +-
 en/maillist.html                                   |    2 +-
 en/option-gl.html                                  |    8 +-
 en/option.html                                     |    8 +-
 en/option3.html                                    |    2 +-
 en/tutorial.html                                   |    8 +-
 examples/en/editor.html                            |    4 +-
 examples/en/index.html                             |    4 +-
 examples/en/view.html                              |    4 +-
 examples/vendors/echarts/echarts.js                | 1851 +++++++++++++++-----
 examples/vendors/echarts/echarts.min.js            |    2 +-
 examples/vendors/echarts/extension/bmap.js         |   17 +
 examples/vendors/echarts/extension/bmap.js.map     |    2 +-
 examples/vendors/echarts/extension/bmap.min.js     |    2 +-
 examples/vendors/echarts/extension/dataTool.js     |   17 +-
 examples/vendors/echarts/extension/dataTool.js.map |    2 +-
 examples/vendors/echarts/extension/dataTool.min.js |    2 +-
 examples/zh/editor.html                            |    4 +-
 examples/zh/index.html                             |    4 +-
 examples/zh/view.html                              |    4 +-
 js/docTool/main.js                                 |   16 +-
 js/spreadsheet/spreadsheet.js                      |   50 +-
 zh/404.html                                        |    2 +-
 zh/api.html                                        |    8 +-
 zh/builder.html                                    |    2 +-
 zh/builder/src/echarts/chart/bar/BarSeries.js      |    5 +
 zh/builder/src/echarts/chart/bar/BarView.js        |  106 +-
 .../echarts/chart/candlestick/candlestickLayout.js |    4 +-
 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 +
 zh/builder/src/echarts/chart/line/LineSeries.js    |    2 +-
 zh/builder/src/echarts/chart/line/LineView.js      |  159 +-
 zh/builder/src/echarts/chart/lines/LinesSeries.js  |    3 +
 zh/builder/src/echarts/chart/lines/LinesView.js    |    9 +
 zh/builder/src/echarts/chart/pie/PieSeries.js      |    4 +-
 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 +-
 zh/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 +-
 zh/builder/src/echarts/component/graphic.js        |   55 +-
 zh/builder/src/echarts/component/helper/MapDraw.js |   49 +-
 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 +-
 zh/builder/src/echarts/coord/polar/Polar.js        |   33 +
 zh/builder/src/echarts/coord/radar/Radar.js        |    2 +-
 zh/builder/src/echarts/echarts.js                  |   90 +-
 zh/builder/src/echarts/export.js                   |    2 +-
 zh/builder/src/echarts/lang.js                     |   10 +
 zh/builder/src/echarts/langEN.js                   |   10 +
 zh/builder/src/echarts/langES.js                   |   10 +
 zh/builder/src/echarts/langFI.js                   |   10 +
 zh/builder/src/echarts/langTH.js                   |   10 +
 zh/builder/src/echarts/layout/barGrid.js           |   19 +-
 zh/builder/src/echarts/model/Global.js             |    4 +-
 zh/builder/src/echarts/model/Series.js             |    5 +
 zh/builder/src/echarts/model/mixin/dataFormat.js   |    2 +
 zh/builder/src/echarts/model/mixin/lineStyle.js    |   10 +-
 .../src/echarts/preprocessor/backwardCompat.js     |   10 +-
 zh/builder/src/echarts/processor/dataStack.js      |    2 +-
 zh/builder/src/echarts/util/graphic.js             |   83 +-
 zh/builder/src/echarts/util/number.js              |    2 +-
 zh/builder/src/echarts/visual/dataColor.js         |   22 +-
 zh/builder/src/echarts/visual/seriesColor.js       |   10 +-
 zh/builder/src/zrender/Layer.js                    |    6 +-
 zh/builder/src/zrender/Painter.js                  |    8 +-
 zh/builder/src/zrender/animation/track.js          |    0
 zh/builder/src/zrender/config.js                   |    7 +-
 zh/builder/src/zrender/core/PathProxy.js           |   11 +-
 zh/builder/src/zrender/core/env.js                 |    2 +
 zh/builder/src/zrender/core/log.js                 |   16 +-
 zh/builder/src/zrender/core/matrix.js              |    2 +
 zh/builder/src/zrender/core/timsort.js             |    4 +-
 zh/builder/src/zrender/core/util.js                |    8 +-
 zh/builder/src/zrender/core/vector.js              |    1 +
 zh/builder/src/zrender/graphic/States.js           |    3 +
 zh/builder/src/zrender/graphic/Style.js            |    4 +-
 zh/builder/src/zrender/graphic/helper/text.js      |    3 +-
 zh/builder/src/zrender/mixin/Animatable.js         |    4 +-
 zh/builder/src/zrender/svg/Painter.js              |   15 +-
 zh/builder/src/zrender/svg/graphic.js              |    9 +-
 .../src/zrender/svg/helper/GradientManager.js      |    6 +-
 zh/builder/src/zrender/svg/helper/ShadowManager.js |    5 +-
 zh/builder/src/zrender/vml/Painter.js              |    4 +-
 zh/builder/src/zrender/zrender.js                  |    2 +-
 zh/builder3.html                                   |    2 +-
 zh/changelog.html                                  |   49 +-
 zh/cheat-sheet.html                                |    2 +-
 zh/coding-standard.html                            |    2 +-
 zh/committers.html                                 |    4 +-
 zh/css/ecOption.css                                |   22 +-
 zh/css/main.css                                    |    2 +-
 zh/css/spreadsheet.css                             |   16 -
 zh/demo.html                                       |    2 +-
 zh/dependencies.html                               |    2 +-
 zh/dist/echarts-en.common.js                       | 1551 ++++++++++++----
 zh/dist/echarts-en.common.min.js                   |    2 +-
 zh/dist/echarts-en.js                              | 1851 +++++++++++++++-----
 zh/dist/echarts-en.js.map                          |    2 +-
 zh/dist/echarts-en.min.js                          |    2 +-
 zh/dist/echarts-en.simple.js                       |  866 ++++++---
 zh/dist/echarts-en.simple.min.js                   |    2 +-
 zh/dist/echarts.common.js                          | 1551 ++++++++++++----
 zh/dist/echarts.common.min.js                      |    2 +-
 zh/dist/echarts.js                                 | 1851 +++++++++++++++-----
 zh/dist/echarts.js.map                             |    2 +-
 zh/dist/echarts.min.js                             |    2 +-
 zh/dist/echarts.simple.js                          |  866 ++++++---
 zh/dist/echarts.simple.min.js                      |    2 +-
 zh/dist/extension/bmap.js                          |   17 +
 zh/dist/extension/bmap.js.map                      |    2 +-
 zh/dist/extension/bmap.min.js                      |    2 +-
 zh/dist/extension/dataTool.js                      |   17 +-
 zh/dist/extension/dataTool.js.map                  |    2 +-
 zh/dist/extension/dataTool.min.js                  |    2 +-
 zh/documents/en/api.json                           |    2 +-
 zh/documents/en/changelog.html                     |   69 +-
 zh/documents/en/option-gl.json                     |    2 +-
 zh/documents/zh/changelog.html                     |   47 +-
 zh/download-extension.html                         |    2 +-
 zh/download-map.html                               |    2 +-
 zh/download-theme.html                             |    2 +-
 zh/download.html                                   |    4 +-
 zh/download3.html                                  |    4 +-
 zh/examples.html                                   |    2 +-
 zh/faq.html                                        |    2 +-
 zh/feature.html                                    |    2 +-
 zh/images/company/company1.jpg                     |  Bin 10003 -> 11324 bytes
 zh/images/company/company10.jpg                    |  Bin 10815 -> 7953 bytes
 zh/images/company/company11.jpg                    |  Bin 10948 -> 8823 bytes
 zh/images/company/company12.jpg                    |  Bin 6647 -> 9716 bytes
 zh/images/company/company13.jpg                    |  Bin 7396 -> 7639 bytes
 zh/images/company/company14.jpg                    |  Bin 7136 -> 7003 bytes
 zh/images/company/company15.jpg                    |  Bin 7150 -> 10120 bytes
 zh/images/company/company16.jpg                    |  Bin 5899 -> 10401 bytes
 zh/images/company/company17.jpg                    |  Bin 8680 -> 9665 bytes
 zh/images/company/company17.png                    |  Bin 37432 -> 32161 bytes
 zh/images/company/company18.jpg                    |  Bin 8590 -> 11317 bytes
 zh/images/company/company19.jpg                    |  Bin 6425 -> 11519 bytes
 zh/images/company/company2.jpg                     |  Bin 11482 -> 10556 bytes
 zh/images/company/company20.jpg                    |  Bin 7178 -> 11313 bytes
 zh/images/company/company21.jpg                    |  Bin 5760 -> 6808 bytes
 zh/images/company/company22.jpg                    |  Bin 7825 -> 8389 bytes
 zh/images/company/company23.jpg                    |  Bin 7382 -> 9652 bytes
 zh/images/company/company24.jpg                    |  Bin 8602 -> 9962 bytes
 zh/images/company/company3.jpg                     |  Bin 7722 -> 14135 bytes
 zh/images/company/company4.jpg                     |  Bin 7510 -> 9337 bytes
 zh/images/company/company5.jpg                     |  Bin 8923 -> 11358 bytes
 zh/images/company/company6.jpg                     |  Bin 7918 -> 10886 bytes
 zh/images/company/company7.jpg                     |  Bin 7919 -> 10223 bytes
 zh/images/company/company8.jpg                     |  Bin 5779 -> 8969 bytes
 zh/images/company/company9.jpg                     |  Bin 9989 -> 6736 bytes
 zh/images/people/company23.png                     |  Bin 0 -> 21862 bytes
 zh/images/people/dave.jpg                          |  Bin 0 -> 16282 bytes
 zh/images/people/shengwu.jpg                       |  Bin 0 -> 21227 bytes
 zh/images/people/tedliu.jpg                        |  Bin 0 -> 20061 bytes
 zh/images/people/weizhi.jpg                        |  Bin 7060 -> 2755 bytes
 zh/index.html                                      |    4 +-
 zh/js/docTool/main.js                              |   16 +-
 zh/js/spreadsheet/spreadsheet.js                   |   50 +-
 zh/maillist.html                                   |    2 +-
 zh/option-gl.html                                  |    8 +-
 zh/option.html                                     |    8 +-
 zh/option3.html                                    |    8 +-
 zh/spreadsheet.html                                |    8 +-
 zh/tutorial.html                                   |    8 +-
 335 files changed, 17398 insertions(+), 5955 deletions(-)
 create mode 100644 en/builder/src/echarts/chart/helper/createClipPathFromCoordSys.js
 mode change 100644 => 100755 en/builder/src/echarts/component/tooltip/TooltipContentManager.js
 mode change 100644 => 100755 en/builder/src/zrender/animation/track.js
 create mode 100644 en/images/people/company23.png
 create mode 100644 en/images/people/dave.jpg
 create mode 100644 en/images/people/shengwu.jpg
 create mode 100644 en/images/people/tedliu.jpg
 create mode 100644 zh/builder/src/echarts/chart/helper/createClipPathFromCoordSys.js
 mode change 100644 => 100755 zh/builder/src/echarts/component/tooltip/TooltipContentManager.js
 mode change 100644 => 100755 zh/builder/src/zrender/animation/track.js
 create mode 100644 zh/images/people/company23.png
 create mode 100644 zh/images/people/dave.jpg
 create mode 100644 zh/images/people/shengwu.jpg
 create mode 100644 zh/images/people/tedliu.jpg


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org


[incubator-echarts-website] 02/02: fix

Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-website.git

commit 61c684b9f597e85b35656594ee8acc44c8a9384b
Author: SHUANG SU <su...@gmail.com>
AuthorDate: Mon Sep 30 18:43:32 2019 +0800

    fix
---
 .../chart/helper/createClipPathFromCoordSys.js     | 96 ++++++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/zh/builder/src/echarts/chart/helper/createClipPathFromCoordSys.js b/zh/builder/src/echarts/chart/helper/createClipPathFromCoordSys.js
new file mode 100644
index 0000000..b57df2f
--- /dev/null
+++ b/zh/builder/src/echarts/chart/helper/createClipPathFromCoordSys.js
@@ -0,0 +1,96 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+import * as graphic from '../../util/graphic';
+import { round } from '../../util/number';
+
+function createGridClipPath(cartesian, hasAnimation, seriesModel) {
+  var rect = cartesian.getArea();
+  var isHorizontal = cartesian.getBaseAxis().isHorizontal();
+  var x = rect.x;
+  var y = rect.y;
+  var width = rect.width;
+  var height = rect.height;
+  var lineWidth = seriesModel.get('lineStyle.width') || 2; // Expand the clip path a bit to avoid the border is clipped and looks thinner
+
+  x -= lineWidth / 2;
+  y -= lineWidth / 2;
+  width += lineWidth;
+  height += lineWidth;
+  var clipPath = new graphic.Rect({
+    shape: {
+      x: x,
+      y: y,
+      width: width,
+      height: height
+    }
+  });
+
+  if (hasAnimation) {
+    clipPath.shape[isHorizontal ? 'width' : 'height'] = 0;
+    graphic.initProps(clipPath, {
+      shape: {
+        width: width,
+        height: height
+      }
+    }, seriesModel);
+  }
+
+  return clipPath;
+}
+
+function createPolarClipPath(polar, hasAnimation, seriesModel) {
+  var sectorArea = polar.getArea(); // Avoid float number rounding error for symbol on the edge of axis extent.
+
+  var clipPath = new graphic.Sector({
+    shape: {
+      cx: round(polar.cx, 1),
+      cy: round(polar.cy, 1),
+      r0: round(sectorArea.r0, 1),
+      r: round(sectorArea.r, 1),
+      startAngle: sectorArea.startAngle,
+      endAngle: sectorArea.endAngle,
+      clockwise: sectorArea.clockwise
+    }
+  });
+
+  if (hasAnimation) {
+    clipPath.shape.endAngle = sectorArea.startAngle;
+    graphic.initProps(clipPath, {
+      shape: {
+        endAngle: sectorArea.endAngle
+      }
+    }, seriesModel);
+  }
+
+  return clipPath;
+}
+
+function createClipPath(coordSys, hasAnimation, seriesModel) {
+  if (!coordSys) {
+    return null;
+  } else if (coordSys.type === 'polar') {
+    return createPolarClipPath(coordSys, hasAnimation, seriesModel);
+  } else if (coordSys.type === 'cartesian2d') {
+    return createGridClipPath(coordSys, hasAnimation, seriesModel);
+  }
+
+  return null;
+}
+
+export { createGridClipPath, createPolarClipPath, createClipPath };
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org


[incubator-echarts-website] 01/02: build 4.4.0-rc.1

Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-website.git

commit 263f710385167c9fec93060938912b3fa7c50863
Author: SHUANG SU <su...@gmail.com>
AuthorDate: Mon Sep 30 18:43:21 2019 +0800

    build 4.4.0-rc.1
---
 documents/en/api.json                              |    2 +-
 documents/en/changelog.html                        |   69 +-
 documents/en/option-gl.json                        |    2 +-
 documents/zh/changelog.html                        |   47 +-
 en/404.html                                        |    2 +-
 en/api.html                                        |    8 +-
 en/builder.html                                    |    2 +-
 en/builder/src/echarts/chart/bar/BarSeries.js      |    5 +
 en/builder/src/echarts/chart/bar/BarView.js        |  106 +-
 .../echarts/chart/candlestick/candlestickLayout.js |    4 +-
 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 +
 en/builder/src/echarts/chart/line/LineSeries.js    |    2 +-
 en/builder/src/echarts/chart/line/LineView.js      |  159 +-
 en/builder/src/echarts/chart/lines/LinesSeries.js  |    3 +
 en/builder/src/echarts/chart/lines/LinesView.js    |    9 +
 en/builder/src/echarts/chart/pie/PieSeries.js      |    4 +-
 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 +-
 en/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 +-
 en/builder/src/echarts/component/graphic.js        |   55 +-
 en/builder/src/echarts/component/helper/MapDraw.js |   49 +-
 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 +-
 en/builder/src/echarts/coord/polar/Polar.js        |   33 +
 en/builder/src/echarts/coord/radar/Radar.js        |    2 +-
 en/builder/src/echarts/echarts.js                  |   90 +-
 en/builder/src/echarts/export.js                   |    2 +-
 en/builder/src/echarts/lang.js                     |   10 +
 en/builder/src/echarts/langEN.js                   |   10 +
 en/builder/src/echarts/langES.js                   |   10 +
 en/builder/src/echarts/langFI.js                   |   10 +
 en/builder/src/echarts/langTH.js                   |   10 +
 en/builder/src/echarts/layout/barGrid.js           |   19 +-
 en/builder/src/echarts/model/Global.js             |    4 +-
 en/builder/src/echarts/model/Series.js             |    5 +
 en/builder/src/echarts/model/mixin/dataFormat.js   |    2 +
 en/builder/src/echarts/model/mixin/lineStyle.js    |   10 +-
 .../src/echarts/preprocessor/backwardCompat.js     |   10 +-
 en/builder/src/echarts/processor/dataStack.js      |    2 +-
 en/builder/src/echarts/util/graphic.js             |   83 +-
 en/builder/src/echarts/util/number.js              |    2 +-
 en/builder/src/echarts/visual/dataColor.js         |   22 +-
 en/builder/src/echarts/visual/seriesColor.js       |   10 +-
 en/builder/src/zrender/Layer.js                    |    6 +-
 en/builder/src/zrender/Painter.js                  |    8 +-
 en/builder/src/zrender/animation/track.js          |    0
 en/builder/src/zrender/config.js                   |    7 +-
 en/builder/src/zrender/core/PathProxy.js           |   11 +-
 en/builder/src/zrender/core/env.js                 |    2 +
 en/builder/src/zrender/core/log.js                 |   16 +-
 en/builder/src/zrender/core/matrix.js              |    2 +
 en/builder/src/zrender/core/timsort.js             |    4 +-
 en/builder/src/zrender/core/util.js                |    8 +-
 en/builder/src/zrender/core/vector.js              |    1 +
 en/builder/src/zrender/graphic/States.js           |    3 +
 en/builder/src/zrender/graphic/Style.js            |    4 +-
 en/builder/src/zrender/graphic/helper/text.js      |    3 +-
 en/builder/src/zrender/mixin/Animatable.js         |    4 +-
 en/builder/src/zrender/svg/Painter.js              |   15 +-
 en/builder/src/zrender/svg/graphic.js              |    9 +-
 .../src/zrender/svg/helper/GradientManager.js      |    6 +-
 en/builder/src/zrender/svg/helper/ShadowManager.js |    5 +-
 en/builder/src/zrender/vml/Painter.js              |    4 +-
 en/builder/src/zrender/zrender.js                  |    2 +-
 en/changelog.html                                  |   71 +-
 en/cheat-sheet.html                                |    2 +-
 en/coding-standard.html                            |    2 +-
 en/committers.html                                 |    4 +-
 en/css/ecOption.css                                |   22 +-
 en/css/main.css                                    |    2 +-
 en/css/spreadsheet.css                             |   16 -
 en/dependencies.html                               |    2 +-
 en/dist/echarts-en.common.js                       | 1551 ++++++++++++----
 en/dist/echarts-en.common.min.js                   |    2 +-
 en/dist/echarts-en.js                              | 1851 +++++++++++++++-----
 en/dist/echarts-en.js.map                          |    2 +-
 en/dist/echarts-en.min.js                          |    2 +-
 en/dist/echarts-en.simple.js                       |  866 ++++++---
 en/dist/echarts-en.simple.min.js                   |    2 +-
 en/dist/echarts.common.js                          | 1551 ++++++++++++----
 en/dist/echarts.common.min.js                      |    2 +-
 en/dist/echarts.js                                 | 1851 +++++++++++++++-----
 en/dist/echarts.js.map                             |    2 +-
 en/dist/echarts.min.js                             |    2 +-
 en/dist/echarts.simple.js                          |  866 ++++++---
 en/dist/echarts.simple.min.js                      |    2 +-
 en/dist/extension/bmap.js                          |   17 +
 en/dist/extension/bmap.js.map                      |    2 +-
 en/dist/extension/bmap.min.js                      |    2 +-
 en/dist/extension/dataTool.js                      |   17 +-
 en/dist/extension/dataTool.js.map                  |    2 +-
 en/dist/extension/dataTool.min.js                  |    2 +-
 en/documents/en/api.json                           |    2 +-
 en/documents/en/changelog.html                     |   69 +-
 en/documents/en/option-gl.json                     |    2 +-
 en/documents/zh/changelog.html                     |   47 +-
 en/download-extension.html                         |    2 +-
 en/download-map.html                               |    2 +-
 en/download-theme.html                             |    2 +-
 en/download.html                                   |    4 +-
 en/faq.html                                        |    2 +-
 en/feature.html                                    |    2 +-
 en/images/company/company1.jpg                     |  Bin 10003 -> 11324 bytes
 en/images/company/company10.jpg                    |  Bin 10815 -> 7953 bytes
 en/images/company/company11.jpg                    |  Bin 10948 -> 8823 bytes
 en/images/company/company12.jpg                    |  Bin 6647 -> 9716 bytes
 en/images/company/company13.jpg                    |  Bin 7396 -> 7639 bytes
 en/images/company/company14.jpg                    |  Bin 7136 -> 7003 bytes
 en/images/company/company15.jpg                    |  Bin 7150 -> 10120 bytes
 en/images/company/company16.jpg                    |  Bin 5899 -> 10401 bytes
 en/images/company/company17.jpg                    |  Bin 8680 -> 9665 bytes
 en/images/company/company17.png                    |  Bin 37432 -> 32161 bytes
 en/images/company/company18.jpg                    |  Bin 8590 -> 11317 bytes
 en/images/company/company19.jpg                    |  Bin 6425 -> 11519 bytes
 en/images/company/company2.jpg                     |  Bin 11482 -> 10556 bytes
 en/images/company/company20.jpg                    |  Bin 7178 -> 11313 bytes
 en/images/company/company21.jpg                    |  Bin 5760 -> 6808 bytes
 en/images/company/company22.jpg                    |  Bin 7825 -> 8389 bytes
 en/images/company/company23.jpg                    |  Bin 7382 -> 9652 bytes
 en/images/company/company24.jpg                    |  Bin 8602 -> 9962 bytes
 en/images/company/company3.jpg                     |  Bin 7722 -> 14135 bytes
 en/images/company/company4.jpg                     |  Bin 7510 -> 9337 bytes
 en/images/company/company5.jpg                     |  Bin 8923 -> 11358 bytes
 en/images/company/company6.jpg                     |  Bin 7918 -> 10886 bytes
 en/images/company/company7.jpg                     |  Bin 7919 -> 10223 bytes
 en/images/company/company8.jpg                     |  Bin 5779 -> 8969 bytes
 en/images/company/company9.jpg                     |  Bin 9989 -> 6736 bytes
 en/images/people/company23.png                     |  Bin 0 -> 21862 bytes
 en/images/people/dave.jpg                          |  Bin 0 -> 16282 bytes
 en/images/people/shengwu.jpg                       |  Bin 0 -> 21227 bytes
 en/images/people/tedliu.jpg                        |  Bin 0 -> 20061 bytes
 en/images/people/weizhi.jpg                        |  Bin 7060 -> 2755 bytes
 en/index.html                                      |    4 +-
 en/js/docTool/main.js                              |   16 +-
 en/js/spreadsheet/spreadsheet.js                   |   50 +-
 en/maillist.html                                   |    2 +-
 en/option-gl.html                                  |    8 +-
 en/option.html                                     |    8 +-
 en/option3.html                                    |    2 +-
 en/tutorial.html                                   |    8 +-
 examples/en/editor.html                            |    4 +-
 examples/en/index.html                             |    4 +-
 examples/en/view.html                              |    4 +-
 examples/vendors/echarts/echarts.js                | 1851 +++++++++++++++-----
 examples/vendors/echarts/echarts.min.js            |    2 +-
 examples/vendors/echarts/extension/bmap.js         |   17 +
 examples/vendors/echarts/extension/bmap.js.map     |    2 +-
 examples/vendors/echarts/extension/bmap.min.js     |    2 +-
 examples/vendors/echarts/extension/dataTool.js     |   17 +-
 examples/vendors/echarts/extension/dataTool.js.map |    2 +-
 examples/vendors/echarts/extension/dataTool.min.js |    2 +-
 examples/zh/editor.html                            |    4 +-
 examples/zh/index.html                             |    4 +-
 examples/zh/view.html                              |    4 +-
 js/docTool/main.js                                 |   16 +-
 js/spreadsheet/spreadsheet.js                      |   50 +-
 zh/404.html                                        |    2 +-
 zh/api.html                                        |    8 +-
 zh/builder.html                                    |    2 +-
 zh/builder/src/echarts/chart/bar/BarSeries.js      |    5 +
 zh/builder/src/echarts/chart/bar/BarView.js        |  106 +-
 .../echarts/chart/candlestick/candlestickLayout.js |    4 +-
 zh/builder/src/echarts/chart/custom.js             |   42 +-
 .../src/echarts/chart/helper/EffectSymbol.js       |    9 +-
 .../src/echarts/chart/helper/LargeSymbolDraw.js    |   27 +-
 zh/builder/src/echarts/chart/line/LineSeries.js    |    2 +-
 zh/builder/src/echarts/chart/line/LineView.js      |  159 +-
 zh/builder/src/echarts/chart/lines/LinesSeries.js  |    3 +
 zh/builder/src/echarts/chart/lines/LinesView.js    |    9 +
 zh/builder/src/echarts/chart/pie/PieSeries.js      |    4 +-
 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 +-
 zh/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 +-
 zh/builder/src/echarts/component/graphic.js        |   55 +-
 zh/builder/src/echarts/component/helper/MapDraw.js |   49 +-
 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 +-
 zh/builder/src/echarts/coord/polar/Polar.js        |   33 +
 zh/builder/src/echarts/coord/radar/Radar.js        |    2 +-
 zh/builder/src/echarts/echarts.js                  |   90 +-
 zh/builder/src/echarts/export.js                   |    2 +-
 zh/builder/src/echarts/lang.js                     |   10 +
 zh/builder/src/echarts/langEN.js                   |   10 +
 zh/builder/src/echarts/langES.js                   |   10 +
 zh/builder/src/echarts/langFI.js                   |   10 +
 zh/builder/src/echarts/langTH.js                   |   10 +
 zh/builder/src/echarts/layout/barGrid.js           |   19 +-
 zh/builder/src/echarts/model/Global.js             |    4 +-
 zh/builder/src/echarts/model/Series.js             |    5 +
 zh/builder/src/echarts/model/mixin/dataFormat.js   |    2 +
 zh/builder/src/echarts/model/mixin/lineStyle.js    |   10 +-
 .../src/echarts/preprocessor/backwardCompat.js     |   10 +-
 zh/builder/src/echarts/processor/dataStack.js      |    2 +-
 zh/builder/src/echarts/util/graphic.js             |   83 +-
 zh/builder/src/echarts/util/number.js              |    2 +-
 zh/builder/src/echarts/visual/dataColor.js         |   22 +-
 zh/builder/src/echarts/visual/seriesColor.js       |   10 +-
 zh/builder/src/zrender/Layer.js                    |    6 +-
 zh/builder/src/zrender/Painter.js                  |    8 +-
 zh/builder/src/zrender/animation/track.js          |    0
 zh/builder/src/zrender/config.js                   |    7 +-
 zh/builder/src/zrender/core/PathProxy.js           |   11 +-
 zh/builder/src/zrender/core/env.js                 |    2 +
 zh/builder/src/zrender/core/log.js                 |   16 +-
 zh/builder/src/zrender/core/matrix.js              |    2 +
 zh/builder/src/zrender/core/timsort.js             |    4 +-
 zh/builder/src/zrender/core/util.js                |    8 +-
 zh/builder/src/zrender/core/vector.js              |    1 +
 zh/builder/src/zrender/graphic/States.js           |    3 +
 zh/builder/src/zrender/graphic/Style.js            |    4 +-
 zh/builder/src/zrender/graphic/helper/text.js      |    3 +-
 zh/builder/src/zrender/mixin/Animatable.js         |    4 +-
 zh/builder/src/zrender/svg/Painter.js              |   15 +-
 zh/builder/src/zrender/svg/graphic.js              |    9 +-
 .../src/zrender/svg/helper/GradientManager.js      |    6 +-
 zh/builder/src/zrender/svg/helper/ShadowManager.js |    5 +-
 zh/builder/src/zrender/vml/Painter.js              |    4 +-
 zh/builder/src/zrender/zrender.js                  |    2 +-
 zh/builder3.html                                   |    2 +-
 zh/changelog.html                                  |   49 +-
 zh/cheat-sheet.html                                |    2 +-
 zh/coding-standard.html                            |    2 +-
 zh/committers.html                                 |    4 +-
 zh/css/ecOption.css                                |   22 +-
 zh/css/main.css                                    |    2 +-
 zh/css/spreadsheet.css                             |   16 -
 zh/demo.html                                       |    2 +-
 zh/dependencies.html                               |    2 +-
 zh/dist/echarts-en.common.js                       | 1551 ++++++++++++----
 zh/dist/echarts-en.common.min.js                   |    2 +-
 zh/dist/echarts-en.js                              | 1851 +++++++++++++++-----
 zh/dist/echarts-en.js.map                          |    2 +-
 zh/dist/echarts-en.min.js                          |    2 +-
 zh/dist/echarts-en.simple.js                       |  866 ++++++---
 zh/dist/echarts-en.simple.min.js                   |    2 +-
 zh/dist/echarts.common.js                          | 1551 ++++++++++++----
 zh/dist/echarts.common.min.js                      |    2 +-
 zh/dist/echarts.js                                 | 1851 +++++++++++++++-----
 zh/dist/echarts.js.map                             |    2 +-
 zh/dist/echarts.min.js                             |    2 +-
 zh/dist/echarts.simple.js                          |  866 ++++++---
 zh/dist/echarts.simple.min.js                      |    2 +-
 zh/dist/extension/bmap.js                          |   17 +
 zh/dist/extension/bmap.js.map                      |    2 +-
 zh/dist/extension/bmap.min.js                      |    2 +-
 zh/dist/extension/dataTool.js                      |   17 +-
 zh/dist/extension/dataTool.js.map                  |    2 +-
 zh/dist/extension/dataTool.min.js                  |    2 +-
 zh/documents/en/api.json                           |    2 +-
 zh/documents/en/changelog.html                     |   69 +-
 zh/documents/en/option-gl.json                     |    2 +-
 zh/documents/zh/changelog.html                     |   47 +-
 zh/download-extension.html                         |    2 +-
 zh/download-map.html                               |    2 +-
 zh/download-theme.html                             |    2 +-
 zh/download.html                                   |    4 +-
 zh/download3.html                                  |    4 +-
 zh/examples.html                                   |    2 +-
 zh/faq.html                                        |    2 +-
 zh/feature.html                                    |    2 +-
 zh/images/company/company1.jpg                     |  Bin 10003 -> 11324 bytes
 zh/images/company/company10.jpg                    |  Bin 10815 -> 7953 bytes
 zh/images/company/company11.jpg                    |  Bin 10948 -> 8823 bytes
 zh/images/company/company12.jpg                    |  Bin 6647 -> 9716 bytes
 zh/images/company/company13.jpg                    |  Bin 7396 -> 7639 bytes
 zh/images/company/company14.jpg                    |  Bin 7136 -> 7003 bytes
 zh/images/company/company15.jpg                    |  Bin 7150 -> 10120 bytes
 zh/images/company/company16.jpg                    |  Bin 5899 -> 10401 bytes
 zh/images/company/company17.jpg                    |  Bin 8680 -> 9665 bytes
 zh/images/company/company17.png                    |  Bin 37432 -> 32161 bytes
 zh/images/company/company18.jpg                    |  Bin 8590 -> 11317 bytes
 zh/images/company/company19.jpg                    |  Bin 6425 -> 11519 bytes
 zh/images/company/company2.jpg                     |  Bin 11482 -> 10556 bytes
 zh/images/company/company20.jpg                    |  Bin 7178 -> 11313 bytes
 zh/images/company/company21.jpg                    |  Bin 5760 -> 6808 bytes
 zh/images/company/company22.jpg                    |  Bin 7825 -> 8389 bytes
 zh/images/company/company23.jpg                    |  Bin 7382 -> 9652 bytes
 zh/images/company/company24.jpg                    |  Bin 8602 -> 9962 bytes
 zh/images/company/company3.jpg                     |  Bin 7722 -> 14135 bytes
 zh/images/company/company4.jpg                     |  Bin 7510 -> 9337 bytes
 zh/images/company/company5.jpg                     |  Bin 8923 -> 11358 bytes
 zh/images/company/company6.jpg                     |  Bin 7918 -> 10886 bytes
 zh/images/company/company7.jpg                     |  Bin 7919 -> 10223 bytes
 zh/images/company/company8.jpg                     |  Bin 5779 -> 8969 bytes
 zh/images/company/company9.jpg                     |  Bin 9989 -> 6736 bytes
 zh/images/people/company23.png                     |  Bin 0 -> 21862 bytes
 zh/images/people/dave.jpg                          |  Bin 0 -> 16282 bytes
 zh/images/people/shengwu.jpg                       |  Bin 0 -> 21227 bytes
 zh/images/people/tedliu.jpg                        |  Bin 0 -> 20061 bytes
 zh/images/people/weizhi.jpg                        |  Bin 7060 -> 2755 bytes
 zh/index.html                                      |    4 +-
 zh/js/docTool/main.js                              |   16 +-
 zh/js/spreadsheet/spreadsheet.js                   |   50 +-
 zh/maillist.html                                   |    2 +-
 zh/option-gl.html                                  |    8 +-
 zh/option.html                                     |    8 +-
 zh/option3.html                                    |    8 +-
 zh/spreadsheet.html                                |    8 +-
 zh/tutorial.html                                   |    8 +-
 334 files changed, 17302 insertions(+), 5955 deletions(-)

diff --git a/documents/en/api.json b/documents/en/api.json
index 3f320fd..45097fa 100644
--- a/documents/en/api.json
+++ b/documents/en/api.json
@@ -1 +1 @@
-{"$schema":"http://echarts.baidu.com/doc/json-schem","option":{"type":"Object","properties":{"echarts":{"type":["Object"],"description":"<p>Global echarts object, which can be accessed after including <code>echarts.js</code> in script tag or through <code>require(&#39;echarts&#39;)</code> in AMD environment.</p>\n","properties":{"init":{"type":["Function"],"description":"<pre><code class=\"lang-js\">(dom: HTMLDivElement|HTMLCanvasElement, theme?: Object|string, opts?: {\n    devicePixelR [...]
\ No newline at end of file
+{"$schema":"http://echarts.baidu.com/doc/json-schem","option":{"type":"Object","properties":{"echarts":{"type":["Object"],"description":"<p>Global echarts object, which can be accessed after including <code>echarts.js</code> in script tag or through <code>require(&#39;echarts&#39;)</code> in AMD environment.</p>\n","properties":{"init":{"type":["Function"],"description":"<pre><code class=\"lang-js\">(dom: HTMLDivElement|HTMLCanvasElement, theme?: Object|string, opts?: {\n    devicePixelR [...]
\ No newline at end of file
diff --git a/documents/en/changelog.html b/documents/en/changelog.html
index cb4480c..e331e6c 100644
--- a/documents/en/changelog.html
+++ b/documents/en/changelog.html
@@ -1,4 +1,45 @@
-<h2 id="v4-3-0-rc-1">v4.3.0-rc.1</h2>
+<h2 id="v4-4-0-rc-1">v4.4.0-rc.1</h2>
+<div class="time">2019-09-29</div>
+
+<ul>
+<li><p>[Feature] Add option <code>clip</code> for <code>line</code>, <code>bar</code>, <code>lines</code>, <code>scatter</code> and <code>custom series</code>,
+which prevents the shapes overflow the area of the coordinate system. And support setting
+<code>filterMode</code> on <code>toolbox.dataZoom</code>. Fix #9200, #10224, #10748, #11086.</p>
+</li>
+<li><p>[Feature] Support &quot;select all&quot; and &quot;reverse select&quot; buttons in <code>legend</code>. See <code>legend.selector</code> for details.</p>
+</li>
+<li><p>[Feature] Provide <code>echarts.graphic.registerShape</code> and <code>echarts.graphic.getShapeClass</code>.
+The registered shape classes can be used in <code>custom series</code> and <code>graphic component</code>.</p>
+</li>
+<li><p>[Feature] Support show border style on <code>legend</code> item. Support setting <code>itemStyle</code> on <code>legend</code>. Fix #7340.</p>
+</li>
+<li><p>[Feature] Support expansion animation for data update, support <code>pie-series.animationTypeUpdate</code>. Fix #11029.</p>
+</li>
+<li><p>[Feature] Support setting <code>rippleEffect.color</code> in <code>effectScatter</code>.</p>
+</li>
+<li><p>[Feature] Support using BaiduMap API version 3.0 in bmap by option <code>bmap.mapStyleV2</code>.</p>
+</li>
+<li><p>[Fix] Fix that the stacked bar exceed zoom limit.
+Fix #7534, #7672, #7732, #7872, #8069, #8520, #8935, #8955, #9200, #9237, #9847, #10359, #10518, #10972.</p>
+</li>
+<li><p>[Fix] Fix that sometimes when using &quot;toolbox dataZoom&quot; it can not return to the original state. Fix #11055.</p>
+</li>
+<li><p>[Fix] Fix the texture pattern rendering in <code>map</code> and <code>geo</code>. And Fix that the the shadow of them are different between canvas renderer and SVG renderer. Fix #11055, #5429.</p>
+</li>
+<li><p>[Fix] Fix that data does not rendered after a <code>NaN</code> value in candlestick. Fix #11101.</p>
+</li>
+<li><p>[Fix] Fix <code>geo.label.formatter</code> does not work. Fix #8489.</p>
+</li>
+<li><p>[Fix] Fix the hover style incorrect in <code>custom series</code>. Fix #11103.</p>
+</li>
+<li><p>[Fix] Fix that tree root node disappears after roaming. Fix #10291, #10986, #10164, #9580, #9256, #9216.</p>
+</li>
+<li><p>[Fix] Fix that SVG renderer should render normally despite hover layer set. Fix #11054.</p>
+</li>
+<li><p>[Fix] Add dispose checking for chart instance.</p>
+</li>
+</ul>
+<h2 id="v4-3-0">v4.3.0</h2>
 <div class="time">2019-08-27</div>
 
 <ul>
@@ -382,7 +423,7 @@ Fix that the line label can not be returned to its original opacity after <code>
 <div class="time">2018-01-16</div>
 
 <ul>
-<li><p>[+] Supported to render up to <strong>tens millions of data</strong> directly。ECharts4 has upgrade to stream architecture, and along with detailed optimization, it has supported to render incrementally loaded data and support progressive rendering.</p>
+<li><p>[+] Supported to render up to <strong>tens millions of data</strong> directly. ECharts4 has upgrade to stream architecture, and along with detailed optimization, it has supported to render incrementally loaded data and support progressive rendering.</p>
 <ul>
 <li>Ten millions of GIS data probably take up to about hundreds MB of space. In this case chunked data loading or WebStock is required for the purpose of display graphics as soon as possible and not blocking the browser while processing loaded data. The samples of incremental data loading can be checked here: <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=scatterGL-gps&amp;gl=1">scatterGL-gps</a> and <a href="https://ecomfe.github.io/echarts-examples/public/edito [...]
 <li>Supported the human interactions in the big data scenario, where continuous interactions (e.g., roam in geo and cartesian) will not block the browser. Benefit from the using of GPU and avoiding of layout recalculation, ECharts GL provides smooth interactions, which has been demonstrated in the examples above. Without WebGL, the basic ECharts implements progressive rendering to support non-blocking interaction, which can be checked at the pan and zoom in <a href="https://ecomfe.github [...]
@@ -390,7 +431,7 @@ Fix that the line label can not be returned to its original opacity after <code>
 </li>
 <li><p>[+] <strong>Published ZRender SVG Rendering Engine</strong> as an alternative backend of ECharts besides the existing Canvas Rendering Engine. The choice of rendering engine usually depends on the scenario, for example, benefit from the low memory cost, SVG Rendering Engine is suitable for mobile device, or the case that many ECharts instances exists in a single page, while the Canvas Rendering Engine is suitable for big data rendering or when visual effects required. Canvas Rende [...]
 </li>
-<li><p>[+] <strong>Published Sunburst Chart</strong> to visualize hierarchical data efficiently with excellent interactions. See [examples] and (excellent) and <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-sunburst">docs</a>。</p>
+<li><p>[+] <strong>Published Sunburst Chart</strong> to visualize hierarchical data efficiently with excellent interactions. See [examples] and (excellent) and <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-sunburst">docs</a>.</p>
 </li>
 <li><p>[+] <strong>Published <a href="http://echarts.baidu.com/tutorial.html#%E6%95%B0%E6%8D%AE%E9%9B%86%EF%BC%88dataset%EF%BC%89">dataset</a> component</strong> to support data based configuration, visual encoding and data sharing in different series.</p>
 </li>
@@ -554,7 +595,7 @@ Fix that the line label can not be returned to its original opacity after <code>
 </li>
 <li><p>[+] Supported <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#xAxis.minInterval">minInterval</a> on time axis (that is, <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#xAxis.type">axis.type</a> is <code>&#39;time&#39;</code>), and supported <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#xAxis.maxInterval">maxInterval</a> on value axis (that is <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#xAxis.type [...]
 </li>
-<li><p>[+] Supported <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#xAxis.axisLine.onZeroAxisIndex">xAxis.axisLine.onZeroAxisIndex</a>, which enables specifing corresponding relationship when multiple axes used and <code>onZero</code> is required. See <a href="https://github.com/ecomfe/echarts/issues/5069">#5069</a>。</p>
+<li><p>[+] Supported <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#xAxis.axisLine.onZeroAxisIndex">xAxis.axisLine.onZeroAxisIndex</a>, which enables specifing corresponding relationship when multiple axes used and <code>onZero</code> is required. See <a href="https://github.com/ecomfe/echarts/issues/5069">#5069</a>.</p>
 </li>
 <li><p>[+] Supported that do not use <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-custom.coordinateSystems">coordinate system</a> in <code>custom series</code>.</p>
 </li>
@@ -582,7 +623,7 @@ Fix that the line label can not be returned to its original opacity after <code>
 </li>
 <li><p>[+] Fixed the incorrect rendering when the first entry was empty in <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-candlestick">candlestick</a>. See <a href="https://github.com/ecomfe/echarts/issues/6059">#6059</a>.</p>
 </li>
-<li><p>[^] Fixed that <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-bar.dimensions">series-bar.dimensions</a> did not work. See <a href="https://github.com/ecomfe/echarts/issues/6252">#6252</a>。</p>
+<li><p>[^] Fixed that <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-bar.dimensions">series-bar.dimensions</a> did not work. See <a href="https://github.com/ecomfe/echarts/issues/6252">#6252</a>.</p>
 </li>
 <li><p>[^] Fixed that when chilren number of group was not fixed, they could not be removed correctly in <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-custom">custom series</a>.</p>
 </li>
@@ -599,7 +640,7 @@ Fix that the line label can not be returned to its original opacity after <code>
 <div class="time">2017-06-15</div>
 
 <ul>
-<li><p>[+] Supported draw <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-custom">custom series</a> on <a href="https://github.com/ecomfe/echarts/tree/master/extension/bmap">Baidu Map (bmap)</a>. See <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=map-polygon">example 1</a> and <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=map-bin">example 2</a>。</p>
+<li><p>[+] Supported draw <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-custom">custom series</a> on <a href="https://github.com/ecomfe/echarts/tree/master/extension/bmap">Baidu Map (bmap)</a>. See <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=map-polygon">example 1</a> and <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=map-bin">example 2</a>.</p>
 </li>
 <li><p>[+] Supported show parent labels in <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-treemap">treemap</a>. See <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=treemap-show-parent">example</a>. See <a href="https://github.com/ecomfe/echarts/issues/5869">#5869</a> and <a href="https://github.com/ecomfe/echarts/issues/5579">#5579</a>.</p>
 </li>
@@ -640,9 +681,9 @@ Fix that the line label can not be returned to its original opacity after <code>
 <div class="time">2017-05-25</div>
 
 <ul>
-<li><p><strong>[+] Published <a href="http://echarts.baidu.com/option.html#series-custom">custom series</a></strong>, which enables user to customize render logic and make new types of chart. See <a href="http://echarts.baidu.com/examples.html#chart-type-custom">samples</a>。</p>
+<li><p><strong>[+] Published <a href="http://echarts.baidu.com/option.html#series-custom">custom series</a></strong>, which enables user to customize render logic and make new types of chart. See <a href="http://echarts.baidu.com/examples.html#chart-type-custom">samples</a>.</p>
 </li>
-<li><p><strong>[+] Supported polar bar chart</strong>. See <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=bar-polar-stack">sample1</a>, <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=bar-polar-stack-radial">sample2</a>, <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=bar-polar-real-estate">sample3</a>。</p>
+<li><p><strong>[+] Supported polar bar chart</strong>. See <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=bar-polar-stack">sample1</a>, <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=bar-polar-stack-radial">sample2</a>, <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=bar-polar-real-estate">sample3</a>.</p>
 </li>
 <li><p>[+] Supported <a href="http://echarts.baidu.com/option.html#series-scatter.encode">encode</a>, which enable user to specify which dimensions in <a href="http://echarts.baidu.com/option.html#series-scatter.data">data</a> are mapped to which axis of coordinate system. Or which dimensions will be displayed in <a href="http://echarts.baidu.com/option.html#tooltip">tooltip</a> or <a href="http://echarts.baidu.com/option.html#series-scatter.label">label</a>. [Break Change]: The default  [...]
 </li>
@@ -706,13 +747,13 @@ Fix that the line label can not be returned to its original opacity after <code>
 <div class="time">2017-04-05</div>
 
 <ul>
-<li><p>[+] Supported <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#useUTC">useUTC</a>, which enables display <code>axisLabel</code> and <code>tooltip</code> in local time or UTC. Related default setttings are modified: <code>axisLabel</code> and <code>tooltip</code> display local time by default, and <code>data</code> recognize time string as local time if timezone not specified. See <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-line.dat [...]
+<li><p>[+] Supported <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#useUTC">useUTC</a>, which enables display <code>axisLabel</code> and <code>tooltip</code> in local time or UTC. Related default setttings are modified: <code>axisLabel</code> and <code>tooltip</code> display local time by default, and <code>data</code> recognize time string as local time if timezone not specified. See <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-line.dat [...]
 </li>
 <li><p>[+] Supported <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#xAxis.axisLabel.showMinLabel">axisLabel.showMinLabel</a> and <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#xAxis.axisLabel.showMaxLabel">axisLabel.showMaxLabel</a>.</p>
 </li>
 <li><p>[+] Supported <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-funnel.sort">funnel.sort</a>, which enables sorting funnel by index or customized function.</p>
 </li>
-<li><p>[^] Fixed float error of <code>axisTick</code>. See <a href="https://github.com/ecomfe/echarts/issues/5041">#5041</a>。</p>
+<li><p>[^] Fixed float error of <code>axisTick</code>. See <a href="https://github.com/ecomfe/echarts/issues/5041">#5041</a>.</p>
 </li>
 <li><p>[^] Fixed that <code>axisTick</code> did not display when value was too small. See <a href="https://github.com/ecomfe/echarts/issues/5386">#5386</a>.</p>
 </li>
@@ -720,7 +761,7 @@ Fix that the line label can not be returned to its original opacity after <code>
 </li>
 <li><p>[^] Fixed that <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#visualMap">visualMap</a> disabled <code>itemStyle</code> of <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-map">map</a>. See <a href="https://github.com/ecomfe/echarts/issues/5388">#5388</a>.</p>
 </li>
-<li><p>[^] Fixed that <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#tooltip.trigger">tooltip.trigger</a> did not support <code>&#39;none&#39;</code>. See <a href="https://github.com/ecomfe/echarts/issues/5400">#5400</a>。</p>
+<li><p>[^] Fixed that <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#tooltip.trigger">tooltip.trigger</a> did not support <code>&#39;none&#39;</code>. See <a href="https://github.com/ecomfe/echarts/issues/5400">#5400</a>.</p>
 </li>
 <li><p>[^] Fixed problem of <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-sankey">sankey</a> on ie11. See <a href="https://github.com/ecomfe/echarts/issues/3306">#3306</a>.</p>
 </li>
@@ -778,9 +819,9 @@ Fix that the line label can not be returned to its original opacity after <code>
 <div class="time">2017-01-12</div>
 
 <ul>
-<li><p><strong>[+] Published <code>pictorialBar</code> chart:<a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-pictorialBar">pictorialBar</a>。See <a href="https://ecomfe.github.io/echarts-examples/public/index.html#chart-type-pictorialBar">example</a>。</strong></p>
+<li><p><strong>[+] Published <code>pictorialBar</code> chart:<a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-pictorialBar">pictorialBar</a>. See <a href="https://ecomfe.github.io/echarts-examples/public/index.html#chart-type-pictorialBar">example</a>.</strong></p>
 </li>
-<li><p><strong>[+] Published <code>themeRiver</code> chart:<a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-themeRiver">themeRiver</a>。See <a href="https://ecomfe.github.io/echarts-examples/public/index.html#chart-type-themeRiver">example</a>。</strong></p>
+<li><p><strong>[+] Published <code>themeRiver</code> chart:<a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-themeRiver">themeRiver</a>.See <a href="https://ecomfe.github.io/echarts-examples/public/index.html#chart-type-themeRiver">example</a>.</strong></p>
 </li>
 <li><p>[+] A specified <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#geo">geo coordinate system</a> has been able to be used in <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-map">map series</a>. (In the past map series could only creat an inner exclusive geo coodinate system). Thus, <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-map">map series</a> can be used to control color of a geo component. Moreover, a g [...]
 </li>
@@ -839,7 +880,7 @@ Fix that the line label can not be returned to its original opacity after <code>
 </li>
 <li><p>[^] Fix that erroneously forbiden default pan behavior in touch device. See <a href="https://github.com/ecomfe/echarts/issues/4393">#4393</a>.</p>
 </li>
-<li><p>[^] Enhance user experience for <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#geo">geo</a> / <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-map">map</a> in touche device。</p>
+<li><p>[^] Enhance user experience for <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#geo">geo</a> / <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-map">map</a> in touche device.</p>
 </li>
 <li><p>[^] Fix calculation error of <a href="https://ecomfe.github.io/echarts-doc/public/en/api.html#echartsInstance.containPixel">containPixel</a> in <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#geo">geo</a> / <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-graph">graph</a>. See <a href="https://github.com/ecomfe/echarts/issues/4405">#4405</a>.</p>
 </li>
diff --git a/documents/en/option-gl.json b/documents/en/option-gl.json
index 17ac83f..3209dac 100644
--- a/documents/en/option-gl.json
+++ b/documents/en/option-gl.json
@@ -1 +1 @@
-{"$schema":"http://echarts.baidu.com/doc/json-schem","option":{"type":"Object","properties":{"globe":{"type":["Object"],"description":"<p>地球组件。组件提供了地球的绘制以及相应的坐标系,开发者可以在上面展示三维的散点图,气泡图,柱状图,飞线图。</p>\n","properties":{"show":{"type":["boolean"],"description":"<p>是否显示地球组件。</p>\n","default":true},"globeRadius":{"type":["number"],"description":"<p>地球的半径。单位相对于三维空间,跟 <a href=\"#globe.viewControl.distance\">viewControl.distance</a> 相关。</p>\n","default":100},"baseTexture":{"type":["string","HTMLImag [...]
\ No newline at end of file
+{"$schema":"http://echarts.baidu.com/doc/json-schem","option":{"type":"Object","properties":{"globe":{"type":["Object"],"description":"<p>地球组件。组件提供了地球的绘制以及相应的坐标系,开发者可以在上面展示三维的散点图,气泡图,柱状图,飞线图。</p>\n","properties":{"show":{"type":["boolean"],"description":"<p>是否显示地球组件。</p>\n","default":true},"globeRadius":{"type":["number"],"description":"<p>地球的半径。单位相对于三维空间,跟 <a href=\"#globe.viewControl.distance\">viewControl.distance</a> 相关。</p>\n","default":100},"baseTexture":{"type":["string","HTMLImag [...]
\ No newline at end of file
diff --git a/documents/zh/changelog.html b/documents/zh/changelog.html
index 36d2a5b..c254d5c 100644
--- a/documents/zh/changelog.html
+++ b/documents/zh/changelog.html
@@ -1,4 +1,45 @@
-<h2 id="v4-3-0-rc-1">v4.3.0-rc.1</h2>
+<h2 id="v4-4-0-rc-1">v4.4.0-rc.1</h2>
+<div class="time">2019-09-29</div>
+
+<ul>
+<li><p>[Feature] Add option <code>clip</code> for <code>line</code>, <code>bar</code>, <code>lines</code>, <code>scatter</code> and <code>custom series</code>,
+which prevents the shapes overflow the area of the coordinate system. And support setting
+<code>filterMode</code> on <code>toolbox.dataZoom</code>. Fix #9200, #10224, #10748, #11086.</p>
+</li>
+<li><p>[Feature] Support &quot;select all&quot; and &quot;reverse select&quot; buttons in <code>legend</code>. See <code>legend.selector</code> for details.</p>
+</li>
+<li><p>[Feature] Provide <code>echarts.graphic.registerShape</code> and <code>echarts.graphic.getShapeClass</code>.
+The registered shape classes can be used in <code>custom series</code> and <code>graphic component</code>.</p>
+</li>
+<li><p>[Feature] Support show border style on <code>legend</code> item. Support setting <code>itemStyle</code> on <code>legend</code>. Fix #7340.</p>
+</li>
+<li><p>[Feature] Support expansion animation for data update, support <code>pie-series.animationTypeUpdate</code>. Fix #11029.</p>
+</li>
+<li><p>[Feature] Support setting <code>rippleEffect.color</code> in <code>effectScatter</code>.</p>
+</li>
+<li><p>[Feature] Support using BaiduMap API version 3.0 in bmap by option <code>bmap.mapStyleV2</code>.</p>
+</li>
+<li><p>[Fix] Fix that the stacked bar exceed zoom limit.
+Fix #7534, #7672, #7732, #7872, #8069, #8520, #8935, #8955, #9200, #9237, #9847, #10359, #10518, #10972.</p>
+</li>
+<li><p>[Fix] Fix that sometimes when using &quot;toolbox dataZoom&quot; it can not return to the original state. Fix #11055.</p>
+</li>
+<li><p>[Fix] Fix the texture pattern rendering in <code>map</code> and <code>geo</code>. And Fix that the the shadow of them are different between canvas renderer and SVG renderer. Fix #11055, #5429.</p>
+</li>
+<li><p>[Fix] Fix that data does not rendered after a <code>NaN</code> value in candlestick. Fix #11101.</p>
+</li>
+<li><p>[Fix] Fix <code>geo.label.formatter</code> does not work. Fix #8489.</p>
+</li>
+<li><p>[Fix] Fix the hover style incorrect in <code>custom series</code>. Fix #11103.</p>
+</li>
+<li><p>[Fix] Fix that tree root node disappears after roaming. Fix #10291, #10986, #10164, #9580, #9256, #9216.</p>
+</li>
+<li><p>[Fix] Fix that SVG renderer should render normally despite hover layer set. Fix #11054.</p>
+</li>
+<li><p>[Fix] Add dispose checking for chart instance.</p>
+</li>
+</ul>
+<h2 id="v4-3-0">v4.3.0</h2>
 <div class="time">2019-08-27</div>
 
 <ul>
@@ -884,7 +925,7 @@ Fix that the line label can not be returned to its original opacity after <code>
 <div class="time">2016-11-01</div>
 
 <ul>
-<li><p>[+] 开放坐标转换 API:<a href="http://echarts.baidu.com/api.html#echartsInstance.convertToPixel">convertToPixel</a> 和 <a href="http://echarts.baidu.com/api.html#echartsInstance.convertFromPixel">convertFromPixel</a>。参见例子 [<a href="http://echarts.baidu.com/gallery/editor.html?c=line-draggable">http://echarts.baidu.com/gallery/editor.html?c=line-draggable</a>] 和 [<a href="http://echarts.baidu.com/gallery/editor.html?c=line-pen">http://echarts.baidu.com/gallery/editor.html?c=line-pen</a>]</p>
+<li><p>[+] 开放坐标转换 API:<a href="http://echarts.baidu.com/api.html#echartsInstance.convertToPixel">convertToPixel</a> 和 <a href="http://echarts.baidu.com/api.html#echartsInstance.convertFromPixel">convertFromPixel</a>。参见例子 [<a href="http://echarts.baidu.com/gallery/editor.html?c=line-draggable]">http://echarts.baidu.com/gallery/editor.html?c=line-draggable]</a> 和 [<a href="http://echarts.baidu.com/gallery/editor.html?c=line-pen]">http://echarts.baidu.com/gallery/editor.html?c=line-pen]</a></p>
 </li>
 <li><p>[+] 开放坐标判断 API:<a href="http://echarts.baidu.com/api.html#echartsInstance.containPixel">containPixel</a>。</p>
 </li>
@@ -1075,7 +1116,7 @@ Fix that the line label can not be returned to its original opacity after <code>
 </li>
 <li><p>[^] 平行坐标优化</p>
 <ul>
-<li><p>[^] 新增 <a href="http://echarts.baidu.com/option.html#parallel.axisExpandable">parallel.axisExpandable</a>,改善高维数据(大量坐标轴)的展示。参见例子 [<a href="http://echarts.baidu.com/gallery/editor.html?c=map-parallel-prices">http://echarts.baidu.com/gallery/editor.html?c=map-parallel-prices</a>]</p>
+<li><p>[^] 新增 <a href="http://echarts.baidu.com/option.html#parallel.axisExpandable">parallel.axisExpandable</a>,改善高维数据(大量坐标轴)的展示。参见例子 [<a href="http://echarts.baidu.com/gallery/editor.html?c=map-parallel-prices]">http://echarts.baidu.com/gallery/editor.html?c=map-parallel-prices]</a></p>
 </li>
 <li><p>[^] 新增 <a href="http://echarts.baidu.com/option.html#parallelAxis.realtime">parallelAxis.realtime</a></p>
 </li>
diff --git a/en/404.html b/en/404.html
index 78075c3..50a4f0c 100644
--- a/en/404.html
+++ b/en/404.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"><!--  [...]
+<!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"><!--  [...]
 </script><script type="text/javascript" src="./vendors/pace/pace.min.js"></script><script id="font-hack" type="text/javascript">if (/windows/i.test(navigator.userAgent)) {
     var el = document.createElement('style');
     el.innerHTML = ''
diff --git a/en/api.html b/en/api.html
index 1f74ec1..a027e3f 100644
--- a/en/api.html
+++ b/en/api.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en-US"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"><!--  [...]
+<!DOCTYPE html><html lang="en-US"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"><!--  [...]
 </script><script type="text/javascript" src="./vendors/pace/pace.min.js"></script><script id="font-hack" type="text/javascript">if (/windows/i.test(navigator.userAgent)) {
     var el = document.createElement('style');
     el.innerHTML = ''
@@ -6,7 +6,7 @@
         + '@font-face {font-family:"noto-light";src:local("Microsoft Yahei");}';
     document.head.insertBefore(el, document.getElementById('font-hack'));
 }
-</script><title>ECharts Documentation</title><link rel="stylesheet" type="text/css" href="css/ecOption.css?_v_=1568871110616"><link rel="stylesheet" type="text/css" href="vendors/prettify/prettify.css"><link rel="stylesheet" type="text/css" href="vendors/perfect-scrollbar/0.6.8/css/perfect-scrollbar.min.css"><link rel="stylesheet" type="text/css" href="vendors/jquery-autocomplete/jquery.auto-complete.css"><link rel="stylesheet" type="text/css" href="vendors/twentytwenty/twentytwenty.css" [...]
+</script><title>ECharts Documentation</title><link rel="stylesheet" type="text/css" href="css/ecOption.css?_v_=1569839875536"><link rel="stylesheet" type="text/css" href="vendors/prettify/prettify.css"><link rel="stylesheet" type="text/css" href="vendors/perfect-scrollbar/0.6.8/css/perfect-scrollbar.min.css"><link rel="stylesheet" type="text/css" href="vendors/jquery-autocomplete/jquery.auto-complete.css"><link rel="stylesheet" type="text/css" href="vendors/twentytwenty/twentytwenty.css" [...]
 <!--[if (gt IE 8)|!(IE)]><body class="undefined"></body><![endif]--><div id="apache-banner"><div class="txt"><p>Apache ECharts is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.</p><p>We are working on redirecting this Website to <a href="https://echarts.apache.org" target="_blank">https://echarts.apache.org</a>. You may visit our new official Website now.</p></div><a href="https://echarts.apache.org" target="_blank" onclick="lo [...]
     pageName: 'api',
     initHash: 'echarts',
@@ -28,7 +28,7 @@
 var vendorPath = '../vendors';
 
 define('globalArgs', extend({
-    version: '1568871110616',
+    version: '1569839875536',
     basePath: './',
     // Schema url is added by each doc page
     schemaUrl: '',
@@ -55,7 +55,7 @@ require.config({
         hasher: vendorPath + '/hasher/1.2.0/hasher.min',
         perfectScrollbar: vendorPath + '/perfect-scrollbar/0.6.8/js/perfect-scrollbar'
     },
-    urlArgs: '_v_=1568871110616'
+    urlArgs: '_v_=1569839875536'
 });
 
 require(['docTool/main'], function (main) {
diff --git a/en/builder.html b/en/builder.html
index 0552053..2164ffa 100644
--- a/en/builder.html
+++ b/en/builder.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en-US"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"><!--  [...]
+<!DOCTYPE html><html lang="en-US"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"><!--  [...]
 </script><script type="text/javascript" src="./vendors/pace/pace.min.js"></script><script id="font-hack" type="text/javascript">if (/windows/i.test(navigator.userAgent)) {
     var el = document.createElement('style');
     el.innerHTML = ''
diff --git a/en/builder/src/echarts/chart/bar/BarSeries.js b/en/builder/src/echarts/chart/bar/BarSeries.js
index f478ae6..955f076 100644
--- a/en/builder/src/echarts/chart/bar/BarSeries.js
+++ b/en/builder/src/echarts/chart/bar/BarSeries.js
@@ -43,5 +43,10 @@ export default BaseBarSeries.extend({
     }
 
     return progressiveThreshold;
+  },
+  defaultOption: {
+    // If clipped
+    // Only available on cartesian2d
+    clip: true
   }
 });
\ No newline at end of file
diff --git a/en/builder/src/echarts/chart/bar/BarView.js b/en/builder/src/echarts/chart/bar/BarView.js
index 373db08..c50072f 100644
--- a/en/builder/src/echarts/chart/bar/BarView.js
+++ b/en/builder/src/echarts/chart/bar/BarView.js
@@ -25,11 +25,37 @@ import Model from '../../model/Model';
 import barItemStyle from './barItemStyle';
 import Path from 'zrender/src/graphic/Path';
 import { throttle } from '../../util/throttle';
+import { createClipPath } from '../helper/createClipPathFromCoordSys';
 var BAR_BORDER_WIDTH_QUERY = ['itemStyle', 'barBorderWidth'];
 var _eventPos = [0, 0]; // FIXME
 // Just for compatible with ec2.
 
 zrUtil.extend(Model.prototype, barItemStyle);
+
+function getClipArea(coord, data) {
+  var coordSysClipArea = coord.getArea && coord.getArea();
+
+  if (coord.type === 'cartesian2d') {
+    var baseAxis = coord.getBaseAxis(); // When boundaryGap is false or using time axis. bar may exceed the grid.
+    // We should not clip this part.
+    // See test/bar2.html
+
+    if (baseAxis.type !== 'category' || !baseAxis.onBand) {
+      var expandWidth = data.getLayout('bandWidth');
+
+      if (baseAxis.isHorizontal()) {
+        coordSysClipArea.x -= expandWidth;
+        coordSysClipArea.width += expandWidth * 2;
+      } else {
+        coordSysClipArea.y -= expandWidth;
+        coordSysClipArea.height += expandWidth * 2;
+      }
+    }
+  }
+
+  return coordSysClipArea;
+}
+
 export default echarts.extendChartView({
   type: 'bar',
   render: function (seriesModel, ecModel, api) {
@@ -76,6 +102,12 @@ export default echarts.extendChartView({
     }
 
     var animationModel = seriesModel.isAnimationEnabled() ? seriesModel : null;
+    var needsClip = seriesModel.get('clip', true);
+    var coordSysClipArea = getClipArea(coord, data); // If there is clipPath created in large mode. Remove it.
+
+    group.removeClipPath(); // We don't use clipPath in normal mode because we needs a perfect animation
+    // And don't want the label are clipped.
+
     data.diff(oldData).add(function (dataIndex) {
       if (!data.hasValue(dataIndex)) {
         return;
@@ -83,6 +115,18 @@ export default echarts.extendChartView({
 
       var itemModel = data.getItemModel(dataIndex);
       var layout = getLayout[coord.type](data, dataIndex, itemModel);
+
+      if (needsClip) {
+        // Clip will modify the layout params.
+        // And return a boolean to determine if the shape are fully clipped.
+        var isClipped = clip[coord.type](coordSysClipArea, layout);
+
+        if (isClipped) {
+          group.remove(el);
+          return;
+        }
+      }
+
       var el = elementCreator[coord.type](data, dataIndex, itemModel, layout, isHorizontalOrRadial, animationModel);
       data.setItemGraphicEl(dataIndex, el);
       group.add(el);
@@ -98,6 +142,15 @@ export default echarts.extendChartView({
       var itemModel = data.getItemModel(newIndex);
       var layout = getLayout[coord.type](data, newIndex, itemModel);
 
+      if (needsClip) {
+        var isClipped = clip[coord.type](coordSysClipArea, layout);
+
+        if (isClipped) {
+          group.remove(el);
+          return;
+        }
+      }
+
       if (el) {
         graphic.updateProps(el, {
           shape: layout
@@ -124,7 +177,15 @@ export default echarts.extendChartView({
   _renderLarge: function (seriesModel, ecModel, api) {
     this._clear();
 
-    createLarge(seriesModel, this.group);
+    createLarge(seriesModel, this.group); // Use clipPath in large mode.
+
+    var clipPath = seriesModel.get('clip', true) ? createClipPath(seriesModel.coordinateSystem, false, seriesModel) : null;
+
+    if (clipPath) {
+      this.group.setClipPath(clipPath);
+    } else {
+      this.group.removeClipPath();
+    }
   },
   _incrementalRenderLarge: function (params, seriesModel) {
     createLarge(seriesModel, this.group, true);
@@ -152,6 +213,49 @@ export default echarts.extendChartView({
     this._data = null;
   }
 });
+var mathMax = Math.max;
+var mathMin = Math.min;
+var clip = {
+  cartesian2d: function (coordSysBoundingRect, layout) {
+    var signWidth = layout.width < 0 ? -1 : 1;
+    var signHeight = layout.height < 0 ? -1 : 1; // Needs positive width and height
+
+    if (signWidth < 0) {
+      layout.x += layout.width;
+      layout.width = -layout.width;
+    }
+
+    if (signHeight < 0) {
+      layout.y += layout.height;
+      layout.height = -layout.height;
+    }
+
+    var x = mathMax(layout.x, coordSysBoundingRect.x);
+    var x2 = mathMin(layout.x + layout.width, coordSysBoundingRect.x + coordSysBoundingRect.width);
+    var y = mathMax(layout.y, coordSysBoundingRect.y);
+    var y2 = mathMin(layout.y + layout.height, coordSysBoundingRect.y + coordSysBoundingRect.height);
+    layout.x = x;
+    layout.y = y;
+    layout.width = x2 - x;
+    layout.height = y2 - y;
+    var clipped = layout.width < 0 || layout.height < 0; // Reverse back
+
+    if (signWidth < 0) {
+      layout.x += layout.width;
+      layout.width = -layout.width;
+    }
+
+    if (signHeight < 0) {
+      layout.y += layout.height;
+      layout.height = -layout.height;
+    }
+
+    return clipped;
+  },
+  polar: function (coordSysClipArea) {
+    return false;
+  }
+};
 var elementCreator = {
   cartesian2d: function (data, dataIndex, itemModel, layout, isHorizontal, animationModel, isUpdate) {
     var rect = new graphic.Rect({
diff --git a/en/builder/src/echarts/chart/candlestick/candlestickLayout.js b/en/builder/src/echarts/chart/candlestick/candlestickLayout.js
index f104d48..c30a6d9 100644
--- a/en/builder/src/echarts/chart/candlestick/candlestickLayout.js
+++ b/en/builder/src/echarts/chart/candlestick/candlestickLayout.js
@@ -117,7 +117,7 @@ export default {
 
     function largeProgress(params, data) {
       // Structure: [sign, x, yhigh, ylow, sign, x, yhigh, ylow, ...]
-      var points = new LargeArr(params.count * 5);
+      var points = new LargeArr(params.count * 4);
       var offset = 0;
       var point;
       var tmpIn = [];
@@ -133,7 +133,7 @@ export default {
 
         if (isNaN(axisDimVal) || isNaN(lowestVal) || isNaN(highestVal)) {
           points[offset++] = NaN;
-          offset += 4;
+          offset += 3;
           continue;
         }
 
diff --git a/en/builder/src/echarts/chart/custom.js b/en/builder/src/echarts/chart/custom.js
index f49e30f..ca0795d 100644
--- a/en/builder/src/echarts/chart/custom.js
+++ b/en/builder/src/echarts/chart/custom.js
@@ -26,6 +26,7 @@ import DataDiffer from '../data/DataDiffer';
 import SeriesModel from '../model/Series';
 import Model from '../model/Model';
 import ChartView from '../view/Chart';
+import { createClipPath } from './helper/createClipPathFromCoordSys';
 import prepareCartesian2d from '../coord/cartesian/prepareCustom';
 import prepareGeo from '../coord/geo/prepareCustom';
 import prepareSingleAxis from '../coord/single/prepareCustom';
@@ -70,7 +71,12 @@ SeriesModel.extend({
     zlevel: 0,
     z: 2,
     legendHoverLink: true,
-    useTransform: true // Cartesian coordinate system
+    useTransform: true,
+    // Custom series will not clip by default.
+    // Some case will use custom series to draw label
+    // For example https://echarts.apache.org/examples/en/editor.html?c=custom-gantt-flight
+    // Only works on polar and cartesian2d coordinate system.
+    clip: false // Cartesian coordinate system
     // xAxisIndex: 0,
     // yAxisIndex: 0,
     // Polar coordinate system
@@ -131,7 +137,16 @@ ChartView.extend({
     }).remove(function (oldIdx) {
       var el = oldData.getItemGraphicEl(oldIdx);
       el && group.remove(el);
-    }).execute();
+    }).execute(); // Do clipping
+
+    var clipPath = customSeries.get('clip', true) ? createClipPath(customSeries.coordinateSystem, false, customSeries) : null;
+
+    if (clipPath) {
+      group.setClipPath(clipPath);
+    } else {
+      group.removeClipPath();
+    }
+
     this._data = data;
   },
   incrementalPrepareRender: function (customSeries, ecModel, api) {
@@ -184,7 +199,8 @@ ChartView.extend({
 
 function createEl(elOption) {
   var graphicType = elOption.type;
-  var el;
+  var el; // Those graphic elements are not shapes. They should not be
+  // overwritten by users, so do them first.
 
   if (graphicType === 'path') {
     var shape = elOption.shape; // Using pathRect brings convenience to users sacle svg path.
@@ -205,8 +221,12 @@ function createEl(elOption) {
   } else if (graphicType === 'text') {
     el = new graphicUtil.Text({});
     el.__customText = elOption.style.text;
+  } else if (graphicType === 'group') {
+    el = new graphicUtil.Group();
+  } else if (graphicType === 'compoundPath') {
+    throw new Error('"compoundPath" is not supported yet.');
   } else {
-    var Clz = graphicUtil[graphicType.charAt(0).toUpperCase() + graphicType.slice(1)];
+    var Clz = graphicUtil.getShapeClass(graphicType);
     el = new Clz();
   }
 
@@ -275,19 +295,13 @@ function updateEl(el, dataIndex, elOption, animatableModel, data, isInit, isRoot
   elOption.hasOwnProperty('info') && el.attr('info', elOption.info); // If `elOption.styleEmphasis` is `false`, remove hover style. The
   // logic is ensured by `graphicUtil.setElementHoverStyle`.
 
-  var styleEmphasis = elOption.styleEmphasis;
-  var disableStyleEmphasis = styleEmphasis === false;
+  var styleEmphasis = elOption.styleEmphasis; // hoverStyle should always be set here, because if the hover style
+  // may already be changed, where the inner cache should be reset.
 
-  if (!( // Try to escapse setting hover style for performance.
-  el.__cusHasEmphStl && styleEmphasis == null || !el.__cusHasEmphStl && disableStyleEmphasis)) {
-    // Should not use graphicUtil.setHoverStyle, since the styleEmphasis
-    // should not be share by group and its descendants.
-    graphicUtil.setElementHoverStyle(el, styleEmphasis);
-    el.__cusHasEmphStl = !disableStyleEmphasis;
-  }
+  graphicUtil.setElementHoverStyle(el, styleEmphasis);
 
   if (isRoot) {
-    graphicUtil.setAsHighDownDispatcher(el, !disableStyleEmphasis);
+    graphicUtil.setAsHighDownDispatcher(el, styleEmphasis !== false);
   }
 }
 
diff --git a/en/builder/src/echarts/chart/helper/EffectSymbol.js b/en/builder/src/echarts/chart/helper/EffectSymbol.js
index ee9ef41..3afb8a7 100644
--- a/en/builder/src/echarts/chart/helper/EffectSymbol.js
+++ b/en/builder/src/echarts/chart/helper/EffectSymbol.js
@@ -37,13 +37,14 @@ function normalizeSymbolSize(symbolSize) {
 }
 
 function updateRipplePath(rippleGroup, effectCfg) {
+  var color = effectCfg.rippleEffectColor || effectCfg.color;
   rippleGroup.eachChild(function (ripplePath) {
     ripplePath.attr({
       z: effectCfg.z,
       zlevel: effectCfg.zlevel,
       style: {
-        stroke: effectCfg.brushType === 'stroke' ? effectCfg.color : null,
-        fill: effectCfg.brushType === 'fill' ? effectCfg.color : null
+        stroke: effectCfg.brushType === 'stroke' ? color : null,
+        fill: effectCfg.brushType === 'fill' ? color : null
       }
     });
   });
@@ -82,9 +83,6 @@ effectSymbolProto.startEffectAnimation = function (effectCfg) {
   var rippleGroup = this.childAt(1);
 
   for (var i = 0; i < EFFECT_RIPPLE_NUMBER; i++) {
-    // var ripplePath = createSymbol(
-    //     symbolType, -0.5, -0.5, 1, 1, color
-    // );
     // If width/height are set too small (e.g., set to 1) on ios10
     // and macOS Sierra, a circle stroke become a rect, no matter what
     // the scale is set. So we set width/height as 2. See #4136.
@@ -189,6 +187,7 @@ effectSymbolProto.updateData = function (data, idx) {
   effectCfg.zlevel = itemModel.getShallow('zlevel') || 0;
   effectCfg.symbolType = symbolType;
   effectCfg.color = color;
+  effectCfg.rippleEffectColor = itemModel.get('rippleEffect.color');
   this.off('mouseover').off('mouseout').off('emphasis').off('normal');
 
   if (effectCfg.showEffectOn === 'render') {
diff --git a/en/builder/src/echarts/chart/helper/LargeSymbolDraw.js b/en/builder/src/echarts/chart/helper/LargeSymbolDraw.js
index b1613f6..d17858b 100644
--- a/en/builder/src/echarts/chart/helper/LargeSymbolDraw.js
+++ b/en/builder/src/echarts/chart/helper/LargeSymbolDraw.js
@@ -28,6 +28,7 @@ var LargeSymbolPath = graphic.extendShape({
     points: null
   },
   symbolProxy: null,
+  softClipShape: null,
   buildPath: function (path, shape) {
     var points = shape.points;
     var size = shape.size;
@@ -48,6 +49,10 @@ var LargeSymbolPath = graphic.extendShape({
         continue;
       }
 
+      if (this.softClipShape && !this.softClipShape.contain(x, y)) {
+        continue;
+      }
+
       symbolProxyShape.x = x - size[0] / 2;
       symbolProxyShape.y = y - size[1] / 2;
       symbolProxyShape.width = size[0];
@@ -73,6 +78,10 @@ var LargeSymbolPath = graphic.extendShape({
 
       if (isNaN(x) || isNaN(y)) {
         continue;
+      }
+
+      if (this.softClipShape && !this.softClipShape.contain(x, y)) {
+        continue;
       } // fillRect is faster than building a rect path and draw.
       // And it support light globalCompositeOperation.
 
@@ -119,10 +128,12 @@ largeSymbolProto.isPersistent = function () {
 /**
  * Update symbols draw by new data
  * @param {module:echarts/data/List} data
+ * @param {Object} opt
+ * @param {Object} [opt.clipShape]
  */
 
 
-largeSymbolProto.updateData = function (data) {
+largeSymbolProto.updateData = function (data, opt) {
   this.group.removeAll();
   var symbolEl = new LargeSymbolPath({
     rectHover: true,
@@ -132,7 +143,7 @@ largeSymbolProto.updateData = function (data) {
     points: data.getLayout('symbolPoints')
   });
 
-  this._setCommon(symbolEl, data);
+  this._setCommon(symbolEl, data, false, opt);
 
   this.group.add(symbolEl);
   this._incremental = null;
@@ -175,7 +186,7 @@ largeSymbolProto.incrementalPrepareUpdate = function (data) {
   }
 };
 
-largeSymbolProto.incrementalUpdate = function (taskParams, data) {
+largeSymbolProto.incrementalUpdate = function (taskParams, data, opt) {
   var symbolEl;
 
   if (this._incremental) {
@@ -197,11 +208,12 @@ largeSymbolProto.incrementalUpdate = function (taskParams, data) {
     points: data.getLayout('symbolPoints')
   });
 
-  this._setCommon(symbolEl, data, !!this._incremental);
+  this._setCommon(symbolEl, data, !!this._incremental, opt);
 };
 
-largeSymbolProto._setCommon = function (symbolEl, data, isIncremental) {
-  var hostModel = data.hostModel; // TODO
+largeSymbolProto._setCommon = function (symbolEl, data, isIncremental, opt) {
+  var hostModel = data.hostModel;
+  opt = opt || {}; // TODO
   // if (data.hasItemVisual.symbolSize) {
   //     // TODO typed array?
   //     symbolEl.setShape('sizes', data.mapArray(
@@ -215,7 +227,8 @@ largeSymbolProto._setCommon = function (symbolEl, data, isIncremental) {
 
   var size = data.getVisual('symbolSize');
   symbolEl.setShape('size', size instanceof Array ? size : [size, size]); // }
-  // Create symbolProxy to build path for each data
+
+  symbolEl.softClipShape = opt.clipShape || null; // Create symbolProxy to build path for each data
 
   symbolEl.symbolProxy = createSymbol(data.getVisual('symbol'), 0, 0, 0, 0); // Use symbolProxy setColor method
 
diff --git a/en/builder/src/echarts/chart/helper/createClipPathFromCoordSys.js b/en/builder/src/echarts/chart/helper/createClipPathFromCoordSys.js
new file mode 100644
index 0000000..b57df2f
--- /dev/null
+++ b/en/builder/src/echarts/chart/helper/createClipPathFromCoordSys.js
@@ -0,0 +1,96 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+import * as graphic from '../../util/graphic';
+import { round } from '../../util/number';
+
+function createGridClipPath(cartesian, hasAnimation, seriesModel) {
+  var rect = cartesian.getArea();
+  var isHorizontal = cartesian.getBaseAxis().isHorizontal();
+  var x = rect.x;
+  var y = rect.y;
+  var width = rect.width;
+  var height = rect.height;
+  var lineWidth = seriesModel.get('lineStyle.width') || 2; // Expand the clip path a bit to avoid the border is clipped and looks thinner
+
+  x -= lineWidth / 2;
+  y -= lineWidth / 2;
+  width += lineWidth;
+  height += lineWidth;
+  var clipPath = new graphic.Rect({
+    shape: {
+      x: x,
+      y: y,
+      width: width,
+      height: height
+    }
+  });
+
+  if (hasAnimation) {
+    clipPath.shape[isHorizontal ? 'width' : 'height'] = 0;
+    graphic.initProps(clipPath, {
+      shape: {
+        width: width,
+        height: height
+      }
+    }, seriesModel);
+  }
+
+  return clipPath;
+}
+
+function createPolarClipPath(polar, hasAnimation, seriesModel) {
+  var sectorArea = polar.getArea(); // Avoid float number rounding error for symbol on the edge of axis extent.
+
+  var clipPath = new graphic.Sector({
+    shape: {
+      cx: round(polar.cx, 1),
+      cy: round(polar.cy, 1),
+      r0: round(sectorArea.r0, 1),
+      r: round(sectorArea.r, 1),
+      startAngle: sectorArea.startAngle,
+      endAngle: sectorArea.endAngle,
+      clockwise: sectorArea.clockwise
+    }
+  });
+
+  if (hasAnimation) {
+    clipPath.shape.endAngle = sectorArea.startAngle;
+    graphic.initProps(clipPath, {
+      shape: {
+        endAngle: sectorArea.endAngle
+      }
+    }, seriesModel);
+  }
+
+  return clipPath;
+}
+
+function createClipPath(coordSys, hasAnimation, seriesModel) {
+  if (!coordSys) {
+    return null;
+  } else if (coordSys.type === 'polar') {
+    return createPolarClipPath(coordSys, hasAnimation, seriesModel);
+  } else if (coordSys.type === 'cartesian2d') {
+    return createGridClipPath(coordSys, hasAnimation, seriesModel);
+  }
+
+  return null;
+}
+
+export { createGridClipPath, createPolarClipPath, createClipPath };
\ No newline at end of file
diff --git a/en/builder/src/echarts/chart/line/LineSeries.js b/en/builder/src/echarts/chart/line/LineSeries.js
index bf53f8f..1e43f84 100644
--- a/en/builder/src/echarts/chart/line/LineSeries.js
+++ b/en/builder/src/echarts/chart/line/LineSeries.js
@@ -36,7 +36,7 @@ export default SeriesModel.extend({
     // yAxisIndex: 0,
     // polarIndex: 0,
     // If clip the overflow value
-    clipOverflow: true,
+    clip: true,
     // cursor: null,
     label: {
       position: 'top'
diff --git a/en/builder/src/echarts/chart/line/LineView.js b/en/builder/src/echarts/chart/line/LineView.js
index 07707ae..2de3855 100644
--- a/en/builder/src/echarts/chart/line/LineView.js
+++ b/en/builder/src/echarts/chart/line/LineView.js
@@ -26,8 +26,8 @@ import * as graphic from '../../util/graphic';
 import * as modelUtil from '../../util/model';
 import { Polyline, Polygon } from './poly';
 import ChartView from '../../view/Chart';
-import { round } from '../../util/number';
 import { prepareDataCoordInfo, getStackedOnPoint } from './helper';
+import { createGridClipPath, createPolarClipPath } from '../helper/createClipPathFromCoordSys';
 
 function isPointsSame(points1, points2) {
   if (points1.length !== points2.length) {
@@ -49,20 +49,6 @@ function isPointsSame(points1, points2) {
 function getSmooth(smooth) {
   return typeof smooth === 'number' ? smooth : smooth ? 0.5 : 0;
 }
-
-function getAxisExtentWithGap(axis) {
-  var extent = axis.getGlobalExtent();
-
-  if (axis.onBand) {
-    // Remove extra 1px to avoid line miter in clipped edge
-    var halfBandWidth = axis.getBandWidth() / 2 - 1;
-    var dir = extent[1] > extent[0] ? 1 : -1;
-    extent[0] += dir * halfBandWidth;
-    extent[1] -= dir * halfBandWidth;
-  }
-
-  return extent;
-}
 /**
  * @param {module:echarts/coord/cartesian/Cartesian2D|module:echarts/coord/polar/Polar} coordSys
  * @param {module:echarts/data/List} data
@@ -85,98 +71,6 @@ function getStackedOnPoints(coordSys, data, dataCoordInfo) {
   return points;
 }
 
-function createGridClipShape(cartesian, hasAnimation, forSymbol, seriesModel) {
-  var xExtent = getAxisExtentWithGap(cartesian.getAxis('x'));
-  var yExtent = getAxisExtentWithGap(cartesian.getAxis('y'));
-  var isHorizontal = cartesian.getBaseAxis().isHorizontal();
-  var x = Math.min(xExtent[0], xExtent[1]);
-  var y = Math.min(yExtent[0], yExtent[1]);
-  var width = Math.max(xExtent[0], xExtent[1]) - x;
-  var height = Math.max(yExtent[0], yExtent[1]) - y; // Avoid float number rounding error for symbol on the edge of axis extent.
-  // See #7913 and `test/dataZoom-clip.html`.
-
-  if (forSymbol) {
-    x -= 0.5;
-    width += 0.5;
-    y -= 0.5;
-    height += 0.5;
-  } else {
-    var lineWidth = seriesModel.get('lineStyle.width') || 2; // Expand clip shape to avoid clipping when line value exceeds axis
-
-    var expandSize = seriesModel.get('clipOverflow') ? lineWidth / 2 : Math.max(width, height);
-
-    if (isHorizontal) {
-      y -= expandSize;
-      height += expandSize * 2;
-    } else {
-      x -= expandSize;
-      width += expandSize * 2;
-    }
-  }
-
-  var clipPath = new graphic.Rect({
-    shape: {
-      x: x,
-      y: y,
-      width: width,
-      height: height
-    }
-  });
-
-  if (hasAnimation) {
-    clipPath.shape[isHorizontal ? 'width' : 'height'] = 0;
-    graphic.initProps(clipPath, {
-      shape: {
-        width: width,
-        height: height
-      }
-    }, seriesModel);
-  }
-
-  return clipPath;
-}
-
-function createPolarClipShape(polar, hasAnimation, forSymbol, seriesModel) {
-  var angleAxis = polar.getAngleAxis();
-  var radiusAxis = polar.getRadiusAxis();
-  var radiusExtent = radiusAxis.getExtent().slice();
-  radiusExtent[0] > radiusExtent[1] && radiusExtent.reverse();
-  var angleExtent = angleAxis.getExtent();
-  var RADIAN = Math.PI / 180; // Avoid float number rounding error for symbol on the edge of axis extent.
-
-  if (forSymbol) {
-    radiusExtent[0] -= 0.5;
-    radiusExtent[1] += 0.5;
-  }
-
-  var clipPath = new graphic.Sector({
-    shape: {
-      cx: round(polar.cx, 1),
-      cy: round(polar.cy, 1),
-      r0: round(radiusExtent[0], 1),
-      r: round(radiusExtent[1], 1),
-      startAngle: -angleExtent[0] * RADIAN,
-      endAngle: -angleExtent[1] * RADIAN,
-      clockwise: angleAxis.inverse
-    }
-  });
-
-  if (hasAnimation) {
-    clipPath.shape.endAngle = -angleExtent[0] * RADIAN;
-    graphic.initProps(clipPath, {
-      shape: {
-        endAngle: -angleExtent[1] * RADIAN
-      }
-    }, seriesModel);
-  }
-
-  return clipPath;
-}
-
-function createClipShape(coordSys, hasAnimation, forSymbol, seriesModel) {
-  return coordSys.type === 'polar' ? createPolarClipShape(coordSys, hasAnimation, forSymbol, seriesModel) : createGridClipShape(coordSys, hasAnimation, forSymbol, seriesModel);
-}
-
 function turnPointsIntoStep(points, coordSys, stepTurnAt) {
   var baseAxis = coordSys.getBaseAxis();
   var baseIndex = baseAxis.dim === 'x' || baseAxis.dim === 'radius' ? 0 : 1;
@@ -362,6 +256,30 @@ function canShowAllSymbolForCategory(categoryAxis, data) {
   return true;
 }
 
+function createLineClipPath(coordSys, hasAnimation, seriesModel) {
+  if (coordSys.type === 'cartesian2d') {
+    var isHorizontal = coordSys.getBaseAxis().isHorizontal();
+    var clipPath = createGridClipPath(coordSys, hasAnimation, seriesModel); // Expand clip shape to avoid clipping when line value exceeds axis
+
+    if (!seriesModel.get('clip', true)) {
+      var rectShape = clipPath.shape;
+      var expandSize = Math.max(rectShape.width, rectShape.height);
+
+      if (isHorizontal) {
+        rectShape.y -= expandSize;
+        rectShape.height += expandSize * 2;
+      } else {
+        rectShape.x -= expandSize;
+        rectShape.width += expandSize * 2;
+      }
+    }
+
+    return clipPath;
+  } else {
+    return createPolarClipPath(coordSys, hasAnimation, seriesModel);
+  }
+}
+
 export default ChartView.extend({
   type: 'line',
   init: function () {
@@ -406,12 +324,29 @@ export default ChartView.extend({
 
     group.add(lineGroup); // FIXME step not support polar
 
-    var step = !isCoordSysPolar && seriesModel.get('step'); // Initialization animation or coordinate system changed
+    var step = !isCoordSysPolar && seriesModel.get('step');
+    var clipShapeForSymbol;
+
+    if (coordSys && coordSys.getArea) {
+      clipShapeForSymbol = coordSys.getArea(); // Avoid float number rounding error for symbol on the edge of axis extent.
+      // See #7913 and `test/dataZoom-clip.html`.
+
+      if (clipShapeForSymbol.width != null) {
+        clipShapeForSymbol.x -= 0.1;
+        clipShapeForSymbol.y -= 0.1;
+        clipShapeForSymbol.width += 0.2;
+        clipShapeForSymbol.height += 0.2;
+      } else if (clipShapeForSymbol.r0) {
+        clipShapeForSymbol.r0 -= 0.5;
+        clipShapeForSymbol.r1 += 0.5;
+      }
+    } // Initialization animation or coordinate system changed
+
 
     if (!(polyline && prevCoordSys.type === coordSys.type && step === this._step)) {
       showSymbol && symbolDraw.updateData(data, {
         isIgnore: isIgnoreFunc,
-        clipShape: createClipShape(coordSys, false, true, seriesModel)
+        clipShape: clipShapeForSymbol
       });
 
       if (step) {
@@ -426,7 +361,7 @@ export default ChartView.extend({
         polygon = this._newPolygon(points, stackedOnPoints, coordSys, hasAnimation);
       }
 
-      lineGroup.setClipPath(createClipShape(coordSys, true, false, seriesModel));
+      lineGroup.setClipPath(createLineClipPath(coordSys, true, seriesModel));
     } else {
       if (isAreaChart && !polygon) {
         // If areaStyle is added
@@ -438,12 +373,12 @@ export default ChartView.extend({
       } // Update clipPath
 
 
-      lineGroup.setClipPath(createClipShape(coordSys, false, false, seriesModel)); // Always update, or it is wrong in the case turning on legend
+      lineGroup.setClipPath(createLineClipPath(coordSys, false, seriesModel)); // Always update, or it is wrong in the case turning on legend
       // because points are not changed
 
       showSymbol && symbolDraw.updateData(data, {
         isIgnore: isIgnoreFunc,
-        clipShape: createClipShape(coordSys, false, true, seriesModel)
+        clipShape: clipShapeForSymbol
       }); // Stop symbol animation and sync with line points
       // FIXME performance?
 
diff --git a/en/builder/src/echarts/chart/lines/LinesSeries.js b/en/builder/src/echarts/chart/lines/LinesSeries.js
index 95ff6c1..4622ae7 100644
--- a/en/builder/src/echarts/chart/lines/LinesSeries.js
+++ b/en/builder/src/echarts/chart/lines/LinesSeries.js
@@ -282,6 +282,9 @@ var LinesSeries = SeriesModel.extend({
     // If lines are polyline
     // polyline not support curveness, label, animation
     polyline: false,
+    // If clip the overflow.
+    // Available when coordinateSystem is cartesian or polar.
+    clip: true,
     label: {
       show: false,
       position: 'end' // distance: 5,
diff --git a/en/builder/src/echarts/chart/lines/LinesView.js b/en/builder/src/echarts/chart/lines/LinesView.js
index eaa3139..5c00bb2 100644
--- a/en/builder/src/echarts/chart/lines/LinesView.js
+++ b/en/builder/src/echarts/chart/lines/LinesView.js
@@ -25,6 +25,7 @@ import Polyline from '../helper/Polyline';
 import EffectPolyline from '../helper/EffectPolyline';
 import LargeLineDraw from '../helper/LargeLineDraw';
 import linesLayout from './linesLayout';
+import { createClipPath } from '../helper/createClipPathFromCoordSys';
 export default echarts.extendChartView({
   type: 'lines',
   init: function () {},
@@ -62,6 +63,14 @@ export default echarts.extendChartView({
     }
 
     lineDraw.updateData(data);
+    var clipPath = seriesModel.get('clip', true) && createClipPath(seriesModel.coordinateSystem, false, seriesModel);
+
+    if (clipPath) {
+      this.group.setClipPath(clipPath);
+    } else {
+      this.group.removeClipPath();
+    }
+
     this._lastZlevel = zlevel;
     this._finished = true;
   },
diff --git a/en/builder/src/echarts/chart/pie/PieSeries.js b/en/builder/src/echarts/chart/pie/PieSeries.js
index a54c80e..6b649a9 100644
--- a/en/builder/src/echarts/chart/pie/PieSeries.js
+++ b/en/builder/src/echarts/chart/pie/PieSeries.js
@@ -140,8 +140,10 @@ var PieSeries = echarts.extendSeriesModel({
     itemStyle: {
       borderWidth: 1
     },
-    // Animation type canbe expansion, scale
+    // Animation type. Valid values: expansion, scale
     animationType: 'expansion',
+    // Animation type when update. Valid values: transition, expansion
+    animationTypeUpdate: 'transition',
     animationEasing: 'cubicOut'
   }
 });
diff --git a/en/builder/src/echarts/chart/pie/PieView.js b/en/builder/src/echarts/chart/pie/PieView.js
index f2b9afb..903403d 100644
--- a/en/builder/src/echarts/chart/pie/PieView.js
+++ b/en/builder/src/echarts/chart/pie/PieView.js
@@ -92,6 +92,7 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
   var layout = data.getItemLayout(idx);
   var sectorShape = zrUtil.extend({}, layout);
   sectorShape.label = null;
+  var animationTypeUpdate = seriesModel.getShallow('animationTypeUpdate');
 
   if (firstCreate) {
     sector.setShape(sectorShape);
@@ -114,9 +115,15 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
         }, seriesModel, idx);
       }
   } else {
-    graphic.updateProps(sector, {
-      shape: sectorShape
-    }, seriesModel, idx);
+    if (animationTypeUpdate === 'expansion') {
+      // Sectors are set to be target shape and an overlaying clipPath is used for animation
+      sector.setShape(sectorShape);
+    } else {
+      // Transition animation from the old shape
+      graphic.updateProps(sector, {
+        shape: sectorShape
+      }, seriesModel, idx);
+    }
   } // Update common style
 
 
@@ -129,9 +136,11 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
   var cursorStyle = itemModel.getShallow('cursor');
   cursorStyle && sector.attr('cursor', cursorStyle); // Toggle selected
 
-  toggleItemSelected(this, data.getItemLayout(idx), seriesModel.isSelected(null, idx), seriesModel.get('selectedOffset'), seriesModel.get('animation'));
+  toggleItemSelected(this, data.getItemLayout(idx), seriesModel.isSelected(null, idx), seriesModel.get('selectedOffset'), seriesModel.get('animation')); // Label and text animation should be applied only for transition type animation when update
+
+  var withAnimation = !firstCreate && animationTypeUpdate === 'transition';
 
-  this._updateLabel(data, idx);
+  this._updateLabel(data, idx, withAnimation);
 
   this.highDownOnUpdate = itemModel.get('hoverAnimation') && seriesModel.isAnimationEnabled() ? function (fromState, toState) {
     if (toState === 'emphasis') {
@@ -159,7 +168,7 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
   graphic.setHoverStyle(this);
 };
 
-piePieceProto._updateLabel = function (data, idx) {
+piePieceProto._updateLabel = function (data, idx, withAnimation) {
   var labelLine = this.childAt(1);
   var labelText = this.childAt(2);
   var seriesModel = data.hostModel;
@@ -173,17 +182,30 @@ piePieceProto._updateLabel = function (data, idx) {
     return;
   }
 
-  graphic.updateProps(labelLine, {
-    shape: {
-      points: labelLayout.linePoints || [[labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y]]
-    }
-  }, seriesModel, idx);
-  graphic.updateProps(labelText, {
-    style: {
-      x: labelLayout.x,
-      y: labelLayout.y
-    }
-  }, seriesModel, idx);
+  var targetLineShape = {
+    points: labelLayout.linePoints || [[labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y]]
+  };
+  var targetTextStyle = {
+    x: labelLayout.x,
+    y: labelLayout.y
+  };
+
+  if (withAnimation) {
+    graphic.updateProps(labelLine, {
+      shape: targetLineShape
+    }, seriesModel, idx);
+    graphic.updateProps(labelText, {
+      style: targetTextStyle
+    }, seriesModel, idx);
+  } else {
+    labelLine.attr({
+      shape: targetLineShape
+    });
+    labelText.attr({
+      style: targetTextStyle
+    });
+  }
+
   labelText.attr({
     rotation: labelLayout.rotation,
     origin: [labelLayout.x, labelLayout.y],
@@ -246,6 +268,7 @@ var PieView = ChartView.extend({
     var hasAnimation = ecModel.get('animation');
     var isFirstRender = !oldData;
     var animationType = seriesModel.get('animationType');
+    var animationTypeUpdate = seriesModel.get('animationTypeUpdate');
     var onSectorClick = zrUtil.curry(updateDataSelected, this.uid, seriesModel, hasAnimation, api);
     var selectedMode = seriesModel.get('selectedMode');
     data.diff(oldData).add(function (idx) {
@@ -262,6 +285,13 @@ var PieView = ChartView.extend({
       group.add(piePiece);
     }).update(function (newIdx, oldIdx) {
       var piePiece = oldData.getItemGraphicEl(oldIdx);
+
+      if (!isFirstRender && animationTypeUpdate !== 'transition') {
+        piePiece.eachChild(function (child) {
+          child.stopAnimation(true);
+        });
+      }
+
       piePiece.updateData(data, newIdx);
       piePiece.off('click');
       selectedMode && piePiece.on('click', onSectorClick);
@@ -272,8 +302,7 @@ var PieView = ChartView.extend({
       group.remove(piePiece);
     }).execute();
 
-    if (hasAnimation && isFirstRender && data.count() > 0 // Default expansion animation
-    && animationType !== 'scale') {
+    if (hasAnimation && data.count() > 0 && (isFirstRender ? animationType !== 'scale' : animationTypeUpdate !== 'transition')) {
       var shape = data.getItemLayout(0);
 
       for (var s = 1; isNaN(shape.startAngle) && s < data.count(); ++s) {
@@ -282,7 +311,7 @@ var PieView = ChartView.extend({
 
       var r = Math.max(api.getWidth(), api.getHeight()) / 2;
       var removeClipPath = zrUtil.bind(group.removeClipPath, group);
-      group.setClipPath(this._createClipPath(shape.cx, shape.cy, r, shape.startAngle, shape.clockwise, removeClipPath, seriesModel));
+      group.setClipPath(this._createClipPath(shape.cx, shape.cy, r, shape.startAngle, shape.clockwise, removeClipPath, seriesModel, isFirstRender));
     } else {
       // clipPath is used in first-time animation, so remove it when otherwise. See: #8994
       group.removeClipPath();
@@ -291,7 +320,7 @@ var PieView = ChartView.extend({
     this._data = data;
   },
   dispose: function () {},
-  _createClipPath: function (cx, cy, r, startAngle, clockwise, cb, seriesModel) {
+  _createClipPath: function (cx, cy, r, startAngle, clockwise, cb, seriesModel, isFirstRender) {
     var clipPath = new graphic.Sector({
       shape: {
         cx: cx,
@@ -303,7 +332,8 @@ var PieView = ChartView.extend({
         clockwise: clockwise
       }
     });
-    graphic.initProps(clipPath, {
+    var initOrUpdate = isFirstRender ? graphic.initProps : graphic.updateProps;
+    initOrUpdate(clipPath, {
       shape: {
         endAngle: startAngle + (clockwise ? 1 : -1) * Math.PI * 2
       }
diff --git a/en/builder/src/echarts/chart/sankey/sankeyAction.js b/en/builder/src/echarts/chart/sankey/sankeyAction.js
index ae540f8..2329240 100644
--- a/en/builder/src/echarts/chart/sankey/sankeyAction.js
+++ b/en/builder/src/echarts/chart/sankey/sankeyAction.js
@@ -20,7 +20,7 @@ import * as echarts from '../../echarts';
 import '../helper/focusNodeAdjacencyAction';
 echarts.registerAction({
   type: 'dragNode',
-  event: 'dragNode',
+  event: 'dragnode',
   // here can only use 'update' now, other value is not support in echarts.
   update: 'update'
 }, function (payload, ecModel) {
diff --git a/en/builder/src/echarts/chart/scatter/ScatterSeries.js b/en/builder/src/echarts/chart/scatter/ScatterSeries.js
index f66944c..04dde5b 100644
--- a/en/builder/src/echarts/chart/scatter/ScatterSeries.js
+++ b/en/builder/src/echarts/chart/scatter/ScatterSeries.js
@@ -76,8 +76,11 @@ export default SeriesModel.extend({
     // },
     itemStyle: {
       opacity: 0.8 // color: 各异
-      // progressive: null
 
-    }
+    },
+    // If clip the overflow graphics
+    // Works on cartesian / polar series
+    clip: true // progressive: null
+
   }
 });
\ No newline at end of file
diff --git a/en/builder/src/echarts/chart/scatter/ScatterView.js b/en/builder/src/echarts/chart/scatter/ScatterView.js
index c3b0f04..686924d 100644
--- a/en/builder/src/echarts/chart/scatter/ScatterView.js
+++ b/en/builder/src/echarts/chart/scatter/ScatterView.js
@@ -27,7 +27,13 @@ echarts.extendChartView({
 
     var symbolDraw = this._updateSymbolDraw(data, seriesModel);
 
-    symbolDraw.updateData(data);
+    symbolDraw.updateData(data, {
+      // TODO
+      // If this parameter should be a shape or a bounding volume
+      // shape will be more general.
+      // But bounding volume like bounding rect will be much faster in the contain calculation
+      clipShape: this._getClipShape(seriesModel)
+    });
     this._finished = true;
   },
   incrementalPrepareRender: function (seriesModel, ecModel, api) {
@@ -39,7 +45,9 @@ echarts.extendChartView({
     this._finished = false;
   },
   incrementalRender: function (taskParams, seriesModel, ecModel) {
-    this._symbolDraw.incrementalUpdate(taskParams, seriesModel.getData());
+    this._symbolDraw.incrementalUpdate(taskParams, seriesModel.getData(), {
+      clipShape: this._getClipShape(seriesModel)
+    });
 
     this._finished = taskParams.end === seriesModel.getData().count();
   },
@@ -66,6 +74,11 @@ echarts.extendChartView({
       this._symbolDraw.updateLayout(data);
     }
   },
+  _getClipShape: function (seriesModel) {
+    var coordSys = seriesModel.coordinateSystem;
+    var clipArea = coordSys && coordSys.getArea && coordSys.getArea();
+    return seriesModel.get('clip', true) ? clipArea : null;
+  },
   _updateSymbolDraw: function (data, seriesModel) {
     var symbolDraw = this._symbolDraw;
     var pipelineContext = seriesModel.pipelineContext;
diff --git a/en/builder/src/echarts/chart/sunburst/sunburstLayout.js b/en/builder/src/echarts/chart/sunburst/sunburstLayout.js
index 82585cc..a764421 100644
--- a/en/builder/src/echarts/chart/sunburst/sunburstLayout.js
+++ b/en/builder/src/echarts/chart/sunburst/sunburstLayout.js
@@ -17,8 +17,8 @@
 * under the License.
 */
 import { parsePercent } from '../../util/number';
-import * as zrUtil from 'zrender/src/core/util';
-var PI2 = Math.PI * 2;
+import * as zrUtil from 'zrender/src/core/util'; // var PI2 = Math.PI * 2;
+
 var RADIAN = Math.PI / 180;
 export default function (seriesType, ecModel, api, payload) {
   ecModel.eachSeriesByType(seriesType, function (seriesModel) {
@@ -63,9 +63,9 @@ export default function (seriesType, ecModel, api, payload) {
     var rPerLevel = (r - r0) / (levels || 1);
     var clockwise = seriesModel.get('clockwise');
     var stillShowZeroSum = seriesModel.get('stillShowZeroSum'); // In the case some sector angle is smaller than minAngle
+    // var restAngle = PI2;
+    // var valueSumLargerThanMinAngle = 0;
 
-    var restAngle = PI2;
-    var valueSumLargerThanMinAngle = 0;
     var dir = clockwise ? 1 : -1;
     /**
      * Render a tree
@@ -85,11 +85,11 @@ export default function (seriesType, ecModel, api, payload) {
         var angle = sum === 0 && stillShowZeroSum ? unitRadian : value * unitRadian;
 
         if (angle < minAngle) {
-          angle = minAngle;
-          restAngle -= minAngle;
-        } else {
-          valueSumLargerThanMinAngle += value;
-        }
+          angle = minAngle; // restAngle -= minAngle;
+        } // else {
+        //     valueSumLargerThanMinAngle += value;
+        // }
+
 
         endAngle = startAngle + dir * angle;
         var depth = node.depth - rootDepth - (renderRollupNode ? -1 : 1);
diff --git a/en/builder/src/echarts/chart/tree/TreeSeries.js b/en/builder/src/echarts/chart/tree/TreeSeries.js
index 0f28625..ad9045a 100644
--- a/en/builder/src/echarts/chart/tree/TreeSeries.js
+++ b/en/builder/src/echarts/chart/tree/TreeSeries.js
@@ -108,8 +108,8 @@ export default SeriesModel.extend({
     bottom: '12%',
     // the layout of the tree, two value can be selected, 'orthogonal' or 'radial'
     layout: 'orthogonal',
-    roam: false,
     // true | false | 'move' | 'scale', see module:component/helper/RoamController.
+    roam: false,
     // Symbol size scale ratio in roam
     nodeScaleRatio: 0.4,
     // Default on center of graph
diff --git a/en/builder/src/echarts/chart/tree/TreeView.js b/en/builder/src/echarts/chart/tree/TreeView.js
index 3f99cfe..e70f72b 100644
--- a/en/builder/src/echarts/chart/tree/TreeView.js
+++ b/en/builder/src/echarts/chart/tree/TreeView.js
@@ -70,7 +70,7 @@ export default echarts.extendChartView({
       group.attr('position', [layoutInfo.x, layoutInfo.y]);
     }
 
-    this._updateViewCoordSys(seriesModel);
+    this._updateViewCoordSys(seriesModel, layoutInfo, layout);
 
     this._updateController(seriesModel, ecModel, api);
 
@@ -142,16 +142,20 @@ export default echarts.extendChartView({
     });
     var min = [];
     var max = [];
-    bbox.fromPoints(points, min, max); // If width or height is 0
+    bbox.fromPoints(points, min, max); // If don't Store min max when collapse the root node after roam,
+    // the root node will disappear.
+
+    var oldMin = this._min;
+    var oldMax = this._max; // If width or height is 0
 
     if (max[0] - min[0] === 0) {
-      max[0] += 1;
-      min[0] -= 1;
+      min[0] = oldMin ? oldMin[0] : min[0] - 1;
+      max[0] = oldMax ? oldMax[0] : max[0] + 1;
     }
 
     if (max[1] - min[1] === 0) {
-      max[1] += 1;
-      min[1] -= 1;
+      min[1] = oldMin ? oldMin[1] : min[1] - 1;
+      max[1] = oldMax ? oldMax[1] : max[1] + 1;
     }
 
     var viewCoordSys = seriesModel.coordinateSystem = new View();
@@ -165,6 +169,8 @@ export default echarts.extendChartView({
       scale: viewCoordSys.scale
     });
     this._viewCoordSys = viewCoordSys;
+    this._min = min;
+    this._max = max;
   },
   _updateController: function (seriesModel, ecModel, api) {
     var controller = this._controller;
diff --git a/en/builder/src/echarts/component/dataZoom/AxisProxy.js b/en/builder/src/echarts/component/dataZoom/AxisProxy.js
index 09aa105..7581c3d 100644
--- a/en/builder/src/echarts/component/dataZoom/AxisProxy.js
+++ b/en/builder/src/echarts/component/dataZoom/AxisProxy.js
@@ -275,7 +275,7 @@ AxisProxy.prototype = {
     // `calculateDataWindow` uses min/maxSpan.
 
     setMinMaxSpan(this);
-    var dataWindow = this.calculateDataWindow(dataZoomModel.option);
+    var dataWindow = this.calculateDataWindow(dataZoomModel.settledOption);
     this._valueWindow = dataWindow.valueWindow;
     this._percentWindow = dataWindow.percentWindow; // Update axis setting then.
 
diff --git a/en/builder/src/echarts/component/dataZoom/DataZoomModel.js b/en/builder/src/echarts/component/dataZoom/DataZoomModel.js
index 8310e26..b353685 100644
--- a/en/builder/src/echarts/component/dataZoom/DataZoomModel.js
+++ b/en/builder/src/echarts/component/dataZoom/DataZoomModel.js
@@ -120,40 +120,67 @@ var DataZoomModel = echarts.extendComponentModel({
      */
 
     this._rangePropMode = ['percent', 'percent'];
-    var rawOption = retrieveRaw(option);
+    var inputRawOption = retrieveRawOption(option);
+    /**
+     * Suppose a "main process" start at the point that model prepared (that is,
+     * model initialized or merged or method called in `action`).
+     * We should keep the `main process` idempotent, that is, given a set of values
+     * on `option`, we get the same result.
+     *
+     * But sometimes, values on `option` will be updated for providing users
+     * a "final calculated value" (`dataZoomProcessor` will do that). Those value
+     * should not be the base/input of the `main process`.
+     *
+     * So in that case we should save and keep the input of the `main process`
+     * separately, called `settledOption`.
+     *
+     * For example, consider the case:
+     * (Step_1) brush zoom the grid by `toolbox.dataZoom`,
+     *     where the original input `option.startValue`, `option.endValue` are earsed by
+     *     calculated value.
+     * (Step)2) click the legend to hide and show a series,
+     *     where the new range is calculated by the earsed `startValue` and `endValue`,
+     *     which brings incorrect result.
+     *
+     * @readOnly
+     */
+
+    this.settledOption = inputRawOption;
     this.mergeDefaultAndTheme(option, ecModel);
-    this.doInit(rawOption);
+    this.doInit(inputRawOption);
   },
 
   /**
    * @override
    */
   mergeOption: function (newOption) {
-    var rawOption = retrieveRaw(newOption); //FIX #2591
+    var inputRawOption = retrieveRawOption(newOption); //FIX #2591
 
     zrUtil.merge(this.option, newOption, true);
-    this.doInit(rawOption);
+    zrUtil.merge(this.settledOption, inputRawOption, true);
+    this.doInit(inputRawOption);
   },
 
   /**
    * @protected
    */
-  doInit: function (rawOption) {
+  doInit: function (inputRawOption) {
     var thisOption = this.option; // Disable realtime view update if canvas is not supported.
 
     if (!env.canvasSupported) {
       thisOption.realtime = false;
     }
 
-    this._setDefaultThrottle(rawOption);
+    this._setDefaultThrottle(inputRawOption);
 
-    updateRangeUse(this, rawOption);
+    updateRangeUse(this, inputRawOption);
+    var settledOption = this.settledOption;
     each([['start', 'startValue'], ['end', 'endValue']], function (names, index) {
       // start/end has higher priority over startValue/endValue if they
       // both set, but we should make chart.setOption({endValue: 1000})
       // effective, rather than chart.setOption({endValue: 1000, end: null}).
       if (this._rangePropMode[index] === 'value') {
-        thisOption[names[0]] = null;
+        thisOption[names[0]] = settledOption[names[0]] = null;
       } // Otherwise do nothing and use the merge result.
 
     }, this);
@@ -345,9 +372,9 @@ var DataZoomModel = echarts.extendComponentModel({
   /**
    * @private
    */
-  _setDefaultThrottle: function (rawOption) {
+  _setDefaultThrottle: function (inputRawOption) {
     // When first time user set throttle, auto throttle ends.
-    if (rawOption.hasOwnProperty('throttle')) {
+    if (inputRawOption.hasOwnProperty('throttle')) {
       this._autoThrottle = false;
     }
 
@@ -415,22 +442,41 @@ var DataZoomModel = echarts.extendComponentModel({
    * @param {number} [opt.end]
    * @param {number} [opt.startValue]
    * @param {number} [opt.endValue]
-   * @param {boolean} [ignoreUpdateRangeUsg=false]
    */
-  setRawRange: function (opt, ignoreUpdateRangeUsg) {
-    var option = this.option;
+  setRawRange: function (opt) {
+    var thisOption = this.option;
+    var settledOption = this.settledOption;
     each([['start', 'startValue'], ['end', 'endValue']], function (names) {
-      // If only one of 'start' and 'startValue' is not null/undefined, the other
-      // should be cleared, which enable clear the option.
-      // If both of them are not set, keep option with the original value, which
-      // enable use only set start but not set end when calling `dispatchAction`.
-      // The same as 'end' and 'endValue'.
+      // Consider the pair <start, startValue>:
+      // If one has value and the other one is `null/undefined`, we both set them
+      // to `settledOption`. This strategy enables the feature to clear the original
+      // value in `settledOption` to `null/undefined`.
+      // But if both of them are `null/undefined`, we do not set them to `settledOption`
+      // and keep `settledOption` with the original value. This strategy enables users to
+      // only set <end or endValue> but not set <start or startValue> when calling
+      // `dispatchAction`.
+      // The pair <end, endValue> is treated in the same way.
       if (opt[names[0]] != null || opt[names[1]] != null) {
-        option[names[0]] = opt[names[0]];
-        option[names[1]] = opt[names[1]];
+        thisOption[names[0]] = settledOption[names[0]] = opt[names[0]];
+        thisOption[names[1]] = settledOption[names[1]] = opt[names[1]];
       }
     }, this);
-    !ignoreUpdateRangeUsg && updateRangeUse(this, opt);
+    updateRangeUse(this, opt);
+  },
+
+  /**
+   * @public
+   * @param {Object} opt
+   * @param {number} [opt.start]
+   * @param {number} [opt.end]
+   * @param {number} [opt.startValue]
+   * @param {number} [opt.endValue]
+   */
+  setCalculatedRange: function (opt) {
+    var option = this.option;
+    each(['start', 'startValue', 'end', 'endValue'], function (name) {
+      option[name] = opt[name];
+    });
   },
 
   /**
@@ -504,8 +550,13 @@ var DataZoomModel = echarts.extendComponentModel({
     return this._rangePropMode.slice();
   }
 });
+/**
+ * Retrieve the those raw params from option, which will be cached separately.
+ * becasue they will be overwritten by normalized/calculated values in the main
+ * process.
+ */
 
-function retrieveRaw(option) {
+function retrieveRawOption(option) {
   var ret = {};
   each(['start', 'end', 'startValue', 'endValue', 'throttle'], function (name) {
     option.hasOwnProperty(name) && (ret[name] = option[name]);
@@ -513,12 +564,12 @@ function retrieveRaw(option) {
   return ret;
 }
 
-function updateRangeUse(dataZoomModel, rawOption) {
+function updateRangeUse(dataZoomModel, inputRawOption) {
   var rangePropMode = dataZoomModel._rangePropMode;
   var rangeModeInOption = dataZoomModel.get('rangeMode');
   each([['start', 'startValue'], ['end', 'endValue']], function (names, index) {
-    var percentSpecified = rawOption[names[0]] != null;
-    var valueSpecified = rawOption[names[1]] != null;
+    var percentSpecified = inputRawOption[names[0]] != null;
+    var valueSpecified = inputRawOption[names[1]] != null;
 
     if (percentSpecified && !valueSpecified) {
       rangePropMode[index] = 'percent';
diff --git a/en/builder/src/echarts/component/dataZoom/dataZoomProcessor.js b/en/builder/src/echarts/component/dataZoom/dataZoomProcessor.js
index 8546346..7ef87c5 100644
--- a/en/builder/src/echarts/component/dataZoom/dataZoomProcessor.js
+++ b/en/builder/src/echarts/component/dataZoom/dataZoomProcessor.js
@@ -70,12 +70,12 @@ echarts.registerProcessor({
       var axisProxy = dataZoomModel.findRepresentativeAxisProxy();
       var percentRange = axisProxy.getDataPercentWindow();
       var valueRange = axisProxy.getDataValueWindow();
-      dataZoomModel.setRawRange({
+      dataZoomModel.setCalculatedRange({
         start: percentRange[0],
         end: percentRange[1],
         startValue: valueRange[0],
         endValue: valueRange[1]
-      }, true);
+      });
     });
   }
 });
\ No newline at end of file
diff --git a/en/builder/src/echarts/component/graphic.js b/en/builder/src/echarts/component/graphic.js
index 29fc378..cff3410 100644
--- a/en/builder/src/echarts/component/graphic.js
+++ b/en/builder/src/echarts/component/graphic.js
@@ -21,7 +21,17 @@ import * as echarts from '../echarts';
 import * as zrUtil from 'zrender/src/core/util';
 import * as modelUtil from '../util/model';
 import * as graphicUtil from '../util/graphic';
-import * as layoutUtil from '../util/layout'; // -------------
+import * as layoutUtil from '../util/layout';
+import { parsePercent } from '../util/number';
+var _nonShapeGraphicElements = {
+  // Reserved but not supported in graphic component.
+  path: null,
+  compoundPath: null,
+  // Supported in graphic component.
+  group: graphicUtil.Group,
+  image: graphicUtil.Image,
+  text: graphicUtil.Text
+}; // -------------
 // Preprocessor
 // -------------
 
@@ -292,8 +302,8 @@ echarts.extendComponentView({
       var el = elMap.get(id);
 
       if (el) {
-        el.__ecGraphicWidth = elOption.width;
-        el.__ecGraphicHeight = elOption.height;
+        el.__ecGraphicWidthOption = elOption.width;
+        el.__ecGraphicHeightOption = elOption.height;
         setEventData(el, graphicModel, elOption);
       }
     });
@@ -309,7 +319,25 @@ echarts.extendComponentView({
   _relocate: function (graphicModel, api) {
     var elOptions = graphicModel.option.elements;
     var rootGroup = this.group;
-    var elMap = this._elMap; // Bottom-up tranvese all elements (consider ec resize) to locate elements.
+    var elMap = this._elMap;
+    var apiWidth = api.getWidth();
+    var apiHeight = api.getHeight(); // Top-down to calculate percentage width/height of group
+
+    for (var i = 0; i < elOptions.length; i++) {
+      var elOption = elOptions[i];
+      var el = elMap.get(elOption.id);
+
+      if (!el || !el.isGroup) {
+        continue;
+      }
+
+      var parentEl = el.parent;
+      var isParentRoot = parentEl === rootGroup; // Like 'position:absolut' in css, default 0.
+
+      el.__ecGraphicWidth = parsePercent(el.__ecGraphicWidthOption, isParentRoot ? apiWidth : parentEl.__ecGraphicWidth) || 0;
+      el.__ecGraphicHeight = parsePercent(el.__ecGraphicHeightOption, isParentRoot ? apiHeight : parentEl.__ecGraphicHeight) || 0;
+    } // Bottom-up tranvese all elements (consider ec resize) to locate elements.
+
 
     for (var i = elOptions.length - 1; i >= 0; i--) {
       var elOption = elOptions[i];
@@ -321,13 +349,16 @@ echarts.extendComponentView({
 
       var parentEl = el.parent;
       var containerInfo = parentEl === rootGroup ? {
-        width: api.getWidth(),
-        height: api.getHeight()
+        width: apiWidth,
+        height: apiHeight
       } : {
-        // Like 'position:absolut' in css, default 0.
-        width: parentEl.__ecGraphicWidth || 0,
-        height: parentEl.__ecGraphicHeight || 0
-      };
+        width: parentEl.__ecGraphicWidth,
+        height: parentEl.__ecGraphicHeight
+      }; // PENDING
+      // Currently, when `bounding: 'all'`, the union bounding rect of the group
+      // does not include the rect of [0, 0, group.width, group.height], which
+      // is probably weird for users. Should we make a break change for it?
+
       layoutUtil.positionElement(el, elOption, containerInfo, null, {
         hv: elOption.hv,
         boundingMode: elOption.bounding
@@ -358,7 +389,9 @@ echarts.extendComponentView({
 
 function createEl(id, targetElParent, elOption, elMap) {
   var graphicType = elOption.type;
-  var Clz = graphicUtil[graphicType.charAt(0).toUpperCase() + graphicType.slice(1)];
+  var Clz = _nonShapeGraphicElements.hasOwnProperty(graphicType) // Those graphic elements are not shapes. They should not be
+  // overwritten by users, so do them first.
+  ? _nonShapeGraphicElements[graphicType] : graphicUtil.getShapeClass(graphicType);
   var el = new Clz(elOption);
   targetElParent.add(el);
   elMap.set(id, el);
diff --git a/en/builder/src/echarts/component/helper/MapDraw.js b/en/builder/src/echarts/component/helper/MapDraw.js
index a8f90ab..84fe81b 100644
--- a/en/builder/src/echarts/component/helper/MapDraw.js
+++ b/en/builder/src/echarts/component/helper/MapDraw.js
@@ -24,7 +24,7 @@ import * as graphic from '../../util/graphic';
 import geoSourceManager from '../../coord/geo/geoSourceManager';
 import { getUID } from '../../util/component';
 
-function getFixedItemStyle(model, scale) {
+function getFixedItemStyle(model) {
   var itemStyle = model.getItemStyle();
   var areaColor = model.get('areaColor'); // If user want the color not to be changed when hover,
   // they should both set areaColor and color to be null.
@@ -176,18 +176,14 @@ MapDraw.prototype = {
 
     var regionsGroup = this._regionsGroup;
     var group = this.group;
-    var scale = geo.scale;
-    var transform = {
-      position: geo.position,
-      scale: scale
-    }; // No animation when first draw or in action
-
-    if (!regionsGroup.childAt(0) || payload) {
-      group.attr(transform);
-    } else {
-      graphic.updateProps(group, transform, mapOrGeoModel);
+
+    if (geo._roamTransformable.transform) {
+      group.transform = geo._roamTransformable.transform.slice();
+      group.decomposeTransform();
     }
 
+    var scale = geo._rawTransformable.scale;
+    var position = geo._rawTransformable.position;
     regionsGroup.removeAll();
     var itemStyleAccessPath = ['itemStyle'];
     var hoverItemStyleAccessPath = ['emphasis', 'itemStyle'];
@@ -211,8 +207,8 @@ MapDraw.prototype = {
       var regionModel = mapOrGeoModel.getRegionModel(region.name) || mapOrGeoModel;
       var itemStyleModel = regionModel.getModel(itemStyleAccessPath);
       var hoverItemStyleModel = regionModel.getModel(hoverItemStyleAccessPath);
-      var itemStyle = getFixedItemStyle(itemStyleModel, scale);
-      var hoverItemStyle = getFixedItemStyle(hoverItemStyleModel, scale);
+      var itemStyle = getFixedItemStyle(itemStyleModel);
+      var hoverItemStyle = getFixedItemStyle(hoverItemStyleModel);
       var labelModel = regionModel.getModel(labelAccessPath);
       var hoverLabelModel = regionModel.getModel(hoverLabelAccessPath);
       var dataIdx; // Use the itemStyle in data if has data
@@ -230,23 +226,40 @@ MapDraw.prototype = {
         }
       }
 
+      var transformPoint = function (point) {
+        return [point[0] * scale[0] + position[0], point[1] * scale[1] + position[1]];
+      };
+
       zrUtil.each(region.geometries, function (geometry) {
         if (geometry.type !== 'polygon') {
           return;
         }
 
+        var points = [];
+
+        for (var i = 0; i < geometry.exterior.length; ++i) {
+          points.push(transformPoint(geometry.exterior[i]));
+        }
+
         compoundPath.shape.paths.push(new graphic.Polygon({
           segmentIgnoreThreshold: 1,
           shape: {
-            points: geometry.exterior
+            points: points
           }
         }));
 
-        for (var i = 0; i < (geometry.interiors ? geometry.interiors.length : 0); i++) {
+        for (var i = 0; i < (geometry.interiors ? geometry.interiors.length : 0); ++i) {
+          var interior = geometry.interiors[i];
+          var points = [];
+
+          for (var j = 0; j < interior.length; ++j) {
+            points.push(transformPoint(interior[j]));
+          }
+
           compoundPath.shape.paths.push(new graphic.Polygon({
             segmentIgnoreThreshold: 1,
             shape: {
-              points: geometry.interiors[i]
+              points: points
             }
           }));
         }
@@ -272,12 +285,12 @@ MapDraw.prototype = {
         }
 
         var textEl = new graphic.Text({
-          position: region.center.slice(),
+          position: transformPoint(region.center.slice()),
           // FIXME
           // label rotation is not support yet in geo or regions of series-map
           // that has no data. The rotation will be effected by this `scale`.
           // So needed to change to RectText?
-          scale: [1 / scale[0], 1 / scale[1]],
+          scale: [1 / group.scale[0], 1 / group.scale[1]],
           z2: 10,
           silent: true
         });
diff --git a/en/builder/src/echarts/component/legend.js b/en/builder/src/echarts/component/legend.js
index 79064fd..1b1da85 100644
--- a/en/builder/src/echarts/component/legend.js
+++ b/en/builder/src/echarts/component/legend.js
@@ -24,7 +24,7 @@ import './legend/LegendView';
 import legendFilter from './legend/legendFilter';
 import Component from '../model/Component'; // Series Filter
 
-echarts.registerProcessor(legendFilter);
+echarts.registerProcessor(echarts.PRIORITY.PROCESSOR.SERIES_FILTER, legendFilter);
 Component.registerSubTypeDefaulter('legend', function () {
   // Default 'plain' when no type specified.
   return 'plain';
diff --git a/en/builder/src/echarts/component/legend/LegendModel.js b/en/builder/src/echarts/component/legend/LegendModel.js
index 9a70336..7091ffd 100644
--- a/en/builder/src/echarts/component/legend/LegendModel.js
+++ b/en/builder/src/echarts/component/legend/LegendModel.js
@@ -20,6 +20,18 @@ import * as echarts from '../../echarts';
 import * as zrUtil from 'zrender/src/core/util';
 import Model from '../../model/Model';
 import { isNameSpecified } from '../../util/model';
+import lang from '../../lang';
+var langSelector = lang.legend.selector;
+var defaultSelectorOption = {
+  all: {
+    type: 'all',
+    title: zrUtil.clone(langSelector.all)
+  },
+  inverse: {
+    type: 'inverse',
+    title: zrUtil.clone(langSelector.inverse)
+  }
+};
 var LegendModel = echarts.extendComponentModel({
   type: 'legend.plain',
   dependencies: ['series'],
@@ -37,9 +49,29 @@ var LegendModel = echarts.extendComponentModel({
   init: function (option, parentModel, ecModel) {
     this.mergeDefaultAndTheme(option, ecModel);
     option.selected = option.selected || {};
+
+    this._updateSelector(option);
   },
   mergeOption: function (option) {
     LegendModel.superCall(this, 'mergeOption', option);
+
+    this._updateSelector(option);
+  },
+  _updateSelector: function (option) {
+    var selector = option.selector;
+
+    if (selector === true) {
+      selector = option.selector = ['all', 'inverse'];
+    }
+
+    if (zrUtil.isArray(selector)) {
+      zrUtil.each(selector, function (item, index) {
+        zrUtil.isString(item) && (item = {
+          type: item
+        });
+        selector[index] = zrUtil.merge(item, defaultSelectorOption[item.type]);
+      });
+    }
   },
   optionUpdated: function () {
     this._updateData(this.ecModel);
@@ -165,6 +197,26 @@ var LegendModel = echarts.extendComponentModel({
 
     this[selected[name] ? 'unSelect' : 'select'](name);
   },
+  allSelect: function () {
+    var data = this._data;
+    var selected = this.option.selected;
+    zrUtil.each(data, function (dataItem) {
+      selected[dataItem.get('name', true)] = true;
+    });
+  },
+  inverseSelect: function () {
+    var data = this._data;
+    var selected = this.option.selected;
+    zrUtil.each(data, function (dataItem) {
+      var name = dataItem.get('name', true); // Initially, default value is true
+
+      if (!selected.hasOwnProperty(name)) {
+        selected[name] = true;
+      }
+
+      selected[name] = !selected[name];
+    });
+  },
 
   /**
    * @param {string} name
@@ -173,6 +225,15 @@ var LegendModel = echarts.extendComponentModel({
     var selected = this.option.selected;
     return !(selected.hasOwnProperty(name) && !selected[name]) && zrUtil.indexOf(this._availableNames, name) >= 0;
   },
+  getOrient: function () {
+    return this.get('orient') === 'vertical' ? {
+      index: 1,
+      name: 'vertical'
+    } : {
+      index: 0,
+      name: 'horizontal'
+    };
+  },
   defaultOption: {
     // 一级层叠
     zlevel: 0,
@@ -202,12 +263,18 @@ var LegendModel = echarts.extendComponentModel({
     // 各个item之间的间隔,单位px,默认为10,
     // 横向布局时为水平间隔,纵向布局时为纵向间隔
     itemGap: 10,
-    // 图例图形宽度
+    // the width of legend symbol
     itemWidth: 25,
-    // 图例图形高度
+    // the height of legend symbol
     itemHeight: 14,
-    // 图例关闭时候的颜色
+    // the color of unselected legend symbol
     inactiveColor: '#ccc',
+    // the borderColor of unselected legend symbol
+    inactiveBorderColor: '#ccc',
+    itemStyle: {
+      // the default borderWidth of legend symbol
+      borderWidth: 0
+    },
     textStyle: {
       // 图例文字颜色
       color: '#333'
@@ -219,6 +286,34 @@ var LegendModel = echarts.extendComponentModel({
     // selected: null,
     // 图例内容(详见legend.data,数组中每一项代表一个item
     // data: [],
+    // Usage:
+    // selector: [{type: 'all or inverse', title: xxx}]
+    // or
+    // selector: true
+    // or
+    // selector: ['all', 'inverse']
+    selector: false,
+    selectorLabel: {
+      show: true,
+      borderRadius: 10,
+      padding: [3, 5, 3, 5],
+      fontSize: 12,
+      fontFamily: ' sans-serif',
+      color: '#666',
+      borderWidth: 1,
+      borderColor: '#666'
+    },
+    emphasis: {
+      selectorLabel: {
+        show: true,
+        color: '#eee',
+        backgroundColor: '#666'
+      }
+    },
+    // Value can be 'start' or 'end'
+    selectorPosition: 'auto',
+    selectorItemGap: 7,
+    selectorButtonGap: 10,
     // Tooltip 相关配置
     tooltip: {
       show: false
diff --git a/en/builder/src/echarts/component/legend/LegendView.js b/en/builder/src/echarts/component/legend/LegendView.js
index 4bd0001..0fc74bc 100644
--- a/en/builder/src/echarts/component/legend/LegendView.js
+++ b/en/builder/src/echarts/component/legend/LegendView.js
@@ -46,6 +46,12 @@ export default echarts.extendComponentView({
 
     this._backgroundEl;
     /**
+     * @private
+     * @type {module:zrender/container/Group}
+     */
+
+    this.group.add(this._selectorGroup = new Group());
+    /**
      * If first rendering, `contentGroup.position` is [0, 0], which
      * does not make sense and may cause unexepcted animation if adopted.
      * @private
@@ -63,6 +69,13 @@ export default echarts.extendComponentView({
   },
 
   /**
+   * @protected
+   */
+  getSelectorGroup: function () {
+    return this._selectorGroup;
+  },
+
+  /**
    * @override
    */
   render: function (legendModel, ecModel, api) {
@@ -75,12 +88,20 @@ export default echarts.extendComponentView({
     }
 
     var itemAlign = legendModel.get('align');
+    var orient = legendModel.get('orient');
 
     if (!itemAlign || itemAlign === 'auto') {
-      itemAlign = legendModel.get('left') === 'right' && legendModel.get('orient') === 'vertical' ? 'right' : 'left';
+      itemAlign = legendModel.get('left') === 'right' && orient === 'vertical' ? 'right' : 'left';
     }
 
-    this.renderInner(itemAlign, legendModel, ecModel, api); // Perform layout.
+    var selector = legendModel.get('selector', true);
+    var selectorPosition = legendModel.get('selectorPosition', true);
+
+    if (selector && (!selectorPosition || selectorPosition === 'auto')) {
+      selectorPosition = orient === 'horizontal' ? 'end' : 'start';
+    }
+
+    this.renderInner(itemAlign, legendModel, ecModel, api, selector, orient, selectorPosition); // Perform layout.
 
     var positionInfo = legendModel.getBoxLayoutParams();
     var viewportSize = {
@@ -89,7 +110,7 @@ export default echarts.extendComponentView({
     };
     var padding = legendModel.get('padding');
     var maxSize = layoutUtil.getLayoutRect(positionInfo, viewportSize, padding);
-    var mainRect = this.layoutInner(legendModel, itemAlign, maxSize, isFirstRender); // Place mainGroup, based on the calculated `mainRect`.
+    var mainRect = this.layoutInner(legendModel, itemAlign, maxSize, isFirstRender, selector, selectorPosition); // Place mainGroup, based on the calculated `mainRect`.
 
     var layoutRect = layoutUtil.getLayoutRect(zrUtil.defaults({
       width: mainRect.width,
@@ -106,12 +127,13 @@ export default echarts.extendComponentView({
   resetInner: function () {
     this.getContentGroup().removeAll();
     this._backgroundEl && this.group.remove(this._backgroundEl);
+    this.getSelectorGroup().removeAll();
   },
 
   /**
    * @protected
    */
-  renderInner: function (itemAlign, legendModel, ecModel, api) {
+  renderInner: function (itemAlign, legendModel, ecModel, api, selector, orient, selectorPosition) {
     var contentGroup = this.getContentGroup();
     var legendDrawnMap = zrUtil.createHashMap();
     var selectMode = legendModel.get('selectedMode');
@@ -140,18 +162,25 @@ export default echarts.extendComponentView({
 
       if (seriesModel) {
         var data = seriesModel.getData();
-        var color = data.getVisual('color'); // If color is a callback function
+        var color = data.getVisual('color');
+        var borderColor = data.getVisual('borderColor'); // If color is a callback function
 
         if (typeof color === 'function') {
           // Use the first data
           color = color(seriesModel.getDataParams(0));
+        } // If borderColor is a callback function
+
+
+        if (typeof borderColor === 'function') {
+          // Use the first data
+          borderColor = borderColor(seriesModel.getDataParams(0));
         } // Using rect symbol defaultly
 
 
         var legendSymbolType = data.getVisual('legendSymbol') || 'roundRect';
         var symbolType = data.getVisual('symbol');
 
-        var itemGroup = this._createItem(name, dataIndex, itemModel, legendModel, legendSymbolType, symbolType, itemAlign, color, selectMode);
+        var itemGroup = this._createItem(name, dataIndex, itemModel, legendModel, legendSymbolType, symbolType, itemAlign, color, borderColor, selectMode);
 
         itemGroup.on('click', curry(dispatchSelectAction, name, api)).on('mouseover', curry(dispatchHighlightAction, seriesModel.name, null, api, excludeSeriesId)).on('mouseout', curry(dispatchDownplayAction, seriesModel.name, null, api, excludeSeriesId));
         legendDrawnMap.set(name, true);
@@ -172,9 +201,10 @@ export default echarts.extendComponentView({
             }
 
             var color = data.getItemVisual(idx, 'color');
+            var borderColor = data.getItemVisual(idx, 'borderColor');
             var legendSymbolType = 'roundRect';
 
-            var itemGroup = this._createItem(name, dataIndex, itemModel, legendModel, legendSymbolType, null, itemAlign, color, selectMode); // FIXME: consider different series has items with the same name.
+            var itemGroup = this._createItem(name, dataIndex, itemModel, legendModel, legendSymbolType, null, itemAlign, color, borderColor, selectMode); // FIXME: consider different series has items with the same name.
 
 
             itemGroup.on('click', curry(dispatchSelectAction, name, api)) // Should not specify the series name, consider legend controls
@@ -185,12 +215,49 @@ export default echarts.extendComponentView({
         }, this);
       }
     }, this);
+
+    if (selector) {
+      this._createSelector(selector, legendModel, api, orient, selectorPosition);
+    }
   },
-  _createItem: function (name, dataIndex, itemModel, legendModel, legendSymbolType, symbolType, itemAlign, color, selectMode) {
+  _createSelector: function (selector, legendModel, api, orient, selectorPosition) {
+    var selectorGroup = this.getSelectorGroup();
+    each(selector, function (selectorItem) {
+      createSelectorButton(selectorItem);
+    });
+
+    function createSelectorButton(selectorItem) {
+      var type = selectorItem.type;
+      var labelText = new graphic.Text({
+        style: {
+          x: 0,
+          y: 0,
+          align: 'center',
+          verticalAlign: 'middle'
+        },
+        onclick: function () {
+          api.dispatchAction({
+            type: type === 'all' ? 'legendAllSelect' : 'legendInverseSelect'
+          });
+        }
+      });
+      selectorGroup.add(labelText);
+      var labelModel = legendModel.getModel('selectorLabel');
+      var emphasisLabelModel = legendModel.getModel('emphasis.selectorLabel');
+      graphic.setLabelStyle(labelText.style, labelText.hoverStyle = {}, labelModel, emphasisLabelModel, {
+        defaultText: selectorItem.title,
+        isRectText: false
+      });
+      graphic.setHoverStyle(labelText);
+    }
+  },
+  _createItem: function (name, dataIndex, itemModel, legendModel, legendSymbolType, symbolType, itemAlign, color, borderColor, selectMode) {
     var itemWidth = legendModel.get('itemWidth');
     var itemHeight = legendModel.get('itemHeight');
     var inactiveColor = legendModel.get('inactiveColor');
+    var inactiveBorderColor = legendModel.get('inactiveBorderColor');
     var symbolKeepAspect = legendModel.get('symbolKeepAspect');
+    var legendModelItemStyle = legendModel.getModel('itemStyle');
     var isSelected = legendModel.isSelected(name);
     var itemGroup = new Group();
     var textStyleModel = itemModel.getModel('textStyle');
@@ -199,8 +266,9 @@ export default echarts.extendComponentView({
     var legendGlobalTooltipModel = tooltipModel.parentModel; // Use user given icon first
 
     legendSymbolType = itemIcon || legendSymbolType;
-    itemGroup.add(createSymbol(legendSymbolType, 0, 0, itemWidth, itemHeight, isSelected ? color : inactiveColor, // symbolKeepAspect default true for legend
-    symbolKeepAspect == null ? true : symbolKeepAspect)); // Compose symbols
+    var legendSymbol = createSymbol(legendSymbolType, 0, 0, itemWidth, itemHeight, isSelected ? color : inactiveColor, // symbolKeepAspect default true for legend
+    symbolKeepAspect == null ? true : symbolKeepAspect);
+    itemGroup.add(setSymbolStyle(legendSymbol, legendSymbolType, legendModelItemStyle, borderColor, inactiveBorderColor, isSelected)); // Compose symbols
     // PENDING
 
     if (!itemIcon && symbolType // At least show one symbol, can't be all none
@@ -209,11 +277,12 @@ export default echarts.extendComponentView({
 
       if (symbolType === 'none') {
         symbolType = 'circle';
-      } // Put symbol in the center
+      }
 
+      var legendSymbolCenter = createSymbol(symbolType, (itemWidth - size) / 2, (itemHeight - size) / 2, size, size, isSelected ? color : inactiveColor, // symbolKeepAspect default true for legend
+      symbolKeepAspect == null ? true : symbolKeepAspect); // Put symbol in the center
 
-      itemGroup.add(createSymbol(symbolType, (itemWidth - size) / 2, (itemHeight - size) / 2, size, size, isSelected ? color : inactiveColor, // symbolKeepAspect default true for legend
-      symbolKeepAspect == null ? true : symbolKeepAspect));
+      itemGroup.add(setSymbolStyle(legendSymbolCenter, symbolType, legendModelItemStyle, borderColor, inactiveBorderColor, isSelected));
     }
 
     var textX = itemAlign === 'left' ? itemWidth + 5 : -5;
@@ -269,13 +338,48 @@ export default echarts.extendComponentView({
   /**
    * @protected
    */
-  layoutInner: function (legendModel, itemAlign, maxSize) {
-    var contentGroup = this.getContentGroup(); // Place items in contentGroup.
+  layoutInner: function (legendModel, itemAlign, maxSize, isFirstRender, selector, selectorPosition) {
+    var contentGroup = this.getContentGroup();
+    var selectorGroup = this.getSelectorGroup(); // Place items in contentGroup.
 
     layoutUtil.box(legendModel.get('orient'), contentGroup, legendModel.get('itemGap'), maxSize.width, maxSize.height);
     var contentRect = contentGroup.getBoundingRect();
-    contentGroup.attr('position', [-contentRect.x, -contentRect.y]);
-    return this.group.getBoundingRect();
+    var contentPos = [-contentRect.x, -contentRect.y];
+
+    if (selector) {
+      // Place buttons in selectorGroup
+      layoutUtil.box( // Buttons in selectorGroup always layout horizontally
+      'horizontal', selectorGroup, legendModel.get('selectorItemGap', true));
+      var selectorRect = selectorGroup.getBoundingRect();
+      var selectorPos = [-selectorRect.x, -selectorRect.y];
+      var selectorButtonGap = legendModel.get('selectorButtonGap', true);
+      var orientIdx = legendModel.getOrient().index;
+      var wh = orientIdx === 0 ? 'width' : 'height';
+      var hw = orientIdx === 0 ? 'height' : 'width';
+      var yx = orientIdx === 0 ? 'y' : 'x';
+
+      if (selectorPosition === 'end') {
+        selectorPos[orientIdx] += contentRect[wh] + selectorButtonGap;
+      } else {
+        contentPos[orientIdx] += selectorRect[wh] + selectorButtonGap;
+      } //Always align selector to content as 'middle'
+
+
+      selectorPos[1 - orientIdx] += contentRect[hw] / 2 - selectorRect[hw] / 2;
+      selectorGroup.attr('position', selectorPos);
+      contentGroup.attr('position', contentPos);
+      var mainRect = {
+        x: 0,
+        y: 0
+      };
+      mainRect[wh] = contentRect[wh] + selectorButtonGap + selectorRect[wh];
+      mainRect[hw] = Math.max(contentRect[hw], selectorRect[hw]);
+      mainRect[yx] = Math.min(0, selectorRect[yx] + selectorPos[1 - orientIdx]);
+      return mainRect;
+    } else {
+      contentGroup.attr('position', contentPos);
+      return this.group.getBoundingRect();
+    }
   },
 
   /**
@@ -287,6 +391,23 @@ export default echarts.extendComponentView({
   }
 });
 
+function setSymbolStyle(symbol, symbolType, legendModelItemStyle, borderColor, inactiveBorderColor, isSelected) {
+  var itemStyle;
+
+  if (symbolType !== 'line' && symbolType.indexOf('empty') < 0) {
+    itemStyle = legendModelItemStyle.getItemStyle();
+    symbol.style.stroke = borderColor;
+
+    if (!isSelected) {
+      itemStyle.stroke = inactiveBorderColor;
+    }
+  } else {
+    itemStyle = legendModelItemStyle.getItemStyle(['borderWidth', 'borderColor']);
+  }
+
+  return symbol.setStyle(itemStyle);
+}
+
 function dispatchSelectAction(name, api) {
   api.dispatchAction({
     type: 'legendToggleSelect',
diff --git a/en/builder/src/echarts/component/legend/ScrollableLegendModel.js b/en/builder/src/echarts/component/legend/ScrollableLegendModel.js
index bdfaea0..073b108 100644
--- a/en/builder/src/echarts/component/legend/ScrollableLegendModel.js
+++ b/en/builder/src/echarts/component/legend/ScrollableLegendModel.js
@@ -64,15 +64,6 @@ var ScrollableLegendModel = LegendModel.extend({
   mergeOption: function (option, extraOpt) {
     ScrollableLegendModel.superCall(this, 'mergeOption', option, extraOpt);
     mergeAndNormalizeLayoutParams(this, this.option, option);
-  },
-  getOrient: function () {
-    return this.get('orient') === 'vertical' ? {
-      index: 1,
-      name: 'vertical'
-    } : {
-      index: 0,
-      name: 'horizontal'
-    };
   }
 }); // Do not `ignoreSize` to enable setting {left: 10, right: 10}.
 
diff --git a/en/builder/src/echarts/component/legend/ScrollableLegendView.js b/en/builder/src/echarts/component/legend/ScrollableLegendView.js
index d82ccd7..b15c96e 100644
--- a/en/builder/src/echarts/component/legend/ScrollableLegendView.js
+++ b/en/builder/src/echarts/component/legend/ScrollableLegendView.js
@@ -77,10 +77,10 @@ var ScrollableLegendView = LegendView.extend({
   /**
    * @override
    */
-  renderInner: function (itemAlign, legendModel, ecModel, api) {
+  renderInner: function (itemAlign, legendModel, ecModel, api, selector, orient, selectorPosition) {
     var me = this; // Render content items.
 
-    ScrollableLegendView.superCall(this, 'renderInner', itemAlign, legendModel, ecModel, api);
+    ScrollableLegendView.superCall(this, 'renderInner', itemAlign, legendModel, ecModel, api, selector, orient, selectorPosition);
     var controllerGroup = this._controllerGroup; // FIXME: support be 'auto' adapt to size number text length,
     // e.g., '3/12345' should not overlap with the control arrow button.
 
@@ -124,14 +124,45 @@ var ScrollableLegendView = LegendView.extend({
   /**
    * @override
    */
-  layoutInner: function (legendModel, itemAlign, maxSize, isFirstRender) {
-    var contentGroup = this.getContentGroup();
-    var containerGroup = this._containerGroup;
-    var controllerGroup = this._controllerGroup;
+  layoutInner: function (legendModel, itemAlign, maxSize, isFirstRender, selector, selectorPosition) {
+    var selectorGroup = this.getSelectorGroup();
     var orientIdx = legendModel.getOrient().index;
     var wh = WH[orientIdx];
+    var xy = XY[orientIdx];
     var hw = WH[1 - orientIdx];
-    var yx = XY[1 - orientIdx]; // Place items in contentGroup.
+    var yx = XY[1 - orientIdx];
+    selector && layoutUtil.box( // Buttons in selectorGroup always layout horizontally
+    'horizontal', selectorGroup, legendModel.get('selectorItemGap', true));
+    var selectorButtonGap = legendModel.get('selectorButtonGap', true);
+    var selectorRect = selectorGroup.getBoundingRect();
+    var selectorPos = [-selectorRect.x, -selectorRect.y];
+    var processMaxSize = zrUtil.clone(maxSize);
+    selector && (processMaxSize[wh] = maxSize[wh] - selectorRect[wh] - selectorButtonGap);
+
+    var mainRect = this._layoutContentAndController(legendModel, isFirstRender, processMaxSize, orientIdx, wh, hw, yx);
+
+    if (selector) {
+      if (selectorPosition === 'end') {
+        selectorPos[orientIdx] += mainRect[wh] + selectorButtonGap;
+      } else {
+        var offset = selectorRect[wh] + selectorButtonGap;
+        selectorPos[orientIdx] -= offset;
+        mainRect[xy] -= offset;
+      }
+
+      mainRect[wh] += selectorRect[wh] + selectorButtonGap;
+      selectorPos[1 - orientIdx] += mainRect[yx] + mainRect[hw] / 2 - selectorRect[hw] / 2;
+      mainRect[hw] = Math.max(mainRect[hw], selectorRect[hw]);
+      mainRect[yx] = Math.min(mainRect[yx], selectorRect[yx] + selectorPos[1 - orientIdx]);
+      selectorGroup.attr('position', selectorPos);
+    }
+
+    return mainRect;
+  },
+  _layoutContentAndController: function (legendModel, isFirstRender, maxSize, orientIdx, wh, hw, yx) {
+    var contentGroup = this.getContentGroup();
+    var containerGroup = this._containerGroup;
+    var controllerGroup = this._controllerGroup; // Place items in contentGroup.
 
     layoutUtil.box(legendModel.get('orient'), contentGroup, legendModel.get('itemGap'), !orientIdx ? null : maxSize.width, orientIdx ? null : maxSize.height);
     layoutUtil.box( // Buttons in controller are layout always horizontally.
@@ -171,7 +202,6 @@ var ScrollableLegendView = LegendView.extend({
     // mainRect should not be calculated by `this.group.getBoundingRect()`
     // for sake of the overflow.
 
-    var mainRect = this.group.getBoundingRect();
     var mainRect = {
       x: 0,
       y: 0
@@ -197,7 +227,7 @@ var ScrollableLegendView = LegendView.extend({
 
       containerGroup.__rectSize = clipShape[wh];
     } else {
-      // Do not remove or ignore controller. Keep them set as place holders.
+      // Do not remove or ignore controller. Keep them set as placeholders.
       controllerGroup.eachChild(function (child) {
         child.attr({
           invisible: true,
@@ -212,7 +242,7 @@ var ScrollableLegendView = LegendView.extend({
     pageInfo.pageIndex != null && graphic.updateProps(contentGroup, {
       position: pageInfo.contentPosition
     }, // When switch from "show controller" to "not show controller", view should be
-    // updated immediately without animation, otherwise causes weird efffect.
+    // updated immediately without animation, otherwise causes weird effect.
     showController ? legendModel : false);
 
     this._updatePageInfoView(legendModel, pageInfo);
@@ -256,8 +286,8 @@ var ScrollableLegendView = LegendView.extend({
    *  contentPosition: Array.<number>, null when data item not found.
    *  pageIndex: number, null when data item not found.
    *  pageCount: number, always be a number, can be 0.
-   *  pagePrevDataIndex: number, null when no next page.
-   *  pageNextDataIndex: number, null when no previous page.
+   *  pagePrevDataIndex: number, null when no previous page.
+   *  pageNextDataIndex: number, null when no next page.
    * }
    */
   _getPageInfo: function (legendModel) {
diff --git a/en/builder/src/echarts/component/legend/legendAction.js b/en/builder/src/echarts/component/legend/legendAction.js
index 91850a2..c7c352c 100644
--- a/en/builder/src/echarts/component/legend/legendAction.js
+++ b/en/builder/src/echarts/component/legend/legendAction.js
@@ -31,6 +31,8 @@ function legendSelectActionHandler(methodName, payload, ecModel) {
       // In the case one legend has some item unSelected in option. And if other legend
       // doesn't has the item, they will assume it is selected.
       legendModel[isSelected ? 'select' : 'unSelect'](payload.name);
+    } else if (methodName === 'allSelect' || methodName === 'inverseSelect') {
+      legendModel[methodName]();
     } else {
       legendModel[methodName](payload.name);
       isSelected = legendModel.isSelected(payload.name);
@@ -55,7 +57,9 @@ function legendSelectActionHandler(methodName, payload, ecModel) {
     });
   }); // Return the event explicitly
 
-  return {
+  return methodName === 'allSelect' || methodName === 'inverseSelect' ? {
+    selected: selectedMap
+  } : {
     name: payload.name,
     selected: selectedMap
   };
@@ -70,6 +74,8 @@ function legendSelectActionHandler(methodName, payload, ecModel) {
 
 
 echarts.registerAction('legendToggleSelect', 'legendselectchanged', zrUtil.curry(legendSelectActionHandler, 'toggleSelected'));
+echarts.registerAction('legendAllSelect', 'legendselectall', zrUtil.curry(legendSelectActionHandler, 'allSelect'));
+echarts.registerAction('legendInverseSelect', 'legendinverseselect', zrUtil.curry(legendSelectActionHandler, 'inverseSelect'));
 /**
  * @event legendSelect
  * @type {Object}
diff --git a/en/builder/src/echarts/component/marker/MarkerModel.js b/en/builder/src/echarts/component/marker/MarkerModel.js
index 500a6e7..c104533 100644
--- a/en/builder/src/echarts/component/marker/MarkerModel.js
+++ b/en/builder/src/echarts/component/marker/MarkerModel.js
@@ -37,9 +37,10 @@ var MarkerModel = echarts.extendComponentModel({
   /**
    * @overrite
    */
-  init: function (option, parentModel, ecModel, extraOpt) {
+  init: function (option, parentModel, ecModel) {
     this.mergeDefaultAndTheme(option, ecModel);
-    this.mergeOption(option, ecModel, extraOpt.createdBySelf, true);
+
+    this._mergeOption(option, ecModel, false, true);
   },
 
   /**
@@ -53,7 +54,14 @@ var MarkerModel = echarts.extendComponentModel({
     var hostSeries = this.__hostSeries;
     return this.getShallow('animation') && hostSeries && hostSeries.isAnimationEnabled();
   },
-  mergeOption: function (newOpt, ecModel, createdBySelf, isInit) {
+
+  /**
+   * @overrite
+   */
+  mergeOption: function (newOpt, ecModel) {
+    this._mergeOption(newOpt, ecModel, false, false);
+  },
+  _mergeOption: function (newOpt, ecModel, createdBySelf, isInit) {
     var MarkerModel = this.constructor;
     var modelPropName = this.mainType + 'Model';
 
@@ -92,7 +100,7 @@ var MarkerModel = echarts.extendComponentModel({
           });
           markerModel.__hostSeries = seriesModel;
         } else {
-          markerModel.mergeOption(markerOpt, ecModel, true);
+          markerModel._mergeOption(markerOpt, ecModel, true);
         }
 
         seriesModel[modelPropName] = markerModel;
diff --git a/en/builder/src/echarts/component/toolbox/feature/DataZoom.js b/en/builder/src/echarts/component/toolbox/feature/DataZoom.js
index 17c1892..65abfa5 100644
--- a/en/builder/src/echarts/component/toolbox/feature/DataZoom.js
+++ b/en/builder/src/echarts/component/toolbox/feature/DataZoom.js
@@ -47,6 +47,7 @@ function DataZoom(model, ecModel, api) {
 
 DataZoom.defaultOption = {
   show: true,
+  filterMode: 'filter',
   // Icon group
   icon: {
     zoom: 'M0,13.5h26.9 M13.5,26.9V0 M32.1,13.5H58V58H13.5 V32.1',
@@ -273,6 +274,8 @@ echarts.registerPreprocessor(function (option) {
       var newOpt = {
         type: 'select',
         $fromToolbox: true,
+        // Default to be filter
+        filterMode: dataZoomOpt.filterMode || 'filter',
         // Id for merge mapping.
         id: DATA_ZOOM_ID_BASE + axisName + axisIndex
       }; // FIXME
diff --git a/en/builder/src/echarts/component/tooltip/TooltipContentManager.js b/en/builder/src/echarts/component/tooltip/TooltipContentManager.js
old mode 100644
new mode 100755
diff --git a/en/builder/src/echarts/coord/cartesian/Cartesian2D.js b/en/builder/src/echarts/coord/cartesian/Cartesian2D.js
index 9127e01..a952306 100644
--- a/en/builder/src/echarts/coord/cartesian/Cartesian2D.js
+++ b/en/builder/src/echarts/coord/cartesian/Cartesian2D.js
@@ -17,7 +17,22 @@
 * under the License.
 */
 import * as zrUtil from 'zrender/src/core/util';
-import Cartesian from './Cartesian';
+import BoundingRect from 'zrender/src/core/BoundingRect';
+import Cartesian from './Cartesian'; // A helper function to calculate extent of axis.
+
+function getAxisExtentWithGap(axis) {
+  var extent = axis.getGlobalExtent();
+
+  if (axis.onBand) {
+    // Remove extra 1px to avoid line miter in clipped edge
+    var halfBandWidth = axis.getBandWidth() / 2 - 1;
+    var dir = extent[1] > extent[0] ? 1 : -1;
+    extent[0] += dir * halfBandWidth;
+    extent[1] -= dir * halfBandWidth;
+  }
+
+  return extent;
+}
 
 function Cartesian2D(name) {
   Cartesian.call(this, name);
@@ -114,6 +129,22 @@ Cartesian2D.prototype = {
    */
   getOtherAxis: function (axis) {
     return this.getAxis(axis.dim === 'x' ? 'y' : 'x');
+  },
+
+  /**
+   * Get rect area of cartesian.
+   * Area will have a contain function to determine if a point is in the coordinate system.
+   * @return {BoundingRect}
+   */
+  getArea: function () {
+    var xExtent = this.getAxis('x').getGlobalExtent();
+    var yExtent = this.getAxis('y').getGlobalExtent();
+    var x = Math.min(xExtent[0], xExtent[1]);
+    var y = Math.min(yExtent[0], yExtent[1]);
+    var width = Math.max(xExtent[0], xExtent[1]) - x;
+    var height = Math.max(yExtent[0], yExtent[1]) - y;
+    var rect = new BoundingRect(x, y, width, height);
+    return rect;
   }
 };
 zrUtil.inherits(Cartesian2D, Cartesian);
diff --git a/en/builder/src/echarts/coord/geo/GeoModel.js b/en/builder/src/echarts/coord/geo/GeoModel.js
index ff33e6d..d4b8380 100644
--- a/en/builder/src/echarts/coord/geo/GeoModel.js
+++ b/en/builder/src/echarts/coord/geo/GeoModel.js
@@ -118,7 +118,7 @@ var GeoModel = ComponentModel.extend({
    */
   getFormattedLabel: function (name, status) {
     var regionModel = this.getRegionModel(name);
-    var formatter = regionModel.get('label.' + status + '.formatter');
+    var formatter = regionModel.get('label' + (status === 'normal' ? '.' : status + '.') + 'formatter');
     var params = {
       name: name
     };
diff --git a/en/builder/src/echarts/coord/polar/Polar.js b/en/builder/src/echarts/coord/polar/Polar.js
index 35e84b0..34b83b1 100644
--- a/en/builder/src/echarts/coord/polar/Polar.js
+++ b/en/builder/src/echarts/coord/polar/Polar.js
@@ -231,6 +231,39 @@ Polar.prototype = {
 
     var y = -Math.sin(radian) * radius + this.cy;
     return [x, y];
+  },
+
+  /**
+   * Get ring area of cartesian.
+   * Area will have a contain function to determine if a point is in the coordinate system.
+   * @return {Ring}
+   */
+  getArea: function () {
+    var angleAxis = this.getAngleAxis();
+    var radiusAxis = this.getRadiusAxis();
+    var radiusExtent = radiusAxis.getExtent().slice();
+    radiusExtent[0] > radiusExtent[1] && radiusExtent.reverse();
+    var angleExtent = angleAxis.getExtent();
+    var RADIAN = Math.PI / 180;
+    return {
+      cx: this.cx,
+      cy: this.cy,
+      r0: radiusExtent[0],
+      r: radiusExtent[1],
+      startAngle: -angleExtent[0] * RADIAN,
+      endAngle: -angleExtent[1] * RADIAN,
+      clockwise: angleAxis.inverse,
+      contain: function (x, y) {
+        // It's a ring shape.
+        // Start angle and end angle don't matter
+        var dx = x - this.cx;
+        var dy = y - this.cy;
+        var d2 = dx * dx + dy * dy;
+        var r = this.r;
+        var r0 = this.r0;
+        return d2 <= r * r && d2 >= r0 * r0;
+      }
+    };
   }
 };
 export default Polar;
\ No newline at end of file
diff --git a/en/builder/src/echarts/coord/radar/Radar.js b/en/builder/src/echarts/coord/radar/Radar.js
index 187a362..d7f1492 100644
--- a/en/builder/src/echarts/coord/radar/Radar.js
+++ b/en/builder/src/echarts/coord/radar/Radar.js
@@ -116,7 +116,7 @@ Radar.prototype.pointToData = function (pt) {
     }
   }
 
-  return [closestAxisIdx, +(closestAxis && closestAxis.coodToData(radius))];
+  return [closestAxisIdx, +(closestAxis && closestAxis.coordToData(radius))];
 };
 
 Radar.prototype.resize = function (radarModel, api) {
diff --git a/en/builder/src/echarts/echarts.js b/en/builder/src/echarts/echarts.js
index 6c9721a..61be7ee 100644
--- a/en/builder/src/echarts/echarts.js
+++ b/en/builder/src/echarts/echarts.js
@@ -49,12 +49,14 @@ var each = zrUtil.each;
 var isFunction = zrUtil.isFunction;
 var isObject = zrUtil.isObject;
 var parseClassType = ComponentModel.parseClassType;
-export var version = '4.3.0';
+export var version = '4.4.0';
 export var dependencies = {
-  zrender: '4.1.0'
+  zrender: '4.1.1'
 };
 var TEST_FRAME_REMAIN_TIME = 1;
 var PRIORITY_PROCESSOR_FILTER = 1000;
+var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
+var PRIORITY_PROCESSOR_DATASTACK = 900;
 var PRIORITY_PROCESSOR_STATISTIC = 5000;
 var PRIORITY_VISUAL_LAYOUT = 1000;
 var PRIORITY_VISUAL_PROGRESSIVE_LAYOUT = 1100;
@@ -68,6 +70,7 @@ var PRIORITY_VISUAL_BRUSH = 5000;
 export var PRIORITY = {
   PROCESSOR: {
     FILTER: PRIORITY_PROCESSOR_FILTER,
+    SERIES_FILTER: PRIORITY_PROCESSOR_SERIES_FILTER,
     STATISTIC: PRIORITY_PROCESSOR_STATISTIC
   },
   VISUAL: {
@@ -89,9 +92,14 @@ var IN_MAIN_PROCESS = '__flagInMainProcess';
 var OPTION_UPDATED = '__optionUpdated';
 var ACTION_REG = /^[a-zA-Z0-9_]+$/;
 
-function createRegisterEventWithLowercaseName(method) {
+function createRegisterEventWithLowercaseName(method, ignoreDisposed) {
   return function (eventName, handler, context) {
-    // Event name is all lowercase
+    if (!ignoreDisposed && this._disposed) {
+      disposedWarning(this.id);
+      return;
+    } // Event name is all lowercase
+
+
     eventName = eventName && eventName.toLowerCase();
     Eventful.prototype[method].call(this, eventName, handler, context);
   };
@@ -105,9 +113,9 @@ function MessageCenter() {
   Eventful.call(this);
 }
 
-MessageCenter.prototype.on = createRegisterEventWithLowercaseName('on');
-MessageCenter.prototype.off = createRegisterEventWithLowercaseName('off');
-MessageCenter.prototype.one = createRegisterEventWithLowercaseName('one');
+MessageCenter.prototype.on = createRegisterEventWithLowercaseName('on', true);
+MessageCenter.prototype.off = createRegisterEventWithLowercaseName('off', true);
+MessageCenter.prototype.one = createRegisterEventWithLowercaseName('one', true);
 zrUtil.mixin(MessageCenter, Eventful);
 /**
  * @module echarts~ECharts
@@ -316,6 +324,11 @@ echartsProto.getZr = function () {
 
 
 echartsProto.setOption = function (option, notMerge, lazyUpdate) {
+  if (this._disposed) {
+    disposedWarning(this.id);
+    return;
+  }
+
   var silent;
 
   if (isObject(notMerge)) {
@@ -457,6 +470,11 @@ echartsProto.getSvgDataUrl = function () {
 
 
 echartsProto.getDataURL = function (opts) {
+  if (this._disposed) {
+    disposedWarning(this.id);
+    return;
+  }
+
   opts = opts || {};
   var excludeComponents = opts.excludeComponents;
   var ecModel = this._model;
@@ -490,6 +508,11 @@ echartsProto.getDataURL = function (opts) {
 
 
 echartsProto.getConnectedDataURL = function (opts) {
+  if (this._disposed) {
+    disposedWarning(this.id);
+    return;
+  }
+
   if (!env.canvasSupported) {
     return;
   }
@@ -605,6 +628,11 @@ echartsProto.convertToPixel = zrUtil.curry(doConvertPixel, 'convertToPixel');
 echartsProto.convertFromPixel = zrUtil.curry(doConvertPixel, 'convertFromPixel');
 
 function doConvertPixel(methodName, finder, value) {
+  if (this._disposed) {
+    disposedWarning(this.id);
+    return;
+  }
+
   var ecModel = this._model;
 
   var coordSysList = this._coordSysMgr.getCoordinateSystems();
@@ -640,6 +668,11 @@ function doConvertPixel(methodName, finder, value) {
 
 
 echartsProto.containPixel = function (finder, value) {
+  if (this._disposed) {
+    disposedWarning(this.id);
+    return;
+  }
+
   var ecModel = this._model;
   var result;
   finder = modelUtil.parseFinder(ecModel, finder);
@@ -941,6 +974,11 @@ function updateDirectly(ecIns, method, payload, mainType, subType) {
 
 
 echartsProto.resize = function (opts) {
+  if (this._disposed) {
+    disposedWarning(this.id);
+    return;
+  }
+
   this._zr.resize(opts);
 
   var ecModel = this._model; // Resize loading effect
@@ -976,6 +1014,11 @@ function updateStreamModes(ecIns, ecModel) {
 
 
 echartsProto.showLoading = function (name, cfg) {
+  if (this._disposed) {
+    disposedWarning(this.id);
+    return;
+  }
+
   if (isObject(name)) {
     cfg = name;
     name = '';
@@ -999,6 +1042,11 @@ echartsProto.showLoading = function (name, cfg) {
 
 
 echartsProto.hideLoading = function () {
+  if (this._disposed) {
+    disposedWarning(this.id);
+    return;
+  }
+
   this._loadingFX && this._zr.remove(this._loadingFX);
   this._loadingFX = null;
 };
@@ -1022,12 +1070,17 @@ echartsProto.makeActionFromEvent = function (eventObj) {
  * @param {boolean} [opt.flush=undefined]
  *                  true: Flush immediately, and then pixel in canvas can be fetched
  *                      immediately. Caution: it might affect performance.
- *                  false: Not not flush.
+ *                  false: Not flush.
  *                  undefined: Auto decide whether perform flush.
  */
 
 
 echartsProto.dispatchAction = function (payload, opt) {
+  if (this._disposed) {
+    disposedWarning(this.id);
+    return;
+  }
+
   if (!isObject(opt)) {
     opt = {
       silent: !!opt
@@ -1184,6 +1237,11 @@ function bindRenderedEvent(zr, ecIns) {
 
 
 echartsProto.appendData = function (params) {
+  if (this._disposed) {
+    disposedWarning(this.id);
+    return;
+  }
+
   var seriesIndex = params.seriesIndex;
   var ecModel = this.getModel();
   var seriesModel = ecModel.getSeriesByIndex(seriesIndex);
@@ -1203,9 +1261,9 @@ echartsProto.appendData = function (params) {
  */
 
 
-echartsProto.on = createRegisterEventWithLowercaseName('on');
-echartsProto.off = createRegisterEventWithLowercaseName('off');
-echartsProto.one = createRegisterEventWithLowercaseName('one');
+echartsProto.on = createRegisterEventWithLowercaseName('on', false);
+echartsProto.off = createRegisterEventWithLowercaseName('off', false);
+echartsProto.one = createRegisterEventWithLowercaseName('one', false);
 /**
  * Prepare view instances of charts and components
  * @param  {module:echarts/model/Global} ecModel
@@ -1442,6 +1500,11 @@ echartsProto.isDisposed = function () {
 
 
 echartsProto.clear = function () {
+  if (this._disposed) {
+    disposedWarning(this.id);
+    return;
+  }
+
   this.setOption({
     series: []
   }, true);
@@ -1453,6 +1516,7 @@ echartsProto.clear = function () {
 
 echartsProto.dispose = function () {
   if (this._disposed) {
+    disposedWarning(this.id);
     return;
   }
 
@@ -1474,6 +1538,8 @@ echartsProto.dispose = function () {
 
 zrUtil.mixin(ECharts, Eventful);
 
+function disposedWarning(id) {}
+
 function updateHoverLayerStatus(ecIns, ecModel) {
   var zr = ecIns._zr;
   var storage = zr.storage;
@@ -2125,7 +2191,7 @@ export function getMap(mapName) {
 }
 registerVisual(PRIORITY_VISUAL_GLOBAL, seriesColor);
 registerPreprocessor(backwardCompat);
-registerProcessor(PRIORITY_PROCESSOR_STATISTIC, dataStack);
+registerProcessor(PRIORITY_PROCESSOR_DATASTACK, dataStack);
 registerLoading('default', loadingDefault); // Default actions
 
 registerAction({
diff --git a/en/builder/src/echarts/export.js b/en/builder/src/echarts/export.js
index a35a18f..ec70518 100644
--- a/en/builder/src/echarts/export.js
+++ b/en/builder/src/echarts/export.js
@@ -51,7 +51,7 @@ zrUtil.each(['map', 'each', 'filter', 'indexOf', 'inherits', 'reduce', 'filter',
 });
 export { ecUtil as util };
 var graphic = {};
-zrUtil.each(['extendShape', 'extendPath', 'makePath', 'makeImage', 'mergePath', 'resizePath', 'createIcon', 'setHoverStyle', 'setLabelStyle', 'setTextStyle', 'setText', 'getFont', 'updateProps', 'initProps', 'getTransform', 'clipPointsByRect', 'clipRectByRect', 'Group', 'Image', 'Text', 'Circle', 'Sector', 'Ring', 'Polygon', 'Polyline', 'Rect', 'Line', 'BezierCurve', 'Arc', 'IncrementalDisplayable', 'CompoundPath', 'LinearGradient', 'RadialGradient', 'BoundingRect'], function (name) {
+zrUtil.each(['extendShape', 'extendPath', 'makePath', 'makeImage', 'mergePath', 'resizePath', 'createIcon', 'setHoverStyle', 'setLabelStyle', 'setTextStyle', 'setText', 'getFont', 'updateProps', 'initProps', 'getTransform', 'clipPointsByRect', 'clipRectByRect', 'registerShape', 'getShapeClass', 'Group', 'Image', 'Text', 'Circle', 'Sector', 'Ring', 'Polygon', 'Polyline', 'Rect', 'Line', 'BezierCurve', 'Arc', 'IncrementalDisplayable', 'CompoundPath', 'LinearGradient', 'RadialGradient', 'Bo [...]
   graphic[name] = graphicUtil[name];
 });
 export { graphic };
\ No newline at end of file
diff --git a/en/builder/src/echarts/lang.js b/en/builder/src/echarts/lang.js
index 4413c12..22d1beb 100644
--- a/en/builder/src/echarts/lang.js
+++ b/en/builder/src/echarts/lang.js
@@ -16,7 +16,17 @@
 * specific language governing permissions and limitations
 * under the License.
 */
+
+/**
+ * Language: (Simplified) Chinese.
+ */
 export default {
+  legend: {
+    selector: {
+      all: '全选',
+      inverse: '反选'
+    }
+  },
   toolbox: {
     brush: {
       title: {
diff --git a/en/builder/src/echarts/langEN.js b/en/builder/src/echarts/langEN.js
index 4ebdcff..f028ee1 100644
--- a/en/builder/src/echarts/langEN.js
+++ b/en/builder/src/echarts/langEN.js
@@ -16,7 +16,17 @@
 * specific language governing permissions and limitations
 * under the License.
 */
+
+/**
+ * Language: English.
+ */
 export default {
+  legend: {
+    selector: {
+      all: 'All',
+      inverse: 'Inv'
+    }
+  },
   toolbox: {
     brush: {
       title: {
diff --git a/en/builder/src/echarts/langES.js b/en/builder/src/echarts/langES.js
index 4467942..e78b538 100644
--- a/en/builder/src/echarts/langES.js
+++ b/en/builder/src/echarts/langES.js
@@ -16,7 +16,17 @@
 * specific language governing permissions and limitations
 * under the License.
 */
+
+/**
+ * Language: Spanish
+ */
 export default {
+  legend: {
+    selector: {
+      all: 'Todas',
+      inverse: 'Inversa'
+    }
+  },
   toolbox: {
     brush: {
       title: {
diff --git a/en/builder/src/echarts/langFI.js b/en/builder/src/echarts/langFI.js
index a6a9c4a..a25cc18 100644
--- a/en/builder/src/echarts/langFI.js
+++ b/en/builder/src/echarts/langFI.js
@@ -16,7 +16,17 @@
 * specific language governing permissions and limitations
 * under the License.
 */
+
+/**
+ * Language: Finnish
+ */
 export default {
+  legend: {
+    selector: {
+      all: 'Kaikki',
+      inverse: 'Käänteinen'
+    }
+  },
   toolbox: {
     brush: {
       title: {
diff --git a/en/builder/src/echarts/langTH.js b/en/builder/src/echarts/langTH.js
index 06f6589..d74a493 100644
--- a/en/builder/src/echarts/langTH.js
+++ b/en/builder/src/echarts/langTH.js
@@ -16,7 +16,17 @@
 * specific language governing permissions and limitations
 * under the License.
 */
+
+/**
+ * Language: Thai
+ */
 export default {
+  legend: {
+    selector: {
+      all: 'ทั้งหมด',
+      inverse: 'ผกผัน'
+    }
+  },
   toolbox: {
     brush: {
       title: {
diff --git a/en/builder/src/echarts/layout/barGrid.js b/en/builder/src/echarts/layout/barGrid.js
index 22bce74..1c7da97 100644
--- a/en/builder/src/echarts/layout/barGrid.js
+++ b/en/builder/src/echarts/layout/barGrid.js
@@ -205,6 +205,7 @@ function doCalBarWidthAndOffset(seriesInfoList) {
     var offset = -widthSum / 2;
     zrUtil.each(stacks, function (column, stackId) {
       result[coordSysName][stackId] = result[coordSysName][stackId] || {
+        bandWidth: bandWidth,
         offset: offset,
         width: column.width
       };
@@ -256,6 +257,7 @@ export function layout(seriesType, ecModel) {
     lastStackCoordsOrigin[stackId] = lastStackCoordsOrigin[stackId] || []; // Fix #4243
 
     data.setLayout({
+      bandWidth: columnLayoutInfo.bandWidth,
       offset: columnOffset,
       size: columnWidth
     });
@@ -404,20 +406,5 @@ function isInLargeMode(seriesModel) {
 
 
 function getValueAxisStart(baseAxis, valueAxis, stacked) {
-  var extent = valueAxis.getGlobalExtent();
-  var min;
-  var max;
-
-  if (extent[0] > extent[1]) {
-    min = extent[1];
-    max = extent[0];
-  } else {
-    min = extent[0];
-    max = extent[1];
-  }
-
-  var valueStart = valueAxis.toGlobalCoord(valueAxis.dataToCoord(0));
-  valueStart < min && (valueStart = min);
-  valueStart > max && (valueStart = max);
-  return valueStart;
+  return valueAxis.toGlobalCoord(valueAxis.dataToCoord(0));
 }
\ No newline at end of file
diff --git a/en/builder/src/echarts/model/Global.js b/en/builder/src/echarts/model/Global.js
index 48cb6ca..487023e 100644
--- a/en/builder/src/echarts/model/Global.js
+++ b/en/builder/src/echarts/model/Global.js
@@ -324,8 +324,8 @@ var GlobalModel = Model.extend({
    *     {mainType: 'series', subType: 'pie', query: {seriesName: 'uio'}}
    * );
    * var result = findComponents(
-   *     {mainType: 'series'},
-   *     function (model, index) {...}
+   *     {mainType: 'series',
+   *     filter: function (model, index) {...}}
    * );
    * // result like [component0, componnet1, ...]
    *
diff --git a/en/builder/src/echarts/model/Series.js b/en/builder/src/echarts/model/Series.js
index 4944aff..6b1412c 100644
--- a/en/builder/src/echarts/model/Series.js
+++ b/en/builder/src/echarts/model/Series.js
@@ -58,6 +58,11 @@ var SeriesModel = ComponentModel.extend({
   visualColorAccessPath: 'itemStyle.color',
 
   /**
+   * Access path of borderColor for visual
+   */
+  visualBorderColorAccessPath: 'itemStyle.borderColor',
+
+  /**
    * Support merge layout params.
    * Only support 'box' now (left/right/top/bottom/width/height).
    * @type {string|Object} Object can be {ignoreSize: true}
diff --git a/en/builder/src/echarts/model/mixin/dataFormat.js b/en/builder/src/echarts/model/mixin/dataFormat.js
index cffd4f6..432987d 100644
--- a/en/builder/src/echarts/model/mixin/dataFormat.js
+++ b/en/builder/src/echarts/model/mixin/dataFormat.js
@@ -35,6 +35,7 @@ export default {
     var name = data.getName(dataIndex);
     var itemOpt = data.getRawDataItem(dataIndex);
     var color = data.getItemVisual(dataIndex, 'color');
+    var borderColor = data.getItemVisual(dataIndex, 'borderColor');
     var tooltipModel = this.ecModel.getComponent('tooltip');
     var renderModeOption = tooltipModel && tooltipModel.get('renderMode');
     var renderMode = getTooltipRenderMode(renderModeOption);
@@ -55,6 +56,7 @@ export default {
       dataType: dataType,
       value: rawValue,
       color: color,
+      borderColor: borderColor,
       dimensionNames: userOutput ? userOutput.dimensionNames : null,
       encode: userOutput ? userOutput.encode : null,
       marker: getTooltipMarker({
diff --git a/en/builder/src/echarts/model/mixin/lineStyle.js b/en/builder/src/echarts/model/mixin/lineStyle.js
index 17a5188..6434a8c 100644
--- a/en/builder/src/echarts/model/mixin/lineStyle.js
+++ b/en/builder/src/echarts/model/mixin/lineStyle.js
@@ -20,7 +20,7 @@ import makeStyleMapper from './makeStyleMapper';
 var getLineStyle = makeStyleMapper([['lineWidth', 'width'], ['stroke', 'color'], ['opacity'], ['shadowBlur'], ['shadowOffsetX'], ['shadowOffsetY'], ['shadowColor']]);
 export default {
   getLineStyle: function (excludes) {
-    var style = getLineStyle(this, excludes); // Always set lineDash whether dashed, otherwise we can not 
+    var style = getLineStyle(this, excludes); // Always set lineDash whether dashed, otherwise we can not
     // erase the previous style when assigning to el.style.
 
     style.lineDash = this.getLineDash(style.lineWidth);
@@ -34,10 +34,10 @@ export default {
     var lineType = this.get('type');
     var dotSize = Math.max(lineWidth, 2);
     var dashSize = lineWidth * 4;
-    return lineType === 'solid' || lineType == null ? // Use `false` but not `null` for the solid line here, because `null` might be 
-    // ignored when assigning to `el.style`. e.g., when setting `lineStyle.type` as 
-    // `'dashed'` and `emphasis.lineStyle.type` as `'solid'` in graph series, the 
-    // `lineDash` gotten form the latter one is not able to erase that from the former 
+    return lineType === 'solid' || lineType == null ? // Use `false` but not `null` for the solid line here, because `null` might be
+    // ignored when assigning to `el.style`. e.g., when setting `lineStyle.type` as
+    // `'dashed'` and `emphasis.lineStyle.type` as `'solid'` in graph series, the
+    // `lineDash` gotten form the latter one is not able to erase that from the former
     // one if using `null` here according to the emhpsis strategy in `util/graphic.js`.
     false : lineType === 'dashed' ? [dashSize, dashSize] : [dotSize, dotSize];
   }
diff --git a/en/builder/src/echarts/preprocessor/backwardCompat.js b/en/builder/src/echarts/preprocessor/backwardCompat.js
index 811fe3e..711a5b0 100644
--- a/en/builder/src/echarts/preprocessor/backwardCompat.js
+++ b/en/builder/src/echarts/preprocessor/backwardCompat.js
@@ -77,13 +77,15 @@ export default function (option, isTheme) {
 
     var seriesType = seriesOpt.type;
 
-    if (seriesType === 'pie' || seriesType === 'gauge') {
+    if (seriesType === 'line') {
+      if (seriesOpt.clipOverflow != null) {
+        seriesOpt.clip = seriesOpt.clipOverflow;
+      }
+    } else if (seriesType === 'pie' || seriesType === 'gauge') {
       if (seriesOpt.clockWise != null) {
         seriesOpt.clockwise = seriesOpt.clockWise;
       }
-    }
-
-    if (seriesType === 'gauge') {
+    } else if (seriesType === 'gauge') {
       var pointerColor = get(seriesOpt, 'pointer.color');
       pointerColor != null && set(seriesOpt, 'itemStyle.color', pointerColor);
     }
diff --git a/en/builder/src/echarts/processor/dataStack.js b/en/builder/src/echarts/processor/dataStack.js
index 98e80e2..8daad80 100644
--- a/en/builder/src/echarts/processor/dataStack.js
+++ b/en/builder/src/echarts/processor/dataStack.js
@@ -20,7 +20,7 @@ import { createHashMap, each } from 'zrender/src/core/util'; // (1) [Caution]: t
 //     data processing stage is blocked in stream.
 //     See <module:echarts/stream/Scheduler#performDataProcessorTasks>
 // (2) Only register once when import repeatly.
-//     Should be executed before after series filtered and before stack calculation.
+//     Should be executed after series filtered and before stack calculation.
 
 export default function (ecModel) {
   var stackInfoMap = createHashMap();
diff --git a/en/builder/src/echarts/util/graphic.js b/en/builder/src/echarts/util/graphic.js
index 002f5b4..5477ae7 100644
--- a/en/builder/src/echarts/util/graphic.js
+++ b/en/builder/src/echarts/util/graphic.js
@@ -56,6 +56,7 @@ var NORMAL = 'normal'; // Reserve 0 as default.
 
 var _highlightNextDigit = 1;
 var _highlightKeyMap = {};
+var _customShapeMap = {};
 /**
  * Extend shape with parameters
  */
@@ -71,6 +72,54 @@ export function extendPath(pathData, opts) {
   return pathTool.extendFromString(pathData, opts);
 }
 /**
+ * Register a user defined shape.
+ * The shape class can be fetched by `getShapeClass`
+ * This method will overwrite the registered shapes, including
+ * the registered built-in shapes, if using the same `name`.
+ * The shape can be used in `custom series` and
+ * `graphic component` by declaring `{type: name}`.
+ *
+ * @param {string} name
+ * @param {Object} ShapeClass Can be generated by `extendShape`.
+ */
+
+export function registerShape(name, ShapeClass) {
+  _customShapeMap[name] = ShapeClass;
+}
+/**
+ * Find shape class registered by `registerShape`. Usually used in
+ * fetching user defined shape.
+ *
+ * [Caution]:
+ * (1) This method **MUST NOT be used inside echarts !!!**, unless it is prepared
+ * to use user registered shapes.
+ * Because the built-in shape (see `getBuiltInShape`) will be registered by
+ * `registerShape` by default. That enables users to get both built-in
+ * shapes as well as the shapes belonging to themsleves. But users can overwrite
+ * the built-in shapes by using names like 'circle', 'rect' via calling
+ * `registerShape`. So the echarts inner featrues should not fetch shapes from here
+ * in case that it is overwritten by users, except that some features, like
+ * `custom series`, `graphic component`, do it deliberately.
+ *
+ * (2) In the features like `custom series`, `graphic component`, the user input
+ * `{tpye: 'xxx'}` does not only specify shapes but also specify other graphic
+ * elements like `'group'`, `'text'`, `'image'` or event `'path'`. Those names
+ * are reserved names, that is, if some user register a shape named `'image'`,
+ * the shape will not be used. If we intending to add some more reserved names
+ * in feature, that might bring break changes (disable some existing user shape
+ * names). But that case probably rearly happen. So we dont make more mechanism
+ * to resolve this issue here.
+ *
+ * @param {string} name
+ * @return {Object} The shape class. If not found, return nothing.
+ */
+
+export function getShapeClass(name) {
+  if (_customShapeMap.hasOwnProperty(name)) {
+    return _customShapeMap[name];
+  }
+}
+/**
  * Create a path element from path data string
  * @param {string} pathData
  * @param {Object} opts
@@ -277,11 +326,11 @@ function singleEnterEmphasis(el) {
     return;
   }
 
-  var useHoverLayer = el.useHoverLayer;
-  el.__highlighted = useHoverLayer ? 'layer' : 'plain';
   var zr = el.__zr;
+  var useHoverLayer = el.useHoverLayer && zr && zr.painter.type === 'canvas';
+  el.__highlighted = useHoverLayer ? 'layer' : 'plain';
 
-  if (el.isGroup || !zr && useHoverLayer) {
+  if (el.isGroup || !zr && el.useHoverLayer) {
     return;
   }
 
@@ -742,10 +791,17 @@ function setTextStyleCommon(textStyle, textStyleModel, opt, isEmphasis) {
   opt = opt || EMPTY_OBJ;
 
   if (opt.isRectText) {
-    var textPosition = textStyleModel.getShallow('position') || (isEmphasis ? null : 'inside'); // 'outside' is not a valid zr textPostion value, but used
-    // in bar series, and magric type should be considered.
+    var textPosition;
+
+    if (opt.getTextPosition) {
+      textPosition = opt.getTextPosition(textStyleModel, isEmphasis);
+    } else {
+      textPosition = textStyleModel.getShallow('position') || (isEmphasis ? null : 'inside'); // 'outside' is not a valid zr textPostion value, but used
+      // in bar series, and magric type should be considered.
+
+      textPosition === 'outside' && (textPosition = 'top');
+    }
 
-    textPosition === 'outside' && (textPosition = 'top');
     textStyle.textPosition = textPosition;
     textStyle.textOffset = textStyleModel.getShallow('offset');
     var labelRotate = textStyleModel.getShallow('rotate');
@@ -1313,6 +1369,17 @@ function crossProduct2d(x1, y1, x2, y2) {
 
 function nearZero(val) {
   return val <= 1e-6 && val >= -1e-6;
-}
-
+} // Register built-in shapes. These shapes might be overwirtten
+// by users, although we do not recommend that.
+
+
+registerShape('circle', Circle);
+registerShape('sector', Sector);
+registerShape('ring', Ring);
+registerShape('polygon', Polygon);
+registerShape('polyline', Polyline);
+registerShape('rect', Rect);
+registerShape('line', Line);
+registerShape('bezierCurve', BezierCurve);
+registerShape('arc', Arc);
 export { Group, ZImage as Image, Text, Circle, Sector, Ring, Polygon, Polyline, Rect, Line, BezierCurve, Arc, IncrementalDisplayable, CompoundPath, LinearGradient, RadialGradient, BoundingRect };
\ No newline at end of file
diff --git a/en/builder/src/echarts/util/number.js b/en/builder/src/echarts/util/number.js
index 2043b91..f464a13 100644
--- a/en/builder/src/echarts/util/number.js
+++ b/en/builder/src/echarts/util/number.js
@@ -29,7 +29,7 @@ import * as zrUtil from 'zrender/src/core/util';
 var RADIAN_EPSILON = 1e-4;
 
 function _trim(str) {
-  return str.replace(/^\s+/, '').replace(/\s+$/, '');
+  return str.replace(/^\s+|\s+$/g, '');
 }
 /**
  * Linear mapping a value from domain to range
diff --git a/en/builder/src/echarts/visual/dataColor.js b/en/builder/src/echarts/visual/dataColor.js
index f523518..14af9bc 100644
--- a/en/builder/src/echarts/visual/dataColor.js
+++ b/en/builder/src/echarts/visual/dataColor.js
@@ -44,10 +44,15 @@ export default function (seriesType) {
         var filteredIdx = idxMap[rawIdx]; // If series.itemStyle.normal.color is a function. itemVisual may be encoded
 
         var singleDataColor = filteredIdx != null && data.getItemVisual(filteredIdx, 'color', true);
+        var singleDataBorderColor = filteredIdx != null && data.getItemVisual(filteredIdx, 'borderColor', true);
+        var itemModel;
 
-        if (!singleDataColor) {
+        if (!singleDataColor || !singleDataBorderColor) {
           // FIXME Performance
-          var itemModel = dataAll.getItemModel(rawIdx);
+          itemModel = dataAll.getItemModel(rawIdx);
+        }
+
+        if (!singleDataColor) {
           var color = itemModel.get('itemStyle.color') || seriesModel.getColorFromPalette(dataAll.getName(rawIdx) || rawIdx + '', seriesModel.__paletteScope, dataAll.count()); // Legend may use the visual info in data before processed
 
           dataAll.setItemVisual(rawIdx, 'color', color); // Data is not filtered
@@ -59,6 +64,19 @@ export default function (seriesType) {
           // Set data all color for legend
           dataAll.setItemVisual(rawIdx, 'color', singleDataColor);
         }
+
+        if (!singleDataBorderColor) {
+          var borderColor = itemModel.get('itemStyle.borderColor'); // Legend may use the visual info in data before processed
+
+          dataAll.setItemVisual(rawIdx, 'borderColor', borderColor); // Data is not filtered
+
+          if (filteredIdx != null) {
+            data.setItemVisual(filteredIdx, 'borderColor', borderColor);
+          }
+        } else {
+          // Set data all borderColor for legend
+          dataAll.setItemVisual(rawIdx, 'borderColor', singleDataBorderColor);
+        }
       });
     }
   };
diff --git a/en/builder/src/echarts/visual/seriesColor.js b/en/builder/src/echarts/visual/seriesColor.js
index de0feb2..0a6a24f 100644
--- a/en/builder/src/echarts/visual/seriesColor.js
+++ b/en/builder/src/echarts/visual/seriesColor.js
@@ -28,7 +28,10 @@ export default {
     seriesModel.name, null, ecModel.getSeriesCount()); // Default color
     // FIXME Set color function or use the platte color
 
-    data.setVisual('color', color); // Only visible series has each data be visual encoded
+    data.setVisual('color', color);
+    var borderColorAccessPath = (seriesModel.visualBorderColorAccessPath || 'itemStyle.borderColor').split('.');
+    var borderColor = seriesModel.get(borderColorAccessPath);
+    data.setVisual('borderColor', borderColor); // Only visible series has each data be visual encoded
 
     if (!ecModel.isSeriesFiltered(seriesModel)) {
       if (typeof color === 'function' && !(color instanceof Gradient)) {
@@ -41,10 +44,15 @@ export default {
       var dataEach = function (data, idx) {
         var itemModel = data.getItemModel(idx);
         var color = itemModel.get(colorAccessPath, true);
+        var borderColor = itemModel.get(borderColorAccessPath, true);
 
         if (color != null) {
           data.setItemVisual(idx, 'color', color);
         }
+
+        if (borderColor != null) {
+          data.setItemVisual(idx, 'borderColor', borderColor);
+        }
       };
 
       return {
diff --git a/en/builder/src/zrender/Layer.js b/en/builder/src/zrender/Layer.js
index e545854..ccce68d 100644
--- a/en/builder/src/zrender/Layer.js
+++ b/en/builder/src/zrender/Layer.js
@@ -74,8 +74,10 @@ var Layer = function (id, painter, dpr) {
     domStyle['user-select'] = 'none';
     domStyle['-webkit-touch-callout'] = 'none';
     domStyle['-webkit-tap-highlight-color'] = 'rgba(0,0,0,0)';
-    domStyle['padding'] = 0;
-    domStyle['margin'] = 0;
+    domStyle['padding'] = 0; // eslint-disable-line dot-notation
+
+    domStyle['margin'] = 0; // eslint-disable-line dot-notation
+
     domStyle['border-width'] = 0;
   }
 
diff --git a/en/builder/src/zrender/Painter.js b/en/builder/src/zrender/Painter.js
index 061c95e..9dc802d 100644
--- a/en/builder/src/zrender/Painter.js
+++ b/en/builder/src/zrender/Painter.js
@@ -1,6 +1,6 @@
 import { devicePixelRatio } from './config';
 import * as util from './core/util';
-import log from './core/log';
+import logError from './core/log';
 import BoundingRect from './core/BoundingRect';
 import timsort from './core/timsort';
 import Layer from './Layer';
@@ -546,13 +546,13 @@ Painter.prototype = {
     var domRoot = this._domRoot;
 
     if (layersMap[zlevel]) {
-      log('ZLevel ' + zlevel + ' has been used already');
+      logError('ZLevel ' + zlevel + ' has been used already');
       return;
     } // Check if is a valid layer
 
 
     if (!isLayerValid(layer)) {
-      log('Layer of zlevel ' + zlevel + ' is not valid');
+      logError('Layer of zlevel ' + zlevel + ' is not valid');
       return;
     }
 
@@ -684,7 +684,7 @@ Painter.prototype = {
       }
 
       if (!layer.__builtin__) {
-        log('ZLevel ' + zlevel + ' has been used by unkown layer ' + layer.id);
+        logError('ZLevel ' + zlevel + ' has been used by unkown layer ' + layer.id);
       }
 
       if (layer !== prevLayer) {
diff --git a/en/builder/src/zrender/animation/track.js b/en/builder/src/zrender/animation/track.js
old mode 100644
new mode 100755
diff --git a/en/builder/src/zrender/config.js b/en/builder/src/zrender/config.js
index cb5cc1d..0cc679e 100644
--- a/en/builder/src/zrender/config.js
+++ b/en/builder/src/zrender/config.js
@@ -10,10 +10,9 @@ if (typeof window !== 'undefined') {
  */
 
 /**
- * debug日志选项:catchBrushException为true下有效
- * 0 : 不生成debug数据,发布用
- * 1 : 异常抛出,调试用
- * 2 : 控制台输出,调试用
+ * Debug log mode:
+ * 0: Do nothing, for release.
+ * 1: console.error, for debug.
  */
 
 
diff --git a/en/builder/src/zrender/core/PathProxy.js b/en/builder/src/zrender/core/PathProxy.js
index 7c86a8b..8e03633 100644
--- a/en/builder/src/zrender/core/PathProxy.js
+++ b/en/builder/src/zrender/core/PathProxy.js
@@ -6,6 +6,8 @@
  * @author Yi Shen (http://www.github.com/pissang)
  */
 // TODO getTotalLength, getPointAtLength
+
+/* global Float32Array */
 import * as curve from './curve';
 import * as vec2 from './vector';
 import * as bbox from './bbox';
@@ -649,9 +651,12 @@ PathProxy.prototype = {
    */
   rebuildPath: function (ctx) {
     var d = this.data;
-    var x0, y0;
-    var xi, yi;
-    var x, y;
+    var x0;
+    var y0;
+    var xi;
+    var yi;
+    var x;
+    var y;
     var ux = this._ux;
     var uy = this._uy;
     var len = this._len;
diff --git a/en/builder/src/zrender/core/env.js b/en/builder/src/zrender/core/env.js
index f65d019..3a781eb 100644
--- a/en/builder/src/zrender/core/env.js
+++ b/en/builder/src/zrender/core/env.js
@@ -5,6 +5,8 @@
  * @author firede[firede@firede.us]
  * @desc thanks zepto.
  */
+
+/* global wx */
 var env = {};
 
 if (typeof wx === 'object' && typeof wx.getSystemInfoSync === 'function') {
diff --git a/en/builder/src/zrender/core/log.js b/en/builder/src/zrender/core/log.js
index e5ac242..1959d21 100644
--- a/en/builder/src/zrender/core/log.js
+++ b/en/builder/src/zrender/core/log.js
@@ -1,19 +1,9 @@
 import { debugMode } from '../config';
 
-var log = function () {};
+var logError = function () {};
 
 if (debugMode === 1) {
-  log = function () {
-    for (var k in arguments) {
-      throw new Error(arguments[k]);
-    }
-  };
-} else if (debugMode > 1) {
-  log = function () {
-    for (var k in arguments) {
-      console.log(arguments[k]);
-    }
-  };
+  logError = console.error;
 }
 
-export default log;
\ No newline at end of file
+export default logError;
\ No newline at end of file
diff --git a/en/builder/src/zrender/core/matrix.js b/en/builder/src/zrender/core/matrix.js
index f919e56..ccd56d7 100644
--- a/en/builder/src/zrender/core/matrix.js
+++ b/en/builder/src/zrender/core/matrix.js
@@ -2,6 +2,8 @@
  * 3x2矩阵操作类
  * @exports zrender/tool/matrix
  */
+
+/* global Float32Array */
 var ArrayCtor = typeof Float32Array === 'undefined' ? Array : Float32Array;
 /**
  * Create a identity matrix.
diff --git a/en/builder/src/zrender/core/timsort.js b/en/builder/src/zrender/core/timsort.js
index 899cc39..5036e09 100644
--- a/en/builder/src/zrender/core/timsort.js
+++ b/en/builder/src/zrender/core/timsort.js
@@ -327,7 +327,9 @@ function TimSort(array, compare) {
     }
 
     var _minGallop = minGallop;
-    var count1, count2, exit;
+    var count1;
+    var count2;
+    var exit;
 
     while (1) {
       count1 = 0;
diff --git a/en/builder/src/zrender/core/util.js b/en/builder/src/zrender/core/util.js
index a56949d..8a7a4ae 100644
--- a/en/builder/src/zrender/core/util.js
+++ b/en/builder/src/zrender/core/util.js
@@ -235,7 +235,9 @@ export function inherits(clazz, baseClazz) {
   clazz.prototype = new F();
 
   for (var prop in clazzPrototype) {
-    clazz.prototype[prop] = clazzPrototype[prop];
+    if (clazzPrototype.hasOwnProperty(prop)) {
+      clazz.prototype[prop] = clazzPrototype[prop];
+    }
   }
 
   clazz.prototype.constructor = clazz;
@@ -492,6 +494,7 @@ export function isDom(value) {
  */
 
 export function eqNaN(value) {
+  /* eslint-disable-next-line no-self-compare */
   return value !== value;
 }
 /**
@@ -624,10 +627,13 @@ HashMap.prototype = {
   // should not use the exposed keys, who are prefixed.
   each: function (cb, context) {
     context !== void 0 && (cb = bind(cb, context));
+    /* eslint-disable guard-for-in */
 
     for (var key in this.data) {
       this.data.hasOwnProperty(key) && cb(this.data[key], key);
     }
+    /* eslint-enable guard-for-in */
+
   },
   // Do not use this method if performance sensitive.
   removeKey: function (key) {
diff --git a/en/builder/src/zrender/core/vector.js b/en/builder/src/zrender/core/vector.js
index 39d533d..e7b7226 100644
--- a/en/builder/src/zrender/core/vector.js
+++ b/en/builder/src/zrender/core/vector.js
@@ -1,3 +1,4 @@
+/* global Float32Array */
 var ArrayCtor = typeof Float32Array === 'undefined' ? Array : Float32Array;
 /**
  * 创建一个向量
diff --git a/en/builder/src/zrender/graphic/States.js b/en/builder/src/zrender/graphic/States.js
index 1aa2229..be6459d 100644
--- a/en/builder/src/zrender/graphic/States.js
+++ b/en/builder/src/zrender/graphic/States.js
@@ -276,6 +276,7 @@ GraphicStates.prototype = {
           if (propName === 'style' || propName === 'shape') {
             if (state[propName]) {
               for (var key in state[propName]) {
+                /* eslint-disable max-depth */
                 if (!state[propName].hasOwnProperty(key)) {
                   continue;
                 }
@@ -285,6 +286,8 @@ GraphicStates.prototype = {
                 if (propPathMap[path]) {
                   continue;
                 }
+                /* eslint-enable max-depth */
+
 
                 propPathMap[path] = 1;
                 animatingCount += self._animProp(state, propName, key, transitionCfg, animationDone);
diff --git a/en/builder/src/zrender/graphic/Style.js b/en/builder/src/zrender/graphic/Style.js
index 6f0e1eb..aab55cc 100644
--- a/en/builder/src/zrender/graphic/Style.js
+++ b/en/builder/src/zrender/graphic/Style.js
@@ -78,8 +78,8 @@ Style.prototype = {
   /**
    * `true` is not supported.
    * `false`/`null`/`undefined` are the same.
-   * `false` is used to remove lineDash in some 
-   * case that `null`/`undefined` can not be set. 
+   * `false` is used to remove lineDash in some
+   * case that `null`/`undefined` can not be set.
    * (e.g., emphasis.lineStyle in echarts)
    * @type {Array.<number>|boolean}
    */
diff --git a/en/builder/src/zrender/graphic/helper/text.js b/en/builder/src/zrender/graphic/helper/text.js
index 44aced0..42c9899 100644
--- a/en/builder/src/zrender/graphic/helper/text.js
+++ b/en/builder/src/zrender/graphic/helper/text.js
@@ -494,8 +494,7 @@ export function getFill(fill) {
   return fill == null || fill === 'none' ? null // TODO pattern and gradient?
   : fill.image || fill.colorStops ? '#000' : fill;
 }
-
-function parsePercent(value, maxValue) {
+export function parsePercent(value, maxValue) {
   if (typeof value === 'string') {
     if (value.lastIndexOf('%') >= 0) {
       return parseFloat(value) / 100 * maxValue;
diff --git a/en/builder/src/zrender/mixin/Animatable.js b/en/builder/src/zrender/mixin/Animatable.js
index 2a57e09..b2605ab 100644
--- a/en/builder/src/zrender/mixin/Animatable.js
+++ b/en/builder/src/zrender/mixin/Animatable.js
@@ -1,5 +1,5 @@
 import Animator from '../animation/Animator';
-import log from '../core/log';
+import logError from '../core/log';
 import { isString, isFunction, isObject, isArrayLike, indexOf } from '../core/util';
 /**
  * @alias modue:zrender/mixin/Animatable
@@ -57,7 +57,7 @@ Animatable.prototype = {
     }
 
     if (!target) {
-      log('Property "' + path + '" is not existed in element ' + el.id);
+      logError('Property "' + path + '" is not existed in element ' + el.id);
       return;
     }
 
diff --git a/en/builder/src/zrender/svg/Painter.js b/en/builder/src/zrender/svg/Painter.js
index 77d7e2c..9f39d17 100644
--- a/en/builder/src/zrender/svg/Painter.js
+++ b/en/builder/src/zrender/svg/Painter.js
@@ -4,7 +4,7 @@
  */
 import { createElement } from './core';
 import * as util from '../core/util';
-import zrLog from '../core/log';
+import logError from '../core/log';
 import Path from '../graphic/Path';
 import ZImage from '../graphic/Image';
 import ZText from '../graphic/Text';
@@ -46,13 +46,12 @@ function prepend(parent, child) {
     var firstChild = parent.firstChild;
     firstChild ? parent.insertBefore(child, firstChild) : parent.appendChild(child);
   }
-}
+} // function append(parent, child) {
+//     if (checkParentAvailable(parent, child)) {
+//         parent.appendChild(child);
+//     }
+// }
 
-function append(parent, child) {
-  if (checkParentAvailable(parent, child)) {
-    parent.appendChild(child);
-  }
-}
 
 function remove(parent, child) {
   if (child && parent && child.parentNode === parent) {
@@ -331,7 +330,7 @@ SVGPainter.prototype = {
 
 function createMethodNotSupport(method) {
   return function () {
-    zrLog('In SVG mode painter not support method "' + method + '"');
+    logError('In SVG mode painter not support method "' + method + '"');
   };
 } // Unsuppoted methods
 
diff --git a/en/builder/src/zrender/svg/graphic.js b/en/builder/src/zrender/svg/graphic.js
index a907e67..8d3ec7b 100644
--- a/en/builder/src/zrender/svg/graphic.js
+++ b/en/builder/src/zrender/svg/graphic.js
@@ -329,12 +329,12 @@ var svgTextDrawRectText = function (el, rect, textRect) {
 
   var font = style.font || [style.fontStyle || '', style.fontWeight || '', style.fontSize || '', style.fontFamily || ''].join(' ') || textContain.DEFAULT_FONT;
   var verticalAlign = style.textVerticalAlign;
-  textRect = textContain.getBoundingRect(text, font, align, verticalAlign, style.textPadding, style.textLineHeight);
+  textRect = textContain.getBoundingRect(text, font, align, verticalAlign, style.textPadding, style.textLineHeight, false, style.truncate);
   var lineHeight = textRect.lineHeight; // Text position represented by coord
 
   if (textPosition instanceof Array) {
-    x = rect.x + textPosition[0];
-    y = rect.y + textPosition[1];
+    x = rect.x + textHelper.parsePercent(textPosition[0], rect.width);
+    y = rect.y + textHelper.parsePercent(textPosition[1], rect.height);
   } else {
     var newPos = el.calculateTextPosition ? el.calculateTextPosition(tmpTextPositionResult, style, rect) : textContain.calculateTextPosition(tmpTextPositionResult, style, rect);
     x = newPos.x;
@@ -390,7 +390,8 @@ var svgTextDrawRectText = function (el, rect, textRect) {
     setTransform(textSvgEl, transform);
   }
 
-  var textLines = text.split('\n');
+  var contentBlock = textContain.parsePlainText(text, font, textPadding, lineHeight, style.truncate);
+  var textLines = contentBlock.lines;
   var nTextLines = textLines.length;
   var textAnchor = align; // PENDING
 
diff --git a/en/builder/src/zrender/svg/helper/GradientManager.js b/en/builder/src/zrender/svg/helper/GradientManager.js
index e3fc779..af03d8a 100644
--- a/en/builder/src/zrender/svg/helper/GradientManager.js
+++ b/en/builder/src/zrender/svg/helper/GradientManager.js
@@ -4,7 +4,7 @@
  */
 import Definable from './Definable';
 import * as zrUtil from '../../core/util';
-import zrLog from '../../core/log';
+import logError from '../../core/log';
 import * as colorTool from '../../tool/color';
 /**
  * Manages SVG gradient elements.
@@ -75,7 +75,7 @@ GradientManager.prototype.add = function (gradient) {
   } else if (gradient.type === 'radial') {
     dom = this.createElement('radialGradient');
   } else {
-    zrLog('Illegal gradient type.');
+    logError('Illegal gradient type.');
     return null;
   } // Set dom id with gradient id, since each gradient instance
   // will have no more than one dom element.
@@ -133,7 +133,7 @@ GradientManager.prototype.updateDom = function (gradient, dom) {
     dom.setAttribute('cy', gradient.y);
     dom.setAttribute('r', gradient.r);
   } else {
-    zrLog('Illegal gradient type.');
+    logError('Illegal gradient type.');
     return;
   }
 
diff --git a/en/builder/src/zrender/svg/helper/ShadowManager.js b/en/builder/src/zrender/svg/helper/ShadowManager.js
index d7dd469..83c6f8e 100644
--- a/en/builder/src/zrender/svg/helper/ShadowManager.js
+++ b/en/builder/src/zrender/svg/helper/ShadowManager.js
@@ -125,7 +125,10 @@ ShadowManager.prototype.updateDom = function (displayable, dom) {
   var scaleX = displayable.scale ? displayable.scale[0] || 1 : 1;
   var scaleY = displayable.scale ? displayable.scale[1] || 1 : 1; // TODO: textBoxShadowBlur is not supported yet
 
-  var offsetX, offsetY, blur, color;
+  var offsetX;
+  var offsetY;
+  var blur;
+  var color;
 
   if (style.shadowBlur || style.shadowOffsetX || style.shadowOffsetY) {
     offsetX = style.shadowOffsetX || 0;
diff --git a/en/builder/src/zrender/vml/Painter.js b/en/builder/src/zrender/vml/Painter.js
index bd1c0ce..fd5beef 100644
--- a/en/builder/src/zrender/vml/Painter.js
+++ b/en/builder/src/zrender/vml/Painter.js
@@ -3,7 +3,7 @@
  *
  * @module zrender/vml/Painter
  */
-import zrLog from '../core/log';
+import logError from '../core/log';
 import * as vmlCore from './core';
 import { each } from '../core/util';
 
@@ -159,7 +159,7 @@ VMLPainter.prototype = {
 
 function createMethodNotSupport(method) {
   return function () {
-    zrLog('In IE8.0 VML mode painter not support method "' + method + '"');
+    logError('In IE8.0 VML mode painter not support method "' + method + '"');
   };
 } // Unsupported methods
 
diff --git a/en/builder/src/zrender/zrender.js b/en/builder/src/zrender/zrender.js
index ce775f4..aa5184e 100644
--- a/en/builder/src/zrender/zrender.js
+++ b/en/builder/src/zrender/zrender.js
@@ -25,7 +25,7 @@ var instances = {}; // ZRender实例map索引
  * @type {string}
  */
 
-export var version = '4.1.0';
+export var version = '4.1.1';
 /**
  * Initializing a zrender instance
  * @param {HTMLElement} dom
diff --git a/en/changelog.html b/en/changelog.html
index 67f7b46..b90b253 100644
--- a/en/changelog.html
+++ b/en/changelog.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en-US"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"><!--  [...]
+<!DOCTYPE html><html lang="en-US"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"><!--  [...]
 </script><script type="text/javascript" src="./vendors/pace/pace.min.js"></script><script id="font-hack" type="text/javascript">if (/windows/i.test(navigator.userAgent)) {
     var el = document.createElement('style');
     el.innerHTML = ''
@@ -7,7 +7,48 @@
     document.head.insertBefore(el, document.getElementById('font-hack'));
 }
 </script><title>Changelog - Apache ECharts (incubating)</title><script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery@2.2.4/dist/jquery.min.js"></script></head><!--[if lte IE 8]><body class="lower-ie"><div id="lowie-main"><img src="./images/forie.png" alt="ie tip"></div></body><![endif]-->
-<!--[if (gt IE 8)|!(IE)]><body class="undefined"></body><![endif]--><div id="apache-banner"><div class="txt"><p>Apache ECharts is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.</p><p>We are working on redirecting this Website to <a href="https://echarts.apache.org" target="_blank">https://echarts.apache.org</a>. You may visit our new official Website now.</p></div><a href="https://echarts.apache.org" target="_blank" onclick="lo [...]
+<!--[if (gt IE 8)|!(IE)]><body class="undefined"></body><![endif]--><div id="apache-banner"><div class="txt"><p>Apache ECharts is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.</p><p>We are working on redirecting this Website to <a href="https://echarts.apache.org" target="_blank">https://echarts.apache.org</a>. You may visit our new official Website now.</p></div><a href="https://echarts.apache.org" target="_blank" onclick="lo [...]
+<div class="time">2019-09-29</div>
+
+<ul>
+<li><p>[Feature] Add option <code>clip</code> for <code>line</code>, <code>bar</code>, <code>lines</code>, <code>scatter</code> and <code>custom series</code>,
+which prevents the shapes overflow the area of the coordinate system. And support setting
+<code>filterMode</code> on <code>toolbox.dataZoom</code>. Fix #9200, #10224, #10748, #11086.</p>
+</li>
+<li><p>[Feature] Support &quot;select all&quot; and &quot;reverse select&quot; buttons in <code>legend</code>. See <code>legend.selector</code> for details.</p>
+</li>
+<li><p>[Feature] Provide <code>echarts.graphic.registerShape</code> and <code>echarts.graphic.getShapeClass</code>.
+The registered shape classes can be used in <code>custom series</code> and <code>graphic component</code>.</p>
+</li>
+<li><p>[Feature] Support show border style on <code>legend</code> item. Support setting <code>itemStyle</code> on <code>legend</code>. Fix #7340.</p>
+</li>
+<li><p>[Feature] Support expansion animation for data update, support <code>pie-series.animationTypeUpdate</code>. Fix #11029.</p>
+</li>
+<li><p>[Feature] Support setting <code>rippleEffect.color</code> in <code>effectScatter</code>.</p>
+</li>
+<li><p>[Feature] Support using BaiduMap API version 3.0 in bmap by option <code>bmap.mapStyleV2</code>.</p>
+</li>
+<li><p>[Fix] Fix that the stacked bar exceed zoom limit.
+Fix #7534, #7672, #7732, #7872, #8069, #8520, #8935, #8955, #9200, #9237, #9847, #10359, #10518, #10972.</p>
+</li>
+<li><p>[Fix] Fix that sometimes when using &quot;toolbox dataZoom&quot; it can not return to the original state. Fix #11055.</p>
+</li>
+<li><p>[Fix] Fix the texture pattern rendering in <code>map</code> and <code>geo</code>. And Fix that the the shadow of them are different between canvas renderer and SVG renderer. Fix #11055, #5429.</p>
+</li>
+<li><p>[Fix] Fix that data does not rendered after a <code>NaN</code> value in candlestick. Fix #11101.</p>
+</li>
+<li><p>[Fix] Fix <code>geo.label.formatter</code> does not work. Fix #8489.</p>
+</li>
+<li><p>[Fix] Fix the hover style incorrect in <code>custom series</code>. Fix #11103.</p>
+</li>
+<li><p>[Fix] Fix that tree root node disappears after roaming. Fix #10291, #10986, #10164, #9580, #9256, #9216.</p>
+</li>
+<li><p>[Fix] Fix that SVG renderer should render normally despite hover layer set. Fix #11054.</p>
+</li>
+<li><p>[Fix] Add dispose checking for chart instance.</p>
+</li>
+</ul>
+<h2 id="v4-3-0">v4.3.0</h2>
 <div class="time">2019-08-27</div>
 
 <ul>
@@ -391,7 +432,7 @@ Fix that the line label can not be returned to its original opacity after <code>
 <div class="time">2018-01-16</div>
 
 <ul>
-<li><p>[+] Supported to render up to <strong>tens millions of data</strong> directly。ECharts4 has upgrade to stream architecture, and along with detailed optimization, it has supported to render incrementally loaded data and support progressive rendering.</p>
+<li><p>[+] Supported to render up to <strong>tens millions of data</strong> directly. ECharts4 has upgrade to stream architecture, and along with detailed optimization, it has supported to render incrementally loaded data and support progressive rendering.</p>
 <ul>
 <li>Ten millions of GIS data probably take up to about hundreds MB of space. In this case chunked data loading or WebStock is required for the purpose of display graphics as soon as possible and not blocking the browser while processing loaded data. The samples of incremental data loading can be checked here: <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=scatterGL-gps&amp;gl=1">scatterGL-gps</a> and <a href="https://ecomfe.github.io/echarts-examples/public/edito [...]
 <li>Supported the human interactions in the big data scenario, where continuous interactions (e.g., roam in geo and cartesian) will not block the browser. Benefit from the using of GPU and avoiding of layout recalculation, ECharts GL provides smooth interactions, which has been demonstrated in the examples above. Without WebGL, the basic ECharts implements progressive rendering to support non-blocking interaction, which can be checked at the pan and zoom in <a href="https://ecomfe.github [...]
@@ -399,7 +440,7 @@ Fix that the line label can not be returned to its original opacity after <code>
 </li>
 <li><p>[+] <strong>Published ZRender SVG Rendering Engine</strong> as an alternative backend of ECharts besides the existing Canvas Rendering Engine. The choice of rendering engine usually depends on the scenario, for example, benefit from the low memory cost, SVG Rendering Engine is suitable for mobile device, or the case that many ECharts instances exists in a single page, while the Canvas Rendering Engine is suitable for big data rendering or when visual effects required. Canvas Rende [...]
 </li>
-<li><p>[+] <strong>Published Sunburst Chart</strong> to visualize hierarchical data efficiently with excellent interactions. See [examples] and (excellent) and <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-sunburst">docs</a>。</p>
+<li><p>[+] <strong>Published Sunburst Chart</strong> to visualize hierarchical data efficiently with excellent interactions. See [examples] and (excellent) and <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-sunburst">docs</a>.</p>
 </li>
 <li><p>[+] <strong>Published <a href="http://echarts.baidu.com/tutorial.html#%E6%95%B0%E6%8D%AE%E9%9B%86%EF%BC%88dataset%EF%BC%89">dataset</a> component</strong> to support data based configuration, visual encoding and data sharing in different series.</p>
 </li>
@@ -563,7 +604,7 @@ Fix that the line label can not be returned to its original opacity after <code>
 </li>
 <li><p>[+] Supported <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#xAxis.minInterval">minInterval</a> on time axis (that is, <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#xAxis.type">axis.type</a> is <code>&#39;time&#39;</code>), and supported <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#xAxis.maxInterval">maxInterval</a> on value axis (that is <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#xAxis.type [...]
 </li>
-<li><p>[+] Supported <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#xAxis.axisLine.onZeroAxisIndex">xAxis.axisLine.onZeroAxisIndex</a>, which enables specifing corresponding relationship when multiple axes used and <code>onZero</code> is required. See <a href="https://github.com/ecomfe/echarts/issues/5069">#5069</a>。</p>
+<li><p>[+] Supported <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#xAxis.axisLine.onZeroAxisIndex">xAxis.axisLine.onZeroAxisIndex</a>, which enables specifing corresponding relationship when multiple axes used and <code>onZero</code> is required. See <a href="https://github.com/ecomfe/echarts/issues/5069">#5069</a>.</p>
 </li>
 <li><p>[+] Supported that do not use <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-custom.coordinateSystems">coordinate system</a> in <code>custom series</code>.</p>
 </li>
@@ -591,7 +632,7 @@ Fix that the line label can not be returned to its original opacity after <code>
 </li>
 <li><p>[+] Fixed the incorrect rendering when the first entry was empty in <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-candlestick">candlestick</a>. See <a href="https://github.com/ecomfe/echarts/issues/6059">#6059</a>.</p>
 </li>
-<li><p>[^] Fixed that <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-bar.dimensions">series-bar.dimensions</a> did not work. See <a href="https://github.com/ecomfe/echarts/issues/6252">#6252</a>。</p>
+<li><p>[^] Fixed that <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-bar.dimensions">series-bar.dimensions</a> did not work. See <a href="https://github.com/ecomfe/echarts/issues/6252">#6252</a>.</p>
 </li>
 <li><p>[^] Fixed that when chilren number of group was not fixed, they could not be removed correctly in <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-custom">custom series</a>.</p>
 </li>
@@ -608,7 +649,7 @@ Fix that the line label can not be returned to its original opacity after <code>
 <div class="time">2017-06-15</div>
 
 <ul>
-<li><p>[+] Supported draw <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-custom">custom series</a> on <a href="https://github.com/ecomfe/echarts/tree/master/extension/bmap">Baidu Map (bmap)</a>. See <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=map-polygon">example 1</a> and <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=map-bin">example 2</a>。</p>
+<li><p>[+] Supported draw <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-custom">custom series</a> on <a href="https://github.com/ecomfe/echarts/tree/master/extension/bmap">Baidu Map (bmap)</a>. See <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=map-polygon">example 1</a> and <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=map-bin">example 2</a>.</p>
 </li>
 <li><p>[+] Supported show parent labels in <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-treemap">treemap</a>. See <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=treemap-show-parent">example</a>. See <a href="https://github.com/ecomfe/echarts/issues/5869">#5869</a> and <a href="https://github.com/ecomfe/echarts/issues/5579">#5579</a>.</p>
 </li>
@@ -649,9 +690,9 @@ Fix that the line label can not be returned to its original opacity after <code>
 <div class="time">2017-05-25</div>
 
 <ul>
-<li><p><strong>[+] Published <a href="http://echarts.baidu.com/option.html#series-custom">custom series</a></strong>, which enables user to customize render logic and make new types of chart. See <a href="http://echarts.baidu.com/examples.html#chart-type-custom">samples</a>。</p>
+<li><p><strong>[+] Published <a href="http://echarts.baidu.com/option.html#series-custom">custom series</a></strong>, which enables user to customize render logic and make new types of chart. See <a href="http://echarts.baidu.com/examples.html#chart-type-custom">samples</a>.</p>
 </li>
-<li><p><strong>[+] Supported polar bar chart</strong>. See <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=bar-polar-stack">sample1</a>, <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=bar-polar-stack-radial">sample2</a>, <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=bar-polar-real-estate">sample3</a>。</p>
+<li><p><strong>[+] Supported polar bar chart</strong>. See <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=bar-polar-stack">sample1</a>, <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=bar-polar-stack-radial">sample2</a>, <a href="https://ecomfe.github.io/echarts-examples/public/editor.html?c=bar-polar-real-estate">sample3</a>.</p>
 </li>
 <li><p>[+] Supported <a href="http://echarts.baidu.com/option.html#series-scatter.encode">encode</a>, which enable user to specify which dimensions in <a href="http://echarts.baidu.com/option.html#series-scatter.data">data</a> are mapped to which axis of coordinate system. Or which dimensions will be displayed in <a href="http://echarts.baidu.com/option.html#tooltip">tooltip</a> or <a href="http://echarts.baidu.com/option.html#series-scatter.label">label</a>. [Break Change]: The default  [...]
 </li>
@@ -715,13 +756,13 @@ Fix that the line label can not be returned to its original opacity after <code>
 <div class="time">2017-04-05</div>
 
 <ul>
-<li><p>[+] Supported <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#useUTC">useUTC</a>, which enables display <code>axisLabel</code> and <code>tooltip</code> in local time or UTC. Related default setttings are modified: <code>axisLabel</code> and <code>tooltip</code> display local time by default, and <code>data</code> recognize time string as local time if timezone not specified. See <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-line.dat [...]
+<li><p>[+] Supported <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#useUTC">useUTC</a>, which enables display <code>axisLabel</code> and <code>tooltip</code> in local time or UTC. Related default setttings are modified: <code>axisLabel</code> and <code>tooltip</code> display local time by default, and <code>data</code> recognize time string as local time if timezone not specified. See <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-line.dat [...]
 </li>
 <li><p>[+] Supported <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#xAxis.axisLabel.showMinLabel">axisLabel.showMinLabel</a> and <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#xAxis.axisLabel.showMaxLabel">axisLabel.showMaxLabel</a>.</p>
 </li>
 <li><p>[+] Supported <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-funnel.sort">funnel.sort</a>, which enables sorting funnel by index or customized function.</p>
 </li>
-<li><p>[^] Fixed float error of <code>axisTick</code>. See <a href="https://github.com/ecomfe/echarts/issues/5041">#5041</a>。</p>
+<li><p>[^] Fixed float error of <code>axisTick</code>. See <a href="https://github.com/ecomfe/echarts/issues/5041">#5041</a>.</p>
 </li>
 <li><p>[^] Fixed that <code>axisTick</code> did not display when value was too small. See <a href="https://github.com/ecomfe/echarts/issues/5386">#5386</a>.</p>
 </li>
@@ -729,7 +770,7 @@ Fix that the line label can not be returned to its original opacity after <code>
 </li>
 <li><p>[^] Fixed that <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#visualMap">visualMap</a> disabled <code>itemStyle</code> of <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-map">map</a>. See <a href="https://github.com/ecomfe/echarts/issues/5388">#5388</a>.</p>
 </li>
-<li><p>[^] Fixed that <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#tooltip.trigger">tooltip.trigger</a> did not support <code>&#39;none&#39;</code>. See <a href="https://github.com/ecomfe/echarts/issues/5400">#5400</a>。</p>
+<li><p>[^] Fixed that <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#tooltip.trigger">tooltip.trigger</a> did not support <code>&#39;none&#39;</code>. See <a href="https://github.com/ecomfe/echarts/issues/5400">#5400</a>.</p>
 </li>
 <li><p>[^] Fixed problem of <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-sankey">sankey</a> on ie11. See <a href="https://github.com/ecomfe/echarts/issues/3306">#3306</a>.</p>
 </li>
@@ -787,9 +828,9 @@ Fix that the line label can not be returned to its original opacity after <code>
 <div class="time">2017-01-12</div>
 
 <ul>
-<li><p><strong>[+] Published <code>pictorialBar</code> chart:<a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-pictorialBar">pictorialBar</a>。See <a href="https://ecomfe.github.io/echarts-examples/public/index.html#chart-type-pictorialBar">example</a>。</strong></p>
+<li><p><strong>[+] Published <code>pictorialBar</code> chart:<a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-pictorialBar">pictorialBar</a>. See <a href="https://ecomfe.github.io/echarts-examples/public/index.html#chart-type-pictorialBar">example</a>.</strong></p>
 </li>
-<li><p><strong>[+] Published <code>themeRiver</code> chart:<a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-themeRiver">themeRiver</a>。See <a href="https://ecomfe.github.io/echarts-examples/public/index.html#chart-type-themeRiver">example</a>。</strong></p>
+<li><p><strong>[+] Published <code>themeRiver</code> chart:<a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-themeRiver">themeRiver</a>.See <a href="https://ecomfe.github.io/echarts-examples/public/index.html#chart-type-themeRiver">example</a>.</strong></p>
 </li>
 <li><p>[+] A specified <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#geo">geo coordinate system</a> has been able to be used in <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-map">map series</a>. (In the past map series could only creat an inner exclusive geo coodinate system). Thus, <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-map">map series</a> can be used to control color of a geo component. Moreover, a g [...]
 </li>
@@ -848,7 +889,7 @@ Fix that the line label can not be returned to its original opacity after <code>
 </li>
 <li><p>[^] Fix that erroneously forbiden default pan behavior in touch device. See <a href="https://github.com/ecomfe/echarts/issues/4393">#4393</a>.</p>
 </li>
-<li><p>[^] Enhance user experience for <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#geo">geo</a> / <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-map">map</a> in touche device。</p>
+<li><p>[^] Enhance user experience for <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#geo">geo</a> / <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-map">map</a> in touche device.</p>
 </li>
 <li><p>[^] Fix calculation error of <a href="https://ecomfe.github.io/echarts-doc/public/en/api.html#echartsInstance.containPixel">containPixel</a> in <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#geo">geo</a> / <a href="https://ecomfe.github.io/echarts-doc/public/en/option.html#series-graph">graph</a>. See <a href="https://github.com/ecomfe/echarts/issues/4405">#4405</a>.</p>
 </li>
diff --git a/en/cheat-sheet.html b/en/cheat-sheet.html
index d4bd6ea..ad3695a 100644
--- a/en/cheat-sheet.html
+++ b/en/cheat-sheet.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en-US"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"><!--  [...]
+<!DOCTYPE html><html lang="en-US"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"><!--  [...]
 </script><script type="text/javascript" src="./vendors/pace/pace.min.js"></script><script id="font-hack" type="text/javascript">if (/windows/i.test(navigator.userAgent)) {
     var el = document.createElement('style');
     el.innerHTML = ''
diff --git a/en/coding-standard.html b/en/coding-standard.html
index c6fc3bb..5aeb6d6 100644
--- a/en/coding-standard.html
+++ b/en/coding-standard.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en-US"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"><!--  [...]
+<!DOCTYPE html><html lang="en-US"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"><!--  [...]
 </script><script type="text/javascript" src="./vendors/pace/pace.min.js"></script><script id="font-hack" type="text/javascript">if (/windows/i.test(navigator.userAgent)) {
     var el = document.createElement('style');
     el.innerHTML = ''
diff --git a/en/committers.html b/en/committers.html
index c4515e2..2645c53 100644
--- a/en/committers.html
+++ b/en/committers.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en-US"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"><!--  [...]
+<!DOCTYPE html><html lang="en-US"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"><!--  [...]
 </script><script type="text/javascript" src="./vendors/pace/pace.min.js"></script><script id="font-hack" type="text/javascript">if (/windows/i.test(navigator.userAgent)) {
     var el = document.createElement('style');
     el.innerHTML = ''
@@ -7,7 +7,7 @@
     document.head.insertBefore(el, document.getElementById('font-hack'));
 }
 </script><title>Committers - Apache ECharts (incubating)</title><script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery@2.2.4/dist/jquery.min.js"></script></head><!--[if lte IE 8]><body class="lower-ie"><div id="lowie-main"><img src="./images/forie.png" alt="ie tip"></div></body><![endif]-->
-<!--[if (gt IE 8)|!(IE)]><body class="undefined"></body><![endif]--><div id="apache-banner"><div class="txt"><p>Apache ECharts is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.</p><p>We are working on redirecting this Website to <a href="https://echarts.apache.org" target="_blank">https://echarts.apache.org</a>. You may visit our new official Website now.</p></div><a href="https://echarts.apache.org" target="_blank" onclick="lo [...]
+<!--[if (gt IE 8)|!(IE)]><body class="undefined"></body><![endif]--><div id="apache-banner"><div class="txt"><p>Apache ECharts is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.</p><p>We are working on redirecting this Website to <a href="https://echarts.apache.org" target="_blank">https://echarts.apache.org</a>. You may visit our new official Website now.</p></div><a href="https://echarts.apache.org" target="_blank" onclick="lo [...]
 </div></section><section class="container company"><h4 class="group companie">Companies using ECharts</h4><div class="row"><div class="col-md-3 col-sm-4 col-xs-6"><img src="images/company/company1.jpg"></div><div class="col-md-3 col-sm-4 col-xs-6"><img src="images/company/company2.jpg"></div><div class="col-md-3 col-sm-4 col-xs-6"><img src="images/company/company3.jpg"></div><div class="col-md-3 col-sm-4 col-xs-6"><img src="images/company/company4.jpg"></div><div class="col-md-3 col-sm-4 [...]
 (function() {
 var hm = document.createElement("script");
diff --git a/en/css/ecOption.css b/en/css/ecOption.css
index 5af206f..26890ac 100644
--- a/en/css/ecOption.css
+++ b/en/css/ecOption.css
@@ -5,7 +5,6 @@
   width: 30px;
   height: 30px;
   line-height: 30px;
-  -webkit-border-radius: 4px;
   border-radius: 4px;
   position: absolute;
   text-align: center;
@@ -40,7 +39,6 @@
   margin: 0 2px;
 }
 .dtui-btn {
-  -webkit-border-radius: 2px;
   border-radius: 2px;
   -webkit-user-select: none;
   -moz-user-select: none;
@@ -74,7 +72,6 @@
   *display: inline;
   *zoom: 1;
   vertical-align: middle;
-  -webkit-border-radius: 3px;
   border-radius: 3px;
   background: #fff;
   position: relative;
@@ -101,7 +98,6 @@
   top: 5px;
   right: 3px;
   text-align: center;
-  -webkit-border-radius: 8px;
   border-radius: 8px;
   height: 16px;
   line-height: 16px;
@@ -126,7 +122,6 @@
   font-size: 12px;
   padding: 6px;
   display: block;
-  -webkit-border-radius: 2px;
   border-radius: 2px;
 }
 .dtui-txipt-type-text {
@@ -185,7 +180,6 @@
   margin: 3px 5px;
   padding: 0 5px;
   font-size: 12px;
-  -webkit-border-radius: 2px;
   border-radius: 2px;
   border: 0 solid #828599;
   background: transparent;
@@ -271,7 +265,6 @@
   padding: 5px 10px;
   line-height: 25px;
   z-index: 9999;
-  -webkit-border-radius: 4px;
   border-radius: 4px;
   -webkit-box-shadow: rgba(0, 0, 0, 0.6) 0px 1px 3px, rgba(255, 255, 255, 0.1) 0px 1px 0px inset, rgba(0, 0, 0, 0.2) 0px -1px 0px inset;
   box-shadow: rgba(0, 0, 0, 0.6) 0px 1px 3px, rgba(255, 255, 255, 0.1) 0px 1px 0px inset, rgba(0, 0, 0, 0.2) 0px -1px 0px inset;
@@ -299,7 +292,6 @@
   padding: 5px 10px;
   line-height: 25px;
   z-index: 99999;
-  -webkit-border-radius: 3px;
   border-radius: 3px;
 }
 .iconfont {
@@ -326,8 +318,7 @@ code {
   color: #333;
   padding: 5px 10px;
   line-height: 25px;
-  -webkit-border-radius: 4px;
-          border-radius: 4px;
+  border-radius: 4px;
 }
 .ecdoc-normal-panel a,
 .ecdoc-normal-panel a:visited {
@@ -492,7 +483,6 @@ code {
   height: 95px;
   z-index: 1;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#FAFAFC), to(rgba(247, 247, 249, 0.1)));
-  background-image: -webkit-linear-gradient(top, #FAFAFC, rgba(247, 247, 249, 0.1));
   background-image: linear-gradient(to bottom, #FAFAFC, rgba(247, 247, 249, 0.1));
 }
 .ecdoc-api-tree-area .ps-scrollbar-y-rail {
@@ -569,8 +559,7 @@ code {
   background-color: #f5f5f5;
   border: none;
   padding: 15px;
-  -webkit-border-radius: 0;
-          border-radius: 0;
+  border-radius: 0;
 }
 .ecdoc-api-doc-group-content code * {
   font-family: Monaco, Consolas, 'Courier New';
@@ -595,8 +584,7 @@ code {
   color: #999;
 }
 .ecdoc-api-doc-sub-group .ecdoc-api-doc-group-line {
-  -webkit-border-radius: 4px;
-          border-radius: 4px;
+  border-radius: 4px;
 }
 .ecdoc-api-doc-line-expand {
   position: absolute;
@@ -615,8 +603,7 @@ code {
   padding: 0 10px;
   line-height: 2;
   display: inline-block;
-  -webkit-border-radius: 3px;
-          border-radius: 3px;
+  border-radius: 3px;
   cursor: pointer;
   -webkit-user-select: none;
      -moz-user-select: none;
@@ -687,7 +674,6 @@ code {
   right: 0;
   height: 25px;
   background-image: -webkit-gradient(linear, left bottom, left top, from(#fff), color-stop(#fff), color-stop(#fff), to(rgba(255, 255, 255, 0.1)));
-  background-image: -webkit-linear-gradient(bottom, #fff, #fff, #fff, rgba(255, 255, 255, 0.1));
   background-image: linear-gradient(to top, #fff, #fff, #fff, rgba(255, 255, 255, 0.1));
   color: red;
 }
diff --git a/en/css/main.css b/en/css/main.css
index 93e896f..a7c8d90 100644
--- a/en/css/main.css
+++ b/en/css/main.css
@@ -1 +1 @@
-@font-face{font-family:'iconfont';src:url("font/iconfont.eot");src:url("font/iconfont.eot?#iefix") format("embedded-opentype"),url("font/iconfont.woff") format("woff"),url("font/iconfont.ttf") format("truetype"),url("font/iconfont.svg#iconfont") format("svg")}.iconfont{font-family:"iconfont" !important;speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}html{height:100%}body{height:10 [...]
+@font-face{font-family:'iconfont';src:url("font/iconfont.eot");src:url("font/iconfont.eot?#iefix") format("embedded-opentype"),url("font/iconfont.woff") format("woff"),url("font/iconfont.ttf") format("truetype"),url("font/iconfont.svg#iconfont") format("svg")}.iconfont{font-family:"iconfont" !important;speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}html{height:100%}body{height:10 [...]
diff --git a/en/css/spreadsheet.css b/en/css/spreadsheet.css
index 4e82349..780da1c 100644
--- a/en/css/spreadsheet.css
+++ b/en/css/spreadsheet.css
@@ -5,7 +5,6 @@
   width: 30px;
   height: 30px;
   line-height: 30px;
-  -webkit-border-radius: 4px;
   border-radius: 4px;
   position: absolute;
   text-align: center;
@@ -40,7 +39,6 @@
   margin: 0 2px;
 }
 .dtui-btn {
-  -webkit-border-radius: 2px;
   border-radius: 2px;
   -webkit-user-select: none;
   -moz-user-select: none;
@@ -74,7 +72,6 @@
   *display: inline;
   *zoom: 1;
   vertical-align: middle;
-  -webkit-border-radius: 3px;
   border-radius: 3px;
   background: #fff;
   position: relative;
@@ -101,7 +98,6 @@
   top: 5px;
   right: 3px;
   text-align: center;
-  -webkit-border-radius: 8px;
   border-radius: 8px;
   height: 16px;
   line-height: 16px;
@@ -126,7 +122,6 @@
   font-size: 12px;
   padding: 6px;
   display: block;
-  -webkit-border-radius: 2px;
   border-radius: 2px;
 }
 .dtui-txipt-type-text {
@@ -185,7 +180,6 @@
   margin: 3px 5px;
   padding: 0 5px;
   font-size: 12px;
-  -webkit-border-radius: 2px;
   border-radius: 2px;
   border: 0 solid #828599;
   background: transparent;
@@ -271,7 +265,6 @@
   padding: 5px 10px;
   line-height: 25px;
   z-index: 9999;
-  -webkit-border-radius: 4px;
   border-radius: 4px;
   -webkit-box-shadow: rgba(0, 0, 0, 0.6) 0px 1px 3px, rgba(255, 255, 255, 0.1) 0px 1px 0px inset, rgba(0, 0, 0, 0.2) 0px -1px 0px inset;
   box-shadow: rgba(0, 0, 0, 0.6) 0px 1px 3px, rgba(255, 255, 255, 0.1) 0px 1px 0px inset, rgba(0, 0, 0, 0.2) 0px -1px 0px inset;
@@ -299,7 +292,6 @@
   padding: 5px 10px;
   line-height: 25px;
   z-index: 99999;
-  -webkit-border-radius: 3px;
   border-radius: 3px;
 }
 body {
@@ -311,7 +303,6 @@ body {
   border: 1px solid transparent;
   height: 20px;
   line-height: 20px;
-  -webkit-border-radius: 2px;
   border-radius: 2px;
   color: #555;
 }
@@ -324,7 +315,6 @@ body {
   color: #eee;
 }
 .dtui-txipt {
-  -webkit-border-radius: 4px;
   border-radius: 4px;
   background-color: #FAFAFC;
   width: 100px;
@@ -354,7 +344,6 @@ body {
   color: #333;
   padding: 5px 10px;
   line-height: 25px;
-  -webkit-border-radius: 4px;
   border-radius: 4px;
 }
 .ecdoc-sprsht-datatable-ctrl {
@@ -389,7 +378,6 @@ body {
   font-size: 12px;
 }
 .ecdoc-sprsht-datatable .handsontable .dragdealer .handle {
-  -webkit-border-radius: 4px;
   border-radius: 4px;
 }
 .ecdoc-sprsht-datatable .handsontable table.htCore td.area {
@@ -409,7 +397,6 @@ body {
   padding: 5px 0;
   position: relative;
   border: 1px solid #ccc;
-  -webkit-border-radius: 4px;
   border-radius: 4px;
 }
 .ecdoc-sprsht-ctrl-area h1 {
@@ -452,7 +439,6 @@ body {
   line-height: 22px;
   font-size: 20px;
   font-family: Arial;
-  -webkit-border-radius: 11px;
   border-radius: 11px;
   padding: 0;
   background-color: #b03a5b;
@@ -511,9 +497,7 @@ body {
   border: 1px solid transparent;
   border-bottom-width: 0;
   bottom: -1px;
-  -webkit-border-top-left-radius: 4px;
   border-top-left-radius: 4px;
-  -webkit-border-top-right-radius: 4px;
   border-top-right-radius: 4px;
 }
 .ecdoc-sprsht-ctrl-area .ctrl-tab-hi:hover {
diff --git a/en/dependencies.html b/en/dependencies.html
index e1196f0..4085ac1 100644
--- a/en/dependencies.html
+++ b/en/dependencies.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en-US"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"><!--  [...]
+<!DOCTYPE html><html lang="en-US"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="no"><meta name="description" content="ECharts, a powerful, interactive charting and visualization library for browser"><link rel="shortcut icon" href="images/favicon.png"><link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"><!--  [...]
 </script><script type="text/javascript" src="./vendors/pace/pace.min.js"></script><script id="font-hack" type="text/javascript">if (/windows/i.test(navigator.userAgent)) {
     var el = document.createElement('style');
     el.innerHTML = ''
diff --git a/en/dist/echarts-en.common.js b/en/dist/echarts-en.common.js
index 0250538..b6a2c26 100644
--- a/en/dist/echarts-en.common.js
+++ b/en/dist/echarts-en.common.js
@@ -66,6 +66,8 @@ var guid = function () {
  * @desc thanks zepto.
  */
 
+/* global wx */
+
 var env = {};
 
 if (typeof wx === 'object' && typeof wx.getSystemInfoSync === 'function') {
@@ -480,7 +482,9 @@ function inherits(clazz, baseClazz) {
     clazz.prototype = new F();
 
     for (var prop in clazzPrototype) {
-        clazz.prototype[prop] = clazzPrototype[prop];
+        if (clazzPrototype.hasOwnProperty(prop)) {
+            clazz.prototype[prop] = clazzPrototype[prop];
+        }
     }
     clazz.prototype.constructor = clazz;
     clazz.superClass = baseClazz;
@@ -732,6 +736,7 @@ function isDom(value) {
  * @return {boolean}
  */
 function eqNaN(value) {
+    /* eslint-disable-next-line no-self-compare */
     return value !== value;
 }
 
@@ -876,9 +881,11 @@ HashMap.prototype = {
     // should not use the exposed keys, who are prefixed.
     each: function (cb, context) {
         context !== void 0 && (cb = bind(cb, context));
+        /* eslint-disable guard-for-in */
         for (var key in this.data) {
             this.data.hasOwnProperty(key) && cb(this.data[key], key);
         }
+        /* eslint-enable guard-for-in */
     },
     // Do not use this method if performance sensitive.
     removeKey: function (key) {
@@ -948,6 +955,8 @@ var zrUtil = (Object.freeze || Object)({
 	noop: noop
 });
 
+/* global Float32Array */
+
 var ArrayCtor = typeof Float32Array === 'undefined'
     ? Array
     : Float32Array;
@@ -2506,6 +2515,8 @@ mixin(Handler, Draggable);
  * @exports zrender/tool/matrix
  */
 
+/* global Float32Array */
+
 var ArrayCtor$1 = typeof Float32Array === 'undefined'
     ? Array
     : Float32Array;
@@ -3764,11 +3775,17 @@ function lerpNumber(a, b, p) {
 }
 
 function setRgba(out, r, g, b, a) {
-    out[0] = r; out[1] = g; out[2] = b; out[3] = a;
+    out[0] = r;
+    out[1] = g;
+    out[2] = b;
+    out[3] = a;
     return out;
 }
 function copyRgba(out, a) {
-    out[0] = a[0]; out[1] = a[1]; out[2] = a[2]; out[3] = a[3];
+    out[0] = a[0];
+    out[1] = a[1];
+    out[2] = a[2];
+    out[3] = a[3];
     return out;
 }
 
@@ -4843,35 +4860,23 @@ if (typeof window !== 'undefined') {
  */
 
 /**
- * debug日志选项:catchBrushException为true下有效
- * 0 : 不生成debug数据,发布用
- * 1 : 异常抛出,调试用
- * 2 : 控制台输出,调试用
+ * Debug log mode:
+ * 0: Do nothing, for release.
+ * 1: console.error, for debug.
  */
 var debugMode = 0;
 
 // retina 屏幕优化
 var devicePixelRatio = dpr;
 
-var log = function () {
+var logError = function () {
 };
 
 if (debugMode === 1) {
-    log = function () {
-        for (var k in arguments) {
-            throw new Error(arguments[k]);
-        }
-    };
-}
-else if (debugMode > 1) {
-    log = function () {
-        for (var k in arguments) {
-            console.log(arguments[k]);
-        }
-    };
+    logError = console.error;
 }
 
-var zrLog = log;
+var logError$1 = logError;
 
 /**
  * @alias modue:zrender/mixin/Animatable
@@ -4927,7 +4932,7 @@ Animatable.prototype = {
         }
 
         if (!target) {
-            zrLog(
+            logError$1(
                 'Property "'
                 + path
                 + '" is not existed in element '
@@ -6148,7 +6153,10 @@ function TimSort(array, compare) {
         while (stackSize > 1) {
             var n = stackSize - 2;
 
-            if (n >= 1 && runLength[n - 1] <= runLength[n] + runLength[n + 1] || n >= 2 && runLength[n - 2] <= runLength[n] + runLength[n - 1]) {
+            if (
+                (n >= 1 && runLength[n - 1] <= runLength[n] + runLength[n + 1])
+                || (n >= 2 && runLength[n - 2] <= runLength[n] + runLength[n - 1])
+            ) {
                 if (runLength[n - 1] < runLength[n + 1]) {
                     n--;
                 }
@@ -6238,7 +6246,9 @@ function TimSort(array, compare) {
         }
 
         var _minGallop = minGallop;
-        var count1, count2, exit;
+        var count1;
+        var count2;
+        var exit;
 
         while (1) {
             count1 = 0;
@@ -6921,8 +6931,8 @@ Style.prototype = {
     /**
      * `true` is not supported.
      * `false`/`null`/`undefined` are the same.
-     * `false` is used to remove lineDash in some 
-     * case that `null`/`undefined` can not be set. 
+     * `false` is used to remove lineDash in some
+     * case that `null`/`undefined` can not be set.
      * (e.g., emphasis.lineStyle in echarts)
      * @type {Array.<number>|boolean}
      */
@@ -7402,8 +7412,8 @@ var Layer = function (id, painter, dpr) {
         domStyle['user-select'] = 'none';
         domStyle['-webkit-touch-callout'] = 'none';
         domStyle['-webkit-tap-highlight-color'] = 'rgba(0,0,0,0)';
-        domStyle['padding'] = 0;
-        domStyle['margin'] = 0;
+        domStyle['padding'] = 0; // eslint-disable-line dot-notation
+        domStyle['margin'] = 0; // eslint-disable-line dot-notation
         domStyle['border-width'] = 0;
     }
 
@@ -9529,7 +9539,7 @@ function isDisplayableCulled(el, width, height) {
 
 function isClipPathChanged(clipPaths, prevClipPaths) {
     // displayable.__clipPaths can only be `null`/`undefined` or an non-empty array.
-    if (clipPaths === prevClipPaths) { 
+    if (clipPaths === prevClipPaths) {
         return false;
     }
     if (!clipPaths || !prevClipPaths || (clipPaths.length !== prevClipPaths.length)) {
@@ -10058,12 +10068,12 @@ Painter.prototype = {
         var domRoot = this._domRoot;
 
         if (layersMap[zlevel]) {
-            zrLog('ZLevel ' + zlevel + ' has been used already');
+            logError$1('ZLevel ' + zlevel + ' has been used already');
             return;
         }
         // Check if is a valid layer
         if (!isLayerValid(layer)) {
-            zrLog('Layer of zlevel ' + zlevel + ' is not valid');
+            logError$1('Layer of zlevel ' + zlevel + ' is not valid');
             return;
         }
 
@@ -10197,11 +10207,14 @@ Painter.prototype = {
                 incrementalLayerCount = 1;
             }
             else {
-                layer = this.getLayer(zlevel + (incrementalLayerCount > 0 ? EL_AFTER_INCREMENTAL_INC : 0), this._needsManuallyCompositing);
+                layer = this.getLayer(
+                    zlevel + (incrementalLayerCount > 0 ? EL_AFTER_INCREMENTAL_INC : 0),
+                    this._needsManuallyCompositing
+                );
             }
 
             if (!layer.__builtin__) {
-                zrLog('ZLevel ' + zlevel + ' has been used by unkown layer ' + layer.id);
+                logError$1('ZLevel ' + zlevel + ' has been used by unkown layer ' + layer.id);
             }
 
             if (layer !== prevLayer) {
@@ -11140,7 +11153,7 @@ var instances$1 = {};    // ZRender实例map索引
 /**
  * @type {string}
  */
-var version$1 = '4.1.0';
+var version$1 = '4.1.1';
 
 /**
  * Initializing a zrender instance
@@ -12410,7 +12423,7 @@ var getLineStyle = makeStyleMapper(
 var lineStyleMixin = {
     getLineStyle: function (excludes) {
         var style = getLineStyle(this, excludes);
-        // Always set lineDash whether dashed, otherwise we can not 
+        // Always set lineDash whether dashed, otherwise we can not
         // erase the previous style when assigning to el.style.
         style.lineDash = this.getLineDash(style.lineWidth);
         return style;
@@ -12423,15 +12436,15 @@ var lineStyleMixin = {
         var lineType = this.get('type');
         var dotSize = Math.max(lineWidth, 2);
         var dashSize = lineWidth * 4;
-        return (lineType === 'solid' || lineType == null) 
-            // Use `false` but not `null` for the solid line here, because `null` might be 
-            // ignored when assigning to `el.style`. e.g., when setting `lineStyle.type` as 
-            // `'dashed'` and `emphasis.lineStyle.type` as `'solid'` in graph series, the 
-            // `lineDash` gotten form the latter one is not able to erase that from the former 
+        return (lineType === 'solid' || lineType == null)
+            // Use `false` but not `null` for the solid line here, because `null` might be
+            // ignored when assigning to `el.style`. e.g., when setting `lineStyle.type` as
+            // `'dashed'` and `emphasis.lineStyle.type` as `'solid'` in graph series, the
+            // `lineDash` gotten form the latter one is not able to erase that from the former
             // one if using `null` here according to the emhpsis strategy in `util/graphic.js`.
             ? false
-            : lineType === 'dashed' 
-            ? [dashSize, dashSize] 
+            : lineType === 'dashed'
+            ? [dashSize, dashSize]
             : [dotSize, dotSize];
     }
 };
@@ -13213,6 +13226,8 @@ function fromArc(
 
 // TODO getTotalLength, getPointAtLength
 
+/* global Float32Array */
+
 var CMD = {
     M: 1,
     L: 2,
@@ -13884,9 +13899,12 @@ PathProxy.prototype = {
      */
     rebuildPath: function (ctx) {
         var d = this.data;
-        var x0, y0;
-        var xi, yi;
-        var x, y;
+        var x0;
+        var y0;
+        var xi;
+        var yi;
+        var x;
+        var y;
         var ux = this._ux;
         var uy = this._uy;
         var len$$1 = this._len;
@@ -16743,6 +16761,8 @@ var NORMAL = 'normal';
 var _highlightNextDigit = 1;
 var _highlightKeyMap = {};
 
+var _customShapeMap = {};
+
 
 /**
  * Extend shape with parameters
@@ -16759,6 +16779,54 @@ function extendPath(pathData, opts) {
 }
 
 /**
+ * Register a user defined shape.
+ * The shape class can be fetched by `getShapeClass`
+ * This method will overwrite the registered shapes, including
+ * the registered built-in shapes, if using the same `name`.
+ * The shape can be used in `custom series` and
+ * `graphic component` by declaring `{type: name}`.
+ *
+ * @param {string} name
+ * @param {Object} ShapeClass Can be generated by `extendShape`.
+ */
+function registerShape(name, ShapeClass) {
+    _customShapeMap[name] = ShapeClass;
+}
+
+/**
+ * Find shape class registered by `registerShape`. Usually used in
+ * fetching user defined shape.
+ *
+ * [Caution]:
+ * (1) This method **MUST NOT be used inside echarts !!!**, unless it is prepared
+ * to use user registered shapes.
+ * Because the built-in shape (see `getBuiltInShape`) will be registered by
+ * `registerShape` by default. That enables users to get both built-in
+ * shapes as well as the shapes belonging to themsleves. But users can overwrite
+ * the built-in shapes by using names like 'circle', 'rect' via calling
+ * `registerShape`. So the echarts inner featrues should not fetch shapes from here
+ * in case that it is overwritten by users, except that some features, like
+ * `custom series`, `graphic component`, do it deliberately.
+ *
+ * (2) In the features like `custom series`, `graphic component`, the user input
+ * `{tpye: 'xxx'}` does not only specify shapes but also specify other graphic
+ * elements like `'group'`, `'text'`, `'image'` or event `'path'`. Those names
+ * are reserved names, that is, if some user register a shape named `'image'`,
+ * the shape will not be used. If we intending to add some more reserved names
+ * in feature, that might bring break changes (disable some existing user shape
+ * names). But that case probably rearly happen. So we dont make more mechanism
+ * to resolve this issue here.
+ *
+ * @param {string} name
+ * @return {Object} The shape class. If not found, return nothing.
+ */
+function getShapeClass(name) {
+    if (_customShapeMap.hasOwnProperty(name)) {
+        return _customShapeMap[name];
+    }
+}
+
+/**
  * Create a path element from path data string
  * @param {string} pathData
  * @param {Object} opts
@@ -16959,11 +17027,12 @@ function singleEnterEmphasis(el) {
         return;
     }
 
-    var useHoverLayer = el.useHoverLayer;
+    var zr = el.__zr;
+
+    var useHoverLayer = el.useHoverLayer && zr && zr.painter.type === 'canvas';
     el.__highlighted = useHoverLayer ? 'layer' : 'plain';
 
-    var zr = el.__zr;
-    if (el.isGroup || (!zr && useHoverLayer)) {
+    if (el.isGroup || (!zr && el.useHoverLayer)) {
         return;
     }
 
@@ -17445,11 +17514,18 @@ function setTextStyleCommon(textStyle, textStyleModel, opt, isEmphasis) {
     opt = opt || EMPTY_OBJ;
 
     if (opt.isRectText) {
-        var textPosition = textStyleModel.getShallow('position')
-            || (isEmphasis ? null : 'inside');
-        // 'outside' is not a valid zr textPostion value, but used
-        // in bar series, and magric type should be considered.
-        textPosition === 'outside' && (textPosition = 'top');
+        var textPosition;
+        if (opt.getTextPosition) {
+            textPosition = opt.getTextPosition(textStyleModel, isEmphasis);
+        }
+        else {
+            textPosition = textStyleModel.getShallow('position')
+                || (isEmphasis ? null : 'inside');
+            // 'outside' is not a valid zr textPostion value, but used
+            // in bar series, and magric type should be considered.
+            textPosition === 'outside' && (textPosition = 'top');
+        }
+
         textStyle.textPosition = textPosition;
         textStyle.textOffset = textStyleModel.getShallow('offset');
         var labelRotate = textStyleModel.getShallow('rotate');
@@ -18048,6 +18124,18 @@ function nearZero(val) {
     return val <= (1e-6) && val >= -(1e-6);
 }
 
+// Register built-in shapes. These shapes might be overwirtten
+// by users, although we do not recommend that.
+registerShape('circle', Circle);
+registerShape('sector', Sector);
+registerShape('ring', Ring);
+registerShape('polygon', Polygon);
+registerShape('polyline', Polyline);
+registerShape('rect', Rect);
+registerShape('line', Line);
+registerShape('bezierCurve', BezierCurve);
+registerShape('arc', Arc);
+
 
 
 
@@ -18056,6 +18144,8 @@ var graphic = (Object.freeze || Object)({
 	CACHED_LABEL_STYLE_PROPERTIES: CACHED_LABEL_STYLE_PROPERTIES,
 	extendShape: extendShape,
 	extendPath: extendPath,
+	registerShape: registerShape,
+	getShapeClass: getShapeClass,
 	makePath: makePath,
 	makeImage: makeImage,
 	mergePath: mergePath,
@@ -18641,7 +18731,7 @@ function enableTopologicalTravel(entity, dependencyGetter) {
 var RADIAN_EPSILON = 1e-4;
 
 function _trim(str) {
-    return str.replace(/^\s+/, '').replace(/\s+$/, '');
+    return str.replace(/^\s+|\s+$/g, '');
 }
 
 /**
@@ -21612,8 +21702,8 @@ var GlobalModel = Model.extend({
      *     {mainType: 'series', subType: 'pie', query: {seriesName: 'uio'}}
      * );
      * var result = findComponents(
-     *     {mainType: 'series'},
-     *     function (model, index) {...}
+     *     {mainType: 'series',
+     *     filter: function (model, index) {...}}
      * );
      * // result like [component0, componnet1, ...]
      *
@@ -22932,12 +23022,17 @@ var backwardCompat = function (option, isTheme) {
 
         var seriesType = seriesOpt.type;
 
-        if (seriesType === 'pie' || seriesType === 'gauge') {
+        if (seriesType === 'line') {
+            if (seriesOpt.clipOverflow != null) {
+                seriesOpt.clip = seriesOpt.clipOverflow;
+            }
+        }
+        else if (seriesType === 'pie' || seriesType === 'gauge') {
             if (seriesOpt.clockWise != null) {
                 seriesOpt.clockwise = seriesOpt.clockWise;
             }
         }
-        if (seriesType === 'gauge') {
+        else if (seriesType === 'gauge') {
             var pointerColor = get(seriesOpt, 'pointer.color');
             pointerColor != null
                 && set$1(seriesOpt, 'itemStyle.color', pointerColor);
@@ -22987,7 +23082,7 @@ var backwardCompat = function (option, isTheme) {
 //     data processing stage is blocked in stream.
 //     See <module:echarts/stream/Scheduler#performDataProcessorTasks>
 // (2) Only register once when import repeatly.
-//     Should be executed before after series filtered and before stack calculation.
+//     Should be executed after series filtered and before stack calculation.
 var dataStack = function (ecModel) {
     var stackInfoMap = createHashMap();
     ecModel.eachSeries(function (seriesModel) {
@@ -23499,6 +23594,7 @@ var dataFormatMixin = {
         var name = data.getName(dataIndex);
         var itemOpt = data.getRawDataItem(dataIndex);
         var color = data.getItemVisual(dataIndex, 'color');
+        var borderColor = data.getItemVisual(dataIndex, 'borderColor');
         var tooltipModel = this.ecModel.getComponent('tooltip');
         var renderModeOption = tooltipModel && tooltipModel.get('renderMode');
         var renderMode = getTooltipRenderMode(renderModeOption);
@@ -23520,6 +23616,7 @@ var dataFormatMixin = {
             dataType: dataType,
             value: rawValue,
             color: color,
+            borderColor: borderColor,
             dimensionNames: userOutput ? userOutput.dimensionNames : null,
             encode: userOutput ? userOutput.encode : null,
             marker: getTooltipMarker({
@@ -23998,6 +24095,11 @@ var SeriesModel = ComponentModel.extend({
     visualColorAccessPath: 'itemStyle.color',
 
     /**
+     * Access path of borderColor for visual
+     */
+    visualBorderColorAccessPath: 'itemStyle.borderColor',
+
+    /**
      * Support merge layout params.
      * Only support 'box' now (left/right/top/bottom/width/height).
      * @type {string|Object} Object can be {ignoreSize: true}
@@ -24596,10 +24698,10 @@ Component$1.prototype = {
 };
 
 var componentProto = Component$1.prototype;
-componentProto.updateView
-    = componentProto.updateLayout
-    = componentProto.updateVisual
-    = function (seriesModel, ecModel, api, payload) {
+componentProto.updateView =
+    componentProto.updateLayout =
+    componentProto.updateVisual =
+    function (seriesModel, ecModel, api, payload) {
         // Do nothing;
     };
 // Enable Component.extend.
@@ -25117,6 +25219,10 @@ var seriesColor = {
 
         // FIXME Set color function or use the platte color
         data.setVisual('color', color);
+        
+        var borderColorAccessPath = (seriesModel.visualBorderColorAccessPath || 'itemStyle.borderColor').split('.');
+        var borderColor = seriesModel.get(borderColorAccessPath);
+        data.setVisual('borderColor', borderColor);
 
         // Only visible series has each data be visual encoded
         if (!ecModel.isSeriesFiltered(seriesModel)) {
@@ -25132,9 +25238,13 @@ var seriesColor = {
             var dataEach = function (data, idx) {
                 var itemModel = data.getItemModel(idx);
                 var color = itemModel.get(colorAccessPath, true);
+                var borderColor = itemModel.get(borderColorAccessPath, true);
                 if (color != null) {
                     data.setItemVisual(idx, 'color', color);
                 }
+                if (borderColor != null) {
+                    data.setItemVisual(idx, 'borderColor', borderColor);
+                }
             };
 
             return { dataEach: data.hasItemOption ? dataEach : null };
@@ -25161,8 +25271,17 @@ var seriesColor = {
 * under the License.
 */
 
+/**
+ * Language: English.
+ */
 
 var lang = {
+    legend: {
+        selector: {
+            all: 'All',
+            inverse: 'Inv'
+        }
+    },
     toolbox: {
         brush: {
             title: {
@@ -27139,15 +27258,17 @@ var isFunction = isFunction$1;
 var isObject = isObject$1;
 var parseClassType = ComponentModel.parseClassType;
 
-var version = '4.3.0';
+var version = '4.4.0';
 
 var dependencies = {
-    zrender: '4.1.0'
+    zrender: '4.1.1'
 };
 
 var TEST_FRAME_REMAIN_TIME = 1;
 
 var PRIORITY_PROCESSOR_FILTER = 1000;
+var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
+var PRIORITY_PROCESSOR_DATASTACK = 900;
 var PRIORITY_PROCESSOR_STATISTIC = 5000;
 
 var PRIORITY_VISUAL_LAYOUT = 1000;
@@ -27163,6 +27284,7 @@ var PRIORITY_VISUAL_BRUSH = 5000;
 var PRIORITY = {
     PROCESSOR: {
         FILTER: PRIORITY_PROCESSOR_FILTER,
+        SERIES_FILTER: PRIORITY_PROCESSOR_SERIES_FILTER,
         STATISTIC: PRIORITY_PROCESSOR_STATISTIC
     },
     VISUAL: {
@@ -27186,8 +27308,13 @@ var OPTION_UPDATED = '__optionUpdated';
 var ACTION_REG = /^[a-zA-Z0-9_]+$/;
 
 
-function createRegisterEventWithLowercaseName(method) {
+function createRegisterEventWithLowercaseName(method, ignoreDisposed) {
     return function (eventName, handler, context) {
+        if (!ignoreDisposed && this._disposed) {
+            disposedWarning(this.id);
+            return;
+        }
+
         // Event name is all lowercase
         eventName = eventName && eventName.toLowerCase();
         Eventful.prototype[method].call(this, eventName, handler, context);
@@ -27200,9 +27327,9 @@ function createRegisterEventWithLowercaseName(method) {
 function MessageCenter() {
     Eventful.call(this);
 }
-MessageCenter.prototype.on = createRegisterEventWithLowercaseName('on');
-MessageCenter.prototype.off = createRegisterEventWithLowercaseName('off');
-MessageCenter.prototype.one = createRegisterEventWithLowercaseName('one');
+MessageCenter.prototype.on = createRegisterEventWithLowercaseName('on', true);
+MessageCenter.prototype.off = createRegisterEventWithLowercaseName('off', true);
+MessageCenter.prototype.one = createRegisterEventWithLowercaseName('one', true);
 mixin(MessageCenter, Eventful);
 
 /**
@@ -27438,6 +27565,10 @@ echartsProto.setOption = function (option, notMerge, lazyUpdate) {
     if (__DEV__) {
         assert(!this[IN_MAIN_PROCESS], '`setOption` should not be called during main process.');
     }
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
 
     var silent;
     if (isObject(notMerge)) {
@@ -27573,6 +27704,11 @@ echartsProto.getSvgDataUrl = function () {
  * @param {string} [opts.excludeComponents]
  */
 echartsProto.getDataURL = function (opts) {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
+
     opts = opts || {};
     var excludeComponents = opts.excludeComponents;
     var ecModel = this._model;
@@ -27613,6 +27749,11 @@ echartsProto.getDataURL = function (opts) {
  * @param {string} [opts.backgroundColor]
  */
 echartsProto.getConnectedDataURL = function (opts) {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
+
     if (!env$1.canvasSupported) {
         return;
     }
@@ -27732,6 +27873,11 @@ echartsProto.convertToPixel = curry(doConvertPixel, 'convertToPixel');
 echartsProto.convertFromPixel = curry(doConvertPixel, 'convertFromPixel');
 
 function doConvertPixel(methodName, finder, value) {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
+
     var ecModel = this._model;
     var coordSysList = this._coordSysMgr.getCoordinateSystems();
     var result;
@@ -27772,6 +27918,11 @@ function doConvertPixel(methodName, finder, value) {
  * @return {boolean} result
  */
 echartsProto.containPixel = function (finder, value) {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
+
     var ecModel = this._model;
     var result;
 
@@ -28144,6 +28295,10 @@ echartsProto.resize = function (opts) {
     if (__DEV__) {
         assert(!this[IN_MAIN_PROCESS], '`resize` should not be called during main process.');
     }
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
 
     this._zr.resize(opts);
 
@@ -28186,6 +28341,11 @@ function updateStreamModes(ecIns, ecModel) {
  * @param  {Object} [cfg]
  */
 echartsProto.showLoading = function (name, cfg) {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
+
     if (isObject(name)) {
         cfg = name;
         name = '';
@@ -28210,6 +28370,11 @@ echartsProto.showLoading = function (name, cfg) {
  * Hide loading effect
  */
 echartsProto.hideLoading = function () {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
+
     this._loadingFX && this._zr.remove(this._loadingFX);
     this._loadingFX = null;
 };
@@ -28233,10 +28398,15 @@ echartsProto.makeActionFromEvent = function (eventObj) {
  * @param {boolean} [opt.flush=undefined]
  *                  true: Flush immediately, and then pixel in canvas can be fetched
  *                      immediately. Caution: it might affect performance.
- *                  false: Not not flush.
+ *                  false: Not flush.
  *                  undefined: Auto decide whether perform flush.
  */
 echartsProto.dispatchAction = function (payload, opt) {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
+
     if (!isObject(opt)) {
         opt = {silent: !!opt};
     }
@@ -28405,6 +28575,11 @@ function bindRenderedEvent(zr, ecIns) {
  * @param {Array|TypedArray} params.data
  */
 echartsProto.appendData = function (params) {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
+
     var seriesIndex = params.seriesIndex;
     var ecModel = this.getModel();
     var seriesModel = ecModel.getSeriesByIndex(seriesIndex);
@@ -28430,9 +28605,9 @@ echartsProto.appendData = function (params) {
  * Register event
  * @method
  */
-echartsProto.on = createRegisterEventWithLowercaseName('on');
-echartsProto.off = createRegisterEventWithLowercaseName('off');
-echartsProto.one = createRegisterEventWithLowercaseName('one');
+echartsProto.on = createRegisterEventWithLowercaseName('on', false);
+echartsProto.off = createRegisterEventWithLowercaseName('off', false);
+echartsProto.one = createRegisterEventWithLowercaseName('one', false);
 
 /**
  * Prepare view instances of charts and components
@@ -28710,6 +28885,10 @@ echartsProto.isDisposed = function () {
  * Clear
  */
 echartsProto.clear = function () {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
     this.setOption({ series: [] }, true);
 };
 
@@ -28718,9 +28897,7 @@ echartsProto.clear = function () {
  */
 echartsProto.dispose = function () {
     if (this._disposed) {
-        if (__DEV__) {
-            console.warn('Instance ' + this.id + ' has been disposed');
-        }
+        disposedWarning(this.id);
         return;
     }
     this._disposed = true;
@@ -28745,6 +28922,12 @@ echartsProto.dispose = function () {
 
 mixin(ECharts, Eventful);
 
+function disposedWarning(id) {
+    if (__DEV__) {
+        console.warn('Instance ' + id + ' has been disposed');
+    }
+}
+
 function updateHoverLayerStatus(ecIns, ecModel) {
     var zr = ecIns._zr;
     var storage = zr.storage;
@@ -29094,9 +29277,9 @@ function init(dom, theme$$1, opts) {
             )
         ) {
             console.warn('Can\'t get DOM width or height. Please check '
-                + 'dom.clientWidth and dom.clientHeight. They should not be 0.'
-                + 'For example, you may need to call this in the callback '
-                + 'of window.onload.');
+            + 'dom.clientWidth and dom.clientHeight. They should not be 0.'
+            + 'For example, you may need to call this in the callback '
+            + 'of window.onload.');
         }
     }
 
@@ -29447,7 +29630,7 @@ function getMap(mapName) {
 
 registerVisual(PRIORITY_VISUAL_GLOBAL, seriesColor);
 registerPreprocessor(backwardCompat);
-registerProcessor(PRIORITY_PROCESSOR_STATISTIC, dataStack);
+registerProcessor(PRIORITY_PROCESSOR_DATASTACK, dataStack);
 registerLoading('default', loadingDefault);
 
 // Default actions
@@ -31934,8 +32117,8 @@ function completeDimensions(sysDims, source, opt) {
             // `coordDimIndex` should not be set directly.
             sysDimItemDimsDef = sysDimItem.dimsDef;
             sysDimItemOtherDims = sysDimItem.otherDims;
-            sysDimItem.name = sysDimItem.coordDim = sysDimItem.coordDimIndex
-                = sysDimItem.dimsDef = sysDimItem.otherDims = null;
+            sysDimItem.name = sysDimItem.coordDim = sysDimItem.coordDimIndex =
+                sysDimItem.dimsDef = sysDimItem.otherDims = null;
         }
 
         var dataDims = encodeDef.get(coordDim);
@@ -33342,6 +33525,7 @@ function doCalBarWidthAndOffset(seriesInfoList) {
         var offset = -widthSum / 2;
         each$1(stacks, function (column, stackId) {
             result[coordSysName][stackId] = result[coordSysName][stackId] || {
+                bandWidth: bandWidth,
                 offset: offset,
                 width: column.width
             };
@@ -33395,6 +33579,7 @@ function layout(seriesType, ecModel) {
 
         lastStackCoords[stackId] = lastStackCoords[stackId] || [];
         data.setLayout({
+            bandWidth: columnLayoutInfo.bandWidth,
             offset: columnOffset,
             size: columnWidth
         });
@@ -33546,23 +33731,7 @@ function isInLargeMode(seriesModel) {
 
 // See cases in `test/bar-start.html` and `#7412`, `#8747`.
 function getValueAxisStart(baseAxis, valueAxis, stacked) {
-    var extent = valueAxis.getGlobalExtent();
-    var min;
-    var max;
-    if (extent[0] > extent[1]) {
-        min = extent[1];
-        max = extent[0];
-    }
-    else {
-        min = extent[0];
-        max = extent[1];
-    }
-
-    var valueStart = valueAxis.toGlobalCoord(valueAxis.dataToCoord(0));
-    valueStart < min && (valueStart = min);
-    valueStart > max && (valueStart = max);
-
-    return valueStart;
+    return valueAxis.toGlobalCoord(valueAxis.dataToCoord(0));
 }
 
 /*
@@ -36012,6 +36181,7 @@ each$1(
         'setHoverStyle', 'setLabelStyle', 'setTextStyle', 'setText',
         'getFont', 'updateProps', 'initProps', 'getTransform',
         'clipPointsByRect', 'clipRectByRect',
+        'registerShape', 'getShapeClass',
         'Group',
         'Image',
         'Text',
@@ -36084,7 +36254,7 @@ SeriesModel.extend({
         // polarIndex: 0,
 
         // If clip the overflow value
-        clipOverflow: true,
+        clip: true,
         // cursor: null,
 
         label: {
@@ -37480,89 +37650,21 @@ var Polygon$1 = Path.extend({
 * specific language governing permissions and limitations
 * under the License.
 */
-
-// FIXME step not support polar
-
-function isPointsSame(points1, points2) {
-    if (points1.length !== points2.length) {
-        return;
-    }
-    for (var i = 0; i < points1.length; i++) {
-        var p1 = points1[i];
-        var p2 = points2[i];
-        if (p1[0] !== p2[0] || p1[1] !== p2[1]) {
-            return;
-        }
-    }
-    return true;
-}
-
-function getSmooth(smooth) {
-    return typeof (smooth) === 'number' ? smooth : (smooth ? 0.5 : 0);
-}
-
-function getAxisExtentWithGap(axis) {
-    var extent = axis.getGlobalExtent();
-    if (axis.onBand) {
-        // Remove extra 1px to avoid line miter in clipped edge
-        var halfBandWidth = axis.getBandWidth() / 2 - 1;
-        var dir = extent[1] > extent[0] ? 1 : -1;
-        extent[0] += dir * halfBandWidth;
-        extent[1] -= dir * halfBandWidth;
-    }
-    return extent;
-}
-
-/**
- * @param {module:echarts/coord/cartesian/Cartesian2D|module:echarts/coord/polar/Polar} coordSys
- * @param {module:echarts/data/List} data
- * @param {Object} dataCoordInfo
- * @param {Array.<Array.<number>>} points
- */
-function getStackedOnPoints(coordSys, data, dataCoordInfo) {
-    if (!dataCoordInfo.valueDim) {
-        return [];
-    }
-
-    var points = [];
-    for (var idx = 0, len = data.count(); idx < len; idx++) {
-        points.push(getStackedOnPoint(dataCoordInfo, coordSys, data, idx));
-    }
-
-    return points;
-}
-
-function createGridClipShape(cartesian, hasAnimation, forSymbol, seriesModel) {
-    var xExtent = getAxisExtentWithGap(cartesian.getAxis('x'));
-    var yExtent = getAxisExtentWithGap(cartesian.getAxis('y'));
+function createGridClipPath(cartesian, hasAnimation, seriesModel) {
+    var rect = cartesian.getArea();
     var isHorizontal = cartesian.getBaseAxis().isHorizontal();
 
-    var x = Math.min(xExtent[0], xExtent[1]);
-    var y = Math.min(yExtent[0], yExtent[1]);
-    var width = Math.max(xExtent[0], xExtent[1]) - x;
-    var height = Math.max(yExtent[0], yExtent[1]) - y;
+    var x = rect.x;
+    var y = rect.y;
+    var width = rect.width;
+    var height = rect.height;
 
-    // Avoid float number rounding error for symbol on the edge of axis extent.
-    // See #7913 and `test/dataZoom-clip.html`.
-    if (forSymbol) {
-        x -= 0.5;
-        width += 0.5;
-        y -= 0.5;
-        height += 0.5;
-    }
-    else {
-        var lineWidth = seriesModel.get('lineStyle.width') || 2;
-        // Expand clip shape to avoid clipping when line value exceeds axis
-        var expandSize = seriesModel.get('clipOverflow') ? lineWidth / 2 : Math.max(width, height);
-        if (isHorizontal) {
-            y -= expandSize;
-            height += expandSize * 2;
-        }
-        else {
-            x -= expandSize;
-            width += expandSize * 2;
-        }
-    }
+    var lineWidth = seriesModel.get('lineStyle.width') || 2;
+    // Expand the clip path a bit to avoid the border is clipped and looks thinner
+    x -= lineWidth / 2;
+    y -= lineWidth / 2;
+    width += lineWidth;
+    height += lineWidth;
 
     var clipPath = new Rect({
         shape: {
@@ -37586,50 +37688,102 @@ function createGridClipShape(cartesian, hasAnimation, forSymbol, seriesModel) {
     return clipPath;
 }
 
-function createPolarClipShape(polar, hasAnimation, forSymbol, seriesModel) {
-    var angleAxis = polar.getAngleAxis();
-    var radiusAxis = polar.getRadiusAxis();
-
-    var radiusExtent = radiusAxis.getExtent().slice();
-    radiusExtent[0] > radiusExtent[1] && radiusExtent.reverse();
-    var angleExtent = angleAxis.getExtent();
-
-    var RADIAN = Math.PI / 180;
-
+function createPolarClipPath(polar, hasAnimation, seriesModel) {
+    var sectorArea = polar.getArea();
     // Avoid float number rounding error for symbol on the edge of axis extent.
-    if (forSymbol) {
-        radiusExtent[0] -= 0.5;
-        radiusExtent[1] += 0.5;
-    }
 
     var clipPath = new Sector({
         shape: {
             cx: round$1(polar.cx, 1),
             cy: round$1(polar.cy, 1),
-            r0: round$1(radiusExtent[0], 1),
-            r: round$1(radiusExtent[1], 1),
-            startAngle: -angleExtent[0] * RADIAN,
-            endAngle: -angleExtent[1] * RADIAN,
-            clockwise: angleAxis.inverse
+            r0: round$1(sectorArea.r0, 1),
+            r: round$1(sectorArea.r, 1),
+            startAngle: sectorArea.startAngle,
+            endAngle: sectorArea.endAngle,
+            clockwise: sectorArea.clockwise
         }
     });
 
     if (hasAnimation) {
-        clipPath.shape.endAngle = -angleExtent[0] * RADIAN;
+        clipPath.shape.endAngle = sectorArea.startAngle;
         initProps(clipPath, {
             shape: {
-                endAngle: -angleExtent[1] * RADIAN
+                endAngle: sectorArea.endAngle
             }
         }, seriesModel);
     }
-
     return clipPath;
 }
 
-function createClipShape(coordSys, hasAnimation, forSymbol, seriesModel) {
-    return coordSys.type === 'polar'
-        ? createPolarClipShape(coordSys, hasAnimation, forSymbol, seriesModel)
-        : createGridClipShape(coordSys, hasAnimation, forSymbol, seriesModel);
+function createClipPath(coordSys, hasAnimation, seriesModel) {
+    if (!coordSys) {
+        return null;
+    }
+    else if (coordSys.type === 'polar') {
+        return createPolarClipPath(coordSys, hasAnimation, seriesModel);
+    }
+    else if (coordSys.type === 'cartesian2d') {
+        return createGridClipPath(coordSys, hasAnimation, seriesModel);
+    }
+    return null;
+}
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+// FIXME step not support polar
+
+function isPointsSame(points1, points2) {
+    if (points1.length !== points2.length) {
+        return;
+    }
+    for (var i = 0; i < points1.length; i++) {
+        var p1 = points1[i];
+        var p2 = points2[i];
+        if (p1[0] !== p2[0] || p1[1] !== p2[1]) {
+            return;
+        }
+    }
+    return true;
+}
+
+function getSmooth(smooth) {
+    return typeof (smooth) === 'number' ? smooth : (smooth ? 0.5 : 0);
+}
+
+/**
+ * @param {module:echarts/coord/cartesian/Cartesian2D|module:echarts/coord/polar/Polar} coordSys
+ * @param {module:echarts/data/List} data
+ * @param {Object} dataCoordInfo
+ * @param {Array.<Array.<number>>} points
+ */
+function getStackedOnPoints(coordSys, data, dataCoordInfo) {
+    if (!dataCoordInfo.valueDim) {
+        return [];
+    }
+
+    var points = [];
+    for (var idx = 0, len = data.count(); idx < len; idx++) {
+        points.push(getStackedOnPoint(dataCoordInfo, coordSys, data, idx));
+    }
+
+    return points;
 }
 
 function turnPointsIntoStep(points, coordSys, stepTurnAt) {
@@ -37828,6 +37982,31 @@ function canShowAllSymbolForCategory(categoryAxis, data) {
     return true;
 }
 
+function createLineClipPath(coordSys, hasAnimation, seriesModel) {
+    if (coordSys.type === 'cartesian2d') {
+        var isHorizontal = coordSys.getBaseAxis().isHorizontal();
+        var clipPath = createGridClipPath(coordSys, hasAnimation, seriesModel);
+        // Expand clip shape to avoid clipping when line value exceeds axis
+        if (!seriesModel.get('clip', true)) {
+            var rectShape = clipPath.shape;
+            var expandSize = Math.max(rectShape.width, rectShape.height);
+            if (isHorizontal) {
+                rectShape.y -= expandSize;
+                rectShape.height += expandSize * 2;
+            }
+            else {
+                rectShape.x -= expandSize;
+                rectShape.width += expandSize * 2;
+            }
+        }
+        return clipPath;
+    }
+    else {
+        return createPolarClipPath(coordSys, hasAnimation, seriesModel);
+    }
+
+}
+
 Chart.extend({
 
     type: 'line',
@@ -37892,13 +38071,29 @@ Chart.extend({
 
         // FIXME step not support polar
         var step = !isCoordSysPolar && seriesModel.get('step');
+        var clipShapeForSymbol;
+        if (coordSys && coordSys.getArea) {
+            clipShapeForSymbol = coordSys.getArea();
+            // Avoid float number rounding error for symbol on the edge of axis extent.
+            // See #7913 and `test/dataZoom-clip.html`.
+            if (clipShapeForSymbol.width != null) {
+                clipShapeForSymbol.x -= 0.1;
+                clipShapeForSymbol.y -= 0.1;
+                clipShapeForSymbol.width += 0.2;
+                clipShapeForSymbol.height += 0.2;
+            }
+            else if (clipShapeForSymbol.r0) {
+                clipShapeForSymbol.r0 -= 0.5;
+                clipShapeForSymbol.r1 += 0.5;
+            }
+        }
         // Initialization animation or coordinate system changed
         if (
             !(polyline && prevCoordSys.type === coordSys.type && step === this._step)
         ) {
             showSymbol && symbolDraw.updateData(data, {
                 isIgnore: isIgnoreFunc,
-                clipShape: createClipShape(coordSys, false, true, seriesModel)
+                clipShape: clipShapeForSymbol
             });
 
             if (step) {
@@ -37914,7 +38109,7 @@ Chart.extend({
                     coordSys, hasAnimation
                 );
             }
-            lineGroup.setClipPath(createClipShape(coordSys, true, false, seriesModel));
+            lineGroup.setClipPath(createLineClipPath(coordSys, true, seriesModel));
         }
         else {
             if (isAreaChart && !polygon) {
@@ -37931,13 +38126,13 @@ Chart.extend({
             }
 
             // Update clipPath
-            lineGroup.setClipPath(createClipShape(coordSys, false, false, seriesModel));
+            lineGroup.setClipPath(createLineClipPath(coordSys, false, seriesModel));
 
             // Always update, or it is wrong in the case turning on legend
             // because points are not changed
             showSymbol && symbolDraw.updateData(data, {
                 isIgnore: isIgnoreFunc,
-                clipShape: createClipShape(coordSys, false, true, seriesModel)
+                clipShape: clipShapeForSymbol
             });
 
             // Stop symbol animation and sync with line points
@@ -38239,12 +38434,12 @@ Chart.extend({
             }
         });
 
-        this._polyline
-            = this._polygon
-            = this._coordSys
-            = this._points
-            = this._stackedOnPoints
-            = this._data = null;
+        this._polyline =
+            this._polygon =
+            this._coordSys =
+            this._points =
+            this._stackedOnPoints =
+            this._data = null;
     }
 });
 
@@ -38784,6 +38979,23 @@ Cartesian2D.prototype = {
      */
     getOtherAxis: function (axis) {
         return this.getAxis(axis.dim === 'x' ? 'y' : 'x');
+    },
+
+    /**
+     * Get rect area of cartesian.
+     * Area will have a contain function to determine if a point is in the coordinate system.
+     * @return {BoundingRect}
+     */
+    getArea: function () {
+        var xExtent = this.getAxis('x').getGlobalExtent();
+        var yExtent = this.getAxis('y').getGlobalExtent();
+        var x = Math.min(xExtent[0], xExtent[1]);
+        var y = Math.min(yExtent[0], yExtent[1]);
+        var width = Math.max(xExtent[0], xExtent[1]) - x;
+        var height = Math.max(yExtent[0], yExtent[1]) - y;
+
+        var rect = new BoundingRect(x, y, width, height);
+        return rect;
     }
 
 };
@@ -41707,8 +41919,13 @@ BaseBarSeries.extend({
             progressiveThreshold = largeThreshold;
         }
         return progressiveThreshold;
-    }
+    },
 
+    defaultOption: {
+        // If clipped
+        // Only available on cartesian2d
+        clip: true
+    }
 });
 
 /*
@@ -41829,6 +42046,29 @@ var _eventPos = [0, 0];
 // Just for compatible with ec2.
 extend(Model.prototype, barItemStyle);
 
+function getClipArea(coord, data) {
+    var coordSysClipArea = coord.getArea && coord.getArea();
+    if (coord.type === 'cartesian2d') {
+        var baseAxis = coord.getBaseAxis();
+        // When boundaryGap is false or using time axis. bar may exceed the grid.
+        // We should not clip this part.
+        // See test/bar2.html
+        if (baseAxis.type !== 'category' || !baseAxis.onBand) {
+            var expandWidth = data.getLayout('bandWidth');
+            if (baseAxis.isHorizontal()) {
+                coordSysClipArea.x -= expandWidth;
+                coordSysClipArea.width += expandWidth * 2;
+            }
+            else {
+                coordSysClipArea.y -= expandWidth;
+                coordSysClipArea.height += expandWidth * 2;
+            }
+        }
+    }
+
+    return coordSysClipArea;
+}
+
 extendChartView({
 
     type: 'bar',
@@ -41888,6 +42128,13 @@ extendChartView({
 
         var animationModel = seriesModel.isAnimationEnabled() ? seriesModel : null;
 
+        var needsClip = seriesModel.get('clip', true);
+        var coordSysClipArea = getClipArea(coord, data);
+        // If there is clipPath created in large mode. Remove it.
+        group.removeClipPath();
+        // We don't use clipPath in normal mode because we needs a perfect animation
+        // And don't want the label are clipped.
+
         data.diff(oldData)
             .add(function (dataIndex) {
                 if (!data.hasValue(dataIndex)) {
@@ -41896,6 +42143,17 @@ extendChartView({
 
                 var itemModel = data.getItemModel(dataIndex);
                 var layout = getLayout[coord.type](data, dataIndex, itemModel);
+
+                if (needsClip) {
+                    // Clip will modify the layout params.
+                    // And return a boolean to determine if the shape are fully clipped.
+                    var isClipped = clip[coord.type](coordSysClipArea, layout);
+                    if (isClipped) {
+                        group.remove(el);
+                        return;
+                    }
+                }
+
                 var el = elementCreator[coord.type](
                     data, dataIndex, itemModel, layout, isHorizontalOrRadial, animationModel
                 );
@@ -41918,6 +42176,14 @@ extendChartView({
                 var itemModel = data.getItemModel(newIndex);
                 var layout = getLayout[coord.type](data, newIndex, itemModel);
 
+                if (needsClip) {
+                    var isClipped = clip[coord.type](coordSysClipArea, layout);
+                    if (isClipped) {
+                        group.remove(el);
+                        return;
+                    }
+                }
+
                 if (el) {
                     updateProps(el, {shape: layout}, animationModel, newIndex);
                 }
@@ -41953,6 +42219,17 @@ extendChartView({
     _renderLarge: function (seriesModel, ecModel, api) {
         this._clear();
         createLarge(seriesModel, this.group);
+
+        // Use clipPath in large mode.
+        var clipPath = seriesModel.get('clip', true)
+            ? createClipPath(seriesModel.coordinateSystem, false, seriesModel)
+            : null;
+        if (clipPath) {
+            this.group.setClipPath(clipPath);
+        }
+        else {
+            this.group.removeClipPath();
+        }
     },
 
     _incrementalRenderLarge: function (params, seriesModel) {
@@ -41986,6 +42263,53 @@ extendChartView({
 
 });
 
+var mathMax$4 = Math.max;
+var mathMin$4 = Math.min;
+
+var clip = {
+    cartesian2d: function (coordSysBoundingRect, layout) {
+        var signWidth = layout.width < 0 ? -1 : 1;
+        var signHeight = layout.height < 0 ? -1 : 1;
+        // Needs positive width and height
+        if (signWidth < 0) {
+            layout.x += layout.width;
+            layout.width = -layout.width;
+        }
+        if (signHeight < 0) {
+            layout.y += layout.height;
+            layout.height = -layout.height;
+        }
+
+        var x = mathMax$4(layout.x, coordSysBoundingRect.x);
+        var x2 = mathMin$4(layout.x + layout.width, coordSysBoundingRect.x + coordSysBoundingRect.width);
+        var y = mathMax$4(layout.y, coordSysBoundingRect.y);
+        var y2 = mathMin$4(layout.y + layout.height, coordSysBoundingRect.y + coordSysBoundingRect.height);
+
+        layout.x = x;
+        layout.y = y;
+        layout.width = x2 - x;
+        layout.height = y2 - y;
+
+        var clipped = layout.width < 0 || layout.height < 0;
+
+        // Reverse back
+        if (signWidth < 0) {
+            layout.x += layout.width;
+            layout.width = -layout.width;
+        }
+        if (signHeight < 0) {
+            layout.y += layout.height;
+            layout.height = -layout.height;
+        }
+
+        return clipped;
+    },
+
+    polar: function (coordSysClipArea) {
+        return false;
+    }
+};
+
 var elementCreator = {
 
     cartesian2d: function (
@@ -42589,9 +42913,12 @@ var PieSeries = extendSeriesModel({
             borderWidth: 1
         },
 
-        // Animation type canbe expansion, scale
+        // Animation type. Valid values: expansion, scale
         animationType: 'expansion',
 
+        // Animation type when update. Valid values: transition, expansion
+        animationTypeUpdate: 'transition',
+
         animationEasing: 'cubicOut'
     }
 });
@@ -42708,6 +43035,8 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
     var sectorShape = extend({}, layout);
     sectorShape.label = null;
 
+    var animationTypeUpdate = seriesModel.getShallow('animationTypeUpdate');
+
     if (firstCreate) {
         sector.setShape(sectorShape);
 
@@ -42732,9 +43061,16 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
 
     }
     else {
-        updateProps(sector, {
-            shape: sectorShape
-        }, seriesModel, idx);
+        if (animationTypeUpdate === 'expansion') {
+            // Sectors are set to be target shape and an overlaying clipPath is used for animation
+            sector.setShape(sectorShape);
+        }
+        else {
+            // Transition animation from the old shape
+            updateProps(sector, {
+                shape: sectorShape
+            }, seriesModel, idx);
+        }
     }
 
     // Update common style
@@ -42763,7 +43099,9 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
         seriesModel.get('animation')
     );
 
-    this._updateLabel(data, idx);
+    // Label and text animation should be applied only for transition type animation when update
+    var withAnimation = !firstCreate && animationTypeUpdate === 'transition';
+    this._updateLabel(data, idx, withAnimation);
 
     this.highDownOnUpdate = (itemModel.get('hoverAnimation') && seriesModel.isAnimationEnabled())
         ? function (fromState, toState) {
@@ -42797,7 +43135,7 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
     setHoverStyle(this);
 };
 
-piePieceProto._updateLabel = function (data, idx) {
+piePieceProto._updateLabel = function (data, idx, withAnimation) {
 
     var labelLine = this.childAt(1);
     var labelText = this.childAt(2);
@@ -42814,20 +43152,33 @@ piePieceProto._updateLabel = function (data, idx) {
         return;
     }
 
-    updateProps(labelLine, {
-        shape: {
-            points: labelLayout.linePoints || [
-                [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y]
-            ]
-        }
-    }, seriesModel, idx);
+    var targetLineShape = {
+        points: labelLayout.linePoints || [
+            [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y]
+        ]
+    };
+    var targetTextStyle = {
+        x: labelLayout.x,
+        y: labelLayout.y
+    };
+    if (withAnimation) {
+        updateProps(labelLine, {
+            shape: targetLineShape
+        }, seriesModel, idx);
+
+        updateProps(labelText, {
+            style: targetTextStyle
+        }, seriesModel, idx);
+    }
+    else {
+        labelLine.attr({
+            shape: targetLineShape
+        });
+        labelText.attr({
+            style: targetTextStyle
+        });
+    }
 
-    updateProps(labelText, {
-        style: {
-            x: labelLayout.x,
-            y: labelLayout.y
-        }
-    }, seriesModel, idx);
     labelText.attr({
         rotation: labelLayout.rotation,
         origin: [labelLayout.x, labelLayout.y],
@@ -42905,6 +43256,7 @@ var PieView = Chart.extend({
         var hasAnimation = ecModel.get('animation');
         var isFirstRender = !oldData;
         var animationType = seriesModel.get('animationType');
+        var animationTypeUpdate = seriesModel.get('animationTypeUpdate');
 
         var onSectorClick = curry(
             updateDataSelected, this.uid, seriesModel, hasAnimation, api
@@ -42930,6 +43282,12 @@ var PieView = Chart.extend({
             .update(function (newIdx, oldIdx) {
                 var piePiece = oldData.getItemGraphicEl(oldIdx);
 
+                if (!isFirstRender && animationTypeUpdate !== 'transition') {
+                    piePiece.eachChild(function (child) {
+                        child.stopAnimation(true);
+                    });
+                }
+
                 piePiece.updateData(data, newIdx);
 
                 piePiece.off('click');
@@ -42944,9 +43302,8 @@ var PieView = Chart.extend({
             .execute();
 
         if (
-            hasAnimation && isFirstRender && data.count() > 0
-            // Default expansion animation
-            && animationType !== 'scale'
+            hasAnimation && data.count() > 0
+            && (isFirstRender ? animationType !== 'scale' : animationTypeUpdate !== 'transition')
         ) {
             var shape = data.getItemLayout(0);
             for (var s = 1; isNaN(shape.startAngle) && s < data.count(); ++s) {
@@ -42957,7 +43314,7 @@ var PieView = Chart.extend({
 
             var removeClipPath = bind(group.removeClipPath, group);
             group.setClipPath(this._createClipPath(
-                shape.cx, shape.cy, r, shape.startAngle, shape.clockwise, removeClipPath, seriesModel
+                shape.cx, shape.cy, r, shape.startAngle, shape.clockwise, removeClipPath, seriesModel, isFirstRender
             ));
         }
         else {
@@ -42971,7 +43328,7 @@ var PieView = Chart.extend({
     dispose: function () {},
 
     _createClipPath: function (
-        cx, cy, r, startAngle, clockwise, cb, seriesModel
+        cx, cy, r, startAngle, clockwise, cb, seriesModel, isFirstRender
     ) {
         var clipPath = new Sector({
             shape: {
@@ -42985,7 +43342,8 @@ var PieView = Chart.extend({
             }
         });
 
-        initProps(clipPath, {
+        var initOrUpdate = isFirstRender ? initProps : updateProps;
+        initOrUpdate(clipPath, {
             shape: {
                 endAngle: startAngle + (clockwise ? 1 : -1) * Math.PI * 2
             }
@@ -43119,10 +43477,16 @@ var dataColor = function (seriesType) {
                 var singleDataColor = filteredIdx != null
                     && data.getItemVisual(filteredIdx, 'color', true);
 
-                if (!singleDataColor) {
+                var singleDataBorderColor = filteredIdx != null
+                    && data.getItemVisual(filteredIdx, 'borderColor', true);
+
+                var itemModel;
+                if (!singleDataColor || !singleDataBorderColor) {
                     // FIXME Performance
-                    var itemModel = dataAll.getItemModel(rawIdx);
+                    itemModel = dataAll.getItemModel(rawIdx);
+                }
 
+                if (!singleDataColor) {
                     var color = itemModel.get('itemStyle.color')
                         || seriesModel.getColorFromPalette(
                             dataAll.getName(rawIdx) || (rawIdx + ''), seriesModel.__paletteScope,
@@ -43140,6 +43504,21 @@ var dataColor = function (seriesType) {
                     // Set data all color for legend
                     dataAll.setItemVisual(rawIdx, 'color', singleDataColor);
                 }
+
+                if (!singleDataBorderColor) {
+                    var borderColor = itemModel.get('itemStyle.borderColor');
+                    // Legend may use the visual info in data before processed
+                    dataAll.setItemVisual(rawIdx, 'borderColor', borderColor);
+
+                    // Data is not filtered
+                    if (filteredIdx != null) {
+                        data.setItemVisual(filteredIdx, 'borderColor', borderColor);
+                    }
+                }
+                else {
+                    // Set data all borderColor for legend
+                    dataAll.setItemVisual(rawIdx, 'borderColor', singleDataBorderColor);
+                }
             });
         }
     };
@@ -43736,7 +44115,11 @@ SeriesModel.extend({
         itemStyle: {
             opacity: 0.8
             // color: 各异
-        }
+        },
+
+        // If clip the overflow graphics
+        // Works on cartesian / polar series
+        clip: true
 
         // progressive: null
     }
@@ -43776,6 +44159,8 @@ var LargeSymbolPath = extendShape({
 
     symbolProxy: null,
 
+    softClipShape: null,
+
     buildPath: function (path, shape) {
         var points = shape.points;
         var size = shape.size;
@@ -43797,6 +44182,9 @@ var LargeSymbolPath = extendShape({
             if (isNaN(x) || isNaN(y)) {
                 continue;
             }
+            if (this.softClipShape && !this.softClipShape.contain(x, y)) {
+                continue;
+            }
 
             symbolProxyShape.x = x - size[0] / 2;
             symbolProxyShape.y = y - size[1] / 2;
@@ -43825,6 +44213,9 @@ var LargeSymbolPath = extendShape({
             if (isNaN(x) || isNaN(y)) {
                 continue;
             }
+            if (this.softClipShape && !this.softClipShape.contain(x, y)) {
+                continue;
+            }
             // fillRect is faster than building a rect path and draw.
             // And it support light globalCompositeOperation.
             ctx.fillRect(
@@ -43876,8 +44267,10 @@ largeSymbolProto.isPersistent = function () {
 /**
  * Update symbols draw by new data
  * @param {module:echarts/data/List} data
+ * @param {Object} opt
+ * @param {Object} [opt.clipShape]
  */
-largeSymbolProto.updateData = function (data) {
+largeSymbolProto.updateData = function (data, opt) {
     this.group.removeAll();
     var symbolEl = new LargeSymbolPath({
         rectHover: true,
@@ -43887,7 +44280,7 @@ largeSymbolProto.updateData = function (data) {
     symbolEl.setShape({
         points: data.getLayout('symbolPoints')
     });
-    this._setCommon(symbolEl, data);
+    this._setCommon(symbolEl, data, false, opt);
     this.group.add(symbolEl);
 
     this._incremental = null;
@@ -43928,7 +44321,7 @@ largeSymbolProto.incrementalPrepareUpdate = function (data) {
     }
 };
 
-largeSymbolProto.incrementalUpdate = function (taskParams, data) {
+largeSymbolProto.incrementalUpdate = function (taskParams, data, opt) {
     var symbolEl;
     if (this._incremental) {
         symbolEl = new LargeSymbolPath();
@@ -43948,12 +44341,13 @@ largeSymbolProto.incrementalUpdate = function (taskParams, data) {
     symbolEl.setShape({
         points: data.getLayout('symbolPoints')
     });
-    this._setCommon(symbolEl, data, !!this._incremental);
+    this._setCommon(symbolEl, data, !!this._incremental, opt);
 };
 
-largeSymbolProto._setCommon = function (symbolEl, data, isIncremental) {
+largeSymbolProto._setCommon = function (symbolEl, data, isIncremental, opt) {
     var hostModel = data.hostModel;
 
+    opt = opt || {};
     // TODO
     // if (data.hasItemVisual.symbolSize) {
     //     // TODO typed array?
@@ -43969,6 +44363,7 @@ largeSymbolProto._setCommon = function (symbolEl, data, isIncremental) {
     symbolEl.setShape('size', (size instanceof Array) ? size : [size, size]);
     // }
 
+    symbolEl.softClipShape = opt.clipShape || null;
     // Create symbolProxy to build path for each data
     symbolEl.symbolProxy = createSymbol(
         data.getVisual('symbol'), 0, 0, 0, 0
@@ -44042,7 +44437,14 @@ extendChartView({
         var data = seriesModel.getData();
 
         var symbolDraw = this._updateSymbolDraw(data, seriesModel);
-        symbolDraw.updateData(data);
+
+        symbolDraw.updateData(data, {
+            // TODO
+            // If this parameter should be a shape or a bounding volume
+            // shape will be more general.
+            // But bounding volume like bounding rect will be much faster in the contain calculation
+            clipShape: this._getClipShape(seriesModel)
+        });
 
         this._finished = true;
     },
@@ -44057,7 +44459,9 @@ extendChartView({
     },
 
     incrementalRender: function (taskParams, seriesModel, ecModel) {
-        this._symbolDraw.incrementalUpdate(taskParams, seriesModel.getData());
+        this._symbolDraw.incrementalUpdate(taskParams, seriesModel.getData(), {
+            clipShape: this._getClipShape(seriesModel)
+        });
 
         this._finished = taskParams.end === seriesModel.getData().count();
     },
@@ -44083,6 +44487,12 @@ extendChartView({
         }
     },
 
+    _getClipShape: function (seriesModel) {
+        var coordSys = seriesModel.coordinateSystem;
+        var clipArea = coordSys && coordSys.getArea && coordSys.getArea();
+        return seriesModel.get('clip', true) ? clipArea : null;
+    },
+
     _updateSymbolDraw: function (data, seriesModel) {
         var symbolDraw = this._symbolDraw;
         var pipelineContext = seriesModel.pipelineContext;
@@ -44175,6 +44585,18 @@ registerLayout(pointsLayout('scatter'));
 * under the License.
 */
 
+var _nonShapeGraphicElements = {
+
+    // Reserved but not supported in graphic component.
+    path: null,
+    compoundPath: null,
+
+    // Supported in graphic component.
+    group: Group,
+    image: ZImage,
+    text: Text
+};
+
 // -------------
 // Preprocessor
 // -------------
@@ -44488,8 +44910,8 @@ extendComponentView({
 
             var el = elMap.get(id);
             if (el) {
-                el.__ecGraphicWidth = elOption.width;
-                el.__ecGraphicHeight = elOption.height;
+                el.__ecGraphicWidthOption = elOption.width;
+                el.__ecGraphicHeightOption = elOption.height;
                 setEventData(el, graphicModel, elOption);
             }
         });
@@ -44506,6 +44928,29 @@ extendComponentView({
         var elOptions = graphicModel.option.elements;
         var rootGroup = this.group;
         var elMap = this._elMap;
+        var apiWidth = api.getWidth();
+        var apiHeight = api.getHeight();
+
+        // Top-down to calculate percentage width/height of group
+        for (var i = 0; i < elOptions.length; i++) {
+            var elOption = elOptions[i];
+            var el = elMap.get(elOption.id);
+
+            if (!el || !el.isGroup) {
+                continue;
+            }
+            var parentEl = el.parent;
+            var isParentRoot = parentEl === rootGroup;
+            // Like 'position:absolut' in css, default 0.
+            el.__ecGraphicWidth = parsePercent$1(
+                el.__ecGraphicWidthOption,
+                isParentRoot ? apiWidth : parentEl.__ecGraphicWidth
+            ) || 0;
+            el.__ecGraphicHeight = parsePercent$1(
+                el.__ecGraphicHeightOption,
+                isParentRoot ? apiHeight : parentEl.__ecGraphicHeight
+            ) || 0;
+        }
 
         // Bottom-up tranvese all elements (consider ec resize) to locate elements.
         for (var i = elOptions.length - 1; i >= 0; i--) {
@@ -44519,14 +44964,18 @@ extendComponentView({
             var parentEl = el.parent;
             var containerInfo = parentEl === rootGroup
                 ? {
-                    width: api.getWidth(),
-                    height: api.getHeight()
+                    width: apiWidth,
+                    height: apiHeight
                 }
-                : { // Like 'position:absolut' in css, default 0.
-                    width: parentEl.__ecGraphicWidth || 0,
-                    height: parentEl.__ecGraphicHeight || 0
+                : {
+                    width: parentEl.__ecGraphicWidth,
+                    height: parentEl.__ecGraphicHeight
                 };
 
+            // PENDING
+            // Currently, when `bounding: 'all'`, the union bounding rect of the group
+            // does not include the rect of [0, 0, group.width, group.height], which
+            // is probably weird for users. Should we make a break change for it?
             positionElement(
                 el, elOption, containerInfo, null,
                 {hv: elOption.hv, boundingMode: elOption.bounding}
@@ -44562,7 +45011,11 @@ function createEl(id, targetElParent, elOption, elMap) {
         assert$1(graphicType, 'graphic type MUST be set');
     }
 
-    var Clz = graphic[graphicType.charAt(0).toUpperCase() + graphicType.slice(1)];
+    var Clz = _nonShapeGraphicElements.hasOwnProperty(graphicType)
+        // Those graphic elements are not shapes. They should not be
+        // overwritten by users, so do them first.
+        ? _nonShapeGraphicElements[graphicType]
+        : getShapeClass(graphicType);
 
     if (__DEV__) {
         assert$1(Clz, 'graphic type can not be found');
@@ -45614,8 +46067,8 @@ BaseAxisPointer.prototype = {
         }
         this._lastGraphicKey = graphicKey;
 
-        var moveAnimation = this._moveAnimation
-            = this.determineAnimation(axisModel, axisPointerModel);
+        var moveAnimation = this._moveAnimation =
+            this.determineAnimation(axisModel, axisPointerModel);
 
         if (!group) {
             group = this._group = new Group();
@@ -46413,8 +46866,8 @@ registerPreprocessor(function (option) {
 registerProcessor(PRIORITY.PROCESSOR.STATISTIC, function (ecModel, api) {
     // Build axisPointerModel, mergin tooltip.axisPointer model for each axis.
     // allAxesInfo should be updated when setOption performed.
-    ecModel.getComponent('axisPointer').coordSysAxesInfo
-        = collect(ecModel, api);
+    ecModel.getComponent('axisPointer').coordSysAxesInfo =
+        collect(ecModel, api);
 });
 
 // Broadcast to all views.
@@ -47934,6 +48387,19 @@ registerAction(
 * under the License.
 */
 
+var langSelector = lang.legend.selector;
+
+var defaultSelectorOption = {
+    all: {
+        type: 'all',
+        title: clone(langSelector.all)
+    },
+    inverse: {
+        type: 'inverse',
+        title: clone(langSelector.inverse)
+    }
+};
+
 var LegendModel = extendComponentModel({
 
     type: 'legend.plain',
@@ -47956,10 +48422,25 @@ var LegendModel = extendComponentModel({
         this.mergeDefaultAndTheme(option, ecModel);
 
         option.selected = option.selected || {};
+        this._updateSelector(option);
     },
 
     mergeOption: function (option) {
         LegendModel.superCall(this, 'mergeOption', option);
+        this._updateSelector(option);
+    },
+
+    _updateSelector: function (option) {
+        var selector = option.selector;
+        if (selector === true) {
+            selector = option.selector = ['all', 'inverse'];
+        }
+        if (isArray(selector)) {
+            each$1(selector, function (item, index) {
+                isString(item) && (item = {type: item});
+                selector[index] = merge(item, defaultSelectorOption[item.type]);
+            });
+        }
     },
 
     optionUpdated: function () {
@@ -48088,6 +48569,27 @@ var LegendModel = extendComponentModel({
         this[selected[name] ? 'unSelect' : 'select'](name);
     },
 
+    allSelect: function () {
+        var data = this._data;
+        var selected = this.option.selected;
+        each$1(data, function (dataItem) {
+            selected[dataItem.get('name', true)] = true;
+        });
+    },
+
+    inverseSelect: function () {
+        var data = this._data;
+        var selected = this.option.selected;
+        each$1(data, function (dataItem) {
+            var name = dataItem.get('name', true);
+            // Initially, default value is true
+            if (!selected.hasOwnProperty(name)) {
+                selected[name] = true;
+            }
+            selected[name] = !selected[name];
+        });
+    },
+
     /**
      * @param {string} name
      */
@@ -48097,6 +48599,12 @@ var LegendModel = extendComponentModel({
             && indexOf(this._availableNames, name) >= 0;
     },
 
+    getOrient: function () {
+        return this.get('orient') === 'vertical'
+            ? {index: 1, name: 'vertical'}
+            : {index: 0, name: 'horizontal'};
+    },
+
     defaultOption: {
         // 一级层叠
         zlevel: 0,
@@ -48131,14 +48639,22 @@ var LegendModel = extendComponentModel({
         // 各个item之间的间隔,单位px,默认为10,
         // 横向布局时为水平间隔,纵向布局时为纵向间隔
         itemGap: 10,
-        // 图例图形宽度
+        // the width of legend symbol
         itemWidth: 25,
-        // 图例图形高度
+        // the height of legend symbol
         itemHeight: 14,
 
-        // 图例关闭时候的颜色
+        // the color of unselected legend symbol
         inactiveColor: '#ccc',
 
+        // the borderColor of unselected legend symbol
+        inactiveBorderColor: '#ccc',
+
+        itemStyle: {
+            // the default borderWidth of legend symbol
+            borderWidth: 0
+        },
+
         textStyle: {
             // 图例文字颜色
             color: '#333'
@@ -48151,6 +48667,40 @@ var LegendModel = extendComponentModel({
         // 图例内容(详见legend.data,数组中每一项代表一个item
         // data: [],
 
+        // Usage:
+        // selector: [{type: 'all or inverse', title: xxx}]
+        // or
+        // selector: true
+        // or
+        // selector: ['all', 'inverse']
+        selector: false,
+
+        selectorLabel: {
+            show: true,
+            borderRadius: 10,
+            padding: [3, 5, 3, 5],
+            fontSize: 12,
+            fontFamily: ' sans-serif',
+            color: '#666',
+            borderWidth: 1,
+            borderColor: '#666'
+        },
+
+        emphasis: {
+            selectorLabel: {
+                show: true,
+                color: '#eee',
+                backgroundColor: '#666'
+            }
+        },
+
+        // Value can be 'start' or 'end'
+        selectorPosition: 'auto',
+
+        selectorItemGap: 7,
+
+        selectorButtonGap: 10,
+
         // Tooltip 相关配置
         tooltip: {
             show: false
@@ -48190,6 +48740,9 @@ function legendSelectActionHandler(methodName, payload, ecModel) {
             // doesn't has the item, they will assume it is selected.
             legendModel[isSelected ? 'select' : 'unSelect'](payload.name);
         }
+        else if (methodName === 'allSelect' || methodName === 'inverseSelect') {
+            legendModel[methodName]();
+        }
         else {
             legendModel[methodName](payload.name);
             isSelected = legendModel.isSelected(payload.name);
@@ -48212,10 +48765,14 @@ function legendSelectActionHandler(methodName, payload, ecModel) {
         });
     });
     // Return the event explicitly
-    return {
-        name: payload.name,
-        selected: selectedMap
-    };
+    return (methodName === 'allSelect' || methodName === 'inverseSelect')
+        ? {
+            selected: selectedMap
+        }
+        : {
+            name: payload.name,
+            selected: selectedMap
+        };
 }
 /**
  * @event legendToggleSelect
@@ -48229,6 +48786,16 @@ registerAction(
     curry(legendSelectActionHandler, 'toggleSelected')
 );
 
+registerAction(
+    'legendAllSelect', 'legendselectall',
+    curry(legendSelectActionHandler, 'allSelect')
+);
+
+registerAction(
+    'legendInverseSelect', 'legendinverseselect',
+    curry(legendSelectActionHandler, 'inverseSelect')
+);
+
 /**
  * @event legendSelect
  * @type {Object}
@@ -48377,6 +48944,12 @@ var LegendView = extendComponentView({
         this._backgroundEl;
 
         /**
+         * @private
+         * @type {module:zrender/container/Group}
+         */
+        this.group.add(this._selectorGroup = new Group$2());
+
+        /**
          * If first rendering, `contentGroup.position` is [0, 0], which
          * does not make sense and may cause unexepcted animation if adopted.
          * @private
@@ -48393,6 +48966,13 @@ var LegendView = extendComponentView({
     },
 
     /**
+     * @protected
+     */
+    getSelectorGroup: function () {
+        return this._selectorGroup;
+    },
+
+    /**
      * @override
      */
     render: function (legendModel, ecModel, api) {
@@ -48406,14 +48986,21 @@ var LegendView = extendComponentView({
         }
 
         var itemAlign = legendModel.get('align');
+        var orient = legendModel.get('orient');
         if (!itemAlign || itemAlign === 'auto') {
             itemAlign = (
                 legendModel.get('left') === 'right'
-                && legendModel.get('orient') === 'vertical'
+                && orient === 'vertical'
             ) ? 'right' : 'left';
         }
 
-        this.renderInner(itemAlign, legendModel, ecModel, api);
+        var selector = legendModel.get('selector', true);
+        var selectorPosition = legendModel.get('selectorPosition', true);
+        if (selector && (!selectorPosition || selectorPosition === 'auto')) {
+            selectorPosition = orient === 'horizontal' ? 'end' : 'start';
+        }
+
+        this.renderInner(itemAlign, legendModel, ecModel, api, selector, orient, selectorPosition);
 
         // Perform layout.
         var positionInfo = legendModel.getBoxLayoutParams();
@@ -48422,7 +49009,7 @@ var LegendView = extendComponentView({
 
         var maxSize = getLayoutRect(positionInfo, viewportSize, padding);
 
-        var mainRect = this.layoutInner(legendModel, itemAlign, maxSize, isFirstRender);
+        var mainRect = this.layoutInner(legendModel, itemAlign, maxSize, isFirstRender, selector, selectorPosition);
 
         // Place mainGroup, based on the calculated `mainRect`.
         var layoutRect = getLayoutRect(
@@ -48444,12 +49031,13 @@ var LegendView = extendComponentView({
     resetInner: function () {
         this.getContentGroup().removeAll();
         this._backgroundEl && this.group.remove(this._backgroundEl);
+        this.getSelectorGroup().removeAll();
     },
 
     /**
      * @protected
      */
-    renderInner: function (itemAlign, legendModel, ecModel, api) {
+    renderInner: function (itemAlign, legendModel, ecModel, api, selector, orient, selectorPosition) {
         var contentGroup = this.getContentGroup();
         var legendDrawnMap = createHashMap();
         var selectMode = legendModel.get('selectedMode');
@@ -48482,6 +49070,7 @@ var LegendView = extendComponentView({
             if (seriesModel) {
                 var data = seriesModel.getData();
                 var color = data.getVisual('color');
+                var borderColor = data.getVisual('borderColor');
 
                 // If color is a callback function
                 if (typeof color === 'function') {
@@ -48489,6 +49078,12 @@ var LegendView = extendComponentView({
                     color = color(seriesModel.getDataParams(0));
                 }
 
+                 // If borderColor is a callback function
+                if (typeof borderColor === 'function') {
+                    // Use the first data
+                    borderColor = borderColor(seriesModel.getDataParams(0));
+                }
+
                 // Using rect symbol defaultly
                 var legendSymbolType = data.getVisual('legendSymbol') || 'roundRect';
                 var symbolType = data.getVisual('symbol');
@@ -48496,7 +49091,7 @@ var LegendView = extendComponentView({
                 var itemGroup = this._createItem(
                     name, dataIndex, itemModel, legendModel,
                     legendSymbolType, symbolType,
-                    itemAlign, color,
+                    itemAlign, color, borderColor,
                     selectMode
                 );
 
@@ -48522,13 +49117,14 @@ var LegendView = extendComponentView({
                         }
 
                         var color = data.getItemVisual(idx, 'color');
+                        var borderColor = data.getItemVisual(idx, 'borderColor');
 
                         var legendSymbolType = 'roundRect';
 
                         var itemGroup = this._createItem(
                             name, dataIndex, itemModel, legendModel,
                             legendSymbolType, null,
-                            itemAlign, color,
+                            itemAlign, color, borderColor,
                             selectMode
                         );
 
@@ -48553,17 +49149,63 @@ var LegendView = extendComponentView({
                 }
             }
         }, this);
+
+        if (selector) {
+            this._createSelector(selector, legendModel, api, orient, selectorPosition);
+        }
+    },
+
+    _createSelector: function (selector, legendModel, api, orient, selectorPosition) {
+        var selectorGroup = this.getSelectorGroup();
+
+        each$11(selector, function (selectorItem) {
+            createSelectorButton(selectorItem);
+        });
+
+        function createSelectorButton(selectorItem) {
+            var type = selectorItem.type;
+
+            var labelText = new Text({
+                style: {
+                    x: 0,
+                    y: 0,
+                    align: 'center',
+                    verticalAlign: 'middle'
+                },
+                onclick: function () {
+                    api.dispatchAction({
+                        type: type === 'all' ? 'legendAllSelect' : 'legendInverseSelect'
+                    });
+                }
+            });
+
+            selectorGroup.add(labelText);
+
+            var labelModel = legendModel.getModel('selectorLabel');
+            var emphasisLabelModel = legendModel.getModel('emphasis.selectorLabel');
+
+            setLabelStyle(
+                labelText.style, labelText.hoverStyle = {}, labelModel, emphasisLabelModel,
+                {
+                    defaultText: selectorItem.title,
+                    isRectText: false
+                }
+            );
+            setHoverStyle(labelText);
+        }
     },
 
     _createItem: function (
         name, dataIndex, itemModel, legendModel,
         legendSymbolType, symbolType,
-        itemAlign, color, selectMode
+        itemAlign, color, borderColor, selectMode
     ) {
         var itemWidth = legendModel.get('itemWidth');
         var itemHeight = legendModel.get('itemHeight');
         var inactiveColor = legendModel.get('inactiveColor');
+        var inactiveBorderColor = legendModel.get('inactiveBorderColor');
         var symbolKeepAspect = legendModel.get('symbolKeepAspect');
+        var legendModelItemStyle = legendModel.getModel('itemStyle');
 
         var isSelected = legendModel.isSelected(name);
         var itemGroup = new Group$2();
@@ -48577,7 +49219,7 @@ var LegendView = extendComponentView({
 
         // Use user given icon first
         legendSymbolType = itemIcon || legendSymbolType;
-        itemGroup.add(createSymbol(
+        var legendSymbol = createSymbol(
             legendSymbolType,
             0,
             0,
@@ -48586,7 +49228,13 @@ var LegendView = extendComponentView({
             isSelected ? color : inactiveColor,
             // symbolKeepAspect default true for legend
             symbolKeepAspect == null ? true : symbolKeepAspect
-        ));
+        );
+        itemGroup.add(
+            setSymbolStyle(
+                legendSymbol, legendSymbolType, legendModelItemStyle,
+                borderColor, inactiveBorderColor, isSelected
+            )
+        );
 
         // Compose symbols
         // PENDING
@@ -48598,8 +49246,7 @@ var LegendView = extendComponentView({
             if (symbolType === 'none') {
                 symbolType = 'circle';
             }
-            // Put symbol in the center
-            itemGroup.add(createSymbol(
+            var legendSymbolCenter = createSymbol(
                 symbolType,
                 (itemWidth - size) / 2,
                 (itemHeight - size) / 2,
@@ -48608,7 +49255,14 @@ var LegendView = extendComponentView({
                 isSelected ? color : inactiveColor,
                 // symbolKeepAspect default true for legend
                 symbolKeepAspect == null ? true : symbolKeepAspect
-            ));
+            );
+            // Put symbol in the center
+            itemGroup.add(
+                setSymbolStyle(
+                    legendSymbolCenter, symbolType, legendModelItemStyle,
+                    borderColor, inactiveBorderColor, isSelected
+                )
+            );
         }
 
         var textX = itemAlign === 'left' ? itemWidth + 5 : -5;
@@ -48672,8 +49326,9 @@ var LegendView = extendComponentView({
     /**
      * @protected
      */
-    layoutInner: function (legendModel, itemAlign, maxSize) {
+    layoutInner: function (legendModel, itemAlign, maxSize, isFirstRender, selector, selectorPosition) {
         var contentGroup = this.getContentGroup();
+        var selectorGroup = this.getSelectorGroup();
 
         // Place items in contentGroup.
         box(
@@ -48685,9 +49340,48 @@ var LegendView = extendComponentView({
         );
 
         var contentRect = contentGroup.getBoundingRect();
-        contentGroup.attr('position', [-contentRect.x, -contentRect.y]);
+        var contentPos = [-contentRect.x, -contentRect.y];
 
-        return this.group.getBoundingRect();
+        if (selector) {
+            // Place buttons in selectorGroup
+            box(
+                // Buttons in selectorGroup always layout horizontally
+                'horizontal',
+                selectorGroup,
+                legendModel.get('selectorItemGap', true)
+            );
+
+            var selectorRect = selectorGroup.getBoundingRect();
+            var selectorPos = [-selectorRect.x, -selectorRect.y];
+            var selectorButtonGap = legendModel.get('selectorButtonGap', true);
+
+            var orientIdx = legendModel.getOrient().index;
+            var wh = orientIdx === 0 ? 'width' : 'height';
+            var hw = orientIdx === 0 ? 'height' : 'width';
+            var yx = orientIdx === 0 ? 'y' : 'x';
+
+            if (selectorPosition === 'end') {
+                selectorPos[orientIdx] += contentRect[wh] + selectorButtonGap;
+            }
+            else {
+                contentPos[orientIdx] += selectorRect[wh] + selectorButtonGap;
+            }
+
+            //Always align selector to content as 'middle'
+            selectorPos[1 - orientIdx] += contentRect[hw] / 2 - selectorRect[hw] / 2;
+            selectorGroup.attr('position', selectorPos);
+            contentGroup.attr('position', contentPos);
+
+            var mainRect = {x: 0, y: 0};
+            mainRect[wh] = contentRect[wh] + selectorButtonGap + selectorRect[wh];
+            mainRect[hw] = Math.max(contentRect[hw], selectorRect[hw]);
+            mainRect[yx] = Math.min(0, selectorRect[yx] + selectorPos[1 - orientIdx]);
+            return mainRect;
+        }
+        else {
+            contentGroup.attr('position', contentPos);
+            return this.group.getBoundingRect();
+        }
     },
 
     /**
@@ -48700,6 +49394,21 @@ var LegendView = extendComponentView({
 
 });
 
+function setSymbolStyle(symbol, symbolType, legendModelItemStyle, borderColor, inactiveBorderColor, isSelected) {
+    var itemStyle;
+    if (symbolType !== 'line' && symbolType.indexOf('empty') < 0) {
+        itemStyle = legendModelItemStyle.getItemStyle();
+        symbol.style.stroke = borderColor;
+        if (!isSelected) {
+            itemStyle.stroke = inactiveBorderColor;
+        }
+    }
+    else {
+        itemStyle = legendModelItemStyle.getItemStyle(['borderWidth', 'borderColor']);
+    }
+    return symbol.setStyle(itemStyle);
+}
+
 function dispatchSelectAction(name, api) {
     api.dispatchAction({
         type: 'legendToggleSelect',
@@ -48795,7 +49504,7 @@ var legendFilter = function (ecModel) {
 // Do not contain scrollable legend, for sake of file size.
 
 // Series Filter
-registerProcessor(legendFilter);
+registerProcessor(PRIORITY.PROCESSOR.SERIES_FILTER, legendFilter);
 
 ComponentModel.registerSubTypeDefaulter('legend', function () {
     // Default 'plain' when no type specified.
@@ -48870,12 +49579,6 @@ var ScrollableLegendModel = LegendModel.extend({
         ScrollableLegendModel.superCall(this, 'mergeOption', option, extraOpt);
 
         mergeAndNormalizeLayoutParams(this, this.option, option);
-    },
-
-    getOrient: function () {
-        return this.get('orient') === 'vertical'
-            ? {index: 1, name: 'vertical'}
-            : {index: 0, name: 'horizontal'};
     }
 
 });
@@ -48968,11 +49671,12 @@ var ScrollableLegendView = LegendView.extend({
     /**
      * @override
      */
-    renderInner: function (itemAlign, legendModel, ecModel, api) {
+    renderInner: function (itemAlign, legendModel, ecModel, api, selector, orient, selectorPosition) {
         var me = this;
 
         // Render content items.
-        ScrollableLegendView.superCall(this, 'renderInner', itemAlign, legendModel, ecModel, api);
+        ScrollableLegendView.superCall(this, 'renderInner', itemAlign,
+            legendModel, ecModel, api, selector, orient, selectorPosition);
 
         var controllerGroup = this._controllerGroup;
 
@@ -49025,16 +49729,59 @@ var ScrollableLegendView = LegendView.extend({
     /**
      * @override
      */
-    layoutInner: function (legendModel, itemAlign, maxSize, isFirstRender) {
-        var contentGroup = this.getContentGroup();
-        var containerGroup = this._containerGroup;
-        var controllerGroup = this._controllerGroup;
+    layoutInner: function (legendModel, itemAlign, maxSize, isFirstRender, selector, selectorPosition) {
+        var selectorGroup = this.getSelectorGroup();
 
         var orientIdx = legendModel.getOrient().index;
         var wh = WH[orientIdx];
+        var xy = XY[orientIdx];
         var hw = WH[1 - orientIdx];
         var yx = XY[1 - orientIdx];
 
+        selector && box(
+            // Buttons in selectorGroup always layout horizontally
+            'horizontal',
+            selectorGroup,
+            legendModel.get('selectorItemGap', true)
+        );
+
+        var selectorButtonGap = legendModel.get('selectorButtonGap', true);
+        var selectorRect = selectorGroup.getBoundingRect();
+        var selectorPos = [-selectorRect.x, -selectorRect.y];
+
+        var processMaxSize = clone(maxSize);
+        selector && (processMaxSize[wh] = maxSize[wh] - selectorRect[wh] - selectorButtonGap);
+
+        var mainRect = this._layoutContentAndController(legendModel, isFirstRender,
+            processMaxSize, orientIdx, wh, hw, yx
+        );
+
+        if (selector) {
+            if (selectorPosition === 'end') {
+                selectorPos[orientIdx] += mainRect[wh] + selectorButtonGap;
+            }
+            else {
+                var offset = selectorRect[wh] + selectorButtonGap;
+                selectorPos[orientIdx] -= offset;
+                mainRect[xy] -= offset;
+            }
+            mainRect[wh] += selectorRect[wh] + selectorButtonGap;
+
+            selectorPos[1 - orientIdx] += mainRect[yx] + mainRect[hw] / 2 - selectorRect[hw] / 2;
+            mainRect[hw] = Math.max(mainRect[hw], selectorRect[hw]);
+            mainRect[yx] = Math.min(mainRect[yx], selectorRect[yx] + selectorPos[1 - orientIdx]);
+
+            selectorGroup.attr('position', selectorPos);
+        }
+
+        return mainRect;
+    },
+
+    _layoutContentAndController: function (legendModel, isFirstRender, maxSize, orientIdx, wh, hw, yx) {
+        var contentGroup = this.getContentGroup();
+        var containerGroup = this._containerGroup;
+        var controllerGroup = this._controllerGroup;
+
         // Place items in contentGroup.
         box(
             legendModel.get('orient'),
@@ -49093,11 +49840,12 @@ var ScrollableLegendView = LegendView.extend({
         // Calculate `mainRect` and set `clipPath`.
         // mainRect should not be calculated by `this.group.getBoundingRect()`
         // for sake of the overflow.
-        var mainRect = this.group.getBoundingRect();
         var mainRect = {x: 0, y: 0};
+
         // Consider content may be overflow (should be clipped).
         mainRect[wh] = showController ? maxSize[wh] : contentRect[wh];
         mainRect[hw] = Math.max(contentRect[hw], controllerRect[hw]);
+
         // `containerRect[yx] + containerPos[1 - orientIdx]` is 0.
         mainRect[yx] = Math.min(0, controllerRect[yx] + controllerPos[1 - orientIdx]);
 
@@ -49112,7 +49860,7 @@ var ScrollableLegendView = LegendView.extend({
             containerGroup.__rectSize = clipShape[wh];
         }
         else {
-            // Do not remove or ignore controller. Keep them set as place holders.
+            // Do not remove or ignore controller. Keep them set as placeholders.
             controllerGroup.eachChild(function (child) {
                 child.attr({invisible: true, silent: true});
             });
@@ -49124,7 +49872,7 @@ var ScrollableLegendView = LegendView.extend({
             contentGroup,
             {position: pageInfo.contentPosition},
             // When switch from "show controller" to "not show controller", view should be
-            // updated immediately without animation, otherwise causes weird efffect.
+            // updated immediately without animation, otherwise causes weird effect.
             showController ? legendModel : false
         );
 
@@ -49180,8 +49928,8 @@ var ScrollableLegendView = LegendView.extend({
      *  contentPosition: Array.<number>, null when data item not found.
      *  pageIndex: number, null when data item not found.
      *  pageCount: number, always be a number, can be 0.
-     *  pagePrevDataIndex: number, null when no next page.
-     *  pageNextDataIndex: number, null when no previous page.
+     *  pagePrevDataIndex: number, null when no previous page.
+     *  pageNextDataIndex: number, null when no next page.
      * }
      */
     _getPageInfo: function (legendModel) {
@@ -49673,7 +50421,7 @@ var MarkerModel = extendComponentModel({
     /**
      * @overrite
      */
-    init: function (option, parentModel, ecModel, extraOpt) {
+    init: function (option, parentModel, ecModel) {
 
         if (__DEV__) {
             if (this.type === 'marker') {
@@ -49681,7 +50429,7 @@ var MarkerModel = extendComponentModel({
             }
         }
         this.mergeDefaultAndTheme(option, ecModel);
-        this.mergeOption(option, ecModel, extraOpt.createdBySelf, true);
+        this._mergeOption(option, ecModel, false, true);
     },
 
     /**
@@ -49696,7 +50444,14 @@ var MarkerModel = extendComponentModel({
         return this.getShallow('animation') && hostSeries && hostSeries.isAnimationEnabled();
     },
 
-    mergeOption: function (newOpt, ecModel, createdBySelf, isInit) {
+    /**
+     * @overrite
+     */
+    mergeOption: function (newOpt, ecModel) {
+        this._mergeOption(newOpt, ecModel, false, false);
+    },
+
+    _mergeOption: function (newOpt, ecModel, createdBySelf, isInit) {
         var MarkerModel = this.constructor;
         var modelPropName = this.mainType + 'Model';
         if (!createdBySelf) {
@@ -49740,7 +50495,7 @@ var MarkerModel = extendComponentModel({
                     markerModel.__hostSeries = seriesModel;
                 }
                 else {
-                    markerModel.mergeOption(markerOpt, ecModel, true);
+                    markerModel._mergeOption(markerOpt, ecModel, true);
                 }
                 seriesModel[modelPropName] = markerModel;
             }, this);
@@ -52417,7 +53172,7 @@ AxisProxy.prototype = {
         // `calculateDataWindow` uses min/maxSpan.
         setMinMaxSpan(this);
 
-        var dataWindow = this.calculateDataWindow(dataZoomModel.option);
+        var dataWindow = this.calculateDataWindow(dataZoomModel.settledOption);
 
         this._valueWindow = dataWindow.valueWindow;
         this._percentWindow = dataWindow.percentWindow;
@@ -52764,29 +53519,55 @@ var DataZoomModel = extendComponentModel({
          */
         this._rangePropMode = ['percent', 'percent'];
 
-        var rawOption = retrieveRaw(option);
+        var inputRawOption = retrieveRawOption(option);
+
+        /**
+         * Suppose a "main process" start at the point that model prepared (that is,
+         * model initialized or merged or method called in `action`).
+         * We should keep the `main process` idempotent, that is, given a set of values
+         * on `option`, we get the same result.
+         *
+         * But sometimes, values on `option` will be updated for providing users
+         * a "final calculated value" (`dataZoomProcessor` will do that). Those value
+         * should not be the base/input of the `main process`.
+         *
+         * So in that case we should save and keep the input of the `main process`
+         * separately, called `settledOption`.
+         *
+         * For example, consider the case:
+         * (Step_1) brush zoom the grid by `toolbox.dataZoom`,
+         *     where the original input `option.startValue`, `option.endValue` are earsed by
+         *     calculated value.
+         * (Step)2) click the legend to hide and show a series,
+         *     where the new range is calculated by the earsed `startValue` and `endValue`,
+         *     which brings incorrect result.
+         *
+         * @readOnly
+         */
+        this.settledOption = inputRawOption;
 
         this.mergeDefaultAndTheme(option, ecModel);
 
-        this.doInit(rawOption);
+        this.doInit(inputRawOption);
     },
 
     /**
      * @override
      */
     mergeOption: function (newOption) {
-        var rawOption = retrieveRaw(newOption);
+        var inputRawOption = retrieveRawOption(newOption);
 
         //FIX #2591
         merge(this.option, newOption, true);
+        merge(this.settledOption, inputRawOption, true);
 
-        this.doInit(rawOption);
+        this.doInit(inputRawOption);
     },
 
     /**
      * @protected
      */
-    doInit: function (rawOption) {
+    doInit: function (inputRawOption) {
         var thisOption = this.option;
 
         // Disable realtime view update if canvas is not supported.
@@ -52794,16 +53575,17 @@ var DataZoomModel = extendComponentModel({
             thisOption.realtime = false;
         }
 
-        this._setDefaultThrottle(rawOption);
+        this._setDefaultThrottle(inputRawOption);
 
-        updateRangeUse(this, rawOption);
+        updateRangeUse(this, inputRawOption);
 
+        var settledOption = this.settledOption;
         each$12([['start', 'startValue'], ['end', 'endValue']], function (names, index) {
             // start/end has higher priority over startValue/endValue if they
             // both set, but we should make chart.setOption({endValue: 1000})
             // effective, rather than chart.setOption({endValue: 1000, end: null}).
             if (this._rangePropMode[index] === 'value') {
-                thisOption[names[0]] = null;
+                thisOption[names[0]] = settledOption[names[0]] = null;
             }
             // Otherwise do nothing and use the merge result.
         }, this);
@@ -53023,16 +53805,16 @@ var DataZoomModel = extendComponentModel({
     /**
      * @private
      */
-    _setDefaultThrottle: function (rawOption) {
+    _setDefaultThrottle: function (inputRawOption) {
         // When first time user set throttle, auto throttle ends.
-        if (rawOption.hasOwnProperty('throttle')) {
+        if (inputRawOption.hasOwnProperty('throttle')) {
             this._autoThrottle = false;
         }
         if (this._autoThrottle) {
             var globalOption = this.ecModel.option;
-            this.option.throttle
-                = (globalOption.animation && globalOption.animationDurationUpdate > 0)
-                ? 100 : 20;
+            this.option.throttle = (
+                globalOption.animation && globalOption.animationDurationUpdate > 0
+            ) ? 100 : 20;
         }
     },
 
@@ -53098,23 +53880,42 @@ var DataZoomModel = extendComponentModel({
      * @param {number} [opt.end]
      * @param {number} [opt.startValue]
      * @param {number} [opt.endValue]
-     * @param {boolean} [ignoreUpdateRangeUsg=false]
      */
-    setRawRange: function (opt, ignoreUpdateRangeUsg) {
-        var option = this.option;
+    setRawRange: function (opt) {
+        var thisOption = this.option;
+        var settledOption = this.settledOption;
         each$12([['start', 'startValue'], ['end', 'endValue']], function (names) {
-            // If only one of 'start' and 'startValue' is not null/undefined, the other
-            // should be cleared, which enable clear the option.
-            // If both of them are not set, keep option with the original value, which
-            // enable use only set start but not set end when calling `dispatchAction`.
-            // The same as 'end' and 'endValue'.
+            // Consider the pair <start, startValue>:
+            // If one has value and the other one is `null/undefined`, we both set them
+            // to `settledOption`. This strategy enables the feature to clear the original
+            // value in `settledOption` to `null/undefined`.
+            // But if both of them are `null/undefined`, we do not set them to `settledOption`
+            // and keep `settledOption` with the original value. This strategy enables users to
+            // only set <end or endValue> but not set <start or startValue> when calling
+            // `dispatchAction`.
+            // The pair <end, endValue> is treated in the same way.
             if (opt[names[0]] != null || opt[names[1]] != null) {
-                option[names[0]] = opt[names[0]];
-                option[names[1]] = opt[names[1]];
+                thisOption[names[0]] = settledOption[names[0]] = opt[names[0]];
+                thisOption[names[1]] = settledOption[names[1]] = opt[names[1]];
             }
         }, this);
 
-        !ignoreUpdateRangeUsg && updateRangeUse(this, opt);
+        updateRangeUse(this, opt);
+    },
+
+    /**
+     * @public
+     * @param {Object} opt
+     * @param {number} [opt.start]
+     * @param {number} [opt.end]
+     * @param {number} [opt.startValue]
+     * @param {number} [opt.endValue]
+     */
+    setCalculatedRange: function (opt) {
+        var option = this.option;
+        each$12(['start', 'startValue', 'end', 'endValue'], function (name) {
+            option[name] = opt[name];
+        });
     },
 
     /**
@@ -53188,7 +53989,12 @@ var DataZoomModel = extendComponentModel({
 
 });
 
-function retrieveRaw(option) {
+/**
+ * Retrieve the those raw params from option, which will be cached separately.
+ * becasue they will be overwritten by normalized/calculated values in the main
+ * process.
+ */
+function retrieveRawOption(option) {
     var ret = {};
     each$12(
         ['start', 'end', 'startValue', 'endValue', 'throttle'],
@@ -53199,13 +54005,13 @@ function retrieveRaw(option) {
     return ret;
 }
 
-function updateRangeUse(dataZoomModel, rawOption) {
+function updateRangeUse(dataZoomModel, inputRawOption) {
     var rangePropMode = dataZoomModel._rangePropMode;
     var rangeModeInOption = dataZoomModel.get('rangeMode');
 
     each$12([['start', 'startValue'], ['end', 'endValue']], function (names, index) {
-        var percentSpecified = rawOption[names[0]] != null;
-        var valueSpecified = rawOption[names[1]] != null;
+        var percentSpecified = inputRawOption[names[0]] != null;
+        var valueSpecified = inputRawOption[names[1]] != null;
         if (percentSpecified && !valueSpecified) {
             rangePropMode[index] = 'percent';
         }
@@ -54281,12 +55087,12 @@ registerProcessor({
             var percentRange = axisProxy.getDataPercentWindow();
             var valueRange = axisProxy.getDataValueWindow();
 
-            dataZoomModel.setRawRange({
+            dataZoomModel.setCalculatedRange({
                 start: percentRange[0],
                 end: percentRange[1],
                 startValue: valueRange[0],
                 endValue: valueRange[1]
-            }, true);
+            });
         });
     }
 });
@@ -55545,7 +56351,8 @@ extendComponentView({
                             path.setStyle({
                                 text: titles[iconName],
                                 textPosition: iconStyleEmphasisModel.get('textPosition') || 'bottom',
-                                textFill: iconStyleEmphasisModel.get('textFill') || hoverStyle.fill || hoverStyle.stroke || '#000',
+                                textFill: iconStyleEmphasisModel.get('textFill')
+                                    || hoverStyle.fill || hoverStyle.stroke || '#000',
                                 textAlign: iconStyleEmphasisModel.get('textAlign') || 'center',
                                 textBackgroundColor: iconStyleEmphasisModel.get('textBackgroundColor'),
                                 textBorderRadius: iconStyleEmphasisModel.get('textBorderRadius'),
@@ -56409,8 +57216,8 @@ registerAction({
 var curry$5 = curry;
 var each$16 = each$1;
 var map$2 = map;
-var mathMin$4 = Math.min;
-var mathMax$4 = Math.max;
+var mathMin$5 = Math.min;
+var mathMax$5 = Math.max;
 var mathPow$2 = Math.pow;
 
 var COVER_Z = 10000;
@@ -56929,7 +57736,7 @@ function createBaseRectCover(doDrift, controller, brushOption, edgeNames) {
 
 function updateBaseRect(controller, cover, localRange, brushOption) {
     var lineWidth = brushOption.brushStyle.lineWidth || 0;
-    var handleSize = mathMax$4(lineWidth, MIN_RESIZE_LINE_WIDTH);
+    var handleSize = mathMax$5(lineWidth, MIN_RESIZE_LINE_WIDTH);
     var x = localRange[0][0];
     var y = localRange[1][0];
     var xa = x - lineWidth / 2;
@@ -56996,8 +57803,8 @@ function makeStyle(brushOption) {
 }
 
 function formatRectRange(x, y, x2, y2) {
-    var min = [mathMin$4(x, x2), mathMin$4(y, y2)];
-    var max = [mathMax$4(x, x2), mathMax$4(y, y2)];
+    var min = [mathMin$5(x, x2), mathMin$5(y, y2)];
+    var max = [mathMax$5(x, x2), mathMax$5(y, y2)];
 
     return [
         [min[0], max[0]], // x range
@@ -57077,10 +57884,10 @@ function clipByPanel(controller, cover, data) {
 }
 
 function pointsToRect(points) {
-    var xmin = mathMin$4(points[0][0], points[1][0]);
-    var ymin = mathMin$4(points[0][1], points[1][1]);
-    var xmax = mathMax$4(points[0][0], points[1][0]);
-    var ymax = mathMax$4(points[0][1], points[1][1]);
+    var xmin = mathMin$5(points[0][0], points[1][0]);
+    var ymin = mathMin$5(points[0][1], points[1][1]);
+    var xmax = mathMax$5(points[0][0], points[1][0]);
+    var ymax = mathMax$5(points[0][1], points[1][1]);
 
     return {
         x: xmin,
@@ -57356,8 +58163,8 @@ function getLineRenderer(xyIndex) {
         },
         getCreatingRange: function (localTrack) {
             var ends = getTrackEnds(localTrack);
-            var min = mathMin$4(ends[0][xyIndex], ends[1][xyIndex]);
-            var max = mathMax$4(ends[0][xyIndex], ends[1][xyIndex]);
+            var min = mathMin$5(ends[0][xyIndex], ends[1][xyIndex]);
+            var max = mathMax$5(ends[0][xyIndex], ends[1][xyIndex]);
 
             return [min, max];
         },
@@ -58149,6 +58956,7 @@ function DataZoom(model, ecModel, api) {
 
 DataZoom.defaultOption = {
     show: true,
+    filterMode: 'filter',
     // Icon group
     icon: {
         zoom: 'M0,13.5h26.9 M13.5,26.9V0 M32.1,13.5H58V58H13.5 V32.1',
@@ -58397,6 +59205,8 @@ registerPreprocessor(function (option) {
             var newOpt = {
                 type: 'select',
                 $fromToolbox: true,
+                // Default to be filter
+                filterMode: dataZoomOpt.filterMode || 'filter',
                 // Id for merge mapping.
                 id: DATA_ZOOM_ID_BASE + axisName + axisIndex
             };
@@ -58542,7 +59352,7 @@ var sqrt = Math.sqrt;
 var abs$1 = Math.abs;
 var cos = Math.cos;
 var sin = Math.sin;
-var mathMax$5 = Math.max;
+var mathMax$6 = Math.max;
 
 if (!env$1.canvasSupported) {
 
@@ -58677,7 +59487,7 @@ if (!env$1.canvasSupported) {
 
                     width /= scale$$1[0] * Z;
                     height /= scale$$1[1] * Z;
-                    var dimension = mathMax$5(width, height);
+                    var dimension = mathMax$6(width, height);
                     shift = 2 * 0 / dimension;
                     expansion = 2 * fill.r / dimension - shift;
                 }
@@ -59144,8 +59954,8 @@ if (!env$1.canvasSupported) {
             applyTransform(p2, p2, m);
             applyTransform(p3, p3, m);
 
-            var maxX = mathMax$5(p0[0], p1[0], p2[0], p3[0]);
-            var maxY = mathMax$5(p0[1], p1[1], p2[1], p3[1]);
+            var maxX = mathMax$6(p0[0], p1[0], p2[0], p3[0]);
+            var maxY = mathMax$6(p0[1], p1[1], p2[1], p3[1]);
 
             var transformFilter = [];
             transformFilter.push('M11=', m[0] / scaleX, comma,
@@ -59774,7 +60584,7 @@ VMLPainter.prototype = {
 // Not supported methods
 function createMethodNotSupport(method) {
     return function () {
-        zrLog('In IE8.0 VML mode painter not support method "' + method + '"');
+        logError$1('In IE8.0 VML mode painter not support method "' + method + '"');
     };
 }
 
@@ -60136,14 +60946,15 @@ var svgTextDrawRectText = function (el, rect, textRect) {
 
     textRect = getBoundingRect(
         text, font, align,
-        verticalAlign, style.textPadding, style.textLineHeight
+        verticalAlign, style.textPadding, style.textLineHeight,
+        false, style.truncate
     );
 
     var lineHeight = textRect.lineHeight;
     // Text position represented by coord
     if (textPosition instanceof Array) {
-        x = rect.x + textPosition[0];
-        y = rect.y + textPosition[1];
+        x = rect.x + parsePercent(textPosition[0], rect.width);
+        y = rect.y + parsePercent(textPosition[1], rect.height);
     }
     else {
         var newPos = el.calculateTextPosition
@@ -60205,7 +61016,10 @@ var svgTextDrawRectText = function (el, rect, textRect) {
         setTransform(textSvgEl, transform);
     }
 
-    var textLines = text.split('\n');
+    var contentBlock = parsePlainText(
+        text, font, textPadding, lineHeight, style.truncate);
+
+    var textLines = contentBlock.lines;
     var nTextLines = textLines.length;
     var textAnchor = align;
     // PENDING
@@ -60826,7 +61640,7 @@ GradientManager.prototype.add = function (gradient) {
         dom = this.createElement('radialGradient');
     }
     else {
-        zrLog('Illegal gradient type.');
+        logError$1('Illegal gradient type.');
         return null;
     }
 
@@ -60891,7 +61705,7 @@ GradientManager.prototype.updateDom = function (gradient, dom) {
         dom.setAttribute('r', gradient.r);
     }
     else {
-        zrLog('Illegal gradient type.');
+        logError$1('Illegal gradient type.');
         return;
     }
 
@@ -61269,7 +62083,10 @@ ShadowManager.prototype.updateDom = function (displayable, dom) {
     var scaleY = displayable.scale ? (displayable.scale[1] || 1) : 1;
 
     // TODO: textBoxShadowBlur is not supported yet
-    var offsetX, offsetY, blur, color;
+    var offsetX;
+    var offsetY;
+    var blur;
+    var color;
     if (style.shadowBlur || style.shadowOffsetX || style.shadowOffsetY) {
         offsetX = style.shadowOffsetX || 0;
         offsetY = style.shadowOffsetY || 0;
@@ -61376,6 +62193,12 @@ function prepend(parent, child) {
     }
 }
 
+// function append(parent, child) {
+//     if (checkParentAvailable(parent, child)) {
+//         parent.appendChild(child);
+//     }
+// }
+
 function remove$1(parent, child) {
     if (child && parent && child.parentNode === parent) {
         parent.removeChild(child);
@@ -61707,7 +62530,7 @@ SVGPainter.prototype = {
 // Not supported methods
 function createMethodNotSupport$1(method) {
     return function () {
-        zrLog('In SVG mode painter not support method "' + method + '"');
+        logError$1('In SVG mode painter not support method "' + method + '"');
     };
 }
 
diff --git a/en/dist/echarts-en.common.min.js b/en/dist/echarts-en.common.min.js
index ea1b3e1..bfb8e96 100644
--- a/en/dist/echarts-en.common.min.js
+++ b/en/dist/echarts-en.common.min.js
@@ -19,4 +19,4 @@
 */
 
 
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";var e=2311,i=function(){return e++},v="object"==typeof wx&&"function"==typeof wx.getSystemInfoSync?{browser:{},os:{},node:!1,wxa:!0,canvasSupported:!0,svgSupported:!1,touchEventsSupported:!0,domSupported:!1}:"undefined"==typeof document&&"undefined"!=typeof self?{browser:{},os:{},node:!1,worker:!0,canvasS [...]
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";var e=2311,n=function(){return e++},v="object"==typeof wx&&"function"==typeof wx.getSystemInfoSync?{browser:{},os:{},node:!1,wxa:!0,canvasSupported:!0,svgSupported:!1,touchEventsSupported:!0,domSupported:!1}:"undefined"==typeof document&&"undefined"!=typeof self?{browser:{},os:{},node:!1,worker:!0,canvasS [...]
diff --git a/en/dist/echarts-en.js b/en/dist/echarts-en.js
index 929af6b..031a920 100644
--- a/en/dist/echarts-en.js
+++ b/en/dist/echarts-en.js
@@ -66,6 +66,8 @@ var guid = function () {
  * @desc thanks zepto.
  */
 
+/* global wx */
+
 var env = {};
 
 if (typeof wx === 'object' && typeof wx.getSystemInfoSync === 'function') {
@@ -480,7 +482,9 @@ function inherits(clazz, baseClazz) {
     clazz.prototype = new F();
 
     for (var prop in clazzPrototype) {
-        clazz.prototype[prop] = clazzPrototype[prop];
+        if (clazzPrototype.hasOwnProperty(prop)) {
+            clazz.prototype[prop] = clazzPrototype[prop];
+        }
     }
     clazz.prototype.constructor = clazz;
     clazz.superClass = baseClazz;
@@ -732,6 +736,7 @@ function isDom(value) {
  * @return {boolean}
  */
 function eqNaN(value) {
+    /* eslint-disable-next-line no-self-compare */
     return value !== value;
 }
 
@@ -876,9 +881,11 @@ HashMap.prototype = {
     // should not use the exposed keys, who are prefixed.
     each: function (cb, context) {
         context !== void 0 && (cb = bind(cb, context));
+        /* eslint-disable guard-for-in */
         for (var key in this.data) {
             this.data.hasOwnProperty(key) && cb(this.data[key], key);
         }
+        /* eslint-enable guard-for-in */
     },
     // Do not use this method if performance sensitive.
     removeKey: function (key) {
@@ -948,6 +955,8 @@ var zrUtil = (Object.freeze || Object)({
 	noop: noop
 });
 
+/* global Float32Array */
+
 var ArrayCtor = typeof Float32Array === 'undefined'
     ? Array
     : Float32Array;
@@ -2506,6 +2515,8 @@ mixin(Handler, Draggable);
  * @exports zrender/tool/matrix
  */
 
+/* global Float32Array */
+
 var ArrayCtor$1 = typeof Float32Array === 'undefined'
     ? Array
     : Float32Array;
@@ -3764,11 +3775,17 @@ function lerpNumber(a, b, p) {
 }
 
 function setRgba(out, r, g, b, a) {
-    out[0] = r; out[1] = g; out[2] = b; out[3] = a;
+    out[0] = r;
+    out[1] = g;
+    out[2] = b;
+    out[3] = a;
     return out;
 }
 function copyRgba(out, a) {
-    out[0] = a[0]; out[1] = a[1]; out[2] = a[2]; out[3] = a[3];
+    out[0] = a[0];
+    out[1] = a[1];
+    out[2] = a[2];
+    out[3] = a[3];
     return out;
 }
 
@@ -4843,35 +4860,23 @@ if (typeof window !== 'undefined') {
  */
 
 /**
- * debug日志选项:catchBrushException为true下有效
- * 0 : 不生成debug数据,发布用
- * 1 : 异常抛出,调试用
- * 2 : 控制台输出,调试用
+ * Debug log mode:
+ * 0: Do nothing, for release.
+ * 1: console.error, for debug.
  */
 var debugMode = 0;
 
 // retina 屏幕优化
 var devicePixelRatio = dpr;
 
-var log = function () {
+var logError = function () {
 };
 
 if (debugMode === 1) {
-    log = function () {
-        for (var k in arguments) {
-            throw new Error(arguments[k]);
-        }
-    };
-}
-else if (debugMode > 1) {
-    log = function () {
-        for (var k in arguments) {
-            console.log(arguments[k]);
-        }
-    };
+    logError = console.error;
 }
 
-var zrLog = log;
+var logError$1 = logError;
 
 /**
  * @alias modue:zrender/mixin/Animatable
@@ -4927,7 +4932,7 @@ Animatable.prototype = {
         }
 
         if (!target) {
-            zrLog(
+            logError$1(
                 'Property "'
                 + path
                 + '" is not existed in element '
@@ -6148,7 +6153,10 @@ function TimSort(array, compare) {
         while (stackSize > 1) {
             var n = stackSize - 2;
 
-            if (n >= 1 && runLength[n - 1] <= runLength[n] + runLength[n + 1] || n >= 2 && runLength[n - 2] <= runLength[n] + runLength[n - 1]) {
+            if (
+                (n >= 1 && runLength[n - 1] <= runLength[n] + runLength[n + 1])
+                || (n >= 2 && runLength[n - 2] <= runLength[n] + runLength[n - 1])
+            ) {
                 if (runLength[n - 1] < runLength[n + 1]) {
                     n--;
                 }
@@ -6238,7 +6246,9 @@ function TimSort(array, compare) {
         }
 
         var _minGallop = minGallop;
-        var count1, count2, exit;
+        var count1;
+        var count2;
+        var exit;
 
         while (1) {
             count1 = 0;
@@ -6921,8 +6931,8 @@ Style.prototype = {
     /**
      * `true` is not supported.
      * `false`/`null`/`undefined` are the same.
-     * `false` is used to remove lineDash in some 
-     * case that `null`/`undefined` can not be set. 
+     * `false` is used to remove lineDash in some
+     * case that `null`/`undefined` can not be set.
      * (e.g., emphasis.lineStyle in echarts)
      * @type {Array.<number>|boolean}
      */
@@ -7402,8 +7412,8 @@ var Layer = function (id, painter, dpr) {
         domStyle['user-select'] = 'none';
         domStyle['-webkit-touch-callout'] = 'none';
         domStyle['-webkit-tap-highlight-color'] = 'rgba(0,0,0,0)';
-        domStyle['padding'] = 0;
-        domStyle['margin'] = 0;
+        domStyle['padding'] = 0; // eslint-disable-line dot-notation
+        domStyle['margin'] = 0; // eslint-disable-line dot-notation
         domStyle['border-width'] = 0;
     }
 
@@ -9529,7 +9539,7 @@ function isDisplayableCulled(el, width, height) {
 
 function isClipPathChanged(clipPaths, prevClipPaths) {
     // displayable.__clipPaths can only be `null`/`undefined` or an non-empty array.
-    if (clipPaths === prevClipPaths) { 
+    if (clipPaths === prevClipPaths) {
         return false;
     }
     if (!clipPaths || !prevClipPaths || (clipPaths.length !== prevClipPaths.length)) {
@@ -10058,12 +10068,12 @@ Painter.prototype = {
         var domRoot = this._domRoot;
 
         if (layersMap[zlevel]) {
-            zrLog('ZLevel ' + zlevel + ' has been used already');
+            logError$1('ZLevel ' + zlevel + ' has been used already');
             return;
         }
         // Check if is a valid layer
         if (!isLayerValid(layer)) {
-            zrLog('Layer of zlevel ' + zlevel + ' is not valid');
+            logError$1('Layer of zlevel ' + zlevel + ' is not valid');
             return;
         }
 
@@ -10197,11 +10207,14 @@ Painter.prototype = {
                 incrementalLayerCount = 1;
             }
             else {
-                layer = this.getLayer(zlevel + (incrementalLayerCount > 0 ? EL_AFTER_INCREMENTAL_INC : 0), this._needsManuallyCompositing);
+                layer = this.getLayer(
+                    zlevel + (incrementalLayerCount > 0 ? EL_AFTER_INCREMENTAL_INC : 0),
+                    this._needsManuallyCompositing
+                );
             }
 
             if (!layer.__builtin__) {
-                zrLog('ZLevel ' + zlevel + ' has been used by unkown layer ' + layer.id);
+                logError$1('ZLevel ' + zlevel + ' has been used by unkown layer ' + layer.id);
             }
 
             if (layer !== prevLayer) {
@@ -11140,7 +11153,7 @@ var instances$1 = {};    // ZRender实例map索引
 /**
  * @type {string}
  */
-var version$1 = '4.1.0';
+var version$1 = '4.1.1';
 
 /**
  * Initializing a zrender instance
@@ -12466,7 +12479,7 @@ var getLineStyle = makeStyleMapper(
 var lineStyleMixin = {
     getLineStyle: function (excludes) {
         var style = getLineStyle(this, excludes);
-        // Always set lineDash whether dashed, otherwise we can not 
+        // Always set lineDash whether dashed, otherwise we can not
         // erase the previous style when assigning to el.style.
         style.lineDash = this.getLineDash(style.lineWidth);
         return style;
@@ -12479,15 +12492,15 @@ var lineStyleMixin = {
         var lineType = this.get('type');
         var dotSize = Math.max(lineWidth, 2);
         var dashSize = lineWidth * 4;
-        return (lineType === 'solid' || lineType == null) 
-            // Use `false` but not `null` for the solid line here, because `null` might be 
-            // ignored when assigning to `el.style`. e.g., when setting `lineStyle.type` as 
-            // `'dashed'` and `emphasis.lineStyle.type` as `'solid'` in graph series, the 
-            // `lineDash` gotten form the latter one is not able to erase that from the former 
+        return (lineType === 'solid' || lineType == null)
+            // Use `false` but not `null` for the solid line here, because `null` might be
+            // ignored when assigning to `el.style`. e.g., when setting `lineStyle.type` as
+            // `'dashed'` and `emphasis.lineStyle.type` as `'solid'` in graph series, the
+            // `lineDash` gotten form the latter one is not able to erase that from the former
             // one if using `null` here according to the emhpsis strategy in `util/graphic.js`.
             ? false
-            : lineType === 'dashed' 
-            ? [dashSize, dashSize] 
+            : lineType === 'dashed'
+            ? [dashSize, dashSize]
             : [dotSize, dotSize];
     }
 };
@@ -13269,6 +13282,8 @@ function fromArc(
 
 // TODO getTotalLength, getPointAtLength
 
+/* global Float32Array */
+
 var CMD = {
     M: 1,
     L: 2,
@@ -13940,9 +13955,12 @@ PathProxy.prototype = {
      */
     rebuildPath: function (ctx) {
         var d = this.data;
-        var x0, y0;
-        var xi, yi;
-        var x, y;
+        var x0;
+        var y0;
+        var xi;
+        var yi;
+        var x;
+        var y;
         var ux = this._ux;
         var uy = this._uy;
         var len$$1 = this._len;
@@ -16799,6 +16817,8 @@ var NORMAL = 'normal';
 var _highlightNextDigit = 1;
 var _highlightKeyMap = {};
 
+var _customShapeMap = {};
+
 
 /**
  * Extend shape with parameters
@@ -16815,6 +16835,54 @@ function extendPath(pathData, opts) {
 }
 
 /**
+ * Register a user defined shape.
+ * The shape class can be fetched by `getShapeClass`
+ * This method will overwrite the registered shapes, including
+ * the registered built-in shapes, if using the same `name`.
+ * The shape can be used in `custom series` and
+ * `graphic component` by declaring `{type: name}`.
+ *
+ * @param {string} name
+ * @param {Object} ShapeClass Can be generated by `extendShape`.
+ */
+function registerShape(name, ShapeClass) {
+    _customShapeMap[name] = ShapeClass;
+}
+
+/**
+ * Find shape class registered by `registerShape`. Usually used in
+ * fetching user defined shape.
+ *
+ * [Caution]:
+ * (1) This method **MUST NOT be used inside echarts !!!**, unless it is prepared
+ * to use user registered shapes.
+ * Because the built-in shape (see `getBuiltInShape`) will be registered by
+ * `registerShape` by default. That enables users to get both built-in
+ * shapes as well as the shapes belonging to themsleves. But users can overwrite
+ * the built-in shapes by using names like 'circle', 'rect' via calling
+ * `registerShape`. So the echarts inner featrues should not fetch shapes from here
+ * in case that it is overwritten by users, except that some features, like
+ * `custom series`, `graphic component`, do it deliberately.
+ *
+ * (2) In the features like `custom series`, `graphic component`, the user input
+ * `{tpye: 'xxx'}` does not only specify shapes but also specify other graphic
+ * elements like `'group'`, `'text'`, `'image'` or event `'path'`. Those names
+ * are reserved names, that is, if some user register a shape named `'image'`,
+ * the shape will not be used. If we intending to add some more reserved names
+ * in feature, that might bring break changes (disable some existing user shape
+ * names). But that case probably rearly happen. So we dont make more mechanism
+ * to resolve this issue here.
+ *
+ * @param {string} name
+ * @return {Object} The shape class. If not found, return nothing.
+ */
+function getShapeClass(name) {
+    if (_customShapeMap.hasOwnProperty(name)) {
+        return _customShapeMap[name];
+    }
+}
+
+/**
  * Create a path element from path data string
  * @param {string} pathData
  * @param {Object} opts
@@ -17015,11 +17083,12 @@ function singleEnterEmphasis(el) {
         return;
     }
 
-    var useHoverLayer = el.useHoverLayer;
+    var zr = el.__zr;
+
+    var useHoverLayer = el.useHoverLayer && zr && zr.painter.type === 'canvas';
     el.__highlighted = useHoverLayer ? 'layer' : 'plain';
 
-    var zr = el.__zr;
-    if (el.isGroup || (!zr && useHoverLayer)) {
+    if (el.isGroup || (!zr && el.useHoverLayer)) {
         return;
     }
 
@@ -17501,11 +17570,18 @@ function setTextStyleCommon(textStyle, textStyleModel, opt, isEmphasis) {
     opt = opt || EMPTY_OBJ;
 
     if (opt.isRectText) {
-        var textPosition = textStyleModel.getShallow('position')
-            || (isEmphasis ? null : 'inside');
-        // 'outside' is not a valid zr textPostion value, but used
-        // in bar series, and magric type should be considered.
-        textPosition === 'outside' && (textPosition = 'top');
+        var textPosition;
+        if (opt.getTextPosition) {
+            textPosition = opt.getTextPosition(textStyleModel, isEmphasis);
+        }
+        else {
+            textPosition = textStyleModel.getShallow('position')
+                || (isEmphasis ? null : 'inside');
+            // 'outside' is not a valid zr textPostion value, but used
+            // in bar series, and magric type should be considered.
+            textPosition === 'outside' && (textPosition = 'top');
+        }
+
         textStyle.textPosition = textPosition;
         textStyle.textOffset = textStyleModel.getShallow('offset');
         var labelRotate = textStyleModel.getShallow('rotate');
@@ -18104,6 +18180,18 @@ function nearZero(val) {
     return val <= (1e-6) && val >= -(1e-6);
 }
 
+// Register built-in shapes. These shapes might be overwirtten
+// by users, although we do not recommend that.
+registerShape('circle', Circle);
+registerShape('sector', Sector);
+registerShape('ring', Ring);
+registerShape('polygon', Polygon);
+registerShape('polyline', Polyline);
+registerShape('rect', Rect);
+registerShape('line', Line);
+registerShape('bezierCurve', BezierCurve);
+registerShape('arc', Arc);
+
 
 
 
@@ -18112,6 +18200,8 @@ var graphic = (Object.freeze || Object)({
 	CACHED_LABEL_STYLE_PROPERTIES: CACHED_LABEL_STYLE_PROPERTIES,
 	extendShape: extendShape,
 	extendPath: extendPath,
+	registerShape: registerShape,
+	getShapeClass: getShapeClass,
 	makePath: makePath,
 	makeImage: makeImage,
 	mergePath: mergePath,
@@ -18697,7 +18787,7 @@ function enableTopologicalTravel(entity, dependencyGetter) {
 var RADIAN_EPSILON = 1e-4;
 
 function _trim(str) {
-    return str.replace(/^\s+/, '').replace(/\s+$/, '');
+    return str.replace(/^\s+|\s+$/g, '');
 }
 
 /**
@@ -21691,8 +21781,8 @@ var GlobalModel = Model.extend({
      *     {mainType: 'series', subType: 'pie', query: {seriesName: 'uio'}}
      * );
      * var result = findComponents(
-     *     {mainType: 'series'},
-     *     function (model, index) {...}
+     *     {mainType: 'series',
+     *     filter: function (model, index) {...}}
      * );
      * // result like [component0, componnet1, ...]
      *
@@ -23011,12 +23101,17 @@ var backwardCompat = function (option, isTheme) {
 
         var seriesType = seriesOpt.type;
 
-        if (seriesType === 'pie' || seriesType === 'gauge') {
+        if (seriesType === 'line') {
+            if (seriesOpt.clipOverflow != null) {
+                seriesOpt.clip = seriesOpt.clipOverflow;
+            }
+        }
+        else if (seriesType === 'pie' || seriesType === 'gauge') {
             if (seriesOpt.clockWise != null) {
                 seriesOpt.clockwise = seriesOpt.clockWise;
             }
         }
-        if (seriesType === 'gauge') {
+        else if (seriesType === 'gauge') {
             var pointerColor = get(seriesOpt, 'pointer.color');
             pointerColor != null
                 && set$1(seriesOpt, 'itemStyle.color', pointerColor);
@@ -23066,7 +23161,7 @@ var backwardCompat = function (option, isTheme) {
 //     data processing stage is blocked in stream.
 //     See <module:echarts/stream/Scheduler#performDataProcessorTasks>
 // (2) Only register once when import repeatly.
-//     Should be executed before after series filtered and before stack calculation.
+//     Should be executed after series filtered and before stack calculation.
 var dataStack = function (ecModel) {
     var stackInfoMap = createHashMap();
     ecModel.eachSeries(function (seriesModel) {
@@ -23578,6 +23673,7 @@ var dataFormatMixin = {
         var name = data.getName(dataIndex);
         var itemOpt = data.getRawDataItem(dataIndex);
         var color = data.getItemVisual(dataIndex, 'color');
+        var borderColor = data.getItemVisual(dataIndex, 'borderColor');
         var tooltipModel = this.ecModel.getComponent('tooltip');
         var renderModeOption = tooltipModel && tooltipModel.get('renderMode');
         var renderMode = getTooltipRenderMode(renderModeOption);
@@ -23599,6 +23695,7 @@ var dataFormatMixin = {
             dataType: dataType,
             value: rawValue,
             color: color,
+            borderColor: borderColor,
             dimensionNames: userOutput ? userOutput.dimensionNames : null,
             encode: userOutput ? userOutput.encode : null,
             marker: getTooltipMarker({
@@ -24077,6 +24174,11 @@ var SeriesModel = ComponentModel.extend({
     visualColorAccessPath: 'itemStyle.color',
 
     /**
+     * Access path of borderColor for visual
+     */
+    visualBorderColorAccessPath: 'itemStyle.borderColor',
+
+    /**
      * Support merge layout params.
      * Only support 'box' now (left/right/top/bottom/width/height).
      * @type {string|Object} Object can be {ignoreSize: true}
@@ -24675,10 +24777,10 @@ Component$1.prototype = {
 };
 
 var componentProto = Component$1.prototype;
-componentProto.updateView
-    = componentProto.updateLayout
-    = componentProto.updateVisual
-    = function (seriesModel, ecModel, api, payload) {
+componentProto.updateView =
+    componentProto.updateLayout =
+    componentProto.updateVisual =
+    function (seriesModel, ecModel, api, payload) {
         // Do nothing;
     };
 // Enable Component.extend.
@@ -25196,6 +25298,10 @@ var seriesColor = {
 
         // FIXME Set color function or use the platte color
         data.setVisual('color', color);
+        
+        var borderColorAccessPath = (seriesModel.visualBorderColorAccessPath || 'itemStyle.borderColor').split('.');
+        var borderColor = seriesModel.get(borderColorAccessPath);
+        data.setVisual('borderColor', borderColor);
 
         // Only visible series has each data be visual encoded
         if (!ecModel.isSeriesFiltered(seriesModel)) {
@@ -25211,9 +25317,13 @@ var seriesColor = {
             var dataEach = function (data, idx) {
                 var itemModel = data.getItemModel(idx);
                 var color = itemModel.get(colorAccessPath, true);
+                var borderColor = itemModel.get(borderColorAccessPath, true);
                 if (color != null) {
                     data.setItemVisual(idx, 'color', color);
                 }
+                if (borderColor != null) {
+                    data.setItemVisual(idx, 'borderColor', borderColor);
+                }
             };
 
             return { dataEach: data.hasItemOption ? dataEach : null };
@@ -25240,8 +25350,17 @@ var seriesColor = {
 * under the License.
 */
 
+/**
+ * Language: English.
+ */
 
 var lang = {
+    legend: {
+        selector: {
+            all: 'All',
+            inverse: 'Inv'
+        }
+    },
     toolbox: {
         brush: {
             title: {
@@ -27222,15 +27341,17 @@ var isFunction = isFunction$1;
 var isObject = isObject$1;
 var parseClassType = ComponentModel.parseClassType;
 
-var version = '4.3.0';
+var version = '4.4.0';
 
 var dependencies = {
-    zrender: '4.1.0'
+    zrender: '4.1.1'
 };
 
 var TEST_FRAME_REMAIN_TIME = 1;
 
 var PRIORITY_PROCESSOR_FILTER = 1000;
+var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
+var PRIORITY_PROCESSOR_DATASTACK = 900;
 var PRIORITY_PROCESSOR_STATISTIC = 5000;
 
 var PRIORITY_VISUAL_LAYOUT = 1000;
@@ -27246,6 +27367,7 @@ var PRIORITY_VISUAL_BRUSH = 5000;
 var PRIORITY = {
     PROCESSOR: {
         FILTER: PRIORITY_PROCESSOR_FILTER,
+        SERIES_FILTER: PRIORITY_PROCESSOR_SERIES_FILTER,
         STATISTIC: PRIORITY_PROCESSOR_STATISTIC
     },
     VISUAL: {
@@ -27269,8 +27391,13 @@ var OPTION_UPDATED = '__optionUpdated';
 var ACTION_REG = /^[a-zA-Z0-9_]+$/;
 
 
-function createRegisterEventWithLowercaseName(method) {
+function createRegisterEventWithLowercaseName(method, ignoreDisposed) {
     return function (eventName, handler, context) {
+        if (!ignoreDisposed && this._disposed) {
+            disposedWarning(this.id);
+            return;
+        }
+
         // Event name is all lowercase
         eventName = eventName && eventName.toLowerCase();
         Eventful.prototype[method].call(this, eventName, handler, context);
@@ -27283,9 +27410,9 @@ function createRegisterEventWithLowercaseName(method) {
 function MessageCenter() {
     Eventful.call(this);
 }
-MessageCenter.prototype.on = createRegisterEventWithLowercaseName('on');
-MessageCenter.prototype.off = createRegisterEventWithLowercaseName('off');
-MessageCenter.prototype.one = createRegisterEventWithLowercaseName('one');
+MessageCenter.prototype.on = createRegisterEventWithLowercaseName('on', true);
+MessageCenter.prototype.off = createRegisterEventWithLowercaseName('off', true);
+MessageCenter.prototype.one = createRegisterEventWithLowercaseName('one', true);
 mixin(MessageCenter, Eventful);
 
 /**
@@ -27521,6 +27648,10 @@ echartsProto.setOption = function (option, notMerge, lazyUpdate) {
     if (__DEV__) {
         assert(!this[IN_MAIN_PROCESS], '`setOption` should not be called during main process.');
     }
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
 
     var silent;
     if (isObject(notMerge)) {
@@ -27656,6 +27787,11 @@ echartsProto.getSvgDataUrl = function () {
  * @param {string} [opts.excludeComponents]
  */
 echartsProto.getDataURL = function (opts) {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
+
     opts = opts || {};
     var excludeComponents = opts.excludeComponents;
     var ecModel = this._model;
@@ -27696,6 +27832,11 @@ echartsProto.getDataURL = function (opts) {
  * @param {string} [opts.backgroundColor]
  */
 echartsProto.getConnectedDataURL = function (opts) {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
+
     if (!env$1.canvasSupported) {
         return;
     }
@@ -27815,6 +27956,11 @@ echartsProto.convertToPixel = curry(doConvertPixel, 'convertToPixel');
 echartsProto.convertFromPixel = curry(doConvertPixel, 'convertFromPixel');
 
 function doConvertPixel(methodName, finder, value) {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
+
     var ecModel = this._model;
     var coordSysList = this._coordSysMgr.getCoordinateSystems();
     var result;
@@ -27855,6 +28001,11 @@ function doConvertPixel(methodName, finder, value) {
  * @return {boolean} result
  */
 echartsProto.containPixel = function (finder, value) {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
+
     var ecModel = this._model;
     var result;
 
@@ -28227,6 +28378,10 @@ echartsProto.resize = function (opts) {
     if (__DEV__) {
         assert(!this[IN_MAIN_PROCESS], '`resize` should not be called during main process.');
     }
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
 
     this._zr.resize(opts);
 
@@ -28269,6 +28424,11 @@ function updateStreamModes(ecIns, ecModel) {
  * @param  {Object} [cfg]
  */
 echartsProto.showLoading = function (name, cfg) {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
+
     if (isObject(name)) {
         cfg = name;
         name = '';
@@ -28293,6 +28453,11 @@ echartsProto.showLoading = function (name, cfg) {
  * Hide loading effect
  */
 echartsProto.hideLoading = function () {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
+
     this._loadingFX && this._zr.remove(this._loadingFX);
     this._loadingFX = null;
 };
@@ -28316,10 +28481,15 @@ echartsProto.makeActionFromEvent = function (eventObj) {
  * @param {boolean} [opt.flush=undefined]
  *                  true: Flush immediately, and then pixel in canvas can be fetched
  *                      immediately. Caution: it might affect performance.
- *                  false: Not not flush.
+ *                  false: Not flush.
  *                  undefined: Auto decide whether perform flush.
  */
 echartsProto.dispatchAction = function (payload, opt) {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
+
     if (!isObject(opt)) {
         opt = {silent: !!opt};
     }
@@ -28488,6 +28658,11 @@ function bindRenderedEvent(zr, ecIns) {
  * @param {Array|TypedArray} params.data
  */
 echartsProto.appendData = function (params) {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
+
     var seriesIndex = params.seriesIndex;
     var ecModel = this.getModel();
     var seriesModel = ecModel.getSeriesByIndex(seriesIndex);
@@ -28513,9 +28688,9 @@ echartsProto.appendData = function (params) {
  * Register event
  * @method
  */
-echartsProto.on = createRegisterEventWithLowercaseName('on');
-echartsProto.off = createRegisterEventWithLowercaseName('off');
-echartsProto.one = createRegisterEventWithLowercaseName('one');
+echartsProto.on = createRegisterEventWithLowercaseName('on', false);
+echartsProto.off = createRegisterEventWithLowercaseName('off', false);
+echartsProto.one = createRegisterEventWithLowercaseName('one', false);
 
 /**
  * Prepare view instances of charts and components
@@ -28793,6 +28968,10 @@ echartsProto.isDisposed = function () {
  * Clear
  */
 echartsProto.clear = function () {
+    if (this._disposed) {
+        disposedWarning(this.id);
+        return;
+    }
     this.setOption({ series: [] }, true);
 };
 
@@ -28801,9 +28980,7 @@ echartsProto.clear = function () {
  */
 echartsProto.dispose = function () {
     if (this._disposed) {
-        if (__DEV__) {
-            console.warn('Instance ' + this.id + ' has been disposed');
-        }
+        disposedWarning(this.id);
         return;
     }
     this._disposed = true;
@@ -28828,6 +29005,12 @@ echartsProto.dispose = function () {
 
 mixin(ECharts, Eventful);
 
+function disposedWarning(id) {
+    if (__DEV__) {
+        console.warn('Instance ' + id + ' has been disposed');
+    }
+}
+
 function updateHoverLayerStatus(ecIns, ecModel) {
     var zr = ecIns._zr;
     var storage = zr.storage;
@@ -29177,9 +29360,9 @@ function init(dom, theme$$1, opts) {
             )
         ) {
             console.warn('Can\'t get DOM width or height. Please check '
-                + 'dom.clientWidth and dom.clientHeight. They should not be 0.'
-                + 'For example, you may need to call this in the callback '
-                + 'of window.onload.');
+            + 'dom.clientWidth and dom.clientHeight. They should not be 0.'
+            + 'For example, you may need to call this in the callback '
+            + 'of window.onload.');
         }
     }
 
@@ -29530,7 +29713,7 @@ function getMap(mapName) {
 
 registerVisual(PRIORITY_VISUAL_GLOBAL, seriesColor);
 registerPreprocessor(backwardCompat);
-registerProcessor(PRIORITY_PROCESSOR_STATISTIC, dataStack);
+registerProcessor(PRIORITY_PROCESSOR_DATASTACK, dataStack);
 registerLoading('default', loadingDefault);
 
 // Default actions
@@ -32017,8 +32200,8 @@ function completeDimensions(sysDims, source, opt) {
             // `coordDimIndex` should not be set directly.
             sysDimItemDimsDef = sysDimItem.dimsDef;
             sysDimItemOtherDims = sysDimItem.otherDims;
-            sysDimItem.name = sysDimItem.coordDim = sysDimItem.coordDimIndex
-                = sysDimItem.dimsDef = sysDimItem.otherDims = null;
+            sysDimItem.name = sysDimItem.coordDim = sysDimItem.coordDimIndex =
+                sysDimItem.dimsDef = sysDimItem.otherDims = null;
         }
 
         var dataDims = encodeDef.get(coordDim);
@@ -33452,6 +33635,7 @@ function doCalBarWidthAndOffset(seriesInfoList) {
         var offset = -widthSum / 2;
         each$1(stacks, function (column, stackId) {
             result[coordSysName][stackId] = result[coordSysName][stackId] || {
+                bandWidth: bandWidth,
                 offset: offset,
                 width: column.width
             };
@@ -33505,6 +33689,7 @@ function layout(seriesType, ecModel) {
 
         lastStackCoords[stackId] = lastStackCoords[stackId] || [];
         data.setLayout({
+            bandWidth: columnLayoutInfo.bandWidth,
             offset: columnOffset,
             size: columnWidth
         });
@@ -33656,23 +33841,7 @@ function isInLargeMode(seriesModel) {
 
 // See cases in `test/bar-start.html` and `#7412`, `#8747`.
 function getValueAxisStart(baseAxis, valueAxis, stacked) {
-    var extent = valueAxis.getGlobalExtent();
-    var min;
-    var max;
-    if (extent[0] > extent[1]) {
-        min = extent[1];
-        max = extent[0];
-    }
-    else {
-        min = extent[0];
-        max = extent[1];
-    }
-
-    var valueStart = valueAxis.toGlobalCoord(valueAxis.dataToCoord(0));
-    valueStart < min && (valueStart = min);
-    valueStart > max && (valueStart = max);
-
-    return valueStart;
+    return valueAxis.toGlobalCoord(valueAxis.dataToCoord(0));
 }
 
 /*
@@ -36122,6 +36291,7 @@ each$1(
         'setHoverStyle', 'setLabelStyle', 'setTextStyle', 'setText',
         'getFont', 'updateProps', 'initProps', 'getTransform',
         'clipPointsByRect', 'clipRectByRect',
+        'registerShape', 'getShapeClass',
         'Group',
         'Image',
         'Text',
@@ -36194,7 +36364,7 @@ SeriesModel.extend({
         // polarIndex: 0,
 
         // If clip the overflow value
-        clipOverflow: true,
+        clip: true,
         // cursor: null,
 
         label: {
@@ -37590,89 +37760,21 @@ var Polygon$1 = Path.extend({
 * specific language governing permissions and limitations
 * under the License.
 */
-
-// FIXME step not support polar
-
-function isPointsSame(points1, points2) {
-    if (points1.length !== points2.length) {
-        return;
-    }
-    for (var i = 0; i < points1.length; i++) {
-        var p1 = points1[i];
-        var p2 = points2[i];
-        if (p1[0] !== p2[0] || p1[1] !== p2[1]) {
-            return;
-        }
-    }
-    return true;
-}
-
-function getSmooth(smooth) {
-    return typeof (smooth) === 'number' ? smooth : (smooth ? 0.5 : 0);
-}
-
-function getAxisExtentWithGap(axis) {
-    var extent = axis.getGlobalExtent();
-    if (axis.onBand) {
-        // Remove extra 1px to avoid line miter in clipped edge
-        var halfBandWidth = axis.getBandWidth() / 2 - 1;
-        var dir = extent[1] > extent[0] ? 1 : -1;
-        extent[0] += dir * halfBandWidth;
-        extent[1] -= dir * halfBandWidth;
-    }
-    return extent;
-}
-
-/**
- * @param {module:echarts/coord/cartesian/Cartesian2D|module:echarts/coord/polar/Polar} coordSys
- * @param {module:echarts/data/List} data
- * @param {Object} dataCoordInfo
- * @param {Array.<Array.<number>>} points
- */
-function getStackedOnPoints(coordSys, data, dataCoordInfo) {
-    if (!dataCoordInfo.valueDim) {
-        return [];
-    }
-
-    var points = [];
-    for (var idx = 0, len = data.count(); idx < len; idx++) {
-        points.push(getStackedOnPoint(dataCoordInfo, coordSys, data, idx));
-    }
-
-    return points;
-}
-
-function createGridClipShape(cartesian, hasAnimation, forSymbol, seriesModel) {
-    var xExtent = getAxisExtentWithGap(cartesian.getAxis('x'));
-    var yExtent = getAxisExtentWithGap(cartesian.getAxis('y'));
+function createGridClipPath(cartesian, hasAnimation, seriesModel) {
+    var rect = cartesian.getArea();
     var isHorizontal = cartesian.getBaseAxis().isHorizontal();
 
-    var x = Math.min(xExtent[0], xExtent[1]);
-    var y = Math.min(yExtent[0], yExtent[1]);
-    var width = Math.max(xExtent[0], xExtent[1]) - x;
-    var height = Math.max(yExtent[0], yExtent[1]) - y;
+    var x = rect.x;
+    var y = rect.y;
+    var width = rect.width;
+    var height = rect.height;
 
-    // Avoid float number rounding error for symbol on the edge of axis extent.
-    // See #7913 and `test/dataZoom-clip.html`.
-    if (forSymbol) {
-        x -= 0.5;
-        width += 0.5;
-        y -= 0.5;
-        height += 0.5;
-    }
-    else {
-        var lineWidth = seriesModel.get('lineStyle.width') || 2;
-        // Expand clip shape to avoid clipping when line value exceeds axis
-        var expandSize = seriesModel.get('clipOverflow') ? lineWidth / 2 : Math.max(width, height);
-        if (isHorizontal) {
-            y -= expandSize;
-            height += expandSize * 2;
-        }
-        else {
-            x -= expandSize;
-            width += expandSize * 2;
-        }
-    }
+    var lineWidth = seriesModel.get('lineStyle.width') || 2;
+    // Expand the clip path a bit to avoid the border is clipped and looks thinner
+    x -= lineWidth / 2;
+    y -= lineWidth / 2;
+    width += lineWidth;
+    height += lineWidth;
 
     var clipPath = new Rect({
         shape: {
@@ -37696,50 +37798,102 @@ function createGridClipShape(cartesian, hasAnimation, forSymbol, seriesModel) {
     return clipPath;
 }
 
-function createPolarClipShape(polar, hasAnimation, forSymbol, seriesModel) {
-    var angleAxis = polar.getAngleAxis();
-    var radiusAxis = polar.getRadiusAxis();
-
-    var radiusExtent = radiusAxis.getExtent().slice();
-    radiusExtent[0] > radiusExtent[1] && radiusExtent.reverse();
-    var angleExtent = angleAxis.getExtent();
-
-    var RADIAN = Math.PI / 180;
-
+function createPolarClipPath(polar, hasAnimation, seriesModel) {
+    var sectorArea = polar.getArea();
     // Avoid float number rounding error for symbol on the edge of axis extent.
-    if (forSymbol) {
-        radiusExtent[0] -= 0.5;
-        radiusExtent[1] += 0.5;
-    }
 
     var clipPath = new Sector({
         shape: {
             cx: round$1(polar.cx, 1),
             cy: round$1(polar.cy, 1),
-            r0: round$1(radiusExtent[0], 1),
-            r: round$1(radiusExtent[1], 1),
-            startAngle: -angleExtent[0] * RADIAN,
-            endAngle: -angleExtent[1] * RADIAN,
-            clockwise: angleAxis.inverse
+            r0: round$1(sectorArea.r0, 1),
+            r: round$1(sectorArea.r, 1),
+            startAngle: sectorArea.startAngle,
+            endAngle: sectorArea.endAngle,
+            clockwise: sectorArea.clockwise
         }
     });
 
     if (hasAnimation) {
-        clipPath.shape.endAngle = -angleExtent[0] * RADIAN;
+        clipPath.shape.endAngle = sectorArea.startAngle;
         initProps(clipPath, {
             shape: {
-                endAngle: -angleExtent[1] * RADIAN
+                endAngle: sectorArea.endAngle
             }
         }, seriesModel);
     }
-
     return clipPath;
 }
 
-function createClipShape(coordSys, hasAnimation, forSymbol, seriesModel) {
-    return coordSys.type === 'polar'
-        ? createPolarClipShape(coordSys, hasAnimation, forSymbol, seriesModel)
-        : createGridClipShape(coordSys, hasAnimation, forSymbol, seriesModel);
+function createClipPath(coordSys, hasAnimation, seriesModel) {
+    if (!coordSys) {
+        return null;
+    }
+    else if (coordSys.type === 'polar') {
+        return createPolarClipPath(coordSys, hasAnimation, seriesModel);
+    }
+    else if (coordSys.type === 'cartesian2d') {
+        return createGridClipPath(coordSys, hasAnimation, seriesModel);
+    }
+    return null;
+}
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+// FIXME step not support polar
+
+function isPointsSame(points1, points2) {
+    if (points1.length !== points2.length) {
+        return;
+    }
+    for (var i = 0; i < points1.length; i++) {
+        var p1 = points1[i];
+        var p2 = points2[i];
+        if (p1[0] !== p2[0] || p1[1] !== p2[1]) {
+            return;
+        }
+    }
+    return true;
+}
+
+function getSmooth(smooth) {
+    return typeof (smooth) === 'number' ? smooth : (smooth ? 0.5 : 0);
+}
+
+/**
+ * @param {module:echarts/coord/cartesian/Cartesian2D|module:echarts/coord/polar/Polar} coordSys
+ * @param {module:echarts/data/List} data
+ * @param {Object} dataCoordInfo
+ * @param {Array.<Array.<number>>} points
+ */
+function getStackedOnPoints(coordSys, data, dataCoordInfo) {
+    if (!dataCoordInfo.valueDim) {
+        return [];
+    }
+
+    var points = [];
+    for (var idx = 0, len = data.count(); idx < len; idx++) {
+        points.push(getStackedOnPoint(dataCoordInfo, coordSys, data, idx));
+    }
+
+    return points;
 }
 
 function turnPointsIntoStep(points, coordSys, stepTurnAt) {
@@ -37938,6 +38092,31 @@ function canShowAllSymbolForCategory(categoryAxis, data) {
     return true;
 }
 
+function createLineClipPath(coordSys, hasAnimation, seriesModel) {
+    if (coordSys.type === 'cartesian2d') {
+        var isHorizontal = coordSys.getBaseAxis().isHorizontal();
+        var clipPath = createGridClipPath(coordSys, hasAnimation, seriesModel);
+        // Expand clip shape to avoid clipping when line value exceeds axis
+        if (!seriesModel.get('clip', true)) {
+            var rectShape = clipPath.shape;
+            var expandSize = Math.max(rectShape.width, rectShape.height);
+            if (isHorizontal) {
+                rectShape.y -= expandSize;
+                rectShape.height += expandSize * 2;
+            }
+            else {
+                rectShape.x -= expandSize;
+                rectShape.width += expandSize * 2;
+            }
+        }
+        return clipPath;
+    }
+    else {
+        return createPolarClipPath(coordSys, hasAnimation, seriesModel);
+    }
+
+}
+
 Chart.extend({
 
     type: 'line',
@@ -38002,13 +38181,29 @@ Chart.extend({
 
         // FIXME step not support polar
         var step = !isCoordSysPolar && seriesModel.get('step');
+        var clipShapeForSymbol;
+        if (coordSys && coordSys.getArea) {
+            clipShapeForSymbol = coordSys.getArea();
+            // Avoid float number rounding error for symbol on the edge of axis extent.
+            // See #7913 and `test/dataZoom-clip.html`.
+            if (clipShapeForSymbol.width != null) {
+                clipShapeForSymbol.x -= 0.1;
+                clipShapeForSymbol.y -= 0.1;
+                clipShapeForSymbol.width += 0.2;
+                clipShapeForSymbol.height += 0.2;
+            }
+            else if (clipShapeForSymbol.r0) {
+                clipShapeForSymbol.r0 -= 0.5;
+                clipShapeForSymbol.r1 += 0.5;
+            }
+        }
         // Initialization animation or coordinate system changed
         if (
             !(polyline && prevCoordSys.type === coordSys.type && step === this._step)
         ) {
             showSymbol && symbolDraw.updateData(data, {
                 isIgnore: isIgnoreFunc,
-                clipShape: createClipShape(coordSys, false, true, seriesModel)
+                clipShape: clipShapeForSymbol
             });
 
             if (step) {
@@ -38024,7 +38219,7 @@ Chart.extend({
                     coordSys, hasAnimation
                 );
             }
-            lineGroup.setClipPath(createClipShape(coordSys, true, false, seriesModel));
+            lineGroup.setClipPath(createLineClipPath(coordSys, true, seriesModel));
         }
         else {
             if (isAreaChart && !polygon) {
@@ -38041,13 +38236,13 @@ Chart.extend({
             }
 
             // Update clipPath
-            lineGroup.setClipPath(createClipShape(coordSys, false, false, seriesModel));
+            lineGroup.setClipPath(createLineClipPath(coordSys, false, seriesModel));
 
             // Always update, or it is wrong in the case turning on legend
             // because points are not changed
             showSymbol && symbolDraw.updateData(data, {
                 isIgnore: isIgnoreFunc,
-                clipShape: createClipShape(coordSys, false, true, seriesModel)
+                clipShape: clipShapeForSymbol
             });
 
             // Stop symbol animation and sync with line points
@@ -38349,12 +38544,12 @@ Chart.extend({
             }
         });
 
-        this._polyline
-            = this._polygon
-            = this._coordSys
-            = this._points
-            = this._stackedOnPoints
-            = this._data = null;
+        this._polyline =
+            this._polygon =
+            this._coordSys =
+            this._points =
+            this._stackedOnPoints =
+            this._data = null;
     }
 });
 
@@ -38894,6 +39089,23 @@ Cartesian2D.prototype = {
      */
     getOtherAxis: function (axis) {
         return this.getAxis(axis.dim === 'x' ? 'y' : 'x');
+    },
+
+    /**
+     * Get rect area of cartesian.
+     * Area will have a contain function to determine if a point is in the coordinate system.
+     * @return {BoundingRect}
+     */
+    getArea: function () {
+        var xExtent = this.getAxis('x').getGlobalExtent();
+        var yExtent = this.getAxis('y').getGlobalExtent();
+        var x = Math.min(xExtent[0], xExtent[1]);
+        var y = Math.min(yExtent[0], yExtent[1]);
+        var width = Math.max(xExtent[0], xExtent[1]) - x;
+        var height = Math.max(yExtent[0], yExtent[1]) - y;
+
+        var rect = new BoundingRect(x, y, width, height);
+        return rect;
     }
 
 };
@@ -41817,8 +42029,13 @@ BaseBarSeries.extend({
             progressiveThreshold = largeThreshold;
         }
         return progressiveThreshold;
-    }
+    },
 
+    defaultOption: {
+        // If clipped
+        // Only available on cartesian2d
+        clip: true
+    }
 });
 
 /*
@@ -41939,6 +42156,29 @@ var _eventPos = [0, 0];
 // Just for compatible with ec2.
 extend(Model.prototype, barItemStyle);
 
+function getClipArea(coord, data) {
+    var coordSysClipArea = coord.getArea && coord.getArea();
+    if (coord.type === 'cartesian2d') {
+        var baseAxis = coord.getBaseAxis();
+        // When boundaryGap is false or using time axis. bar may exceed the grid.
+        // We should not clip this part.
+        // See test/bar2.html
+        if (baseAxis.type !== 'category' || !baseAxis.onBand) {
+            var expandWidth = data.getLayout('bandWidth');
+            if (baseAxis.isHorizontal()) {
+                coordSysClipArea.x -= expandWidth;
+                coordSysClipArea.width += expandWidth * 2;
+            }
+            else {
+                coordSysClipArea.y -= expandWidth;
+                coordSysClipArea.height += expandWidth * 2;
+            }
+        }
+    }
+
+    return coordSysClipArea;
+}
+
 extendChartView({
 
     type: 'bar',
@@ -41998,6 +42238,13 @@ extendChartView({
 
         var animationModel = seriesModel.isAnimationEnabled() ? seriesModel : null;
 
+        var needsClip = seriesModel.get('clip', true);
+        var coordSysClipArea = getClipArea(coord, data);
+        // If there is clipPath created in large mode. Remove it.
+        group.removeClipPath();
+        // We don't use clipPath in normal mode because we needs a perfect animation
+        // And don't want the label are clipped.
+
         data.diff(oldData)
             .add(function (dataIndex) {
                 if (!data.hasValue(dataIndex)) {
@@ -42006,6 +42253,17 @@ extendChartView({
 
                 var itemModel = data.getItemModel(dataIndex);
                 var layout = getLayout[coord.type](data, dataIndex, itemModel);
+
+                if (needsClip) {
+                    // Clip will modify the layout params.
+                    // And return a boolean to determine if the shape are fully clipped.
+                    var isClipped = clip[coord.type](coordSysClipArea, layout);
+                    if (isClipped) {
+                        group.remove(el);
+                        return;
+                    }
+                }
+
                 var el = elementCreator[coord.type](
                     data, dataIndex, itemModel, layout, isHorizontalOrRadial, animationModel
                 );
@@ -42028,6 +42286,14 @@ extendChartView({
                 var itemModel = data.getItemModel(newIndex);
                 var layout = getLayout[coord.type](data, newIndex, itemModel);
 
+                if (needsClip) {
+                    var isClipped = clip[coord.type](coordSysClipArea, layout);
+                    if (isClipped) {
+                        group.remove(el);
+                        return;
+                    }
+                }
+
                 if (el) {
                     updateProps(el, {shape: layout}, animationModel, newIndex);
                 }
@@ -42063,6 +42329,17 @@ extendChartView({
     _renderLarge: function (seriesModel, ecModel, api) {
         this._clear();
         createLarge(seriesModel, this.group);
+
+        // Use clipPath in large mode.
+        var clipPath = seriesModel.get('clip', true)
+            ? createClipPath(seriesModel.coordinateSystem, false, seriesModel)
+            : null;
+        if (clipPath) {
+            this.group.setClipPath(clipPath);
+        }
+        else {
+            this.group.removeClipPath();
+        }
     },
 
     _incrementalRenderLarge: function (params, seriesModel) {
@@ -42096,6 +42373,53 @@ extendChartView({
 
 });
 
+var mathMax$4 = Math.max;
+var mathMin$4 = Math.min;
+
+var clip = {
+    cartesian2d: function (coordSysBoundingRect, layout) {
+        var signWidth = layout.width < 0 ? -1 : 1;
+        var signHeight = layout.height < 0 ? -1 : 1;
+        // Needs positive width and height
+        if (signWidth < 0) {
+            layout.x += layout.width;
+            layout.width = -layout.width;
+        }
+        if (signHeight < 0) {
+            layout.y += layout.height;
+            layout.height = -layout.height;
+        }
+
+        var x = mathMax$4(layout.x, coordSysBoundingRect.x);
+        var x2 = mathMin$4(layout.x + layout.width, coordSysBoundingRect.x + coordSysBoundingRect.width);
+        var y = mathMax$4(layout.y, coordSysBoundingRect.y);
+        var y2 = mathMin$4(layout.y + layout.height, coordSysBoundingRect.y + coordSysBoundingRect.height);
+
+        layout.x = x;
+        layout.y = y;
+        layout.width = x2 - x;
+        layout.height = y2 - y;
+
+        var clipped = layout.width < 0 || layout.height < 0;
+
+        // Reverse back
+        if (signWidth < 0) {
+            layout.x += layout.width;
+            layout.width = -layout.width;
+        }
+        if (signHeight < 0) {
+            layout.y += layout.height;
+            layout.height = -layout.height;
+        }
+
+        return clipped;
+    },
+
+    polar: function (coordSysClipArea) {
+        return false;
+    }
+};
+
 var elementCreator = {
 
     cartesian2d: function (
@@ -42699,9 +43023,12 @@ var PieSeries = extendSeriesModel({
             borderWidth: 1
         },
 
-        // Animation type canbe expansion, scale
+        // Animation type. Valid values: expansion, scale
         animationType: 'expansion',
 
+        // Animation type when update. Valid values: transition, expansion
+        animationTypeUpdate: 'transition',
+
         animationEasing: 'cubicOut'
     }
 });
@@ -42818,6 +43145,8 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
     var sectorShape = extend({}, layout);
     sectorShape.label = null;
 
+    var animationTypeUpdate = seriesModel.getShallow('animationTypeUpdate');
+
     if (firstCreate) {
         sector.setShape(sectorShape);
 
@@ -42842,9 +43171,16 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
 
     }
     else {
-        updateProps(sector, {
-            shape: sectorShape
-        }, seriesModel, idx);
+        if (animationTypeUpdate === 'expansion') {
+            // Sectors are set to be target shape and an overlaying clipPath is used for animation
+            sector.setShape(sectorShape);
+        }
+        else {
+            // Transition animation from the old shape
+            updateProps(sector, {
+                shape: sectorShape
+            }, seriesModel, idx);
+        }
     }
 
     // Update common style
@@ -42873,7 +43209,9 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
         seriesModel.get('animation')
     );
 
-    this._updateLabel(data, idx);
+    // Label and text animation should be applied only for transition type animation when update
+    var withAnimation = !firstCreate && animationTypeUpdate === 'transition';
+    this._updateLabel(data, idx, withAnimation);
 
     this.highDownOnUpdate = (itemModel.get('hoverAnimation') && seriesModel.isAnimationEnabled())
         ? function (fromState, toState) {
@@ -42907,7 +43245,7 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
     setHoverStyle(this);
 };
 
-piePieceProto._updateLabel = function (data, idx) {
+piePieceProto._updateLabel = function (data, idx, withAnimation) {
 
     var labelLine = this.childAt(1);
     var labelText = this.childAt(2);
@@ -42924,20 +43262,33 @@ piePieceProto._updateLabel = function (data, idx) {
         return;
     }
 
-    updateProps(labelLine, {
-        shape: {
-            points: labelLayout.linePoints || [
-                [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y]
-            ]
-        }
-    }, seriesModel, idx);
+    var targetLineShape = {
+        points: labelLayout.linePoints || [
+            [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y]
+        ]
+    };
+    var targetTextStyle = {
+        x: labelLayout.x,
+        y: labelLayout.y
+    };
+    if (withAnimation) {
+        updateProps(labelLine, {
+            shape: targetLineShape
+        }, seriesModel, idx);
+
+        updateProps(labelText, {
+            style: targetTextStyle
+        }, seriesModel, idx);
+    }
+    else {
+        labelLine.attr({
+            shape: targetLineShape
+        });
+        labelText.attr({
+            style: targetTextStyle
+        });
+    }
 
-    updateProps(labelText, {
-        style: {
-            x: labelLayout.x,
-            y: labelLayout.y
-        }
-    }, seriesModel, idx);
     labelText.attr({
         rotation: labelLayout.rotation,
         origin: [labelLayout.x, labelLayout.y],
@@ -43015,6 +43366,7 @@ var PieView = Chart.extend({
         var hasAnimation = ecModel.get('animation');
         var isFirstRender = !oldData;
         var animationType = seriesModel.get('animationType');
+        var animationTypeUpdate = seriesModel.get('animationTypeUpdate');
 
         var onSectorClick = curry(
             updateDataSelected, this.uid, seriesModel, hasAnimation, api
@@ -43040,6 +43392,12 @@ var PieView = Chart.extend({
             .update(function (newIdx, oldIdx) {
                 var piePiece = oldData.getItemGraphicEl(oldIdx);
 
+                if (!isFirstRender && animationTypeUpdate !== 'transition') {
+                    piePiece.eachChild(function (child) {
+                        child.stopAnimation(true);
+                    });
+                }
+
                 piePiece.updateData(data, newIdx);
 
                 piePiece.off('click');
@@ -43054,9 +43412,8 @@ var PieView = Chart.extend({
             .execute();
 
         if (
-            hasAnimation && isFirstRender && data.count() > 0
-            // Default expansion animation
-            && animationType !== 'scale'
+            hasAnimation && data.count() > 0
+            && (isFirstRender ? animationType !== 'scale' : animationTypeUpdate !== 'transition')
         ) {
             var shape = data.getItemLayout(0);
             for (var s = 1; isNaN(shape.startAngle) && s < data.count(); ++s) {
@@ -43067,7 +43424,7 @@ var PieView = Chart.extend({
 
             var removeClipPath = bind(group.removeClipPath, group);
             group.setClipPath(this._createClipPath(
-                shape.cx, shape.cy, r, shape.startAngle, shape.clockwise, removeClipPath, seriesModel
+                shape.cx, shape.cy, r, shape.startAngle, shape.clockwise, removeClipPath, seriesModel, isFirstRender
             ));
         }
         else {
@@ -43081,7 +43438,7 @@ var PieView = Chart.extend({
     dispose: function () {},
 
     _createClipPath: function (
-        cx, cy, r, startAngle, clockwise, cb, seriesModel
+        cx, cy, r, startAngle, clockwise, cb, seriesModel, isFirstRender
     ) {
         var clipPath = new Sector({
             shape: {
@@ -43095,7 +43452,8 @@ var PieView = Chart.extend({
             }
         });
 
-        initProps(clipPath, {
+        var initOrUpdate = isFirstRender ? initProps : updateProps;
+        initOrUpdate(clipPath, {
             shape: {
                 endAngle: startAngle + (clockwise ? 1 : -1) * Math.PI * 2
             }
@@ -43229,10 +43587,16 @@ var dataColor = function (seriesType) {
                 var singleDataColor = filteredIdx != null
                     && data.getItemVisual(filteredIdx, 'color', true);
 
-                if (!singleDataColor) {
+                var singleDataBorderColor = filteredIdx != null
+                    && data.getItemVisual(filteredIdx, 'borderColor', true);
+
+                var itemModel;
+                if (!singleDataColor || !singleDataBorderColor) {
                     // FIXME Performance
-                    var itemModel = dataAll.getItemModel(rawIdx);
+                    itemModel = dataAll.getItemModel(rawIdx);
+                }
 
+                if (!singleDataColor) {
                     var color = itemModel.get('itemStyle.color')
                         || seriesModel.getColorFromPalette(
                             dataAll.getName(rawIdx) || (rawIdx + ''), seriesModel.__paletteScope,
@@ -43250,6 +43614,21 @@ var dataColor = function (seriesType) {
                     // Set data all color for legend
                     dataAll.setItemVisual(rawIdx, 'color', singleDataColor);
                 }
+
+                if (!singleDataBorderColor) {
+                    var borderColor = itemModel.get('itemStyle.borderColor');
+                    // Legend may use the visual info in data before processed
+                    dataAll.setItemVisual(rawIdx, 'borderColor', borderColor);
+
+                    // Data is not filtered
+                    if (filteredIdx != null) {
+                        data.setItemVisual(filteredIdx, 'borderColor', borderColor);
+                    }
+                }
+                else {
+                    // Set data all borderColor for legend
+                    dataAll.setItemVisual(rawIdx, 'borderColor', singleDataBorderColor);
+                }
             });
         }
     };
@@ -43846,7 +44225,11 @@ SeriesModel.extend({
         itemStyle: {
             opacity: 0.8
             // color: 各异
-        }
+        },
+
+        // If clip the overflow graphics
+        // Works on cartesian / polar series
+        clip: true
 
         // progressive: null
     }
@@ -43886,6 +44269,8 @@ var LargeSymbolPath = extendShape({
 
     symbolProxy: null,
 
+    softClipShape: null,
+
     buildPath: function (path, shape) {
         var points = shape.points;
         var size = shape.size;
@@ -43907,6 +44292,9 @@ var LargeSymbolPath = extendShape({
             if (isNaN(x) || isNaN(y)) {
                 continue;
             }
+            if (this.softClipShape && !this.softClipShape.contain(x, y)) {
+                continue;
+            }
 
             symbolProxyShape.x = x - size[0] / 2;
             symbolProxyShape.y = y - size[1] / 2;
@@ -43935,6 +44323,9 @@ var LargeSymbolPath = extendShape({
             if (isNaN(x) || isNaN(y)) {
                 continue;
             }
+            if (this.softClipShape && !this.softClipShape.contain(x, y)) {
+                continue;
+            }
             // fillRect is faster than building a rect path and draw.
             // And it support light globalCompositeOperation.
             ctx.fillRect(
@@ -43986,8 +44377,10 @@ largeSymbolProto.isPersistent = function () {
 /**
  * Update symbols draw by new data
  * @param {module:echarts/data/List} data
+ * @param {Object} opt
+ * @param {Object} [opt.clipShape]
  */
-largeSymbolProto.updateData = function (data) {
+largeSymbolProto.updateData = function (data, opt) {
     this.group.removeAll();
     var symbolEl = new LargeSymbolPath({
         rectHover: true,
@@ -43997,7 +44390,7 @@ largeSymbolProto.updateData = function (data) {
     symbolEl.setShape({
         points: data.getLayout('symbolPoints')
     });
-    this._setCommon(symbolEl, data);
+    this._setCommon(symbolEl, data, false, opt);
     this.group.add(symbolEl);
 
     this._incremental = null;
@@ -44038,7 +44431,7 @@ largeSymbolProto.incrementalPrepareUpdate = function (data) {
     }
 };
 
-largeSymbolProto.incrementalUpdate = function (taskParams, data) {
+largeSymbolProto.incrementalUpdate = function (taskParams, data, opt) {
     var symbolEl;
     if (this._incremental) {
         symbolEl = new LargeSymbolPath();
@@ -44058,12 +44451,13 @@ largeSymbolProto.incrementalUpdate = function (taskParams, data) {
     symbolEl.setShape({
         points: data.getLayout('symbolPoints')
     });
-    this._setCommon(symbolEl, data, !!this._incremental);
+    this._setCommon(symbolEl, data, !!this._incremental, opt);
 };
 
-largeSymbolProto._setCommon = function (symbolEl, data, isIncremental) {
+largeSymbolProto._setCommon = function (symbolEl, data, isIncremental, opt) {
     var hostModel = data.hostModel;
 
+    opt = opt || {};
     // TODO
     // if (data.hasItemVisual.symbolSize) {
     //     // TODO typed array?
@@ -44079,6 +44473,7 @@ largeSymbolProto._setCommon = function (symbolEl, data, isIncremental) {
     symbolEl.setShape('size', (size instanceof Array) ? size : [size, size]);
     // }
 
+    symbolEl.softClipShape = opt.clipShape || null;
     // Create symbolProxy to build path for each data
     symbolEl.symbolProxy = createSymbol(
         data.getVisual('symbol'), 0, 0, 0, 0
@@ -44152,7 +44547,14 @@ extendChartView({
         var data = seriesModel.getData();
 
         var symbolDraw = this._updateSymbolDraw(data, seriesModel);
-        symbolDraw.updateData(data);
+
+        symbolDraw.updateData(data, {
+            // TODO
+            // If this parameter should be a shape or a bounding volume
+            // shape will be more general.
+            // But bounding volume like bounding rect will be much faster in the contain calculation
+            clipShape: this._getClipShape(seriesModel)
+        });
 
         this._finished = true;
     },
@@ -44167,7 +44569,9 @@ extendChartView({
     },
 
     incrementalRender: function (taskParams, seriesModel, ecModel) {
-        this._symbolDraw.incrementalUpdate(taskParams, seriesModel.getData());
+        this._symbolDraw.incrementalUpdate(taskParams, seriesModel.getData(), {
+            clipShape: this._getClipShape(seriesModel)
+        });
 
         this._finished = taskParams.end === seriesModel.getData().count();
     },
@@ -44193,6 +44597,12 @@ extendChartView({
         }
     },
 
+    _getClipShape: function (seriesModel) {
+        var coordSys = seriesModel.coordinateSystem;
+        var clipArea = coordSys && coordSys.getArea && coordSys.getArea();
+        return seriesModel.get('clip', true) ? clipArea : null;
+    },
+
     _updateSymbolDraw: function (data, seriesModel) {
         var symbolDraw = this._symbolDraw;
         var pipelineContext = seriesModel.pipelineContext;
@@ -44425,7 +44835,7 @@ Radar.prototype.pointToData = function (pt) {
         }
     }
 
-    return [closestAxisIdx, +(closestAxis && closestAxis.coodToData(radius))];
+    return [closestAxisIdx, +(closestAxis && closestAxis.coordToData(radius))];
 };
 
 Radar.prototype.resize = function (radarModel, api) {
@@ -46598,7 +47008,7 @@ function onIrrelevantElement(e, api, targetCoordSysModel) {
 * under the License.
 */
 
-function getFixedItemStyle(model, scale) {
+function getFixedItemStyle(model) {
     var itemStyle = model.getItemStyle();
     var areaColor = model.get('areaColor');
 
@@ -46754,20 +47164,14 @@ MapDraw.prototype = {
         var regionsGroup = this._regionsGroup;
         var group = this.group;
 
-        var scale = geo.scale;
-        var transform = {
-            position: geo.position,
-            scale: scale
-        };
-
-        // No animation when first draw or in action
-        if (!regionsGroup.childAt(0) || payload) {
-            group.attr(transform);
-        }
-        else {
-            updateProps(group, transform, mapOrGeoModel);
+        if (geo._roamTransformable.transform) {
+            group.transform = geo._roamTransformable.transform.slice();
+            group.decomposeTransform();
         }
 
+        var scale = geo._rawTransformable.scale;
+        var position = geo._rawTransformable.position;
+
         regionsGroup.removeAll();
 
         var itemStyleAccessPath = ['itemStyle'];
@@ -46777,7 +47181,6 @@ MapDraw.prototype = {
         var nameMap = createHashMap();
 
         each$1(geo.regions, function (region) {
-
             // Consider in GeoJson properties.name may be duplicated, for example,
             // there is multiple region named "United Kindom" or "France" (so many
             // colonies). And it is not appropriate to merge them in geo, which
@@ -46798,8 +47201,8 @@ MapDraw.prototype = {
 
             var itemStyleModel = regionModel.getModel(itemStyleAccessPath);
             var hoverItemStyleModel = regionModel.getModel(hoverItemStyleAccessPath);
-            var itemStyle = getFixedItemStyle(itemStyleModel, scale);
-            var hoverItemStyle = getFixedItemStyle(hoverItemStyleModel, scale);
+            var itemStyle = getFixedItemStyle(itemStyleModel);
+            var hoverItemStyle = getFixedItemStyle(hoverItemStyleModel);
 
             var labelModel = regionModel.getModel(labelAccessPath);
             var hoverLabelModel = regionModel.getModel(hoverLabelAccessPath);
@@ -46818,22 +47221,38 @@ MapDraw.prototype = {
                 }
             }
 
+            var transformPoint = function (point) {
+                return [
+                    point[0] * scale[0] + position[0],
+                    point[1] * scale[1] + position[1]
+                ];
+            };
+
             each$1(region.geometries, function (geometry) {
                 if (geometry.type !== 'polygon') {
                     return;
                 }
+                var points = [];
+                for (var i = 0; i < geometry.exterior.length; ++i) {
+                    points.push(transformPoint(geometry.exterior[i]));
+                }
                 compoundPath.shape.paths.push(new Polygon({
                     segmentIgnoreThreshold: 1,
                     shape: {
-                        points: geometry.exterior
+                        points: points
                     }
                 }));
 
-                for (var i = 0; i < (geometry.interiors ? geometry.interiors.length : 0); i++) {
+                for (var i = 0; i < (geometry.interiors ? geometry.interiors.length : 0); ++i) {
+                    var interior = geometry.interiors[i];
+                    var points = [];
+                    for (var j = 0; j < interior.length; ++j) {
+                        points.push(transformPoint(interior[j]));
+                    }
                     compoundPath.shape.paths.push(new Polygon({
                         segmentIgnoreThreshold: 1,
                         shape: {
-                            points: geometry.interiors[i]
+                            points: points
                         }
                     }));
                 }
@@ -46842,6 +47261,7 @@ MapDraw.prototype = {
             compoundPath.setStyle(itemStyle);
             compoundPath.style.strokeNoScale = true;
             compoundPath.culling = true;
+
             // Label
             var showLabel = labelModel.get('show');
             var hoverShowLabel = hoverLabelModel.get('show');
@@ -46865,12 +47285,12 @@ MapDraw.prototype = {
                 }
 
                 var textEl = new Text({
-                    position: region.center.slice(),
+                    position: transformPoint(region.center.slice()),
                     // FIXME
                     // label rotation is not support yet in geo or regions of series-map
                     // that has no data. The rotation will be effected by this `scale`.
                     // So needed to change to RectText?
-                    scale: [1 / scale[0], 1 / scale[1]],
+                    scale: [1 / group.scale[0], 1 / group.scale[1]],
                     z2: 10,
                     silent: true
                 });
@@ -49203,7 +49623,9 @@ SeriesModel.extend({
         // the layout of the tree, two value can be selected, 'orthogonal' or 'radial'
         layout: 'orthogonal',
 
-        roam: false, // true | false | 'move' | 'scale', see module:component/helper/RoamController.
+        // true | false | 'move' | 'scale', see module:component/helper/RoamController.
+        roam: false,
+
         // Symbol size scale ratio in roam
         nodeScaleRatio: 0.4,
 
@@ -49656,7 +50078,7 @@ extendChartView({
             group.attr('position', [layoutInfo.x, layoutInfo.y]);
         }
 
-        this._updateViewCoordSys(seriesModel);
+        this._updateViewCoordSys(seriesModel, layoutInfo, layout);
         this._updateController(seriesModel, ecModel, api);
 
         var oldData = this._data;
@@ -49732,14 +50154,20 @@ extendChartView({
         var min = [];
         var max = [];
         fromPoints(points, min, max);
+
+        // If don't Store min max when collapse the root node after roam,
+        // the root node will disappear.
+        var oldMin = this._min;
+        var oldMax = this._max;
+
         // If width or height is 0
         if (max[0] - min[0] === 0) {
-            max[0] += 1;
-            min[0] -= 1;
+            min[0] = oldMin ? oldMin[0] : min[0] - 1;
+            max[0] = oldMax ? oldMax[0] : max[0] + 1;
         }
         if (max[1] - min[1] === 0) {
-            max[1] += 1;
-            min[1] -= 1;
+            min[1] = oldMin ? oldMin[1] : min[1] - 1;
+            max[1] = oldMax ? oldMax[1] : max[1] + 1;
         }
 
         var viewCoordSys = seriesModel.coordinateSystem = new View();
@@ -49757,6 +50185,8 @@ extendChartView({
         });
 
         this._viewCoordSys = viewCoordSys;
+        this._min = min;
+        this._max = max;
     },
 
     _updateController: function (seriesModel, ecModel, api) {
@@ -50101,7 +50531,6 @@ registerAction({
         var tree = seriesModel.getData().tree;
         var node = tree.getNodeByDataIndex(dataIndex);
         node.isExpand = !node.isExpand;
-
     });
 });
 
@@ -52956,8 +53385,8 @@ function mapVisual$1(nodeModel, visuals, child, index, mapping, seriesModel) {
 * </licenses/LICENSE-d3>).
 */
 
-var mathMax$4 = Math.max;
-var mathMin$4 = Math.min;
+var mathMax$5 = Math.max;
+var mathMin$5 = Math.min;
 var retrieveValue = retrieve;
 var each$10 = each$1;
 
@@ -53119,8 +53548,8 @@ function squarify(node, options, hideChildren, depth) {
         upperLabelHeight: upperLabelHeight
     }, true);
 
-    width = mathMax$4(width - 2 * layoutOffset, 0);
-    height = mathMax$4(height - layoutOffset - layoutOffsetUpper, 0);
+    width = mathMax$5(width - 2 * layoutOffset, 0);
+    height = mathMax$5(height - layoutOffset - layoutOffsetUpper, 0);
 
     var totalArea = width * height;
     var viewChildren = initChildren(
@@ -53132,7 +53561,7 @@ function squarify(node, options, hideChildren, depth) {
     }
 
     var rect = {x: layoutOffset, y: layoutOffsetUpper, width: width, height: height};
-    var rowFixedLength = mathMin$4(width, height);
+    var rowFixedLength = mathMin$5(width, height);
     var best = Infinity; // the best row score so far
     var row = [];
     row.area = 0;
@@ -53153,7 +53582,7 @@ function squarify(node, options, hideChildren, depth) {
         else {
             row.area -= row.pop().getLayout().area;
             position(row, rowFixedLength, rect, halfGapWidth, false);
-            rowFixedLength = mathMin$4(rect.width, rect.height);
+            rowFixedLength = mathMin$5(rect.width, rect.height);
             row.length = row.area = 0;
             best = Infinity;
         }
@@ -53340,7 +53769,7 @@ function worst(row, rowFixedLength, ratio) {
     var f = rowFixedLength * rowFixedLength * ratio;
 
     return squareArea
-        ? mathMax$4(
+        ? mathMax$5(
             (f * areaMax) / squareArea,
             squareArea / (f * areaMin)
         )
@@ -53378,15 +53807,15 @@ function position(row, rowFixedLength, rect, halfGapWidth, flush) {
         var step = rowOtherLength
             ? node.getLayout().area / rowOtherLength : 0;
 
-        var wh1 = nodeLayout[wh[idx1WhenH]] = mathMax$4(rowOtherLength - 2 * halfGapWidth, 0);
+        var wh1 = nodeLayout[wh[idx1WhenH]] = mathMax$5(rowOtherLength - 2 * halfGapWidth, 0);
 
         // We use Math.max/min to avoid negative width/height when considering gap width.
         var remain = rect[xy[idx0WhenH]] + rect[wh[idx0WhenH]] - last;
         var modWH = (i === rowLen - 1 || remain < step) ? remain : step;
-        var wh0 = nodeLayout[wh[idx0WhenH]] = mathMax$4(modWH - 2 * halfGapWidth, 0);
+        var wh0 = nodeLayout[wh[idx0WhenH]] = mathMax$5(modWH - 2 * halfGapWidth, 0);
 
-        nodeLayout[xy[idx1WhenH]] = rect[xy[idx1WhenH]] + mathMin$4(halfGapWidth, wh1 / 2);
-        nodeLayout[xy[idx0WhenH]] = last + mathMin$4(halfGapWidth, wh0 / 2);
+        nodeLayout[xy[idx1WhenH]] = rect[xy[idx1WhenH]] + mathMin$5(halfGapWidth, wh1 / 2);
+        nodeLayout[xy[idx0WhenH]] = last + mathMin$5(halfGapWidth, wh0 / 2);
 
         last += modWH;
         node.setLayout(nodeLayout, true);
@@ -56943,7 +57372,7 @@ var GaugeView = Chart.extend({
         var prevEndAngle = startAngle;
         var axisLineWidth = lineStyleModel.get('width');
         var showAxis = axisLineModel.get('show');
-        
+
         for (var i = 0; showAxis && i < colorList.length; i++) {
             // Clamp
             var percent = Math.min(Math.max(colorList[i][0], 0), 1);
@@ -57733,7 +58162,7 @@ function labelLayout$1(data) {
                 x2 = x1 - labelLineLen;
                 textX = x2 - 5;
                 textAlign = 'right';
-            } 
+            }
             else if (labelPosition === 'right') {
                 // Right side
                 x1 = (points[1][0] + points[2][0]) / 2;
@@ -57741,7 +58170,7 @@ function labelLayout$1(data) {
                 x2 = x1 + labelLineLen;
                 textX = x2 + 5;
                 textAlign = 'left';
-            } 
+            }
             else if (labelPosition === 'rightTop') {
                 // RightTop side
                 x1 = points[1][0];
@@ -57749,7 +58178,7 @@ function labelLayout$1(data) {
                 x2 = x1 + labelLineLen;
                 textX = x2 + 5;
                 textAlign = 'top';
-            } 
+            }
             else if (labelPosition === 'rightBottom') {
                 // RightBottom side
                 x1 = points[2][0];
@@ -57757,7 +58186,7 @@ function labelLayout$1(data) {
                 x2 = x1 + labelLineLen;
                 textX = x2 + 5;
                 textAlign = 'bottom';
-            } 
+            }
             else if (labelPosition === 'leftTop') {
                 // LeftTop side
                 x1 = points[0][0];
@@ -57765,7 +58194,7 @@ function labelLayout$1(data) {
                 x2 = x1 - labelLineLen;
                 textX = x2 - 5;
                 textAlign = 'right';
-            } 
+            }
             else if (labelPosition === 'leftBottom') {
                 // LeftBottom side
                 x1 = points[3][0];
@@ -57773,7 +58202,7 @@ function labelLayout$1(data) {
                 x2 = x1 - labelLineLen;
                 textX = x2 - 5;
                 textAlign = 'right';
-            } 
+            }
             else {
                 // Right side
                 x1 = (points[1][0] + points[2][0]) / 2;
@@ -58175,8 +58604,8 @@ function restrict$1(value, extend) {
  */
 
 var each$11 = each$1;
-var mathMin$5 = Math.min;
-var mathMax$5 = Math.max;
+var mathMin$6 = Math.min;
+var mathMax$6 = Math.max;
 var mathFloor$2 = Math.floor;
 var mathCeil$2 = Math.ceil;
 var round$2 = round$1;
@@ -58627,8 +59056,8 @@ Parallel.prototype = {
         else {
             var winSize = axisExpandWindow[1] - axisExpandWindow[0];
             var pos = extent[1] * pointCoord / winSize;
-            axisExpandWindow = [mathMax$5(0, pos - winSize / 2)];
-            axisExpandWindow[1] = mathMin$5(extent[1], axisExpandWindow[0] + winSize);
+            axisExpandWindow = [mathMax$6(0, pos - winSize / 2)];
+            axisExpandWindow[1] = mathMin$6(extent[1], axisExpandWindow[0] + winSize);
             axisExpandWindow[0] = axisExpandWindow[1] - winSize;
         }
 
@@ -58640,7 +59069,7 @@ Parallel.prototype = {
 };
 
 function restrict(len, extent) {
-    return mathMin$5(mathMax$5(len, extent[0]), extent[1]);
+    return mathMin$6(mathMax$6(len, extent[0]), extent[1]);
 }
 
 function layoutAxisWithoutExpand(axisIndex, layoutInfo) {
@@ -59095,8 +59524,8 @@ registerAction('parallelAxisExpand', function (payload, ecModel) {
 var curry$2 = curry;
 var each$12 = each$1;
 var map$2 = map;
-var mathMin$6 = Math.min;
-var mathMax$6 = Math.max;
+var mathMin$7 = Math.min;
+var mathMax$7 = Math.max;
 var mathPow$2 = Math.pow;
 
 var COVER_Z = 10000;
@@ -59615,7 +60044,7 @@ function createBaseRectCover(doDrift, controller, brushOption, edgeNames) {
 
 function updateBaseRect(controller, cover, localRange, brushOption) {
     var lineWidth = brushOption.brushStyle.lineWidth || 0;
-    var handleSize = mathMax$6(lineWidth, MIN_RESIZE_LINE_WIDTH);
+    var handleSize = mathMax$7(lineWidth, MIN_RESIZE_LINE_WIDTH);
     var x = localRange[0][0];
     var y = localRange[1][0];
     var xa = x - lineWidth / 2;
@@ -59682,8 +60111,8 @@ function makeStyle(brushOption) {
 }
 
 function formatRectRange(x, y, x2, y2) {
-    var min = [mathMin$6(x, x2), mathMin$6(y, y2)];
-    var max = [mathMax$6(x, x2), mathMax$6(y, y2)];
+    var min = [mathMin$7(x, x2), mathMin$7(y, y2)];
+    var max = [mathMax$7(x, x2), mathMax$7(y, y2)];
 
     return [
         [min[0], max[0]], // x range
@@ -59763,10 +60192,10 @@ function clipByPanel(controller, cover, data) {
 }
 
 function pointsToRect(points) {
-    var xmin = mathMin$6(points[0][0], points[1][0]);
-    var ymin = mathMin$6(points[0][1], points[1][1]);
-    var xmax = mathMax$6(points[0][0], points[1][0]);
-    var ymax = mathMax$6(points[0][1], points[1][1]);
+    var xmin = mathMin$7(points[0][0], points[1][0]);
+    var ymin = mathMin$7(points[0][1], points[1][1]);
+    var xmax = mathMax$7(points[0][0], points[1][0]);
+    var ymax = mathMax$7(points[0][1], points[1][1]);
 
     return {
         x: xmin,
@@ -60042,8 +60471,8 @@ function getLineRenderer(xyIndex) {
         },
         getCreatingRange: function (localTrack) {
             var ends = getTrackEnds(localTrack);
-            var min = mathMin$6(ends[0][xyIndex], ends[1][xyIndex]);
-            var max = mathMax$6(ends[0][xyIndex], ends[1][xyIndex]);
+            var min = mathMin$7(ends[0][xyIndex], ends[1][xyIndex]);
+            var max = mathMax$7(ends[0][xyIndex], ends[1][xyIndex]);
 
             return [min, max];
         },
@@ -60664,7 +61093,7 @@ var ParallelView = Chart.extend({
         // First create
         if (!this._initialized) {
             this._initialized = true;
-            var clipPath = createGridClipShape$1(
+            var clipPath = createGridClipShape(
                 coordSys, seriesModel, function () {
                     // Callback will be invoked immediately if there is no animation
                     setTimeout(function () {
@@ -60737,7 +61166,7 @@ var ParallelView = Chart.extend({
     }
 });
 
-function createGridClipShape$1(coordSys, seriesModel, cb) {
+function createGridClipShape(coordSys, seriesModel, cb) {
     var parallelModel = coordSys.model;
     var rect = coordSys.getRect();
     var rectEl = new Rect({
@@ -61450,7 +61879,7 @@ extendChartView({
         });
 
         if (!this._data && seriesModel.get('animation')) {
-            group.setClipPath(createGridClipShape$2(group.getBoundingRect(), seriesModel, function () {
+            group.setClipPath(createGridClipShape$1(group.getBoundingRect(), seriesModel, function () {
                 group.removeClipPath();
             }));
         }
@@ -61532,7 +61961,7 @@ extendChartView({
 });
 
 // Add animation to the view
-function createGridClipShape$2(rect, seriesModel, cb) {
+function createGridClipShape$1(rect, seriesModel, cb) {
     var rectEl = new Rect({
         shape: {
             x: rect.x - 10,
@@ -61572,7 +62001,7 @@ function createGridClipShape$2(rect, seriesModel, cb) {
 
 registerAction({
     type: 'dragNode',
-    event: 'dragNode',
+    event: 'dragnode',
     // here can only use 'update' now, other value is not support in echarts.
     update: 'update'
 }, function (payload, ecModel) {
@@ -63463,7 +63892,7 @@ var candlestickLayout = {
 
         function largeProgress(params, data) {
             // Structure: [sign, x, yhigh, ylow, sign, x, yhigh, ylow, ...]
-            var points = new LargeArr$1(params.count * 5);
+            var points = new LargeArr$1(params.count * 4);
             var offset = 0;
             var point;
             var tmpIn = [];
@@ -63479,7 +63908,7 @@ var candlestickLayout = {
 
                 if (isNaN(axisDimVal) || isNaN(lowestVal) || isNaN(highestVal)) {
                     points[offset++] = NaN;
-                    offset += 4;
+                    offset += 3;
                     continue;
                 }
 
@@ -63682,13 +64111,14 @@ function normalizeSymbolSize$1(symbolSize) {
 }
 
 function updateRipplePath(rippleGroup, effectCfg) {
+    var color = effectCfg.rippleEffectColor || effectCfg.color;
     rippleGroup.eachChild(function (ripplePath) {
         ripplePath.attr({
             z: effectCfg.z,
             zlevel: effectCfg.zlevel,
             style: {
-                stroke: effectCfg.brushType === 'stroke' ? effectCfg.color : null,
-                fill: effectCfg.brushType === 'fill' ? effectCfg.color : null
+                stroke: effectCfg.brushType === 'stroke' ? color : null,
+                fill: effectCfg.brushType === 'fill' ? color : null
             }
         });
     });
@@ -63725,9 +64155,6 @@ effectSymbolProto.startEffectAnimation = function (effectCfg) {
     var rippleGroup = this.childAt(1);
 
     for (var i = 0; i < EFFECT_RIPPLE_NUMBER; i++) {
-        // var ripplePath = createSymbol(
-        //     symbolType, -0.5, -0.5, 1, 1, color
-        // );
         // If width/height are set too small (e.g., set to 1) on ios10
         // and macOS Sierra, a circle stroke become a rect, no matter what
         // the scale is set. So we set width/height as 2. See #4136.
@@ -63842,6 +64269,7 @@ effectSymbolProto.updateData = function (data, idx) {
     effectCfg.zlevel = itemModel.getShallow('zlevel') || 0;
     effectCfg.symbolType = symbolType;
     effectCfg.color = color;
+    effectCfg.rippleEffectColor = itemModel.get('rippleEffect.color');
 
     this.off('mouseover').off('mouseout').off('emphasis').off('normal');
 
@@ -64281,6 +64709,10 @@ var LinesSeries = SeriesModel.extend({
         // polyline not support curveness, label, animation
         polyline: false,
 
+        // If clip the overflow.
+        // Available when coordinateSystem is cartesian or polar.
+        clip: true,
+
         label: {
             show: false,
             position: 'end'
@@ -65116,6 +65548,16 @@ extendChartView({
 
         lineDraw.updateData(data);
 
+        var clipPath = seriesModel.get('clip', true) && createClipPath(
+            seriesModel.coordinateSystem, false, seriesModel
+        );
+        if (clipPath) {
+            this.group.setClipPath(clipPath);
+        }
+        else {
+            this.group.removeClipPath();
+        }
+
         this._lastZlevel = zlevel;
 
         this._finished = true;
@@ -67248,9 +67690,8 @@ function layout$2(axisModel, opt) {
 
     var directionMap = {top: -1, bottom: 1, right: 1, left: -1};
 
-    layout.labelDirection = layout.tickDirection
-        = layout.nameDirection
-        = directionMap[axisPosition];
+    layout.labelDirection = layout.tickDirection =
+        layout.nameDirection = directionMap[axisPosition];
 
     if (axisModel.get('axisTick.inside')) {
         layout.tickDirection = -layout.tickDirection;
@@ -68409,8 +68850,8 @@ BaseAxisPointer.prototype = {
         }
         this._lastGraphicKey = graphicKey;
 
-        var moveAnimation = this._moveAnimation
-            = this.determineAnimation(axisModel, axisPointerModel);
+        var moveAnimation = this._moveAnimation =
+            this.determineAnimation(axisModel, axisPointerModel);
 
         if (!group) {
             group = this._group = new Group();
@@ -69220,8 +69661,8 @@ registerPreprocessor(function (option) {
 registerProcessor(PRIORITY.PROCESSOR.STATISTIC, function (ecModel, api) {
     // Build axisPointerModel, mergin tooltip.axisPointer model for each axis.
     // allAxesInfo should be updated when setOption performed.
-    ecModel.getComponent('axisPointer').coordSysAxesInfo
-        = collect(ecModel, api);
+    ecModel.getComponent('axisPointer').coordSysAxesInfo =
+        collect(ecModel, api);
 });
 
 // Broadcast to all views.
@@ -69777,7 +70218,7 @@ extendChartView({
                 layerGroup.add(text);
                 group.add(layerGroup);
 
-                polygon.setClipPath(createGridClipShape$3(polygon.getBoundingRect(), seriesModel, function () {
+                polygon.setClipPath(createGridClipShape$2(polygon.getBoundingRect(), seriesModel, function () {
                     polygon.removeClipPath();
                 }));
             }
@@ -69830,7 +70271,7 @@ extendChartView({
 });
 
 // add animation to the view
-function createGridClipShape$3(rect, seriesModel, cb) {
+function createGridClipShape$2(rect, seriesModel, cb) {
     var rectEl = new Rect({
         shape: {
             x: rect.x - 10,
@@ -70570,7 +71011,8 @@ SunburstPieceProto._updateLabel = function (seriesModel, visualColor, state) {
         else if (rotate < -Math.PI / 2) {
             rotate += Math.PI;
         }
-    } else if (typeof rotateType === 'number') {
+    }
+    else if (typeof rotateType === 'number') {
         rotate = rotateType * Math.PI / 180;
     }
     label.attr('rotation', rotate);
@@ -71052,6 +71494,7 @@ registerAction(
 */
 
 
+// var PI2 = Math.PI * 2;
 var RADIAN$2 = Math.PI / 180;
 
 var sunburstLayout = function (seriesType, ecModel, api, payload) {
@@ -71104,6 +71547,9 @@ var sunburstLayout = function (seriesType, ecModel, api, payload) {
         var stillShowZeroSum = seriesModel.get('stillShowZeroSum');
 
         // In the case some sector angle is smaller than minAngle
+        // var restAngle = PI2;
+        // var valueSumLargerThanMinAngle = 0;
+
         var dir = clockwise ? 1 : -1;
 
         /**
@@ -71126,11 +71572,11 @@ var sunburstLayout = function (seriesType, ecModel, api, payload) {
                     ? unitRadian : (value * unitRadian);
                 if (angle < minAngle) {
                     angle = minAngle;
-                    
-                }
-                else {
-                    
+                    // restAngle -= minAngle;
                 }
+                // else {
+                //     valueSumLargerThanMinAngle += value;
... 37900 lines suppressed ...


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org