From ddf2d6d80214cf91d73add8729e0a2b0612779f2 Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Wed, 23 Sep 2026 10:52:31 +0800
Subject: [PATCH] feat: tool

---
 ui/src/components.d.ts                        |  6 +-
 ui/src/components/COMPONENT_README.md         | 23 ++-----
 .../mk-action/MkTableOperationGroup.vue       | 60 -----------------
 ui/src/components/global/mk-action/context.ts |  9 ---
 .../global/mk-dropdown/MkDropdownMenu.vue     |  7 +-
 .../index.vue => mk-table/MkAction.vue}       | 16 +----
 .../global/mk-table/MkTableMoreDropdown.vue   |  2 +-
 ui/src/views/VIEW_README.md                   | 19 ++----
 .../action-dropdown/AuthorizeModelAction.vue  |  4 +-
 .../action-dropdown/DeleteModelAction.vue     |  5 +-
 .../RelatedResourcesModelAction.vue           |  5 +-
 .../edit-model-action/EditModelAction.vue     |  3 +-
 .../ParamSettingAction.vue                    |  5 +-
 .../chat-management/users/UserListView.vue    |  2 +-
 .../resource-management/ModelResourceView.vue | 37 ++++++-----
 .../resource-management/ToolResourceView.vue  | 64 +++++++------------
 .../views/tool/tool-card/ToolStatusSwitch.vue |  4 +-
 .../action-dropdown/AuthorizeToolAction.vue   |  4 +-
 .../action-dropdown/CopyToolAction.vue        |  5 +-
 .../action-dropdown/DeleteToolAction.vue      |  5 +-
 .../action-dropdown/EditToolAction.vue        |  9 ++-
 .../ExecutionRecordToolAction.vue             |  5 +-
 .../action-dropdown/ExportToolAction.vue      |  5 +-
 .../action-dropdown/InitParamAction.vue       |  5 +-
 .../action-dropdown/MoveToolAction.vue        |  5 +-
 .../RelatedResourcesToolAction.vue            |  5 +-
 .../action-dropdown/ToolWorkflowAction.vue    |  5 +-
 .../action-dropdown/TriggerToolAction.vue     |  5 +-
 .../mcp-config-action/McpConfigAction.vue     |  5 +-
 29 files changed, 134 insertions(+), 200 deletions(-)
 delete mode 100644 ui/src/components/global/mk-action/MkTableOperationGroup.vue
 delete mode 100644 ui/src/components/global/mk-action/context.ts
 rename ui/src/components/global/{mk-action/index.vue => mk-table/MkAction.vue} (50%)

diff --git a/ui/src/components.d.ts b/ui/src/components.d.ts
index 1fbe897fb39..0649b7d0464 100644
--- a/ui/src/components.d.ts
+++ b/ui/src/components.d.ts
@@ -20,7 +20,7 @@ declare module 'vue' {
     MdEditor: typeof import('./components/global/markdown-editor/MdEditor.vue')['default']
     MdEditorMagnify: typeof import('./components/global/markdown-editor/MdEditorMagnify.vue')['default']
     MdPreview: typeof import('./components/global/markdown-editor/MdPreview.vue')['default']
-    MkAction: typeof import('./components/global/mk-action/index.vue')['default']
+    MkAction: typeof import('./components/global/mk-table/MkAction.vue')['default']
     MkCollapse: typeof import('./components/global/mk-collapse/index.vue')['default']
     MkComplexSearch: typeof import('./components/global/mk-complex-search/index.vue')['default']
     MkDialog: typeof import('./components/global/mk-dialog/index.vue')['default']
@@ -42,7 +42,6 @@ declare module 'vue' {
     MkTable: typeof import('./components/global/mk-table/index.vue')['default']
     MkTableFilter: typeof import('./components/global/mk-table/MkTableFilter.vue')['default']
     MkTableMoreDropdown: typeof import('./components/global/mk-table/MkTableMoreDropdown.vue')['default']
-    MkTableOperationGroup: typeof import('./components/global/mk-action/MkTableOperationGroup.vue')['default']
     MkTagGroup: typeof import('./components/global/mk-tag-group/index.vue')['default']
     MkTooltip: typeof import('./components/global/mk-tooltip/index.vue')['default']
     MkViewLayout: typeof import('./components/global/mk-view-layout/index.vue')['default']
@@ -64,7 +63,7 @@ declare global {
   const MdEditor: typeof import('./components/global/markdown-editor/MdEditor.vue')['default']
   const MdEditorMagnify: typeof import('./components/global/markdown-editor/MdEditorMagnify.vue')['default']
   const MdPreview: typeof import('./components/global/markdown-editor/MdPreview.vue')['default']
-  const MkAction: typeof import('./components/global/mk-action/index.vue')['default']
+  const MkAction: typeof import('./components/global/mk-table/MkAction.vue')['default']
   const MkCollapse: typeof import('./components/global/mk-collapse/index.vue')['default']
   const MkComplexSearch: typeof import('./components/global/mk-complex-search/index.vue')['default']
   const MkDialog: typeof import('./components/global/mk-dialog/index.vue')['default']
@@ -86,7 +85,6 @@ declare global {
   const MkTable: typeof import('./components/global/mk-table/index.vue')['default']
   const MkTableFilter: typeof import('./components/global/mk-table/MkTableFilter.vue')['default']
   const MkTableMoreDropdown: typeof import('./components/global/mk-table/MkTableMoreDropdown.vue')['default']
-  const MkTableOperationGroup: typeof import('./components/global/mk-action/MkTableOperationGroup.vue')['default']
   const MkTagGroup: typeof import('./components/global/mk-tag-group/index.vue')['default']
   const MkTooltip: typeof import('./components/global/mk-tooltip/index.vue')['default']
   const MkViewLayout: typeof import('./components/global/mk-view-layout/index.vue')['default']
diff --git a/ui/src/components/COMPONENT_README.md b/ui/src/components/COMPONENT_README.md
index 550f6611ac9..082701d8e91 100644
--- a/ui/src/components/COMPONENT_README.md
+++ b/ui/src/components/COMPONENT_README.md
@@ -293,23 +293,12 @@ Dialog、Drawer、Popover、嵌套区域等其他大、小表格均禁止开启
 `clearSelection()`。操作栏与 `MkViewLayout` 复用 `LayoutBatchFooter`，统一全选、半选、数量和
 取消行为；它在主内容滚动区域内吸附于页面底部，不随表格内容滚出可视区域。
 
-### MkTableOperationGroup、MkAction
-
-`MkTableOperationGroup` 与 `MkAction`、`context.ts` 统一维护在 `global/mk-action/`。
-表格操作列使用 `MkTableOperationGroup` 默认插槽声明操作，按模板顺序将前 `maxVisible` 个操作
-（默认 2）显示为图标按钮，其余自动进入 More；没有剩余操作时不显示 More。
-每个直接子组件代表一个操作，业务 Action 内使用 `MkAction` 作为展示入口。
-整个操作的显隐条件必须写在直接子组件的 `v-if` 上；不通过 `v-show` 或子组件内部条件控制计数。
-支持展开 `template` Fragment，忽略注释和文本；循环操作提供稳定且唯一的 key。
-禁用操作仍占位。开关等独立控件放在操作栏外，页面按实际入口数量设置操作列宽。
-
-`MkAction` 位于 `global/mk-action/index.vue`，适用于表格和卡片，接收 `label`、SVG Symbol 名称
-`icon`、`disabled`、`divided`，发出 `click`。
-通过上下文自动选择图标按钮加 Tooltip 或图标加文字菜单项；独立使用默认显示按钮，
-放入 `MkDropdownMenu` 时显示菜单项。点击阻止冒泡，`divided` 在按钮模式和自动 More 首项中不生效。
-业务 Action 保留自己的请求与浮层生命周期，不需要传递展示模式或维护操作配置数组。
-操作栏内部复用 `MkTableMoreDropdown` 并开启 `persistent`，菜单收起时保留业务 Action 与已打开浮层。
-操作跨越外露和 More 边界时会重新挂载，业务浮层打开期间不要重排入口或改变 `maxVisible`。
+### MkAction
+
+`global/mk-table/MkAction.vue` 统一单个操作的两种外观，通过 `display="menu"`（默认）或
+`display="button"` 显式选择菜单项或带 Tooltip 的图标按钮，不注入或推断展示上下文。
+接收 `label`、SVG Symbol 名称 `icon`、`disabled`、`divided`，发出 `click` 并阻止点击冒泡。
+`divided` 仅用于菜单模式。页面自行组合外露操作与 `MkTableMoreDropdown`，不自动分配位置。
 
 ### MkTagGroup
 
diff --git a/ui/src/components/global/mk-action/MkTableOperationGroup.vue b/ui/src/components/global/mk-action/MkTableOperationGroup.vue
deleted file mode 100644
index 34b8dd2bc15..00000000000
--- a/ui/src/components/global/mk-action/MkTableOperationGroup.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<script lang="ts">
-import { Comment, Fragment, Text, computed, defineComponent, h, isVNode, provide, type PropType, type VNode } from 'vue'
-import MkTableMoreDropdown from '../mk-table/MkTableMoreDropdown.vue'
-import { actionContextKey, type ActionContext } from './context'
-
-/* 每个操作只挂载一次，由所在位置提供展示模式。 */
-const ActionPlacement = defineComponent({
-  name: 'TableActionPlacement',
-  props: {
-    action: { type: Object as PropType<VNode>, required: true },
-    display: { type: String as PropType<ActionContext['display']>, required: true },
-    first: Boolean,
-  },
-  setup(props) {
-    provide(
-      actionContextKey,
-      computed(() => ({ display: props.display, first: props.first })),
-    )
-    return () => props.action
-  },
-})
-
-/* 保留 Fragment 路径与显式 key，忽略条件注释和文本，不读取业务组件内部结构。 */
-function collectActions(children: unknown, parentKey = ''): { key: string; node: VNode }[] {
-  if (!Array.isArray(children)) return []
-  return children.flatMap((node, index) => {
-    if (!isVNode(node) || node.type === Comment || node.type === Text) return []
-    const key = `${parentKey}/${String(node.key ?? index)}`
-    if (node.type === Fragment) return collectActions(node.children, key)
-    return [{ key, node }]
-  })
-}
-
-export default defineComponent({
-  name: 'MkTableOperationGroup',
-  props: { maxVisible: { type: Number, default: 2 } },
-  setup(props, { slots }) {
-    return () => {
-      // 插槽在渲染期间读取，确保 v-if 和行数据变化时重新分配。
-      const actions = collectActions(slots.default?.())
-      const maxVisible = Number.isFinite(props.maxVisible) ? Math.max(0, Math.floor(props.maxVisible)) : 2
-      const inlineActions = actions.slice(0, maxVisible)
-      const moreActions = actions.slice(maxVisible)
-      return h('div', { class: 'flex-align-center gap-1 [&>.el-button]:ml-0!' }, [
-        ...inlineActions.map(({ key, node }) => h(ActionPlacement, { key, action: node, display: 'button' })),
-        moreActions.length
-          ? h(
-              MkTableMoreDropdown,
-              { key: 'more', persistent: true },
-              {
-                default: () =>
-                  moreActions.map(({ key, node }, index) => h(ActionPlacement, { key, action: node, display: 'menu', first: index === 0 })),
-              },
-            )
-          : null,
-      ])
-    }
-  },
-})
-</script>
diff --git a/ui/src/components/global/mk-action/context.ts b/ui/src/components/global/mk-action/context.ts
deleted file mode 100644
index 40848f6407f..00000000000
--- a/ui/src/components/global/mk-action/context.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/** 表格操作与菜单共享的展示上下文。 */
-import type { InjectionKey, Ref } from 'vue'
-
-export interface ActionContext {
-  display: 'button' | 'menu'
-  first?: boolean
-}
-
-export const actionContextKey: InjectionKey<Readonly<Ref<ActionContext>>> = Symbol('action-context')
diff --git a/ui/src/components/global/mk-dropdown/MkDropdownMenu.vue b/ui/src/components/global/mk-dropdown/MkDropdownMenu.vue
index 25389face1b..22bbe0659a9 100644
--- a/ui/src/components/global/mk-dropdown/MkDropdownMenu.vue
+++ b/ui/src/components/global/mk-dropdown/MkDropdownMenu.vue
@@ -1,13 +1,8 @@
 <script setup lang="ts">
-import { provide, ref } from 'vue'
-import { actionContextKey, type ActionContext } from '../mk-action/context'
-
 defineOptions({ name: 'MkDropdownMenu', inheritAttrs: false })
 
-provide(actionContextKey, ref<ActionContext>({ display: 'menu' }))
-
 defineSlots<{
-  /** 菜单项，使用 MkDropdownItem 或以 MkAction 为入口的业务 Action */
+  /** 菜单项，仅使用 MkDropdownItem */
   default(): unknown
 }>()
 </script>
diff --git a/ui/src/components/global/mk-action/index.vue b/ui/src/components/global/mk-table/MkAction.vue
similarity index 50%
rename from ui/src/components/global/mk-action/index.vue
rename to ui/src/components/global/mk-table/MkAction.vue
index 278da3139a2..b6d872a004a 100644
--- a/ui/src/components/global/mk-action/index.vue
+++ b/ui/src/components/global/mk-table/MkAction.vue
@@ -1,28 +1,18 @@
 <script setup lang="ts">
-import { inject } from 'vue'
-import { actionContextKey } from './context'
-
 defineOptions({ name: 'MkAction', inheritAttrs: false })
-defineProps<{ label: string; icon: string; disabled?: boolean; divided?: boolean }>()
+withDefaults(defineProps<{ display?: 'menu' | 'button'; label: string; icon: string; disabled?: boolean; divided?: boolean }>(), { display: 'menu' })
 const emit = defineEmits<{ click: [event: MouseEvent] }>()
-const context = inject(actionContextKey, undefined)
 </script>
 
 <template>
   <!-- 菜单操作 -->
-  <MkDropdownItem
-    v-if="context?.display === 'menu'"
-    v-bind="$attrs"
-    :disabled="disabled"
-    :divided="divided && !context.first"
-    @click.stop="emit('click', $event)"
-  >
+  <MkDropdownItem v-if="display === 'menu'" v-bind="$attrs" :disabled="disabled" :divided="divided" @click.stop="emit('click', $event)">
     <template #icon><MkIcon :name="icon" /></template>
     {{ label }}
   </MkDropdownItem>
   <MkTooltip v-else :content="label" placement="top">
     <!-- 图标操作 -->
-    <el-button v-bind="$attrs" type="primary" text :disabled="disabled" @click.stop="emit('click', $event)">
+    <el-button v-bind="$attrs" text type="primary" :disabled="disabled" @click.stop="emit('click', $event)">
       <MkIcon :name="icon" />
     </el-button>
   </MkTooltip>
diff --git a/ui/src/components/global/mk-table/MkTableMoreDropdown.vue b/ui/src/components/global/mk-table/MkTableMoreDropdown.vue
index 887beb207b5..f48a0b25ba1 100644
--- a/ui/src/components/global/mk-table/MkTableMoreDropdown.vue
+++ b/ui/src/components/global/mk-table/MkTableMoreDropdown.vue
@@ -16,7 +16,7 @@ const hasDropdownItems = computed(() => hasRenderableSlotContent(slots.default?.
 </script>
 
 <template>
-  <MkDropdown v-if="hasDropdownItems" trigger="click" placement="bottom-end" v-bind="$attrs">
+  <MkDropdown v-if="hasDropdownItems" class="mk-table-more-dropdown [button+&]:ml-1" trigger="click" placement="bottom-end" v-bind="$attrs">
     <el-button type="primary" text @click.stop>
       <MkIcon name="icon_more_outlined" />
     </el-button>
diff --git a/ui/src/views/VIEW_README.md b/ui/src/views/VIEW_README.md
index 1c370079a6d..70957ed1d61 100644
--- a/ui/src/views/VIEW_README.md
+++ b/ui/src/views/VIEW_README.md
@@ -804,18 +804,13 @@ application、tool、knowledge 的 WorkflowView 统一使用一个 `loading` 控
 
 `system/resource-management/ModelResourceView.vue` 与 `ToolResourceView.vue` 使用
 `MkViewLayout`、`MkComplexSearch` 和 `MkTable` 展示跨工作空间资源。
-模型操作列通过 `MkTableOperationGroup` 按插槽顺序外露编辑与资源授权，其余操作自动进入 More；
-参数设置的显隐条件直接写在 Action 上，业务 Action 复用 `MkAction` 适配按钮与菜单。
-模型 `action-dropdown` 中的编辑、删除、参数设置、授权和关联资源入口统一使用 `MkAction`。
-资源管理页复用 `EditModelAction`，传入 System API、供应商和禁用状态；该 Action 内聚编辑抽屉，
-保存后发送 `refresh`。共享模型页继续组合相同业务 Action，在卡片菜单中自动显示为菜单项。
-资源管理删除保留页面专属确认、引用数量提示、加载状态和分页回退，通过 `MkAction` 展示，
-不强行复用卡片的 `DeleteModelAction`。
-工具操作列同样使用 `MkTableOperationGroup`，按现有模板顺序和显隐条件外露前两个操作；
-启停开关位于操作组外，不计入两个操作。商店工具改名、System 工作流跳转和带引用提示、
-分页回退的删除继续由资源管理页维护，通过 `MkAction` 展示。
-工具 `action-dropdown` 内的各操作统一使用 `MkAction`，Workspace 和共享工具卡片仍通过
-`MkDropdownMenu` 自动显示菜单项，保留原有 API、权限条件、事件和浮层生命周期。
+模型操作列使用 `EditModelAction display="button"` 展示编辑按钮，其余操作放入 `MkTableMoreDropdown`；
+`EditModelAction` 透传 `display` 给 `MkAction`，默认保持菜单模式，内部管理编辑抽屉，保存后发出 `refresh`。
+模型和工具仅编辑、资源授权四个 Action 使用 `MkAction` 并透传显式 `display`，默认菜单模式；
+其他业务 Action 继续使用 `MkDropdownItem`，页面按现有布局显式选择按钮或菜单。
+工具操作列保留独立启停开关，
+其余操作放入 `MkTableMoreDropdown`。菜单开启 `persistent`，业务 Action 使用 `MkDropdownItem`，
+保留各自 API、权限条件、事件和浮层生命周期。资源管理页保留带引用提示和分页回退的独立删除流程。
 名称、类型、创建者（工具另含来源）筛选和工作空间表头筛选变化后回到第一页；分页大小变化由
 `MkTable` 重置页码。工作空间列及选项查询只在企业版开启，`workspace_ids` 沿用 JSON 数组字符串。
 页面使用 v3 的 System 权限方法保留迁移前已有的操作权限，不增加创建、导入、批量或复制入口。
diff --git a/ui/src/views/model/model-card/action-dropdown/AuthorizeModelAction.vue b/ui/src/views/model/model-card/action-dropdown/AuthorizeModelAction.vue
index b9b1a59f1c6..60a241005a5 100644
--- a/ui/src/views/model/model-card/action-dropdown/AuthorizeModelAction.vue
+++ b/ui/src/views/model/model-card/action-dropdown/AuthorizeModelAction.vue
@@ -5,7 +5,7 @@ import { RESOURCE_TYPE } from '@/api/enums'
 import ResourceAuthorizationDrawer from '@/components/business/resource-authorization-drawer/index.vue'
 
 defineOptions({ name: 'AuthorizeModelAction' })
-const props = defineProps<{ model: ModelItem; label: string }>()
+const props = defineProps<{ model: ModelItem; label: string; display?: 'menu' | 'button' }>()
 
 const drawerMounted = ref(false)
 const authorizationDrawerRef = useTemplateRef<InstanceType<typeof ResourceAuthorizationDrawer>>('authorizationDrawerRef')
@@ -22,7 +22,7 @@ function handleDrawerClosed() {
 
 <template>
   <!-- 资源授权 -->
-  <MkAction :label="label" icon="icon_passkeys_outlined" @click="handleOpenAuthorization" />
+  <MkAction :display="display" :label="label" icon="icon_passkeys_outlined" @click="handleOpenAuthorization" />
   <ResourceAuthorizationDrawer
     v-if="drawerMounted"
     ref="authorizationDrawerRef"
diff --git a/ui/src/views/model/model-card/action-dropdown/DeleteModelAction.vue b/ui/src/views/model/model-card/action-dropdown/DeleteModelAction.vue
index 569ce7a1343..a8c9a2f1239 100644
--- a/ui/src/views/model/model-card/action-dropdown/DeleteModelAction.vue
+++ b/ui/src/views/model/model-card/action-dropdown/DeleteModelAction.vue
@@ -24,5 +24,8 @@ function handleDeleteModel() {
 
 <template>
   <!-- 删除模型 -->
-  <MkAction :label="label" icon="icon_delete-trash_outlined" divided @click="handleDeleteModel" />
+  <MkDropdownItem divided @click="handleDeleteModel">
+    <template #icon><MkIcon name="icon_delete-trash_outlined" /></template>
+    <span>{{ label }}</span>
+  </MkDropdownItem>
 </template>
diff --git a/ui/src/views/model/model-card/action-dropdown/RelatedResourcesModelAction.vue b/ui/src/views/model/model-card/action-dropdown/RelatedResourcesModelAction.vue
index 7d29dc6c10e..8d7a10783a4 100644
--- a/ui/src/views/model/model-card/action-dropdown/RelatedResourcesModelAction.vue
+++ b/ui/src/views/model/model-card/action-dropdown/RelatedResourcesModelAction.vue
@@ -26,6 +26,9 @@ function handleDrawerClosed() {
 
 <template>
   <!-- 查看关联资源 -->
-  <MkAction :label="label" icon="icon_mindnote_outlined" @click="handleOpenRelatedResources" />
+  <MkDropdownItem @click="handleOpenRelatedResources">
+    <template #icon><MkIcon name="icon_mindnote_outlined" /></template>
+    <span>{{ label }}</span>
+  </MkDropdownItem>
   <RelatedResourcesDrawer v-if="drawerMounted" ref="relatedResourcesDrawerRef" :api="api" @closed="handleDrawerClosed" />
 </template>
diff --git a/ui/src/views/model/model-card/action-dropdown/edit-model-action/EditModelAction.vue b/ui/src/views/model/model-card/action-dropdown/edit-model-action/EditModelAction.vue
index 5a27fc0cc5f..43533786533 100644
--- a/ui/src/views/model/model-card/action-dropdown/edit-model-action/EditModelAction.vue
+++ b/ui/src/views/model/model-card/action-dropdown/edit-model-action/EditModelAction.vue
@@ -10,6 +10,7 @@ defineOptions({ name: 'EditModelAction' })
 
 const props = defineProps<{
   api: typeof ModelApi | typeof SystemSharedModelApi | typeof SystemResourceModelApi
+  display?: 'menu' | 'button'
   disabled?: boolean
   label: string
   model: ModelItem
@@ -33,7 +34,7 @@ function handleDrawerClosed() {
 
 <template>
   <!-- 编辑模型 -->
-  <MkAction :label="label" icon="icon_edit_outlined" :disabled="disabled" @click="handleOpenEditModel" />
+  <MkAction :display="display" :label="label" icon="icon_edit_outlined" :disabled="disabled" @click="handleOpenEditModel" />
 
   <EditModelDrawer v-if="drawerMounted" ref="editModelDrawerRef" :api="api" @closed="handleDrawerClosed" @refresh="emit('refresh')" />
 </template>
diff --git a/ui/src/views/model/model-card/action-dropdown/param-setting-action/ParamSettingAction.vue b/ui/src/views/model/model-card/action-dropdown/param-setting-action/ParamSettingAction.vue
index 82e08f381c6..dab768b1138 100644
--- a/ui/src/views/model/model-card/action-dropdown/param-setting-action/ParamSettingAction.vue
+++ b/ui/src/views/model/model-card/action-dropdown/param-setting-action/ParamSettingAction.vue
@@ -25,7 +25,10 @@ function handleDrawerClosed() {
 
 <template>
   <!-- 模型参数设置 -->
-  <MkAction :label="label" icon="icon_preferences_outlined" @click="handleOpenParamSetting" />
+  <MkDropdownItem @click="handleOpenParamSetting">
+    <template #icon><MkIcon name="icon_preferences_outlined" /></template>
+    <span>{{ label }}</span>
+  </MkDropdownItem>
 
   <ParamSettingDrawer v-if="drawerMounted" ref="paramSettingDrawerRef" :api="api" @closed="handleDrawerClosed" />
 </template>
diff --git a/ui/src/views/system/chat-management/users/UserListView.vue b/ui/src/views/system/chat-management/users/UserListView.vue
index 621d4e57ff0..0db0fe25ba2 100644
--- a/ui/src/views/system/chat-management/users/UserListView.vue
+++ b/ui/src/views/system/chat-management/users/UserListView.vue
@@ -222,7 +222,7 @@ onMounted(() => loadChatUsers())
                 <!-- 修改用户密码 -->
                 <ButtonChangeUserPassword :user="row" @refresh="loadChatUsers(false)" />
                 <!-- 更多 -->
-                <MkTableMoreDropdown class="ml-1" persistent>
+                <MkTableMoreDropdown persistent>
                   <!-- 配额设置 -->
                   <ButtonQuotaSettings v-if="perm.system.chatUser.quotaSetting()" :user-ids="row.id" dropdown @refresh="loadChatUsers()" />
                   <!-- 删除 -->
diff --git a/ui/src/views/system/resource-management/ModelResourceView.vue b/ui/src/views/system/resource-management/ModelResourceView.vue
index d80a0818de2..1e070491c0e 100644
--- a/ui/src/views/system/resource-management/ModelResourceView.vue
+++ b/ui/src/views/system/resource-management/ModelResourceView.vue
@@ -149,11 +149,12 @@ onMounted(() => {
         <el-table-column label="创建时间" width="180"
           ><template #default="{ row }">{{ datetimeFormat(row.create_time) }}</template></el-table-column
         >
-        <el-table-column label="操作" width="140" fixed="right">
+        <el-table-column label="操作" width="120" fixed="right">
           <template #default="{ row }">
-            <MkTableOperationGroup>
+            <div class="flex-align-center gap-1">
               <!-- 编辑模型 -->
               <EditModelAction
+                display="button"
                 label="编辑"
                 :api="SystemModelApi"
                 :model="row"
@@ -161,20 +162,26 @@ onMounted(() => {
                 :disabled="loading"
                 @refresh="loadModels"
               />
+
               <!-- 资源授权 -->
-              <AuthorizeModelAction label="资源授权" :model="row" />
-              <!-- 模型参数设置 -->
-              <ParamSettingAction
-                v-if="['TTS', 'LLM', 'IMAGE', 'TTI', 'STT', 'EMBEDDING'].includes(row.model_type)"
-                label="模型参数设置"
-                :api="SystemModelApi"
-                :model="row"
-              />
-              <!-- 查看关联资源 -->
-              <RelatedResourcesModelAction label="查看关联资源" :api="SystemRelatedResourcesApi" :model="row" />
-              <!-- 删除模型 -->
-              <MkAction label="删除" icon="icon_delete-trash_outlined" divided :disabled="loading" @click="handleDeleteModel(row)" />
-            </MkTableOperationGroup>
+              <AuthorizeModelAction display="button" label="资源授权" :model="row" />
+              <!-- 更多模型操作 -->
+              <MkTableMoreDropdown persistent>
+                <!-- 模型参数设置 -->
+                <ParamSettingAction
+                  v-if="['TTS', 'LLM', 'IMAGE', 'TTI', 'STT', 'EMBEDDING'].includes(row.model_type)"
+                  label="模型参数设置"
+                  :api="SystemModelApi"
+                  :model="row"
+                />
+                <!-- 查看关联资源 -->
+                <RelatedResourcesModelAction label="查看关联资源" :api="SystemRelatedResourcesApi" :model="row" />
+                <!-- 删除模型 -->
+                <MkDropdownItem divided :disabled="loading" @click="handleDeleteModel(row)">
+                  <template #icon><MkIcon name="icon_delete-trash_outlined" /></template>删除
+                </MkDropdownItem>
+              </MkTableMoreDropdown>
+            </div>
           </template>
         </el-table-column>
       </MkTable>
diff --git a/ui/src/views/system/resource-management/ToolResourceView.vue b/ui/src/views/system/resource-management/ToolResourceView.vue
index f06d2a80d1b..9c248eabfd8 100644
--- a/ui/src/views/system/resource-management/ToolResourceView.vue
+++ b/ui/src/views/system/resource-management/ToolResourceView.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
-import { computed, onMounted, ref, useTemplateRef } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
-import type { FormInstance } from 'element-plus'
 import SystemToolApi from '@/api/admin/system/resource-management/tool/tool'
 import SystemToolWorkflowApi from '@/api/admin/system/resource-management/tool/tool-workflow'
 import SystemRelatedResourcesApi from '@/api/admin/system/resource-management/related-resources'
@@ -12,7 +11,6 @@ import type { Dict, OptionItem, ToolItem } from '@/api/types'
 import { TOOL_TYPE } from '@/api/enums'
 import { TOOL_TYPE_OPTIONS } from '@/constants'
 import { useStore } from '@/stores'
-import perm from '@/permission'
 import { datetimeFormat } from '@/utils/time'
 import { MsgConfirm, MsgSuccess } from '@/utils/message'
 import ToolStatusSwitch from '@/views/tool/tool-card/ToolStatusSwitch.vue'
@@ -177,28 +175,22 @@ onMounted(() => {
         <el-table-column label="创建时间" width="180"
           ><template #default="{ row }">{{ datetimeFormat(row.create_time) }}</template></el-table-column
         >
-        <el-table-column label="操作" width="200" fixed="right">
+        <el-table-column label="操作" width="140" fixed="right">
           <template #default="{ row }">
-            <div class="flex-align-center gap-3">
+            <div class="flex-align-center gap-1">
               <!-- 启用或禁用工具 -->
-              <ToolStatusSwitch
-                v-if="perm.tool.system.switch()"
-                v-model:loading="operationLoading"
-                :api="SystemToolApi"
-                :tool="row"
-                @update="handleToolUpdate"
-              />
-              <!-- 工具操作，前两个外露，其余进入更多菜单 -->
-              <MkTableOperationGroup>
-                <!-- 编辑工具配置 -->
-                <EditToolAction label="编辑" :api="SystemToolApi" :tool="row" @update="handleToolUpdate" />
-                <!-- 资源授权 -->
-                <AuthorizeToolAction v-if="perm.tool.system.auth()" label="资源授权" :tool="row" />
+              <ToolStatusSwitch class="mr-1!" v-model:loading="operationLoading" :api="SystemToolApi" :tool="row" @update="handleToolUpdate" />
+              <!-- 编辑工具配置 -->
+              <EditToolAction display="button" label="编辑" :api="SystemToolApi" :tool="row" @update="handleToolUpdate" />
+              <!-- 更多工具操作 -->
+              <MkTableMoreDropdown persistent>
                 <!-- 打开工具工作流 -->
-                <MkAction v-if="row.tool_type === TOOL_TYPE.WORKFLOW" label="工作流" icon="icon_setting" @click="handleOpenWorkflow(row, $event)" />
+                <MkDropdownItem v-if="row.tool_type === TOOL_TYPE.WORKFLOW" @click="handleOpenWorkflow(row, $event)">
+                  <template #icon><MkIcon name="icon_setting" /></template>工作流
+                </MkDropdownItem>
                 <!-- 配置启动参数 -->
                 <InitParamAction
-                  v-if="row.init_field_list?.length && perm.tool.system.edit()"
+                  v-if="row.init_field_list?.length"
                   v-model:loading="operationLoading"
                   label="启动参数"
                   :api="SystemToolApi"
@@ -206,17 +198,14 @@ onMounted(() => {
                   @update="handleToolUpdate"
                 />
 
+                <!-- 资源授权 -->
+                <AuthorizeToolAction label="资源授权" :tool="row" />
+
                 <!-- 导出工具 -->
-                <ExportToolAction
-                  v-if="!row.template_id && perm.tool.system.export()"
-                  v-model:loading="operationLoading"
-                  label="导出"
-                  :api="SystemToolApi"
-                  :tool="row"
-                />
+                <ExportToolAction v-if="!row.template_id" v-model:loading="operationLoading" label="导出" :api="SystemToolApi" :tool="row" />
                 <!-- 查看 MCP 配置 -->
                 <McpConfigAction
-                  v-if="row.tool_type === TOOL_TYPE.MCP && perm.tool.system.edit()"
+                  v-if="row.tool_type === TOOL_TYPE.MCP"
                   v-model:loading="operationLoading"
                   label="MCP 配置详情"
                   :api="SystemToolApi"
@@ -226,30 +215,25 @@ onMounted(() => {
                 <TriggerToolAction
                   :tool-api="SystemToolApi"
                   :tool-workflow-api="SystemToolWorkflowApi"
-                  v-if="[TOOL_TYPE.CUSTOM, TOOL_TYPE.WORKFLOW].includes(row.tool_type) && perm.tool.system.triggerRead()"
+                  v-if="[TOOL_TYPE.CUSTOM, TOOL_TYPE.WORKFLOW].includes(row.tool_type)"
                   label="触发器"
                   :api="SystemResourceTriggerApi"
                   :tool="row"
                 />
                 <!-- 查看关联资源 -->
-                <RelatedResourcesToolAction v-if="perm.tool.system.relateMap()" label="查看关联资源" :api="SystemRelatedResourcesApi" :tool="row" />
+                <RelatedResourcesToolAction label="查看关联资源" :api="SystemRelatedResourcesApi" :tool="row" />
                 <!-- 查看执行记录 -->
                 <ExecutionRecordToolAction
-                  v-if="[TOOL_TYPE.CUSTOM, TOOL_TYPE.WORKFLOW].includes(row.tool_type) && perm.tool.system.record()"
+                  v-if="[TOOL_TYPE.CUSTOM, TOOL_TYPE.WORKFLOW].includes(row.tool_type)"
                   label="执行记录"
                   :api="SystemToolWorkflowApi"
                   :tool="row"
                 />
                 <!-- 删除工具 -->
-                <MkAction
-                  v-if="perm.tool.system.delete()"
-                  label="删除"
-                  icon="icon_delete-trash_outlined"
-                  divided
-                  :disabled="operationLoading"
-                  @click="handleDeleteTool(row)"
-                />
-              </MkTableOperationGroup>
+                <MkDropdownItem divided :disabled="operationLoading" @click="handleDeleteTool(row)">
+                  <template #icon><MkIcon name="icon_delete-trash_outlined" /></template>删除
+                </MkDropdownItem>
+              </MkTableMoreDropdown>
             </div>
           </template>
         </el-table-column>
diff --git a/ui/src/views/tool/tool-card/ToolStatusSwitch.vue b/ui/src/views/tool/tool-card/ToolStatusSwitch.vue
index cf66459ce61..93bb60933ac 100644
--- a/ui/src/views/tool/tool-card/ToolStatusSwitch.vue
+++ b/ui/src/views/tool/tool-card/ToolStatusSwitch.vue
@@ -8,7 +8,7 @@ import type { ToolItem } from '@/api/types'
 import { MsgConfirm, MsgError, MsgSuccess } from '@/utils/message'
 import InitParamDialog from './InitParamDialog.vue'
 
-defineOptions({ name: 'ToolStatusSwitch' })
+defineOptions({ name: 'ToolStatusSwitch', inheritAttrs: false })
 
 const props = defineProps<{ api: typeof ToolApi | typeof SystemSharedToolApi | typeof SystemResourceToolApi; tool: ToolItem }>()
 
@@ -73,7 +73,7 @@ function updateToolStatus(active: boolean) {
 </script>
 
 <template>
-  <div>
+  <div class="flex-align-center" v-bind="$attrs">
     <el-switch :disabled="loading" :model-value="tool.is_active" class="mr-3" size="small" :before-change="handleToolStatusChange" />
     <el-divider direction="vertical" />
   </div>
diff --git a/ui/src/views/tool/tool-card/action-dropdown/AuthorizeToolAction.vue b/ui/src/views/tool/tool-card/action-dropdown/AuthorizeToolAction.vue
index 1b569a8f8ff..c1ef6b9416a 100644
--- a/ui/src/views/tool/tool-card/action-dropdown/AuthorizeToolAction.vue
+++ b/ui/src/views/tool/tool-card/action-dropdown/AuthorizeToolAction.vue
@@ -5,7 +5,7 @@ import { RESOURCE_TYPE } from '@/api/enums'
 import ResourceAuthorizationDrawer from '@/components/business/resource-authorization-drawer/index.vue'
 
 defineOptions({ name: 'AuthorizeToolAction' })
-const props = defineProps<{ tool: ToolItem; label: string }>()
+const props = defineProps<{ tool: ToolItem; label: string; display?: 'menu' | 'button' }>()
 
 const drawerMounted = ref(false)
 const authorizationDrawerRef = useTemplateRef<InstanceType<typeof ResourceAuthorizationDrawer>>('authorizationDrawerRef')
@@ -22,7 +22,7 @@ function handleDrawerClosed() {
 
 <template>
   <!-- 资源授权 -->
-  <MkAction :label="label" icon="icon_passkeys_outlined" @click="handleOpenAuthorization" />
+  <MkAction :display="display" :label="label" icon="icon_passkeys_outlined" @click="handleOpenAuthorization" />
   <ResourceAuthorizationDrawer
     v-if="drawerMounted"
     ref="authorizationDrawerRef"
diff --git a/ui/src/views/tool/tool-card/action-dropdown/CopyToolAction.vue b/ui/src/views/tool/tool-card/action-dropdown/CopyToolAction.vue
index d646349ccad..2d535a6bf05 100644
--- a/ui/src/views/tool/tool-card/action-dropdown/CopyToolAction.vue
+++ b/ui/src/views/tool/tool-card/action-dropdown/CopyToolAction.vue
@@ -60,7 +60,10 @@ function handleFormClosed() {
 
 <template>
   <!-- 复制工具 -->
-  <MkAction :label="label" icon="icon_copy_outlined" @click="handleCopyTool" />
+  <MkDropdownItem @click="handleCopyTool">
+    <template #icon><MkIcon name="icon_copy_outlined" /></template>
+    <span>{{ label }}</span>
+  </MkDropdownItem>
 
   <template v-if="formMounted">
     <ToolFormDrawer
diff --git a/ui/src/views/tool/tool-card/action-dropdown/DeleteToolAction.vue b/ui/src/views/tool/tool-card/action-dropdown/DeleteToolAction.vue
index 0e8ee0d24df..31067b6bf7a 100644
--- a/ui/src/views/tool/tool-card/action-dropdown/DeleteToolAction.vue
+++ b/ui/src/views/tool/tool-card/action-dropdown/DeleteToolAction.vue
@@ -30,5 +30,8 @@ function handleDeleteTool() {
 
 <template>
   <!-- 删除工具 -->
-  <MkAction :label="label" icon="icon_delete-trash_outlined" divided @click="handleDeleteTool" />
+  <MkDropdownItem divided @click="handleDeleteTool">
+    <template #icon><MkIcon name="icon_delete-trash_outlined" /></template>
+    <span>{{ label }}</span>
+  </MkDropdownItem>
 </template>
diff --git a/ui/src/views/tool/tool-card/action-dropdown/EditToolAction.vue b/ui/src/views/tool/tool-card/action-dropdown/EditToolAction.vue
index 4c5f2430448..70c515b3f71 100644
--- a/ui/src/views/tool/tool-card/action-dropdown/EditToolAction.vue
+++ b/ui/src/views/tool/tool-card/action-dropdown/EditToolAction.vue
@@ -13,7 +13,12 @@ import WorkflowFormDialog from '@/views/tool/tool-form/WorkflowFormDialog.vue'
 
 defineOptions({ name: 'EditToolAction' })
 
-const props = defineProps<{ api: typeof ToolApi | typeof SystemSharedToolApi | typeof SystemResourceToolApi; label: string; tool: ToolItem }>()
+const props = defineProps<{
+  api: typeof ToolApi | typeof SystemSharedToolApi | typeof SystemResourceToolApi
+  display?: 'menu' | 'button'
+  label: string
+  tool: ToolItem
+}>()
 
 const emit = defineEmits<{ update: [tool: ToolItem] }>()
 
@@ -49,7 +54,7 @@ defineExpose({ handleOpenToolForm })
 
 <template>
   <!-- 编辑工具 -->
-  <MkAction :label="label" icon="icon_edit_outlined" @click="handleOpenToolForm" />
+  <MkAction :display="display" :label="label" icon="icon_edit_outlined" @click="handleOpenToolForm" />
 
   <template v-if="formMounted">
     <DataSourceFormDrawer
diff --git a/ui/src/views/tool/tool-card/action-dropdown/ExecutionRecordToolAction.vue b/ui/src/views/tool/tool-card/action-dropdown/ExecutionRecordToolAction.vue
index d73e7dd1e77..8d7ee4183f4 100644
--- a/ui/src/views/tool/tool-card/action-dropdown/ExecutionRecordToolAction.vue
+++ b/ui/src/views/tool/tool-card/action-dropdown/ExecutionRecordToolAction.vue
@@ -20,6 +20,9 @@ function handleDrawerClosed() {
 
 <template>
   <!-- 查看执行记录 -->
-  <MkAction :label="label" icon="icon_schedule-report_outlined" @click="handleOpenExecutionRecords" />
+  <MkDropdownItem @click="handleOpenExecutionRecords">
+    <template #icon><MkIcon name="icon_schedule-report_outlined" /></template>
+    <span>{{ label }}</span>
+  </MkDropdownItem>
   <ExecutionRecordDrawer v-if="drawerMounted" ref="executionRecordDrawerRef" :api="props.api" :tool-id="tool.id" @closed="handleDrawerClosed" />
 </template>
diff --git a/ui/src/views/tool/tool-card/action-dropdown/ExportToolAction.vue b/ui/src/views/tool/tool-card/action-dropdown/ExportToolAction.vue
index 7d4123e9af5..dde96fa46fa 100644
--- a/ui/src/views/tool/tool-card/action-dropdown/ExportToolAction.vue
+++ b/ui/src/views/tool/tool-card/action-dropdown/ExportToolAction.vue
@@ -28,5 +28,8 @@ function handleExportTool() {
 
 <template>
   <!-- 导出工具 -->
-  <MkAction :label="label" icon="icon_export_outlined" divided @click="handleExportTool" />
+  <MkDropdownItem divided @click="handleExportTool">
+    <template #icon><MkIcon name="icon_export_outlined" /></template>
+    <span>{{ label }}</span>
+  </MkDropdownItem>
 </template>
diff --git a/ui/src/views/tool/tool-card/action-dropdown/InitParamAction.vue b/ui/src/views/tool/tool-card/action-dropdown/InitParamAction.vue
index 84f0c07a3bc..bfe5ce4b3b7 100644
--- a/ui/src/views/tool/tool-card/action-dropdown/InitParamAction.vue
+++ b/ui/src/views/tool/tool-card/action-dropdown/InitParamAction.vue
@@ -37,7 +37,10 @@ function handleDialogClosed() {
 
 <template>
   <!-- 配置启动参数 -->
-  <MkAction :label="label" icon="icon_preferences_outlined" @click="handleOpenInitParam" />
+  <MkDropdownItem @click="handleOpenInitParam">
+    <template #icon><MkIcon name="icon_preferences_outlined" /></template>
+    <span>{{ label }}</span>
+  </MkDropdownItem>
 
   <InitParamDialog v-if="dialogMounted" ref="initParamDialogRef" :api="api" @closed="handleDialogClosed" @update="emit('update', $event)" />
 </template>
diff --git a/ui/src/views/tool/tool-card/action-dropdown/MoveToolAction.vue b/ui/src/views/tool/tool-card/action-dropdown/MoveToolAction.vue
index 47e1d6eb3dc..0bcf2126285 100644
--- a/ui/src/views/tool/tool-card/action-dropdown/MoveToolAction.vue
+++ b/ui/src/views/tool/tool-card/action-dropdown/MoveToolAction.vue
@@ -45,7 +45,10 @@ function handleDialogClosed() {
 
 <template>
   <!-- 移动工具 -->
-  <MkAction :label="label" icon="icon_move2_outlined" @click="handleOpenMoveTool" />
+  <MkDropdownItem @click="handleOpenMoveTool">
+    <template #icon><MkIcon name="icon_move2_outlined" /></template>
+    <span>{{ label }}</span>
+  </MkDropdownItem>
 
   <MoveToDialog
     v-if="dialogMounted"
diff --git a/ui/src/views/tool/tool-card/action-dropdown/RelatedResourcesToolAction.vue b/ui/src/views/tool/tool-card/action-dropdown/RelatedResourcesToolAction.vue
index ade89a0618c..1131a206ce0 100644
--- a/ui/src/views/tool/tool-card/action-dropdown/RelatedResourcesToolAction.vue
+++ b/ui/src/views/tool/tool-card/action-dropdown/RelatedResourcesToolAction.vue
@@ -33,6 +33,9 @@ function handleDrawerClosed() {
 
 <template>
   <!-- 查看关联资源 -->
-  <MkAction :label="label" icon="icon_mindnote_outlined" @click="handleOpenRelatedResources" />
+  <MkDropdownItem @click="handleOpenRelatedResources">
+    <template #icon><MkIcon name="icon_mindnote_outlined" /></template>
+    <span>{{ label }}</span>
+  </MkDropdownItem>
   <RelatedResourcesDrawer v-if="drawerMounted" ref="relatedResourcesDrawerRef" :api="api" @closed="handleDrawerClosed" />
 </template>
diff --git a/ui/src/views/tool/tool-card/action-dropdown/ToolWorkflowAction.vue b/ui/src/views/tool/tool-card/action-dropdown/ToolWorkflowAction.vue
index 7826faa370f..707e7f970b7 100644
--- a/ui/src/views/tool/tool-card/action-dropdown/ToolWorkflowAction.vue
+++ b/ui/src/views/tool/tool-card/action-dropdown/ToolWorkflowAction.vue
@@ -27,5 +27,8 @@ function handleOpenWorkflow(event: MouseEvent) {
 
 <template>
   <!-- 打开工具工作流 -->
-  <MkAction :label="label" icon="icon_setting" @click="handleOpenWorkflow" />
+  <MkDropdownItem @click="handleOpenWorkflow">
+    <template #icon><MkIcon name="icon_setting" /></template>
+    <span>{{ label }}</span>
+  </MkDropdownItem>
 </template>
diff --git a/ui/src/views/tool/tool-card/action-dropdown/TriggerToolAction.vue b/ui/src/views/tool/tool-card/action-dropdown/TriggerToolAction.vue
index ef44ed3e563..fdd42628660 100644
--- a/ui/src/views/tool/tool-card/action-dropdown/TriggerToolAction.vue
+++ b/ui/src/views/tool/tool-card/action-dropdown/TriggerToolAction.vue
@@ -36,7 +36,10 @@ function handleDialogClosed() {
 
 <template>
   <!-- 查看工具触发器 -->
-  <MkAction :label="label" icon="icon-laser" @click="handleOpenTriggers" />
+  <MkDropdownItem @click="handleOpenTriggers">
+    <template #icon><MkIcon name="icon-laser" /></template>
+    <span>{{ label }}</span>
+  </MkDropdownItem>
   <ResourceTriggerDialog
     :tool-api="toolApi"
     :tool-workflow-api="toolWorkflowApi"
diff --git a/ui/src/views/tool/tool-card/action-dropdown/mcp-config-action/McpConfigAction.vue b/ui/src/views/tool/tool-card/action-dropdown/mcp-config-action/McpConfigAction.vue
index 41f51352981..2605f3fbae0 100644
--- a/ui/src/views/tool/tool-card/action-dropdown/mcp-config-action/McpConfigAction.vue
+++ b/ui/src/views/tool/tool-card/action-dropdown/mcp-config-action/McpConfigAction.vue
@@ -35,7 +35,10 @@ function handleDialogClosed() {
 
 <template>
   <!-- 查看 MCP 配置 -->
-  <MkAction :label="label" icon="icon_describe_outlined" @click="handleOpenMcpConfig" />
+  <MkDropdownItem @click="handleOpenMcpConfig">
+    <template #icon><MkIcon name="icon_describe_outlined" /></template>
+    <span>{{ label }}</span>
+  </MkDropdownItem>
 
   <McpConfigDialog v-if="dialogMounted" ref="mcpConfigDialogRef" @closed="handleDialogClosed" />
 </template>