You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by sh...@apache.org on 2020/08/04 13:50:00 UTC
[incubator-echarts] 01/01: Merge pull request #12664 from
apache/fix-12232
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit be6ad17d0e1946506c2bef9fea88b059c59ad5dc
Merge: 2e8961b 0cf0b50
Author: Yi Shen <bm...@gmail.com>
AuthorDate: Tue Aug 4 21:49:45 2020 +0800
Merge pull request #12664 from apache/fix-12232
fix(tooltip): richText for series-specific formatters #12232
src/chart/map/MapSeries.js | 5 +-
src/chart/radar/RadarSeries.js | 7 +-
src/component/marker/MarkerModel.js | 5 +-
src/component/tooltip/TooltipContent.js | 15 +-
src/component/tooltip/TooltipRichContent.js | 16 +-
test/tooltip-textStyle.html | 455 ++++++++++++++++++++++++++++
6 files changed, 491 insertions(+), 12 deletions(-)
diff --cc src/component/tooltip/TooltipRichContent.js
index 1c57433,6337789..8fc7084
--- a/src/component/tooltip/TooltipRichContent.js
+++ b/src/component/tooltip/TooltipRichContent.js
@@@ -20,15 -20,8 +20,16 @@@
import * as zrUtil from 'zrender/src/core/util';
// import Group from 'zrender/src/container/Group';
import Text from 'zrender/src/graphic/Text';
+ import * as graphicUtil from '../../util/graphic';
+
+function makeStyleCoord(out, zr, zrX, zrY) {
+ out[0] = zrX;
+ out[1] = zrY;
+ out[2] = out[0] / zr.getWidth(); // The ratio of left to width
+ out[3] = out[1] / zr.getHeight(); // The ratio of top to height
+}
+
/**
* @alias module:echarts/component/tooltip/TooltipRichContent
* @constructor
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org