diff --git a/src/chart/lines/LinesSeries.ts b/src/chart/lines/LinesSeries.ts index 3c23c15840..bb35b6fdf0 100644 --- a/src/chart/lines/LinesSeries.ts +++ b/src/chart/lines/LinesSeries.ts @@ -337,19 +337,22 @@ class LinesSeriesModel extends SeriesModel { dataType: string ) { const data = this.getData(); + const value = this.getRawValue(dataIndex); const itemModel = data.getItemModel(dataIndex); - const name = itemModel.get('name'); - if (name) { - return name; + let itemName = itemModel.get('name'); + if (!itemName) { + const fromName = itemModel.get('fromName'); + const toName = itemModel.get('toName'); + const nameArr = []; + fromName != null && nameArr.push(fromName); + toName != null && nameArr.push(toName); + itemName = nameArr.join(' > '); } - const fromName = itemModel.get('fromName'); - const toName = itemModel.get('toName'); - const nameArr = []; - fromName != null && nameArr.push(fromName); - toName != null && nameArr.push(toName); return createTooltipMarkup('nameValue', { - name: nameArr.join(' > ') + name: itemName, + value, + noValue: value == null || isNaN(value as number) }); } diff --git a/test/tooltip-xss.html b/test/tooltip-xss.html new file mode 100644 index 0000000000..f14582b9f5 --- /dev/null +++ b/test/tooltip-xss.html @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + +
+ + + + + + +