fix: 修复尖底漏斗图最后一排错位 (#2793)

* feat: 更新漏斗图默认 layout.type

* fix: 修复尖底漏斗图错位&增加注释

Co-authored-by: aiyin.lzy <[email protected]>

Author: liuzhenying

__tests__/unit/plots/funnel/basic-spec.ts

@@ -71,6 +71,20 @@ describe('basic funnel', () => {
     });
   });
 
+  describe('pyramid', () => {
+    test('transpose', () => {
+      funnel.update({
+        ...funnelOption,
+        shape: 'pyramid',
+      });
+
+      const geometry = funnel.chart.geometries[0];
+      expect(geometry.labelOption.cfg.layout.type).toBe('interval-adjust-position');
+      const shapeFields = geometry.getAttribute('shape').getFields();
+      expect(shapeFields[0]).toBe('pyramid');
+    });
+  });
+
   describe('transpose', () => {
     test('transpose', () => {
       funnel.update({

src/plots/funnel/geometries/basic.ts

@@ -1,6 +1,6 @@
 import { Types } from '@antv/g2';
 import { isArray } from '@antv/util';
-import { flow, findGeometry } from '../../../utils';
+import { flow, findGeometry, deepAssign } from '../../../utils';
 import { getTooltipMapping } from '../../../utils/tooltip';
 import { Params } from '../../../core/adaptor';
 import { Datum, Data } from '../../../types/common';
@@ -51,7 +51,15 @@ function geometry(params: Params<FunnelOptions>): Params<FunnelOptions> {
         color,
         style: funnelStyle,
       },
-      label,
+      // 使用 Interval 绘制的漏斗图，默认使用 'interval-adjust-position', 否则尖底漏斗图最后一行 label 错位
+      label: deepAssign(
+        {
+          layout: {
+            type: 'interval-adjust-position',
+          },
+        },
+        label
+      ),
       state,
     },
   });