diff --git a/src/chart/graph/GraphView.js b/src/chart/graph/GraphView.js index 1b5d8d9da9f4b473c38c420f71e4ffe19c3cbc22..4c80fe3d86d0be86f79053096b0293d220c1b023 100644 --- a/src/chart/graph/GraphView.js +++ b/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); diff --git a/src/chart/sankey/SankeyView.js b/src/chart/sankey/SankeyView.js index cfb60a8c65264b8d4eb76e68d5e6d10f43b735e2..3f8a67a2528030db7da3aa0840258681f47fb9e9 100644 --- a/src/chart/sankey/SankeyView.js +++ b/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); diff --git a/src/component/marker/MarkLineView.js b/src/component/marker/MarkLineView.js index 420dd1e6717e3e2edc44f43fcab53b95b99b8315..e3818e1d1a8e1f58d63c36d5b1f9799958751c8d 100644 --- a/src/component/marker/MarkLineView.js +++ b/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; }, diff --git a/src/component/marker/MarkPointView.js b/src/component/marker/MarkPointView.js index fcb135012462dfe58c61e596945b5955c2457647..166ba5885f66360367497dbad1a7e10ed34990cb 100644 --- a/src/component/marker/MarkPointView.js +++ b/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); diff --git a/src/component/timeline/SliderTimelineView.js b/src/component/timeline/SliderTimelineView.js index e8282f23cbeb9a6da077c0ebe08c93b9ba150827..3c63b989c9d6bae86ba87f6db07c391cdde60aca 100644 --- a/src/component/timeline/SliderTimelineView.js +++ b/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) { diff --git a/src/data/List.js b/src/data/List.js index 320f53e136ec424574467f51fc2712e14d77302e..5be91dd8926a8b6b3340d18e25028f66e1fd0585 100644 --- a/src/data/List.js +++ b/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] diff --git a/src/model/Series.js b/src/model/Series.js index 89bad573c0977ab9989f510016a278181ccebd74..6860be0b45f2bbb0793dde6965651f4f0add3bc5 100644 --- a/src/model/Series.js +++ b/src/model/Series.js @@ -125,14 +125,6 @@ define(function(require) { return this._dataBeforeProcessed; }, - /** - * Get raw data array given by user - * @return {Array.} - */ - getRawDataArray: function () { - return this.option.data; - }, - /** * Coord dimension to data dimension. * diff --git a/src/util/model.js b/src/util/model.js index 8b6f285dd75457914591adb6f5a98009ca0a71bb..edde3ff4628ed0b65f462968a1832e5ad6a9a302 100644 --- a/src/util/model.js +++ b/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.} 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', diff --git a/test/graph.html b/test/graph.html index 7c33c8edf067ef23567a634924fba1bc4e96f8c3..4860ff1343c71f7357b8f9602385b35f11b70139 100644 --- a/test/graph.html +++ b/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) { diff --git a/test/markLine.html b/test/markLine.html index 8baf99a63029b2a53387ad8775b4520db57faceb..be3505b5bd587d637ad05ecdc6ebe84816f8fdd7 100644 --- a/test/markLine.html +++ b/test/markLine.html @@ -91,6 +91,11 @@ } }] }); + + chart.on('click', function (params) { + console.log(params, params.data); + }); + }); diff --git a/test/markPoint.html b/test/markPoint.html index 50d079c7eb89910a843bd4aa53310b093402cca2..23b5ab84a346f94dc77dc4e855eeb993916b6606 100644 --- a/test/markPoint.html +++ b/test/markPoint.html @@ -179,6 +179,11 @@ } ] }); + + chart.on('click', function (params) { + console.log(params, params.data); + }); + }) diff --git a/test/sankey.html b/test/sankey.html index 6a7fc2fe62bb51370aba5394110635bf657acb8b..2c809ef711032d66a8f9abeeff69edadd6eb3805 100644 --- a/test/sankey.html +++ b/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({ diff --git a/test/scatter.html b/test/scatter.html index 84278d8a94ea93437ad337625907447d2a4bab17..31ea84e1535bdec58b585efb0b225684edfe7d84 100644 --- a/test/scatter.html +++ b/test/scatter.html @@ -124,6 +124,10 @@ data: data3 }] }); + + chart.on('click', function (params) { + console.log(params.data); + }); })