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 2020/04/25 21:08:53 UTC
[incubator-echarts] 08/08: Merge branch 'next' into
custom-series-enhance
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch attached-text
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 3687f4ba2ab5ebd284c34a65c7da7eee9566f23c
Merge: b35d798 a96d971
Author: 100pah <su...@gmail.com>
AuthorDate: Sun Apr 26 05:04:09 2020 +0800
Merge branch 'next' into custom-series-enhance
# Conflicts:
# src/util/graphic.ts
.eslintignore | 3 +-
src/chart/boxplot/boxplotLayout.ts | 2 +-
src/chart/candlestick/candlestickLayout.ts | 2 +-
src/chart/graph/GraphSeries.ts | 46 +++---
src/chart/graph/simpleLayout.ts | 2 +-
src/chart/helper/labelHelper.ts | 2 +-
src/chart/sankey/SankeySeries.ts | 36 +++--
src/chart/sankey/SankeyView.ts | 2 +-
src/component/axisPointer/axisTrigger.ts | 2 +-
src/component/dataZoom/AxisProxy.ts | 4 +-
src/component/tooltip/TooltipView.ts | 10 ++
src/coord/cartesian/Grid.ts | 2 +-
src/coord/polar/polarCreator.ts | 4 +-
src/coord/single/Single.ts | 2 +-
src/data/List.ts | 24 +--
src/echarts.ts | 3 +
src/model/Model.ts | 72 ++++-----
src/model/Series.ts | 8 +-
src/model/mixin/dataFormat.ts | 15 +-
src/util/graphic.ts | 3 -
src/visual/helper.ts | 2 +
src/visual/style.ts | 32 +++-
test/pie-visual.html | 252 +++++++++++++++++++++++++++++
23 files changed, 404 insertions(+), 126 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org