This is an automated email from the ASF dual-hosted git repository. zakwu pushed a commit to branch fix-10537 in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 423d6ec20482c6a95121db2b1aaba4537570b188 Author: zakwu <123537...@qq.com> AuthorDate: Tue Sep 15 11:17:27 2020 +0800 fix(tooltipView): radar.tooltip.trigger.axis no effect, fix 10537 --- src/component/tooltip/TooltipView.ts | 3 +- test/radar.html | 91 ++++++++++++++++++++++++++++++++++-- 2 files changed, 90 insertions(+), 4 deletions(-) diff --git a/src/component/tooltip/TooltipView.ts b/src/component/tooltip/TooltipView.ts index d877177..50386d1 100644 --- a/src/component/tooltip/TooltipView.ts +++ b/src/component/tooltip/TooltipView.ts @@ -628,8 +628,9 @@ class TooltipView extends ComponentView { this._tooltipModel ]); + // fix 10537 const tooltipTrigger = tooltipModel.get('trigger'); - if (tooltipTrigger != null && tooltipTrigger !== 'item') { + if (!tooltipTrigger || tooltipTrigger === 'none') { return; } diff --git a/test/radar.html b/test/radar.html index c071474..6d687a8 100644 --- a/test/radar.html +++ b/test/radar.html @@ -26,12 +26,17 @@ under the License. </head> <body> <style> - html, body, #main { + html, body { width: 100%; height: 100%; } + #main, #main1 { + width: 100%; + height: 800px; + } </style> <div id="main"></div> + <div id="main1"></div> <script> require([ @@ -47,7 +52,8 @@ under the License. aria: { show: true }, - tooltip: {}, + tooltip: { + }, legend: { data: ['预算分配(Allocated Budget)', '实际开销(Actual Spending)含有 "-" 数据', '第一个元素是 null'] }, @@ -109,5 +115,84 @@ under the License. }); </script> + <script> + + require([ + 'echarts' + // 'echarts/chart/radar', + // 'echarts/component/legend', + // 'echarts/component/tooltip' + ], function (echarts) { + + var chart = echarts.init(document.getElementById('main1')); + + chart.setOption({ + aria: { + show: true + }, + tooltip: { + // fix 10537 + trigger: 'axis' + }, + legend: { + data: ['预算分配(Allocated Budget)', '实际开销(Actual Spending)含有 "-" 数据', '第一个元素是 null'] + }, + radar: { + radius: [50, '70%'], + name: { + formatter:'【{value}】', + color:'#72ACD1' + }, + triggerEvent: true, + // shape: 'circle', + indicator: [ + { text: '销售(sales)', max: 100}, + { text: '管理(Administration)', max: 16000}, + { text: '信息技术(Information Techology)', max: 30000}, + { text: '客服(Customer Support)', max: 38000}, + { text: '研发(Development)', max: 52000}, + { text: '市场(Marketing)', max: 25000} + ] + }, + series: [{ + name: '预算 vs 开销(Budget vs spending)', + type: 'radar', + label: { + normal: { + show: true + } + }, + // areaStyle: {normal: {}}, + data : [ + { + value : [0, 10000, 28000, 35000, 50000, 19000], + name : '预算分配(Allocated Budget)' + }, + { + value : [50, 14000, 28000, 31000, '-', 21000], + name : '实际开销(Actual Spending)含有 "-" 数据' + }, + { + value: ['-', 8000, 20000, 20000, 40000, 10000], + name: '第一个元素是 null' + } + ] + }] + }); + var theIndex = 2; + chart.on('click', function (params) { + console.log(params); + if (theIndex < 0) { + theIndex = 2; + } + chart.dispatchAction({ + type: 'showTip', + seriesIndex: 0, + dataIndex: theIndex + }); + theIndex--; + }); + }); + </script> </body> -</html> \ No newline at end of file +</html> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org