Fix #3063 (params.data in click event are incorrect in treemap)

src/chart/graph/GraphView.js

@@ -46,9 +46,7 @@ define(function (require) {
 
             var edgeData = data.graph.edgeData;
             var rawOption = seriesModel.option;
-            var formatModel = modelUtil.createDataFormatModel(
-                seriesModel, edgeData, rawOption.edges || rawOption.links
-            );
+            var formatModel = modelUtil.createDataFormatModel(seriesModel, edgeData);
             formatModel.formatTooltip = function (dataIndex) {
                 var params = this.getDataParams(dataIndex);
                 var edge = data.graph.getEdgeByIndex(dataIndex);

src/chart/sankey/SankeyView.js

@@ -55,9 +55,7 @@ define(function (require) {
 
             var edgeData = graph.edgeData;
             var rawOption = seriesModel.option;
-            var formatModel = modelUtil.createDataFormatModel(
-                seriesModel, edgeData, rawOption.edges || rawOption.links
-            );
+            var formatModel = modelUtil.createDataFormatModel(seriesModel, edgeData);
 
             formatModel.formatTooltip = function (dataIndex) {
                 var params = this.getDataParams(dataIndex);

src/component/marker/MarkLineView.js

@@ -133,10 +133,6 @@ define(function (require) {
                 + ((name ? encodeHTML(name) + ' : ' : '') + formattedValue);
         },
 
-        getRawDataArray: function () {
-            return this.option.data;
-        },
-
         getData: function () {
             return this._data;
         },

src/component/marker/MarkPointView.js

@@ -45,10 +45,6 @@ define(function (require) {
 
     // FIXME
     var markPointFormatMixin = {
-        getRawDataArray: function () {
-            return this.option.data;
-        },
-
         formatTooltip: function (dataIndex) {
             var data = this.getData();
             var value = this.getRawValue(dataIndex);

src/component/timeline/SliderTimelineView.js

@@ -381,9 +381,7 @@ define(function (require) {
          * @private
          */
         _prepareTooltipHostModel: function (data, timelineModel) {
-            var tooltipHostModel = modelUtil.createDataFormatModel(
-                {}, data, timelineModel.get('data')
-            );
+            var tooltipHostModel = modelUtil.createDataFormatModel({}, data);
             var me = this;
 
             tooltipHostModel.formatTooltip = function (dataIndex) {

src/data/List.js

@@ -520,6 +520,15 @@ define(function (require) {
         return rawIdx == null ? -1 : rawIdx;
     };
 
+    /**
+     * Get raw data item
+     * @param {number} idx
+     * @return {number}
+     */
+    listProto.getRawDataItem = function (idx) {
+        return (this._rawData || [])[this.getRawIndex(idx)];
+    };
+
     /**
      * @param {number} idx
      * @param {boolean} [notDefaultIdx=false]

src/model/Series.js

@@ -125,14 +125,6 @@ define(function(require) {
             return this._dataBeforeProcessed;
         },
 
-        /**
-         * Get raw data array given by user
-         * @return {Array.<Object>}
-         */
-        getRawDataArray: function () {
-            return this.option.data;
-        },
-
         /**
          * Coord dimension to data dimension.
          *

src/util/model.js

@@ -182,9 +182,8 @@ define(function(require) {
      * @param {string} [opt.seriesIndex]
      * @param {Object} [opt.name]
      * @param {module:echarts/data/List} data
-     * @param {Array.<Object>} rawData
      */
-    modelUtil.createDataFormatModel = function (opt, data, rawData) {
+    modelUtil.createDataFormatModel = function (opt, data) {
         var model = new Model();
         zrUtil.mixin(model, modelUtil.dataFormatMixin);
         model.seriesIndex = opt.seriesIndex;
@@ -193,9 +192,6 @@ define(function(require) {
         model.getData = function () {
             return data;
         };
-        model.getRawDataArray = function () {
-            return rawData;
-        };
         return model;
     };
 
@@ -248,10 +244,7 @@ define(function(require) {
             var rawValue = this.getRawValue(dataIndex);
             var rawDataIndex = data.getRawIndex(dataIndex);
             var name = data.getName(dataIndex, true);
-
-            // Data may not exists in the option given by user
-            var rawDataArray = this.getRawDataArray();
-            var itemOpt = rawDataArray && rawDataArray[rawDataIndex];
+            var itemOpt = data.getRawDataItem(dataIndex);
 
             return {
                 componentType: 'series',

test/graph.html

@@ -104,6 +104,10 @@
                         layout: 'none'
                     };
 
+                    chart.on('click', function (params) {
+                        console.log(params, params.data);
+                    });
+
                     var gui = new dat.GUI();
                     gui.add(config, 'layout', ['none', 'circular'])
                         .onChange(function (value) {

test/markLine.html

@@ -91,6 +91,11 @@
                         }
                     }]
                 });
+
+                chart.on('click', function (params) {
+                    console.log(params, params.data);
+                });
+
             });
 
         </script>

test/markPoint.html

@@ -179,6 +179,11 @@
                         }
                     ]
                 });
+
+                chart.on('click', function (params) {
+                    console.log(params, params.data);
+                });
+
             })
 
         </script>

test/sankey.html

@@ -31,6 +31,11 @@
                         chart.resize();
                     }
 
+                    chart.on('click', function (params) {
+                        console.log(params, params.data);
+                    });
+
+
                     $.getJSON('./data/energy.json')
                     .done(function(data) {
                         chart.setOption({

test/scatter.html

@@ -124,6 +124,10 @@
                         data: data3
                     }]
                 });
+
+                chart.on('click', function (params) {
+                    console.log(params.data);
+                });
             })
 
         </script>