fix(venn): 处理非法数据

Author: 酥云

__tests__/unit/plots/venn/data-spec.ts

@@ -11,19 +11,53 @@ describe('venn 异常分支处理', () => {
   });
 
   it('并集中，出现不存在的集合', () => {
-    function render() {
-      plot.changeData([
-        { sets: ['A'], size: 12, label: 'A' },
-        { sets: ['B'], size: 12, label: 'B' },
-        { sets: ['C'], size: 12, label: 'C' },
-        { sets: ['A', 'B'], size: 2, label: 'A&B' },
-        { sets: ['A', 'C'], size: 2, label: 'A&C' },
-        { sets: ['B', 'D'], size: 2, label: 'B&C' },
-        { sets: ['A', 'B', 'C'], size: 300 },
-      ]);
-    }
-    // 下个 pr 再处理
-    expect(render).toThrowError();
+    // @ts-ignore
+    const fn = jest.fn();
+    window.console.warn = fn;
+
+    plot.changeData([
+      { sets: ['A'], size: 12, label: 'A' },
+      { sets: ['C'], size: 12, label: 'C' },
+      { sets: ['A', 'B'], size: 2, label: 'A&B' },
+      { sets: ['A', 'C'], size: 2, label: 'A&C' },
+      { sets: ['B', 'D'], size: 2, label: 'B&C' },
+      { sets: ['A', 'B', 'C'], size: 30 },
+    ]);
+    expect(fn).toBeCalledWith('AntV/G2Plot: warn: 交集中不能出现不存在的集合, 请输入合法数据');
+    // @ts-ignore
+    expect(plot.chart.options.data.length).toBe(3);
+
+    plot.changeData([
+      { sets: ['A'], size: 12, label: 'A' },
+      { sets: ['A', 'B'], size: 2, label: 'A&B' },
+      { sets: ['A', 'C'], size: 2, label: 'A&C' },
+      { sets: ['B', 'D'], size: 2, label: 'B&C' },
+      { sets: ['A', 'B', 'C'], size: 30 },
+    ]);
+    expect(fn).toBeCalledWith('AntV/G2Plot: warn: 交集中不能出现不存在的集合, 请输入合法数据');
+    // @ts-ignore
+    expect(plot.chart.options.data.length).toBe(1);
+  });
+
+  it('数据不为空', () => {
+    // @ts-ignore
+    const fn = jest.fn();
+    window.console.warn = fn;
+
+    plot.changeData([]);
+    expect(fn).toBeCalledWith('AntV/G2Plot: warn: 数据不能为空');
+    // @ts-ignore
+    expect(plot.chart.options.data.length).toBe(0);
+
+    plot.changeData(null);
+    expect(fn).toBeCalledWith('AntV/G2Plot: warn: 数据不能为空');
+    // @ts-ignore
+    expect(plot.chart.options.data.length).toBe(0);
+
+    plot.changeData(undefined);
+    expect(fn).toBeCalledWith('AntV/G2Plot: warn: 数据不能为空');
+    // @ts-ignore
+    expect(plot.chart.options.data.length).toBe(0);
   });
 
   afterAll(() => {

src/plots/venn/adaptor.ts

@@ -1,11 +1,12 @@
 import { Geometry } from '@antv/g2';
-import { isArray, get } from '@antv/util';
+import { isArray, get, deepMix, isEqual } from '@antv/util';
 import { interaction, animation, theme, tooltip, scale } from '../../adaptor/common';
 import { Params } from '../../core/adaptor';
 import { schema as schemaGeometry } from '../../adaptor/geometries';
 import { deepAssign, flow, getAdjustAppendPadding, normalPadding, resolveAllPadding } from '../../utils';
 import { Datum } from '../../types';
-import { getColorMap, layoutVennData } from './utils';
+import { log, LEVEL } from '../../../src/utils';
+import { getColorMap, layoutVennData, islegalSets } from './utils';
 import { CustomInfo, VennData, VennOptions } from './types';
 import { ID_FIELD } from './constant';
 import './shape';
@@ -50,6 +51,48 @@ function padding(params: Params<VennOptions>): Params<VennOptions> {
   return params;
 }
 
+/**
+ * 处理非法数据
+ * @param params
+ */
+function data(params: Params<VennOptions>): Params<VennOptions> {
+  const { options } = params;
+
+  /* 如遇到 交集 中存在 非法元素 的情况，就过滤掉
+   * 如：
+   * data = [
+   *   { sets: ['A'], size: 3 }, // 集合
+   *   { sets: ['B'], size: 4 }, // 集合
+   *   { sets: ['A', 'B'], size: 2 }, // 交集
+   *   { sets: ['A', 'B', 'C'], size: 2 }, // 交集 (存在非法 C，过滤该条数据)
+   *   ...
+   * ]
+   */
+
+  let data = options['data'];
+  if (!data) {
+    log(LEVEL.WARN, false, 'warn: %s', '数据不能为空');
+    data = [];
+  }
+
+  // 合法元素的集合：['A', 'B']
+  const currSets = data.filter((datum) => datum.sets.length === 1).map((datum) => datum.sets[0]);
+  // 过滤 data
+  const filterSets = data.filter((datum) => {
+    const sets = datum.sets;
+    // 存在非法元素，就过滤这条数据
+    return islegalSets(currSets, sets);
+  });
+
+  if (!isEqual(filterSets, data)) log(LEVEL.WARN, false, 'warn: %s', '交集中不能出现不存在的集合, 请输入合法数据');
+
+  return deepMix({}, params, {
+    options: {
+      data: filterSets,
+    },
+  });
+}
+
 /**
  * geometry 处理
  * @param params
@@ -129,6 +172,7 @@ export function adaptor(params: Params<VennOptions>) {
   return flow(
     padding,
     theme,
+    data,
     geometry,
     scale({}),
     legend,

src/plots/venn/utils.ts

@@ -1,5 +1,6 @@
 import { assign, memoize } from '@antv/util';
 import { blend } from '../../utils/color/blend';
+import { log, LEVEL } from '../../../src/utils';
 import { venn, scaleSolution } from './layout/layout';
 import { circlePath, intersectionAreaPath, computeTextCentres } from './layout/diagram';
 import { ID_FIELD, PATH_FIELD } from './constant';
@@ -46,6 +47,12 @@ export const getColorMap = memoize(
 export function layoutVennData(options: VennOptions, width: number, height: number, padding: number = 0): VennData {
   const { data, setsField, sizeField } = options;
 
+  // 处理空数据的情况
+  if (data.length === 0) {
+    log(LEVEL.WARN, false, 'warn: %s', '数据不能为空');
+    return [];
+  }
+
   const vennData: VennData = data.map((d) => ({
     ...d,
     sets: d[setsField] || [],
@@ -81,3 +88,18 @@ export function layoutVennData(options: VennOptions, width: number, height: numb
   });
   return vennData;
 }
+
+/**
+ * 检查是否存在 非法元素
+ * @param legalArr 合法集合：['A', 'B']
+ * @param testArr 检查集合：['A', 'B', 'C'] or ['A', 'C']（存在非法 'C'）
+ * @return boolean
+ */
+export function islegalSets(legalArr: any[], testArr: any[]): boolean {
+  for (let i = 0; i < testArr.length; i++) {
+    if (!legalArr.includes(testArr[i])) {
+      return false;
+    }
+  }
+  return true;
+}