Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

fix(ui): inherit icons for context submenu actions (#11867)

zipg820f7b1c83a0
diff --git a/apps/desktop/src/components/ui/CustomContextMenu.vue b/apps/desktop/src/components/ui/CustomContextMenu.vue
index 28c4e00bec..e3e1fe4e43 100644
--- a/apps/desktop/src/components/ui/CustomContextMenu.vue
+++ b/apps/desktop/src/components/ui/CustomContextMenu.vue
@@ -372,7 +372,7 @@ onBeforeUnmount(() => {
>
<span v-if="child.checkedStyle !== 'switch'" class="flex size-4 shrink-0 items-center justify-center">
<Check v-if="child.checked" class="size-4 text-primary" />
- <component :is="child.icon" v-else-if="child.icon" :class="['size-4', child.iconClass]" />
+ <component :is="child.icon ?? activeItems[activeSubIndex]!.icon" v-else-if="child.icon || activeItems[activeSubIndex]!.icon" :class="['size-4', child.iconClass ?? (child.icon ? undefined : activeItems[activeSubIndex]!.iconClass)]" />
</span>
<span class="flex-1 whitespace-nowrap">{{ child.label }}</span>
<span v-if="child.checkedStyle === 'switch'" aria-hidden="true" class="ml-3 flex h-3.5 w-6 shrink-0 items-center rounded-full p-0.5 transition-colors" :class="child.checked ? 'bg-primary' : 'bg-input'">
diff --git a/apps/desktop/src/lib/sidebar/sidebarMenuLayout.ts b/apps/desktop/src/lib/sidebar/sidebarMenuLayout.ts
index 9cbad96636..759f9e58fa 100644
--- a/apps/desktop/src/lib/sidebar/sidebarMenuLayout.ts
+++ b/apps/desktop/src/lib/sidebar/sidebarMenuLayout.ts
@@ -147,6 +147,8 @@ function flattenMenuItem(item: ContextMenuItem, prefix = ""): ContextMenuItem[]
flattenMenuItem(
{
...child,
+ icon: child.icon ?? item.icon,
+ iconClass: child.iconClass ?? (child.icon ? undefined : item.iconClass),
variant: child.variant ?? item.variant,
disabled: () => (typeof item.disabled === "function" ? item.disabled() : !!item.disabled) || (typeof child.disabled === "function" ? child.disabled() : !!child.disabled),
},
diff --git a/docs/assets/context-menu-icons/copy-menu.jpg b/docs/assets/context-menu-icons/copy-menu.jpg
new file mode 100644
index 0000000000..eca915b772
Binary files /dev/null and b/docs/assets/context-menu-icons/copy-menu.jpg differ
diff --git a/docs/assets/context-menu-icons/export-menu.jpg b/docs/assets/context-menu-icons/export-menu.jpg
new file mode 100644
index 0000000000..887cb8d7ab
Binary files /dev/null and b/docs/assets/context-menu-icons/export-menu.jpg differ