Tooltip in data item can be simply a string

src/component/tooltip/TooltipView.js

@@ -467,9 +467,7 @@ define(function (require) {
                     tooltipOpt = {
                         content: content,
                         // Fixed formatter
-                        formatter: function () {
-                            return content;
-                        }
+                        formatter: content
                     };
                 }
                 var subTooltipModel = new Model(tooltipOpt, tooltipModel);
@@ -1009,17 +1007,23 @@ define(function (require) {
             var data = seriesModel.getData(dataType);
             var itemModel = data.getItemModel(dataIndex);
 
-            var rootTooltipModel = this._tooltipModel;
-
-            var tooltipModel = itemModel.getModel('tooltip');
-
-            // If series model
-            if (tooltipModel.parentModel) {
-                tooltipModel.parentModel.parentModel = rootTooltipModel;
-            }
-            else {
-                tooltipModel.parentModel = this._tooltipModel;
+            var tooltipOpt = itemModel.get('tooltip', true);
+            if (typeof tooltipOpt === 'string') {
+                // In each data item tooltip can be simply write:
+                // {
+                //  value: 10,
+                //  tooltip: 'Something you need to know'
+                // }
+                var tooltipContent = tooltipOpt;
+                tooltipOpt = {
+                    formatter: tooltipContent
+                };
             }
+            var rootTooltipModel = this._tooltipModel;
+            var seriesTooltipModel = seriesModel.getModel(
+                'tooltip', rootTooltipModel
+            );
+            var tooltipModel = new Model(tooltipOpt, seriesTooltipModel, seriesTooltipModel.ecModel);
 
             var params = seriesModel.getDataParams(dataIndex, dataType);
             var defaultHtml = seriesModel.formatTooltip(dataIndex, false, dataType);

test/tooltip.html

@@ -48,7 +48,7 @@
 
                 chart.setOption({
                     legend: {
-                        data: ['坐标轴触发1', '坐标轴触发2'],
+                        data: ['坐标轴触发1', '坐标轴触发2', '数据项触发', '不显示的数据项触发'],
                         tooltip: {
                             show: true,
                             formatter: null
@@ -129,7 +129,7 @@
                             data:[862, 1018, 964, 1026, 1679, 1600, 157]
                         },
                         {
-                            name:'数据项触发1',
+                            name:'数据项触发',
                             type:'bar',
                             tooltip : {             // Series config.
                                 trigger: 'item',
@@ -139,7 +139,10 @@
                             },
                             stack: '数据项',
                             data:[
-                                120, 132,
+                                {
+                                    value: 120,
+                                    tooltip: '我是一个简单的字符串'
+                                }, 132,
                                 {
                                     value: 301,
                                     itemStyle: {normal: {color: 'red'}},
@@ -151,13 +154,19 @@
                                 134, 90,
                                 {
                                     value: 230,
+                                    label: {
+                                        normal: {
+                                            show: true,
+                                            formatter: '我不显示 tooltip'
+                                        }
+                                    },
                                     tooltip: {show: false}
                                 },
                                 210
                             ]
                         },
                         {
-                            name:'数据项触发2',
+                            name:'不显示的数据项触发',
                             type:'bar',
                             tooltip : {
                                 show : false,