This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch fix-legend in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 635d986b92e722841b77eb0ad41d7824335a7306 Merge: a654399 88d2ad7 Author: Ovilia <zwl.s...@gmail.com> AuthorDate: Wed Mar 17 15:55:08 2021 +0800 Merge branch 'master' into fix-legend LICENSE | 9 +- src/chart/sankey/SankeyView.ts | 3 +- src/component/axis/AxisBuilder.ts | 34 +-- src/component/brush/BrushModel.ts | 5 + src/component/dataZoom/SliderZoomView.ts | 5 +- src/component/graphic/install.ts | 16 +- src/component/legend/LegendView.ts | 26 +- src/component/toolbox/ToolboxModel.ts | 3 +- src/component/toolbox/ToolboxView.ts | 28 +- src/component/tooltip/TooltipView.ts | 154 ++++++++-- src/i18n/langCS.ts | 142 ++++++++++ src/model/Series.ts | 4 +- src/util/format.ts | 2 +- src/util/graphic.ts | 56 +++- src/util/innerStore.ts | 17 +- src/util/model.ts | 68 +++-- src/util/types.ts | 28 +- test/line-non-continuous.html | 75 +++++ test/runTest/actions/__meta__.json | 1 + test/tooltip-component.html | 467 +++++++++++++++++++++++++++++++ 20 files changed, 1009 insertions(+), 134 deletions(-) diff --cc src/component/legend/LegendView.ts index c4374fe,694e132..ff643af --- a/src/component/legend/LegendView.ts +++ b/src/component/legend/LegendView.ts @@@ -33,13 -33,8 +33,12 @@@ import ZRColor, ItemStyleOption, ZRRectLike, - ECElement, CommonTooltipOption, - ColorString + ColorString, + SeriesOption, + SymbolOptionMixin, + LineStyleOption, + DecalObject } from '../../util/types'; import Model from '../../model/Model'; import Displayable, { DisplayableState } from 'zrender/src/graphic/Displayable'; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org