From 5d7496708504f0716e9d403b6f1603f3b4b9a916 Mon Sep 17 00:00:00 2001
From: hustcc <i@hust.cc>
Date: Wed, 16 Dec 2020 10:21:34 +0800
Subject: [PATCH] fix(2105): fix percent column/bar yAxis lable > 1 (#2107)

---
 __tests__/bugs/issue-2105-spec.ts | 219 ++++++++++++++++++++++++++++++
 src/plots/column/adaptor.ts       |   9 +-
 2 files changed, 226 insertions(+), 2 deletions(-)
 create mode 100644 __tests__/bugs/issue-2105-spec.ts

diff --git a/__tests__/bugs/issue-2105-spec.ts b/__tests__/bugs/issue-2105-spec.ts
new file mode 100644
index 0000000000..b5ac87ea4a
--- /dev/null
+++ b/__tests__/bugs/issue-2105-spec.ts
@@ -0,0 +1,219 @@
+import { Column, Bar } from '../../src';
+import { createDiv } from '../utils/dom';
+
+const data = [
+  {
+    groupName: '金额',
+    value: 30.14,
+    name: 'A',
+  },
+  {
+    groupName: '数值',
+    value: 345784,
+    name: 'A',
+  },
+  {
+    groupName: '金额',
+    value: 10,
+    name: 'B',
+  },
+  {
+    groupName: '数值',
+    value: 10941,
+    name: 'B',
+  },
+  {
+    groupName: '金额',
+    value: 19,
+    name: 'B_1',
+  },
+  {
+    groupName: '数值',
+    value: 191245,
+    name: 'B_1',
+  },
+  {
+    groupName: '金额',
+    value: 2.22,
+    name: 'B_3',
+  },
+  {
+    groupName: '数值',
+    value: 2124,
+    name: 'B_3',
+  },
+  {
+    groupName: '金额',
+    value: 9.99,
+    name: 'C',
+  },
+  {
+    groupName: '数值',
+    value: 9841,
+    name: 'C',
+  },
+  {
+    groupName: '金额',
+    value: 13,
+    name: 'C_1',
+  },
+  {
+    groupName: '数值',
+    value: 124240,
+    name: 'C_1',
+  },
+  {
+    groupName: '金额',
+    value: 20,
+    name: 'C_2',
+  },
+  {
+    groupName: '数值',
+    value: 241284,
+    name: 'C_2',
+  },
+  {
+    groupName: '金额',
+    value: 12,
+    name: 'D',
+  },
+  {
+    groupName: '数值',
+    value: 2398,
+    name: 'D',
+  },
+  {
+    groupName: '金额',
+    value: 12,
+    name: 'D_1',
+  },
+  {
+    groupName: '数值',
+    value: 21120,
+    name: 'D_1',
+  },
+  {
+    groupName: '金额',
+    value: 10.01,
+    name: 'D_2',
+  },
+  {
+    groupName: '数值',
+    value: 13578,
+    name: 'D_2',
+  },
+  {
+    groupName: '金额',
+    value: 41.21,
+    name: 'D_3',
+  },
+  {
+    groupName: '数值',
+    value: 41805,
+    name: 'D_3',
+  },
+  {
+    groupName: '金额',
+    value: 100,
+    name: 'D_4',
+  },
+  {
+    groupName: '数值',
+    value: 13,
+    name: 'D_4',
+  },
+  {
+    groupName: '金额',
+    value: 101,
+    name: 'D_5',
+  },
+  {
+    groupName: '数值',
+    value: 129,
+    name: 'D_5',
+  },
+  {
+    groupName: '金额',
+    value: 1000,
+    name: 'D_6',
+  },
+  {
+    groupName: '数值',
+    value: 8,
+    name: 'D_6',
+  },
+  {
+    groupName: '金额',
+    value: 12,
+    name: 'E',
+  },
+  {
+    groupName: '数值',
+    value: 21123,
+    name: 'E',
+  },
+  {
+    groupName: '金额',
+    value: 19,
+    name: 'E_1',
+  },
+  {
+    groupName: '数值',
+    value: 199865,
+    name: 'E_1',
+  },
+];
+
+describe('#2105', () => {
+  test('percent column, yAxis max tick should be 1', async () => {
+    const plot = new Column(createDiv(), {
+      data,
+      xField: 'name',
+      yField: 'value',
+      seriesField: 'groupName',
+      isPercent: true,
+      isStack: true,
+    });
+
+    plot.render();
+
+    expect(plot.chart.getYScales()[0].min).toBe(0);
+    expect(plot.chart.getYScales()[0].minLimit).toBe(0);
+    expect(plot.chart.getYScales()[0].max).toBe(1);
+    expect(plot.chart.getYScales()[0].maxLimit).toBe(1);
+    expect(
+      plot.chart
+        .getYScales()[0]
+        .getTicks()
+        .map((t) => t.tickValue)
+    ).toEqual([0, 0.25, 0.5, 0.75, 1]);
+
+    plot.destroy();
+  });
+
+  test('percent bar, yAxis max tick should be 1', async () => {
+    const plot = new Bar(createDiv(), {
+      data,
+      xField: 'value',
+      yField: 'name',
+      seriesField: 'groupName',
+      isPercent: true,
+      isStack: true,
+    });
+
+    plot.render();
+
+    expect(plot.chart.getYScales()[0].min).toBe(0);
+    expect(plot.chart.getYScales()[0].minLimit).toBe(0);
+    expect(plot.chart.getYScales()[0].max).toBe(1);
+    expect(plot.chart.getYScales()[0].maxLimit).toBe(1);
+    expect(
+      plot.chart
+        .getYScales()[0]
+        .getTicks()
+        .map((t) => t.tickValue)
+    ).toEqual([0, 0.25, 0.5, 0.75, 1]);
+
+    plot.destroy();
+  });
+});
diff --git a/src/plots/column/adaptor.ts b/src/plots/column/adaptor.ts
index 2fa3d6c214..04148badaa 100644
--- a/src/plots/column/adaptor.ts
+++ b/src/plots/column/adaptor.ts
@@ -89,7 +89,9 @@ function geometry(params: Params<ColumnOptions>): Params<ColumnOptions> {
  */
 function meta(params: Params<ColumnOptions>): Params<ColumnOptions> {
   const { options } = params;
-  const { xAxis, yAxis, xField, yField, data } = options;
+  const { xAxis, yAxis, xField, yField, data, isPercent } = options;
+
+  const percentYMeta = isPercent ? { max: 1, min: 0, minLimit: 0, maxLimit: 1 } : {};
 
   return flow(
     scale(
@@ -101,7 +103,10 @@ function meta(params: Params<ColumnOptions>): Params<ColumnOptions> {
         [xField]: {
           type: 'cat',
         },
-        [yField]: adjustYMetaByZero(data, yField),
+        [yField]: {
+          ...adjustYMetaByZero(data, yField),
+          ...percentYMeta,
+        },
       }
     )
   )(params);