This is an automated email from the ASF dual-hosted git repository. sushuang pushed a commit to branch decal-custom in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 23d617a9d4affdabe2425f1556884a8183898a31 Merge: 59e0ad3 a172154 Author: 100pah <[email protected]> AuthorDate: Sun Nov 1 17:36:50 2020 +0800 Merge branch 'release' into decal-custom # Conflicts: # test/decal.html src/chart/line/LineView.ts | 5 ++--- src/component/dataZoom/DataZoomModel.ts | 11 +++++------ src/component/timeline/SliderTimelineView.ts | 2 +- src/scale/Interval.ts | 4 ++-- src/scale/Ordinal.ts | 25 +++++++++++++++---------- src/scale/Scale.ts | 10 +++++----- src/scale/Time.ts | 17 ++++++++++------- src/util/decal.ts | 10 +++++++--- src/util/states.ts | 5 ++++- src/util/types.ts | 3 ++- test/browser-esm.html | 2 +- test/custom-hexbin.html | 8 ++++---- test/decal.html | 19 +++++++++++++++---- test/graph.html | 12 ++++++++---- test/hoverStyle.html | 4 ++-- test/runTest/actions/__meta__.json | 27 +++++++++++++++++---------- test/runTest/actions/appendData.json | 2 +- test/runTest/actions/axis-interval2.json | 2 +- test/runTest/actions/brush.json | 2 +- test/runTest/actions/calendar-month.json | 2 +- test/runTest/actions/clip.json | 2 +- test/runTest/actions/color-mix-aqi.json | 2 +- test/runTest/actions/connect-dynamic.json | 2 +- test/runTest/actions/connect.json | 2 +- test/runTest/actions/connect2.json | 2 +- test/runTest/actions/custom-hexbin.json | 2 +- test/runTest/actions/dataSelect.json | 1 + test/runTest/actions/dataZoom-action.json | 2 +- test/runTest/actions/dataZoom-axes.json | 2 +- test/runTest/actions/dataZoom-rainfall.json | 2 +- test/runTest/actions/dataZoom-scatter-hv.json | 2 +- test/runTest/actions/dataZoom-toolbox.json | 2 +- test/runTest/actions/decal.json | 1 + test/runTest/actions/funnel.json | 2 +- test/runTest/actions/geo-map.json | 2 +- test/runTest/actions/getOption.json | 2 +- test/runTest/actions/heatmap.json | 2 +- test/runTest/actions/homepage3.json | 2 +- test/runTest/actions/hoverFocus.json | 1 + test/runTest/actions/hoverFocus2.json | 1 + test/runTest/actions/hoverStyle.json | 2 +- test/runTest/actions/label-layout.json | 1 + test/runTest/actions/legend.json | 2 +- test/runTest/actions/line-boldWhenHover.json | 1 + test/runTest/actions/mapWorld.json | 2 +- test/runTest/actions/markArea.json | 2 +- test/runTest/actions/pie-calculable.json | 2 +- test/runTest/actions/pie-label-extreme.json | 1 + test/runTest/actions/scatter-single-axis.json | 2 +- test/runTest/client/client.js | 4 +--- test/runTest/recorder/recorder.js | 12 +++++++----- test/runTest/server.js | 4 ++-- test/visualMap-continuous.html | 7 +++---- 53 files changed, 146 insertions(+), 104 deletions(-) diff --cc test/decal.html index e8420ef,ab7bbf9..efa248a --- a/test/decal.html +++ b/test/decal.html @@@ -180,7 -185,8 +190,8 @@@ under the License title: [ 'It should use decal when aria.show is true', '(1) Each bar and pie piece should have different decal', - '(2) The first bar and pie piece decal should be **blue**' - '(2) The first bar decal should be blue', ++ '(2) The first bar and pie piece decal should be **blue**', + '(3) The second and third bar should not have decal' ], option: option // height: 300, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
