feat: mapping 传入全部映射数据 (#1559)

antvis · Aug 10, 2022 · d4a3a5b · d4a3a5b
1 parent c7c4f7d
commit d4a3a5b
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 5 deletions.
diff --git a/packages/f2/src/attr/base.ts b/packages/f2/src/attr/base.ts
@@ -55,8 +55,8 @@ class Base {
   }
 
   // 等于 normalize + convert， 参数是原始数据，返回是定义域的值
-  mapping(value) {
-    const rst = isFunction(this.callback) ? this.callback(value) : null;
+  mapping(value, child = null) {
+    const rst = isFunction(this.callback) ? this.callback(value, child) : null;
     if (!isNil(rst)) {
       return rst;
     }

diff --git a/packages/f2/src/components/geometry/index.tsx b/packages/f2/src/components/geometry/index.tsx
@@ -412,7 +412,7 @@ class Geometry<
           const attr = attrs[attrName];
           // 分类属性的线性映射
           if (attrController.isGroupAttr(attrName)) {
-            attrValues[attrName] = attr.mapping(child[attr.field]);
+            attrValues[attrName] = attr.mapping(child[attr.field], child);
           } else {
             normalized[attrName] = attr.normalize(child[attr.field]);
           }

diff --git a/packages/f2/src/components/tooltip/withTooltip.tsx b/packages/f2/src/components/tooltip/withTooltip.tsx
@@ -47,6 +47,10 @@ export interface TooltipProps extends ChartChildProps {
    * 背景样式
    */
   background?: RectAttrs;
+  /**
+   * 是否显示
+   */
+  showItemMarker?: boolean;
 }
 
 export interface TooltipState {

diff --git a/.../f2/test/components/axis/__image_snapshots__/axis-test-tsx-axis-轴-旋转-1-snap.png b/.../f2/test/components/axis/__image_snapshots__/axis-test-tsx-axis-轴-旋转-1-snap.png
diff --git a/packages/f2/test/components/axis/axis.test.tsx b/packages/f2/test/components/axis/axis.test.tsx
@@ -72,82 +72,102 @@ describe('Axis 轴', () => {
       {
         Year: '1987',
         NumberNewMicroBrewery: 1,
+        goal: 10,
       },
       {
         Year: '1989',
         NumberNewMicroBrewery: 1,
+        goal: 10,
       },
       {
         Year: '1995',
         NumberNewMicroBrewery: 2,
+        goal: 10,
       },
       {
         Year: '1996',
         NumberNewMicroBrewery: 2,
+        goal: 10,
       },
       {
         Year: '1997',
         NumberNewMicroBrewery: 1,
+        goal: 10,
       },
       {
         Year: '1998',
         NumberNewMicroBrewery: 3,
+        goal: 10,
       },
       {
         Year: '1999',
         NumberNewMicroBrewery: 2,
+        goal: 10,
       },
       {
         Year: '2006',
         NumberNewMicroBrewery: 1,
+        goal: 10,
       },
       {
         Year: '2007',
         NumberNewMicroBrewery: 1,
+        goal: 10,
       },
       {
         Year: '2008',
         NumberNewMicroBrewery: 1,
+        goal: 10,
       },
       {
         Year: '2009',
         NumberNewMicroBrewery: 2,
+        goal: 10,
       },
       {
         Year: '2010',
         NumberNewMicroBrewery: 3,
+        goal: 10,
       },
       {
         Year: '2011',
         NumberNewMicroBrewery: 4,
+        goal: 3,
       },
       {
         Year: '2012',
         NumberNewMicroBrewery: 5,
+        goal: 10,
       },
       {
         Year: '2013',
         NumberNewMicroBrewery: 11,
+        goal: 10,
       },
       {
         Year: '2014',
         NumberNewMicroBrewery: 20,
+        goal: 21,
       },
       {
         Year: '2015',
         NumberNewMicroBrewery: 16,
+        goal: 15,
       },
       {
         Year: '2016',
         NumberNewMicroBrewery: 13,
+        goal: 10,
       },
       {
         Year: '2017',
         NumberNewMicroBrewery: 6,
+        goal: 10,
       },
       {
         Year: '2018',
         NumberNewMicroBrewery: 1,
+        goal: 10,
       },
     ];
     const { props } = (
@@ -169,8 +189,8 @@ describe('Axis 轴', () => {
             y="NumberNewMicroBrewery"
             color={{
               field: 'NumberNewMicroBrewery',
-              callback: function(val) {
-                if (val === 20) {
+              callback: function(val, child) {
+                if (val > child.goal) {
                   return '#1890ff';
                 }
                 return '#66B5FF';