fix(issue-1174): pie statistics content formatter does not work

__tests__/bugs/issue-1174-spec.ts

@@ -0,0 +1,65 @@
+import { reduce } from '@antv/util';
+import { Pie } from '../../src';
+import { createDiv } from '.././utils/dom';
+import { simulateMouseEvent } from '../utils/event';
+
+describe('donut plot', () => {
+  test('statistic content formatter', () => {
+    const data = [
+      {
+        type: '分类一',
+        value: 27,
+      },
+      {
+        type: '分类二',
+        value: 25,
+      },
+      {
+        type: '分类三',
+        value: 18,
+      },
+      {
+        type: '分类四',
+        value: 15,
+      },
+      {
+        type: '分类五',
+        value: 10,
+      },
+      {
+        type: '其它',
+        value: 5,
+      },
+    ];
+
+    const donutPlot = new Pie(createDiv(), {
+      width: 400,
+      height: 400,
+      radius: 1,
+      innerRadius: 0.3,
+      padding: [0, 0, 0, 0],
+      data,
+      angleField: 'value',
+      colorField: 'type',
+      interactions: [{ type: 'element-active' }, { type: 'pie-statistic-active' }],
+      statistic: {
+        content: {
+          formatter: (datum, data) => {
+            return datum ? `${datum.value} 万` : `${reduce(data, (r, d) => r + d.value, 0)}万`;
+          },
+        },
+      },
+    });
+
+    donutPlot.render();
+
+    const contentAnnotation = donutPlot.chart.getController('annotation').getComponents()[1];
+    expect(contentAnnotation.component.get('content')).toBe(`${reduce(data, (r, d) => r + d.value, 0)}万`);
+
+    setTimeout(() => {
+      const element = donutPlot.chart.geometries[0].elements[0];
+      simulateMouseEvent(element.shape, 'mouseenter');
+      expect(contentAnnotation.component.get('content')).toBe(`${data[0].value}万`);
+    }, 0);
+  });
+});

__tests__/unit/plots/pie/interaction-spec.ts

@@ -30,7 +30,7 @@ describe('register interaction', () => {
     radius: 0.8,
     innerRadius: 0.64,
     statistic: {
-      title: { formatter: (item, data) => (!Array.isArray(data) ? item.title : 'Total') },
+      title: { formatter: (item) => (item ? item.type : 'Total') },
     },
   });
 
@@ -45,7 +45,7 @@ describe('register interaction', () => {
 
     const annotations = context.view.getComponents().filter((co) => co.type === 'annotation');
     expect(annotations[0].extra.content).toBe('item3');
-    expect(annotations[1].extra.content).toBe('13');
+    expect(annotations[1].extra.content).toBe(13);
   });
 
   it('触发 pie-statistic:reset', async () => {
@@ -70,7 +70,7 @@ describe('G2 内置interactions', () => {
     radius: 0.8,
     innerRadius: 0.64,
     statistic: {
-      title: { formatter: (item, data) => (!Array.isArray(data) ? item.title : 'Total') },
+      title: { formatter: (item) => (item ? item.type : 'Total') },
     },
     interactions: [{ type: 'pie-statistic-active' }],
   });

src/plots/pie/adaptor.ts

@@ -1,3 +1,4 @@
+import { Datum } from '@antv/g2/lib/interface';
 import { deepMix, every, filter, get, isFunction, isString, isNil } from '@antv/util';
 import { Params } from '../../core/adaptor';
 import { legend, tooltip, interaction, animation, theme, state, annotation } from '../../adaptor/common';
@@ -174,7 +175,7 @@ function label(params: Params<PieOptions>): Params<PieOptions> {
  */
 function statistic(params: Params<PieOptions>): Params<PieOptions> {
   const { chart, options } = params;
-  const { innerRadius, statistic, angleField } = options;
+  const { innerRadius, statistic, angleField, colorField } = options;
 
   const annotationOptions = [];
 
@@ -189,6 +190,12 @@ function statistic(params: Params<PieOptions>): Params<PieOptions> {
       const { style, formatter, offsetX, offsetY, rotate } = option;
 
       const lineHeight = get(option, 'style.fontSize', 20);
+      const getDefaultContent = (data: Data, datum?: Datum) => {
+        if (index === 0) {
+          return datum ? datum[colorField] : '总计';
+        }
+        return datum ? datum[angleField] : getTotalValue(data, angleField);
+      };
       chart.annotation().text(
         deepMix(
           {},
@@ -200,12 +207,8 @@ function statistic(params: Params<PieOptions>): Params<PieOptions> {
           },
           {
             position: ['50%', '50%'],
-            content: (filterData: Data) => {
-              return formatter
-                ? formatter(null, filterData)
-                : index === 0
-                ? '总计'
-                : getTotalValue(filterData, angleField);
+            content: (filterData: Data, datum?: Datum) => {
+              return formatter ? formatter(datum, filterData) : getDefaultContent(filterData, datum);
             },
             style,
             offsetX,

src/plots/pie/interaction/pie-statistic-action.ts

@@ -1,6 +1,6 @@
 import { Action } from '@antv/g2/lib/interaction';
 import { ComponentOption } from '@antv/g2/lib/interface';
-import { each, get } from '@antv/util';
+import { each, get, isFunction } from '@antv/util';
 
 /**
  * Pie 中心文本事件的 Action
@@ -32,8 +32,6 @@ export class StatisticAction extends Action {
     const { data } = event.data;
     if (data) {
       const annotationController = view.getController('annotation');
-      // todo remove ignore
-      // @ts-ignore
       annotationController.clear(true);
       // @ts-ignore
       const [, angleField, colorField] = view.getScaleFields();
@@ -54,7 +52,7 @@ export class StatisticAction extends Action {
 
         annotationOptions.push({
           ...options,
-          content: options.formatter ? options.formatter(data, view.getData()) : value,
+          content: isFunction(options.content) ? options.content(view.getData(), data) : value,
         });
       });
       annotationOptions.forEach((opt) => {
@@ -69,8 +67,6 @@ export class StatisticAction extends Action {
   public reset() {
     const { view } = this.context;
     const annotationController = view.getController('annotation');
-    // todo remove ignore
-    // @ts-ignore
     annotationController.clear(true);
     const initialStatistic = this.getInitialAnnotation();
     each(initialStatistic, (a) => {