fix: 修复手动调用 showTooltip 不展示菜单的问题

antvis · Dec 6, 2024 · d8afe27 · d8afe27
1 parent 8a55fa6
commit d8afe27
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 27 deletions.
diff --git a/packages/s2-react/playground/config.tsx b/packages/s2-react/playground/config.tsx
@@ -284,6 +284,9 @@ export const S2TooltipOptions: SheetComponentOptions['tooltip'] = {
           key: 'custom-a',
           label: '操作1',
           icon: 'Trend',
+          visible: (cell) => {
+            return cell instanceof DataCell;
+          },
           onClick: (info, cell) => {
             console.log('操作1点击:', info, cell);
           },
@@ -302,33 +305,14 @@ export const S2TooltipOptions: SheetComponentOptions['tooltip'] = {
           key: 'custom-b',
           label: '操作2',
           icon: 'EyeOutlined',
-          onClick: (info, cell) => {
-            console.log('操作2点击:', info, cell);
-          },
-        },
-        {
-          key: 'custom-c',
-          label: '操作3',
-          icon: 'EyeOutlined',
-          visible: (cell) => {
-            return cell instanceof DataCell;
-          },
-          onClick: (info, cell) => {
-            console.log('操作3点击:', info, cell);
-          },
-        },
-        {
-          key: 'custom-d',
-          label: '操作4',
-          icon: 'EyeOutlined',
           visible: (cell) => {
             // 叶子节点才显示
             const meta = cell.getMeta();
 
             return meta.isLeaf;
           },
           onClick: (info, cell) => {
-            console.log('操作4点击:', info, cell);
+            console.log('操作2点击:', info, cell);
           },
         },
       ],

diff --git a/packages/s2-react/src/components/tooltip/custom-tooltip.tsx b/packages/s2-react/src/components/tooltip/custom-tooltip.tsx
@@ -1,7 +1,8 @@
 /* eslint-disable import/order */
 /* eslint-disable import/no-extraneous-dependencies */
 // eslint-disable-next-line prettier/prettier
-import { BaseTooltip, isMobile, SpreadSheet } from '@antv/s2';
+import { BaseTooltip, customMerge, isMobile, SpreadSheet } from '@antv/s2';
+import { omit } from 'lodash';
 import React from 'react';
 import {
   forceClearContent,
@@ -32,19 +33,29 @@ export class CustomTooltip extends BaseTooltip<
 
   renderContent() {
     // 配置级 s2.options.tooltip.content = ''
-    const { content: contentFromOptions } = this.spreadsheet.options.tooltip!;
+    const { content: contentFromOptions, operation } =
+      this.spreadsheet.options.tooltip!;
     // 方法级 s2.showTooltip({ content: '' })
     const showOptions = this.options;
     const cell = this.spreadsheet.getCell(showOptions?.event?.target);
     // 优先级: 方法级 > 配置级, 兼容 content 为空字符串的场景
     const content = (showOptions?.content ??
       contentFromOptions) as React.ReactNode;
 
-    const tooltipProps: TooltipRenderProps = {
-      ...showOptions,
-      cell,
-      content,
-    };
+    const tooltipProps = customMerge<TooltipRenderProps>(
+      {
+        options: {
+          operator: {
+            menu: omit(operation?.menu, 'items'),
+          },
+        },
+      },
+      {
+        ...showOptions,
+        cell,
+        content,
+      },
+    );
 
     if (showOptions?.options?.forceRender) {
       this.forceClearContent();