提交 c3f1f549 编写于 作者: O Ovilia

refactor(tooltip): improve rich tooltip

上级 8721d295
......@@ -46,10 +46,10 @@ export default echarts.extendComponentModel({
displayMode: 'single', // 'single' | 'multipleByCoordSys'
renderMode: 'auto', // 'auto' | 'html' | 'richtext'
renderMode: 'auto', // 'auto' | 'html' | 'richText'
// 'auto': use html by default, and use non-html if `document` is not defined
// 'html': use html for tooltip
// 'richtext': use canvas, svg, and etc. for tooltip
// 'richText': use canvas, svg, and etc. for tooltip
// 位置 {Array} | {Function}
// position: null
......
......@@ -119,16 +119,6 @@ TooltipRichContent.prototype = {
}
self._inContent = true;
});
this.el.on('mousemove', function (e) {
e = e || window.event;
if (!self._enterable) {
// Try trigger zrender event to avoid mouse
// in and out shape too frequently
var handler = zr.handler;
eventUtil.normalizeEvent(container, e, true);
handler.dispatch('mousemove', e);
}
});
this.el.on('mouseout', function () {
if (self._enterable) {
if (self._show) {
......
......@@ -53,8 +53,8 @@ export default echarts.extendComponentView({
var renderMode = tooltipModel.get('renderMode');
this._renderMode = 'html';
if (renderMode === 'auto') {
// using html when `document` exists, use richtext otherwise
this._renderMode = document ? 'html' : 'richtext';
// using html when `document` exists, use richText otherwise
this._renderMode = env.domSupported ? 'html' : 'richText';
}
else {
this._renderMode = renderMode || this._renderMode;
......
......@@ -303,10 +303,10 @@ var SeriesModel = ComponentModel.extend({
* @param {number} dataIndex
* @param {boolean} [multipleSeries=false]
* @param {number} [dataType]
* @param {string} [renderMode='html'] valid values: 'html' and 'richtext'.
* @param {string} [renderMode='html'] valid values: 'html' and 'richText'.
* 'html' is used for rendering tooltip in extra DOM form, and the result
* string is used as DOM HTML content.
* 'richtext' is used for rendering tooltip in rich text form, for those where
* 'richText' is used for rendering tooltip in rich text form, for those where
* DOM operation is not supported.
* @return {Object} formatted tooltip with `html` and `markers`
*/
......@@ -315,7 +315,7 @@ var SeriesModel = ComponentModel.extend({
var series = this;
renderMode = renderMode || 'html';
var newLine = renderMode === 'html' ? '<br/>' : '\n';
var isRichText = renderMode === 'richtext';
var isRichText = renderMode === 'richText';
var markers = {};
var markerId = 0;
......
......@@ -136,7 +136,7 @@ export function formatTplSimple(tpl, param, encode) {
* @param {string} [opt.color]
* @param {string} [opt.extraCssText]
* @param {string} [opt.type='item'] 'item' or 'subItem'
* @param {string} [opt.renderMode='html'] render mode of tooltip, 'html' or 'richtext'
* @param {string} [opt.renderMode='html'] render mode of tooltip, 'html' or 'richText'
* @param {string} [opt.markerId='X'] id name for marker. If only one marker is in a rich text, this can be omitted.
* @return {string}
*/
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册