Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/chart/chord/ChordSeries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,9 @@ class ChordSeriesModel extends SeriesModel<ChordSeriesOption> {

getDataParams(dataIndex: number, dataType: 'node' | 'edge') {
const params = super.getDataParams(dataIndex, dataType);
if (!this.getData()) {
return params;
}
if (dataType === 'node') {
const nodeData = this.getData();
const node = this.getGraph().getNodeByIndex(dataIndex);
Expand Down
3 changes: 3 additions & 0 deletions src/chart/funnel/FunnelSeries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ class FunnelSeriesModel extends SeriesModel<FunnelSeriesOption> {
// Overwrite
getDataParams(dataIndex: number): FunnelCallbackDataParams {
const data = this.getData();
if (!data) {
return {} as FunnelCallbackDataParams;
}
const params = super.getDataParams(dataIndex) as FunnelCallbackDataParams;
const valueDim = data.mapDimension('value');
const sum = data.getSum(valueDim);
Expand Down
3 changes: 3 additions & 0 deletions src/chart/pie/PieSeries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@ class PieSeriesModel extends SeriesModel<PieSeriesOption> {
*/
getDataParams(dataIndex: number): PieCallbackDataParams {
const data = this.getData();
if (!data) {
return {} as PieCallbackDataParams;
}
// update seats when data is changed
const dataInner = innerData(data);
let seats = dataInner.seats;
Expand Down
6 changes: 5 additions & 1 deletion src/chart/sunburst/SunburstSeries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,12 @@ class SunburstSeriesModel extends SeriesModel<SunburstSeriesOption> {
*/
getDataParams(dataIndex: number) {
const params = super.getDataParams.apply(this, arguments as any) as SunburstDataParams;
const data = this.getData();
if (!data) {
return params;
}

const node = this.getData().tree.getNodeByDataIndex(dataIndex);
const node = data.tree.getNodeByDataIndex(dataIndex);
params.treePathInfo = wrapTreePathInfo<SunburstSeriesNodeItemOption['value']>(node, this);

return params;
Expand Down
6 changes: 5 additions & 1 deletion src/chart/tree/TreeSeries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,12 @@ class TreeSeriesModel extends SeriesModel<TreeSeriesOption> {
// Add tree path to tooltip param
getDataParams(dataIndex: number) {
const params = super.getDataParams.apply(this, arguments as any) as TreeSeriesCallbackDataParams;
const data = this.getData();
if (!data) {
return params;
}

const node = this.getData().tree.getNodeByDataIndex(dataIndex);
const node = data.tree.getNodeByDataIndex(dataIndex);
params.treeAncestors = wrapTreePathInfo(node, this);
params.collapsed = !node.isExpand;

Expand Down
6 changes: 5 additions & 1 deletion src/chart/treemap/TreemapSeries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -446,8 +446,12 @@ class TreemapSeriesModel extends SeriesModel<TreemapSeriesOption> {
*/
getDataParams(dataIndex: number) {
const params = super.getDataParams.apply(this, arguments as any) as TreemapSeriesCallbackDataParams;
const data = this.getData();
if (!data) {
return params;
}

const node = this.getData().tree.getNodeByDataIndex(dataIndex);
const node = data.tree.getNodeByDataIndex(dataIndex);
params.treeAncestors = wrapTreePathInfo(node, this);
// compatitable the previous code.
params.treePathInfo = params.treeAncestors;
Expand Down
11 changes: 8 additions & 3 deletions src/core/echarts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1208,9 +1208,14 @@ class ECharts extends Eventful<ECEventDefinition> {
const ecData = getECData(parent);
if (ecData && ecData.dataIndex != null) {
const dataModel = ecData.dataModel || ecModel.getSeriesByIndex(ecData.seriesIndex);
params = (
dataModel && dataModel.getDataParams(ecData.dataIndex, ecData.dataType, el) || {}
) as ECElementEvent;
try {
params = (
dataModel && dataModel.getDataParams(ecData.dataIndex, ecData.dataType, el) || {}
) as ECElementEvent;
}
catch (e) {
params = {} as ECElementEvent;
}
return true;
}
// If element has custom eventData of components
Expand Down
3 changes: 3 additions & 0 deletions src/model/mixin/dataFormat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ export class DataFormatMixin {
): CallbackDataParams {

const data = this.getData(dataType);
if (!data) {
return {} as CallbackDataParams;
}
const rawValue = this.getRawValue(dataIndex, dataType);
const rawDataIndex = data.getRawIndex(dataIndex);
const name = data.getName(dataIndex);
Expand Down
179 changes: 179 additions & 0 deletions test/ut/spec/model/getDataParams.test.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.