diff --git a/CHANGELOG.md b/CHANGELOG.md index 1690fd8470..2993a767b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.1.26 (2020-09-02) + +* fix: 修复双折线中tooltip重复的问题 ([08ec94e](https://github.com/antvis/g2plot/commit/08ec94e)) +* fix: 修复双轴图在一侧数据为空时不渲染问题 ([0963377](https://github.com/antvis/g2plot/commit/0963377)) + ## 1.1.25 (2020-08-31) * docs(waterfall): 修复瀑布图文档, 更新 tooltip 使用方式 (#1492) ([7dbe86a](https://github.com/antvis/g2plot/commit/7dbe86a)), closes [#1492](https://github.com/antvis/g2plot/issues/1492) diff --git a/package.json b/package.json index 1426322b89..00bc9fb3fa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@antv/g2plot", - "version": "1.1.25", + "version": "1.1.26", "description": "An interactive and responsive charting library", "keywords": [ "chart", diff --git a/src/combo/base.ts b/src/combo/base.ts index f6ad470b28..838c6b4bd2 100644 --- a/src/combo/base.ts +++ b/src/combo/base.ts @@ -149,7 +149,16 @@ export default abstract class ComboViewLayer item.name === yField[0]) < 0) { + ev.items.push({ + ...originItem, + mappingData: deepMix({}, originItem.mappingData, { _origin: dataItemsA }), + data: dataItemsA, + name: yField[0], + value: dataItemsA[yField[0]], + color: this.colors[0], + }); + } } if (legend.visible) { each(this.legends, (legend, index) => {