fix: 抽取统一的非法数据处理函数，修复玉玦图changedata没有更新meta

Author: visiky

src/plots/pie/adaptor.ts

@@ -4,9 +4,9 @@ import { legend, animation, theme, state, annotation } from '../../adaptor/commo
 import { getMappingFunction } from '../../adaptor/geometries/base';
 import { interval } from '../../adaptor/geometries';
 import { Interaction } from '../../types/interaction';
-import { flow, template, transformLabel, deepAssign, renderStatistic } from '../../utils';
+import { flow, template, transformLabel, deepAssign, renderStatistic, processIllegalData } from '../../utils';
 import { DEFAULT_OPTIONS } from './contants';
-import { adaptOffset, getTotalValue, processIllegalData, isAllZero } from './utils';
+import { adaptOffset, getTotalValue, isAllZero } from './utils';
 import { PIE_STATISTIC } from './interactions';
 import { PieOptions } from './types';
 

src/plots/pie/index.ts

@@ -1,10 +1,11 @@
 import { VIEW_LIFE_CIRCLE, Event } from '@antv/g2';
 import { Plot } from '../../core/plot';
 import { Adaptor } from '../../core/adaptor';
+import { processIllegalData } from '../../utils';
 import { adaptor, pieAnnotation } from './adaptor';
 import { DEFAULT_OPTIONS } from './contants';
 import { PieOptions } from './types';
-import { isAllZero, processIllegalData } from './utils';
+import { isAllZero } from './utils';
 import './interactions';
 
 export { PieOptions };

src/plots/pie/utils.ts

@@ -1,6 +1,6 @@
-import { each, every, filter, isString } from '@antv/util';
-import { LEVEL, log } from '../../utils';
+import { each, every, isString } from '@antv/util';
 import { Data } from '../../types';
+import { processIllegalData } from '../../utils';
 import { PieOptions } from './types';
 
 /**
@@ -41,23 +41,6 @@ export function adaptOffset(type: string, offset?: string | number): string | nu
   }
 }
 
-/**
- * 处理不合法的数据(过滤 非数值型 和 NaN，保留 null)
- * @param data
- * @param angleField
- */
-export function processIllegalData(data: PieOptions['data'], angleField: string) {
-  const processData = filter(data, (d) => {
-    const v = d[angleField];
-    return v === null || (typeof v === 'number' && !isNaN(v));
-  });
-
-  // 打印异常数据情况
-  log(LEVEL.WARN, processData.length === data.length, 'illegal data existed in chart data.');
-
-  return processData;
-}
-
 /**
  * 判断数据是否全部为 0
  * @param data

src/plots/radial-bar/adaptor.ts

@@ -1,39 +1,23 @@
-import { filter } from '@antv/util';
 import { interaction, animation, theme, scale, tooltip, legend, annotation } from '../../adaptor/common';
 import { Params } from '../../core/adaptor';
-import { flow, deepAssign, findGeometry, transformLabel, log, LEVEL } from '../../utils';
+import { flow, deepAssign, findGeometry, transformLabel } from '../../utils';
 import { interval, point } from '../../adaptor/geometries';
+import { processIllegalData } from '../../utils';
 import { RadialBarOptions } from './types';
 import { getScaleMax } from './utils';
-/**
- * data 处理，过滤非法数据
- * @param params
- */
-function data(params: Params<RadialBarOptions>): Params<RadialBarOptions> {
-  const { chart, options } = params;
-  const { data } = options;
-  const { yField } = options;
-
-  const processData = filter(data, (d) => {
-    const v = d[yField];
-    return v === null || (typeof v === 'number' && !isNaN(v));
-  });
-
-  // 打印异常数据情况
-  log(LEVEL.WARN, processData.length === data.length, 'illegal data existed in chart data.');
-
-  chart.data(processData);
-
-  return params;
-}
 
 /**
  * geometry 处理
  * @param params
  */
 function geometry(params: Params<RadialBarOptions>): Params<RadialBarOptions> {
   const { chart, options } = params;
-  const { barStyle: style, color, tooltip, colorField, type, xField, yField } = options;
+  const { barStyle: style, color, tooltip, colorField, type, xField, yField, data } = options;
+
+  // 处理不合法的数据
+  const processData = processIllegalData(data, yField);
+  chart.data(processData);
+
   const p = deepAssign({}, params, {
     options: {
       tooltip,
@@ -64,16 +48,15 @@ function geometry(params: Params<RadialBarOptions>): Params<RadialBarOptions> {
  * @param params
  */
 export function meta(params: Params<RadialBarOptions>): Params<RadialBarOptions> {
-  const { options, chart } = params;
-  const { yField, maxAngle } = options;
+  const { options } = params;
+  const { yField, maxAngle, data } = options;
 
-  // data使用chart.data()之后的，因为原始data中可能存在非法数据
-  const { data } = chart.getOptions();
+  const processData = processIllegalData(data, yField);
   return flow(
     scale({
       [yField]: {
         min: 0,
-        max: getScaleMax(maxAngle, yField, data),
+        max: getScaleMax(maxAngle, yField, processData),
       },
     })
   )(params);
@@ -147,7 +130,6 @@ function label(params: Params<RadialBarOptions>): Params<RadialBarOptions> {
  */
 export function adaptor(params: Params<RadialBarOptions>) {
   return flow(
-    data,
     geometry,
     meta,
     axis,

src/plots/radial-bar/index.ts

@@ -19,7 +19,7 @@ export class RadialBar extends Plot<RadialBarOptions> {
    */
   public changeData(data) {
     this.updateOption({ data });
-    // 更新玉珏图的scale
+    // 更新玉珏图的 scale
     meta({ chart: this.chart, options: this.options });
     this.chart.changeData(data);
   }

src/utils/data.ts

@@ -1,6 +1,7 @@
-import { get, isNumber } from '@antv/util';
-import { Data, Datum, Meta } from '../types';
+import { get, isNumber, filter } from '@antv/util';
+import { Data, Datum, Meta, Options } from '../types';
 import { NodeLinkData } from '../types/relation-data';
+import { LEVEL, log } from './invariant';
 
 /**
  * 查看数据是否是全负数、或者全正数
@@ -26,6 +27,7 @@ export function adjustYMetaByZero(data: Data, field: string): Meta {
   }
   return {};
 }
+
 /**
  * 转换数据格式为带有节点与边的数据格式
  * @param data
@@ -84,3 +86,20 @@ export function transformDataToNodeLinkData(
     links,
   };
 }
+
+/**
+ * 处理不合法的数据(过滤 非数值型 和 NaN，保留 null)
+ * @param data
+ * @param angleField
+ */
+export function processIllegalData(data: Options['data'], field: string) {
+  const processData = filter(data, (d) => {
+    const v = d[field];
+    return v === null || (typeof v === 'number' && !isNaN(v));
+  });
+
+  // 打印异常数据情况
+  log(LEVEL.WARN, processData.length === data.length, 'illegal data existed in chart data.');
+
+  return processData;
+}

src/utils/index.ts

@@ -12,3 +12,4 @@ export { kebabCase } from './kebab-case';
 export { renderStatistic, renderGaugeStatistic } from './statistic';
 export { measureTextWidth } from './measure-text';
 export { isBetween, isRealNumber } from './number';
+export { processIllegalData } from './data';