V1 combo bugfix (#1516)

CHANGELOG.md

@@ -1,3 +1,8 @@
+## <small>1.1.26 (2020-09-02)</small>
+
+* fix: 修复双折线中tooltip重复的问题 ([08ec94e](https://github.com/antvis/g2plot/commit/08ec94e))
+* fix: 修复双轴图在一侧数据为空时不渲染问题 ([0963377](https://github.com/antvis/g2plot/commit/0963377))
+
 ## <small>1.1.25 (2020-08-31)</small>
 
 * docs(waterfall): 修复瀑布图文档, 更新 tooltip 使用方式 (#1492) ([7dbe86a](https://github.com/antvis/g2plot/commit/7dbe86a)), closes [#1492](https://github.com/antvis/g2plot/issues/1492)

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",

src/combo/base.ts

@@ -149,7 +149,16 @@ export default abstract class ComboViewLayer<T extends IComboViewLayer = IComboV
     return layer;
   }
 
+  // 临时修复 v1 双轴图在左侧数据为0的时候右侧scale处理错误的问题
+  protected getLeftYAxisMax() {
+    const leftScaleData = this.getScaleData(0);
+    const rightScaleData = this.getScaleData(1);
+
+    return leftScaleData.min == 0 && leftScaleData.max === 0 ? Math.max(rightScaleData.max, 0) : leftScaleData.max;
+  }
+
   protected yAxis(index: number) {
+    const leftScaleData = this.getScaleData(0);
     const { yAxis } = this.options;
     const config = index === 0 ? yAxis.leftConfig : yAxis.rightConfig;
     const colorValue = this.colors[index];
@@ -180,6 +189,10 @@ export default abstract class ComboViewLayer<T extends IComboViewLayer = IComboV
     }
     const yAxisGlobalConfig = this.getYAxisGlobalConfig();
 
+    if (index === 0 && leftScaleData.max === 0 && leftScaleData.min === 0) {
+      yAxisConfig.max = this.getLeftYAxisMax();
+    }
+
     return deepMix({}, yAxisGlobalConfig, yAxisConfig);
   }
 
@@ -193,7 +206,7 @@ export default abstract class ComboViewLayer<T extends IComboViewLayer = IComboV
         {},
         {
           min: 0,
-          max: leftScaleData.max,
+          max: this.getLeftYAxisMax(),
           nice: true,
           values: leftScaleData.values,
         },

src/combo/dual-line/layer.ts

@@ -3,7 +3,7 @@ import { registerPlotType } from '../../base/global';
 import ComboViewLayer from '../base';
 import { LayerConfig } from '../../base/layer';
 import LineLayer from '../../plots/line/layer';
-import { clone, deepMix, each } from '@antv/util';
+import { clone, deepMix, each, findIndex } from '@antv/util';
 import { IValueAxis, ICatAxis, ITimeAxis } from '../../interface/config';
 import { ComboViewConfig, LineConfig } from '../util/interface';
 
@@ -148,14 +148,16 @@ export default class DualLineLayer<T extends DualLineLayerConfig = DualLineLayer
     const originItem = clone(ev.items[0]);
     const dataItemsA = this.getDataByXField(ev.title, 0)[0];
     if (dataItemsA) {
-      ev.items.push({
-        ...originItem,
-        mappingData: deepMix({}, originItem.mappingData, { _origin: dataItemsA }),
-        data: dataItemsA,
-        name: yField[0],
-        value: dataItemsA[yField[0]],
-        color: this.colors[0],
-      });
+      if (findIndex(ev.items, (item: any) => 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) => {