Skip to content

Commit c3f1f54

Browse files
committed
refactor(tooltip): improve rich tooltip
1 parent 8721d29 commit c3f1f54

File tree

5 files changed

+8
-18
lines changed

5 files changed

+8
-18
lines changed

src/component/tooltip/TooltipModel.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ export default echarts.extendComponentModel({
4646

4747
displayMode: 'single', // 'single' | 'multipleByCoordSys'
4848

49-
renderMode: 'auto', // 'auto' | 'html' | 'richtext'
49+
renderMode: 'auto', // 'auto' | 'html' | 'richText'
5050
// 'auto': use html by default, and use non-html if `document` is not defined
5151
// 'html': use html for tooltip
52-
// 'richtext': use canvas, svg, and etc. for tooltip
52+
// 'richText': use canvas, svg, and etc. for tooltip
5353

5454
// 位置 {Array} | {Function}
5555
// position: null

src/component/tooltip/TooltipRichContent.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,6 @@ TooltipRichContent.prototype = {
119119
}
120120
self._inContent = true;
121121
});
122-
this.el.on('mousemove', function (e) {
123-
e = e || window.event;
124-
if (!self._enterable) {
125-
// Try trigger zrender event to avoid mouse
126-
// in and out shape too frequently
127-
var handler = zr.handler;
128-
eventUtil.normalizeEvent(container, e, true);
129-
handler.dispatch('mousemove', e);
130-
}
131-
});
132122
this.el.on('mouseout', function () {
133123
if (self._enterable) {
134124
if (self._show) {

src/component/tooltip/TooltipView.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ export default echarts.extendComponentView({
5353
var renderMode = tooltipModel.get('renderMode');
5454
this._renderMode = 'html';
5555
if (renderMode === 'auto') {
56-
// using html when `document` exists, use richtext otherwise
57-
this._renderMode = document ? 'html' : 'richtext';
56+
// using html when `document` exists, use richText otherwise
57+
this._renderMode = env.domSupported ? 'html' : 'richText';
5858
}
5959
else {
6060
this._renderMode = renderMode || this._renderMode;

src/model/Series.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,10 +303,10 @@ var SeriesModel = ComponentModel.extend({
303303
* @param {number} dataIndex
304304
* @param {boolean} [multipleSeries=false]
305305
* @param {number} [dataType]
306-
* @param {string} [renderMode='html'] valid values: 'html' and 'richtext'.
306+
* @param {string} [renderMode='html'] valid values: 'html' and 'richText'.
307307
* 'html' is used for rendering tooltip in extra DOM form, and the result
308308
* string is used as DOM HTML content.
309-
* 'richtext' is used for rendering tooltip in rich text form, for those where
309+
* 'richText' is used for rendering tooltip in rich text form, for those where
310310
* DOM operation is not supported.
311311
* @return {Object} formatted tooltip with `html` and `markers`
312312
*/
@@ -315,7 +315,7 @@ var SeriesModel = ComponentModel.extend({
315315
var series = this;
316316
renderMode = renderMode || 'html';
317317
var newLine = renderMode === 'html' ? '<br/>' : '\n';
318-
var isRichText = renderMode === 'richtext';
318+
var isRichText = renderMode === 'richText';
319319
var markers = {};
320320
var markerId = 0;
321321

src/util/format.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export function formatTplSimple(tpl, param, encode) {
136136
* @param {string} [opt.color]
137137
* @param {string} [opt.extraCssText]
138138
* @param {string} [opt.type='item'] 'item' or 'subItem'
139-
* @param {string} [opt.renderMode='html'] render mode of tooltip, 'html' or 'richtext'
139+
* @param {string} [opt.renderMode='html'] render mode of tooltip, 'html' or 'richText'
140140
* @param {string} [opt.markerId='X'] id name for marker. If only one marker is in a rich text, this can be omitted.
141141
* @return {string}
142142
*/

0 commit comments

Comments
 (0)