fix: legend 自定义items 添加marker回调 (#3591)

Co-authored-by: ai-qing-hai <wb-xcf804241@antgroup.com>
antvis · Sep 15, 2021 · dc80db2 · dc80db2
1 parent d5588a0
commit dc80db2
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 5 deletions.
diff --git a/src/interface.ts b/src/interface.ts
@@ -899,7 +899,7 @@ export interface LegendItem {
   /** 值 */
   value: any;
   /** 图形标记 */
-  marker?: MarkerCfg;
+  marker?: MarkerCfg | ((name: string, index: number, item: { name: string; value: string } & MarkerCfg) => MarkerCfg);
   /** 初始是否处于未激活状态 */
   unchecked?: boolean;
 }

diff --git a/src/util/legend.ts b/src/util/legend.ts
@@ -145,10 +145,13 @@ export function getCustomLegendItems(themeMarker: object, userMarker: object, cu
   // 如果有自定义的 item，那么就直接使用，并合并主题的 marker 配置
   return customItems.map((item: LegendItem, index: number) => {
     let markerCfg = userMarker;
-      if (isFunction(markerCfg)) {
-        markerCfg = markerCfg(item.name, index, deepMix({}, themeMarker, item))
-      }
-    const marker = deepMix({}, themeMarker, markerCfg, item.marker);
+    if (isFunction(markerCfg)) {
+      markerCfg = markerCfg(item.name, index, deepMix({}, themeMarker, item))
+    }
+
+    const itemMarker = isFunction(item.marker) ? item.marker(item.name, index, deepMix({}, themeMarker, item)) : item.marker;
+
+    const marker = deepMix({}, themeMarker, markerCfg, itemMarker);
     setMarkerSymbol(marker);
 
     item.marker = marker;

diff --git a/tests/unit/chart/controller/legend-spec.ts b/tests/unit/chart/controller/legend-spec.ts
@@ -147,6 +147,43 @@ describe('Legend', () => {
     expect(legends[0].component.get('title').text).toBe('城市');
   });
 
+  it('items marker callback custom', () => {
+    const container = createDiv();
+    chart = new Chart({
+      container,
+      height: 500,
+      width: 600,
+      autoFit: false,
+    });
+    chart.data([
+      { name: 'London', 月份: 'Jan.', 月均降雨量: 18.9 },
+      { name: 'London', 月份: 'Feb.', 月均降雨量: 28.8 },
+      { name: 'London', 月份: 'Mar.', 月均降雨量: 39.3 },
+      { name: 'Berlin', 月份: 'Jan.', 月均降雨量: 12.4 },
+      { name: 'Berlin', 月份: 'Feb.', 月均降雨量: 23.2 },
+      { name: 'Berlin', 月份: 'Mar.', 月均降雨量: 34.5 },
+    ]);
+
+    chart.legend({
+      custom: true,
+      items: [
+        { name: 'London', value: 'London', marker: () => ({ symbol: 'tick', style: { r: 10 } }) },
+        { name: 'Berlin', value: 'Berlin', marker: () => ({ symbol: 'circle', style: { r: 10 } }) },
+      ],
+      title: {
+        text: '城市',
+      },
+    });
+
+    chart.interval().position('月份*月均降雨量').size('月均降雨量').adjust('dodge');
+    chart.render();
+
+    const legends = chart.getComponents().filter((co) => co.type === COMPONENT_TYPE.LEGEND);
+    expect(legends[0].component.get('items')[0].marker.symbol).toBeInstanceOf(Function);
+    expect(legends[0].component.get('items')[1].marker.symbol).toBe('circle');
+    expect(legends[0].component.get('title').text).toBe('城市');
+  });
+
   it('category legend, use hexagon marker', () => {
     const container = createDiv();
     chart = new Chart({