From 487d7a502e710a7e7b14c8f7480ffd638a19218b Mon Sep 17 00:00:00 2001
From: OrzMiku <miku@ecy.pink>
Date: Wed, 26 Mar 2025 20:56:04 +0800
Subject: [PATCH] refactor(AgentCard): unify dropmenus

---
 .../src/pages/agents/components/AgentCard.tsx | 23 +++++++++++-----
 .../src/pages/agents/components/MyAgents.tsx  | 26 +++----------------
 2 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/src/renderer/src/pages/agents/components/AgentCard.tsx b/src/renderer/src/pages/agents/components/AgentCard.tsx
index 80a51599..2f64e9aa 100644
--- a/src/renderer/src/pages/agents/components/AgentCard.tsx
+++ b/src/renderer/src/pages/agents/components/AgentCard.tsx
@@ -1,14 +1,20 @@
 import { EllipsisOutlined } from '@ant-design/icons'
-import { Agent } from '@renderer/types'
+import type { Agent } from '@renderer/types'
 import { getLeadingEmoji } from '@renderer/utils'
 import { Dropdown } from 'antd'
-import { FC, memo } from 'react'
+import { type FC, memo } from 'react'
 import styled from 'styled-components'
 
 interface Props {
   agent: Agent
   onClick: () => void
-  contextMenu?: { label: string; onClick: () => void }[]
+  contextMenu?: {
+    key: string
+    label: string
+    icon?: React.ReactNode
+    danger?: boolean
+    onClick: () => void
+  }[]
   menuItems?: {
     key: string
     label: string
@@ -58,9 +64,14 @@ const AgentCard: FC<Props> = ({ agent, onClick, contextMenu, menuItems }) => {
       <Dropdown
         menu={{
           items: contextMenu.map((item) => ({
-            key: item.label,
-            label: item.label,
-            onClick: () => item.onClick()
+            ...item,
+            onClick: (e) => {
+              e.domEvent.stopPropagation()
+              e.domEvent.preventDefault()
+              setTimeout(() => {
+                item.onClick()
+              }, 0)
+            }
           }))
         }}
         trigger={['contextMenu']}>
diff --git a/src/renderer/src/pages/agents/components/MyAgents.tsx b/src/renderer/src/pages/agents/components/MyAgents.tsx
index f1749b9b..ad93a825 100644
--- a/src/renderer/src/pages/agents/components/MyAgents.tsx
+++ b/src/renderer/src/pages/agents/components/MyAgents.tsx
@@ -2,7 +2,7 @@ import { DeleteOutlined, EditOutlined, PlusOutlined, SortAscendingOutlined } fro
 import { useAgents } from '@renderer/hooks/useAgents'
 import AssistantSettingsPopup from '@renderer/pages/settings/AssistantSettings'
 import { createAssistantFromAgent } from '@renderer/services/AssistantService'
-import { Agent } from '@renderer/types'
+import type { Agent } from '@renderer/types'
 import { Col, Row } from 'antd'
 import { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -45,7 +45,7 @@ const MyAgents: React.FC<Props> = ({ onClick, search }) => {
   return (
     <Row gutter={[20, 20]}>
       {filteredAgents.map((agent) => {
-        const dropdownMenuItems = [
+        const menuItems = [
           {
             key: 'edit',
             label: t('agents.edit.title'),
@@ -73,29 +73,9 @@ const MyAgents: React.FC<Props> = ({ onClick, search }) => {
           }
         ]
 
-        const contextMenuItems = [
-          {
-            label: t('agents.edit.title'),
-            onClick: () => AssistantSettingsPopup.show({ assistant: agent })
-          },
-          {
-            label: t('agents.add.button'),
-            onClick: () => createAssistantFromAgent(agent)
-          },
-          {
-            label: t('common.delete'),
-            onClick: () => handleDelete(agent)
-          }
-        ]
-
         return (
           <Col span={6} key={agent.id}>
-            <AgentCard
-              agent={agent}
-              onClick={() => onClick?.(agent)}
-              contextMenu={contextMenuItems}
-              menuItems={dropdownMenuItems}
-            />
+            <AgentCard agent={agent} onClick={() => onClick?.(agent)} contextMenu={menuItems} menuItems={menuItems} />
           </Col>
         )
       })}