feat: attr映射支持自定义map处理

.prettierrc.yml

@@ -0,0 +1,3 @@
+# 详细配置请移步：https://prettier.io/docs/en/configuration.html
+---
+singleQuote: true

packages/f2-next/src/attr/base.ts

@@ -1,12 +1,13 @@
 import { Scale } from '@antv/scale';
-import { mix } from '@antv/util';
+import { mix, isFunction, isNil } from '@antv/util';
 import { values as arrayValues } from '../util/array';
 
 class Base {
   data: any;
   field: string;
   scale: Scale;
   range: any[];
+  map: Function;
 
   constructor(options) {
     mix(this, options);
@@ -22,8 +23,18 @@ class Base {
     return null;
   }
 
+  // 数据映射方法
+  _mapping(value): any {
+    return value;
+  }
+
   // 数据映射方法
   mapping(value): any {
+    const rst = isFunction(this.map) ? this.map(value) : null;
+    if (!isNil(rst)) {
+      return rst;
+    }
+    return this._mapping(value);
   }
 
   update(options) {
@@ -43,4 +54,4 @@ class Base {
   }
 }
 
-export default Base;
+export default Base;

packages/f2-next/src/attr/category.ts

@@ -2,12 +2,11 @@ import { Category as CategoryScale } from '@antv/scale';
 import Base from './base';
 
 class Category extends Base {
-
   createScale(scale) {
     return new CategoryScale(scale);
   }
 
-  mapping(value: any) {
+  _mapping(value: any) {
     const { scale, range } = this;
     const index = scale.translate(value);
     return range[index % range.length];

packages/f2-next/src/attr/identity.ts

@@ -6,7 +6,7 @@ class Identity extends Base {
     return new IdentityScale(scale);
   }
 
-  mapping(value: any) {
+  _mapping(value: any) {
     return value;
   }
 }

packages/f2-next/src/attr/linear.ts

@@ -3,17 +3,16 @@ import { isArray } from '@antv/util';
 import Base from './base';
 
 class Linear extends Base {
-
   createScale(scale) {
     return new LinearScale(scale);
   }
 
-  mapping(value: any) {
+  _mapping(value: any) {
     const { scale, range } = this;
-    const [ min, max ] = range;
+    const [min, max] = range;
 
     if (isArray(value)) {
-      return value.map(v => {
+      return value.map((v) => {
         return min + (max - min) * scale.scale(v);
       });
     }
@@ -24,7 +23,7 @@ class Linear extends Base {
     const { scale } = this;
 
     if (isArray(value)) {
-      return value.map(v => {
+      return value.map((v) => {
         return scale.scale(v);
       });
     }
@@ -33,10 +32,10 @@ class Linear extends Base {
 
   convert(value) {
     const { range } = this;
-    const [ min, max ] = range;
+    const [min, max] = range;
 
     if (isArray(value)) {
-      return value.map(v => {
+      return value.map((v) => {
         return min + (max - min) * v;
       });
     }