From 1a520f1932d548f2dd5e1abdc8c758b7f2c2e010 Mon Sep 17 00:00:00 2001
From: dqn <someonegdeng@qq.com>
Date: Wed, 3 Jun 2026 14:29:36 +0800
Subject: [PATCH 1/2] fix(desktop): swap import/export connection icons and add
 import tooltip

Import now uses Download icon and Export uses Upload icon (they were
reversed). Also wrapped the import dropdown in a styled Tooltip to
match the export button's hover behavior.
---
 .../src/components/layout/AppSidebar.vue      | 40 +++++++++++--------
 .../src/components/layout/WelcomeScreen.vue   |  4 +-
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/apps/desktop/src/components/layout/AppSidebar.vue b/apps/desktop/src/components/layout/AppSidebar.vue
index 83c2fb9ec..bcdac51da 100644
--- a/apps/desktop/src/components/layout/AppSidebar.vue
+++ b/apps/desktop/src/components/layout/AppSidebar.vue
@@ -66,26 +66,32 @@ defineExpose({ focusSearch });
           t("sidebar.connections")
         }}</span>
         <span class="flex-1 self-stretch" data-tauri-drag-region />
-        <LightDropdown
-          model-value=""
-          :items="importSourceItems"
-          :aria-label="t('sidebar.import')"
-          :trigger-title="t('sidebar.import')"
-          :trigger-icon="Upload"
-          trigger-class="inline-flex h-6 w-5 items-center justify-center rounded-md outline-none hover:bg-muted hover:text-foreground focus-visible:ring-0"
-          trigger-icon-class="h-4 w-4"
-          content-class="w-44"
-          :show-trigger-label="false"
-          :show-chevron="false"
-          :highlight-selected="false"
-          check-position="none"
-          align="end"
-          @update:model-value="(source) => emit('import', source as 'dbx' | 'navicat' | 'dbeaver')"
-        />
+        <Tooltip>
+          <TooltipTrigger as-child>
+            <span class="inline-flex">
+              <LightDropdown
+                model-value=""
+                :items="importSourceItems"
+                :aria-label="t('sidebar.import')"
+                :trigger-icon="Download"
+                trigger-class="inline-flex h-6 w-5 items-center justify-center rounded-md outline-none hover:bg-muted hover:text-foreground focus-visible:ring-0"
+                trigger-icon-class="h-4 w-4"
+                content-class="w-44"
+                :show-trigger-label="false"
+                :show-chevron="false"
+                :highlight-selected="false"
+                check-position="none"
+                align="end"
+                @update:model-value="(source) => emit('import', source as 'dbx' | 'navicat' | 'dbeaver')"
+              />
+            </span>
+          </TooltipTrigger>
+          <TooltipContent>{{ t("sidebar.import") }}</TooltipContent>
+        </Tooltip>
         <Tooltip>
           <TooltipTrigger as-child>
             <Button variant="ghost" size="icon" class="h-5 w-5" @click="emit('export')">
-              <Download class="h-3 w-3" />
+              <Upload class="h-3 w-3" />
             </Button>
           </TooltipTrigger>
           <TooltipContent>{{ t("sidebar.export") }}</TooltipContent>
diff --git a/apps/desktop/src/components/layout/WelcomeScreen.vue b/apps/desktop/src/components/layout/WelcomeScreen.vue
index c475eadf9..f4a1d8bed 100644
--- a/apps/desktop/src/components/layout/WelcomeScreen.vue
+++ b/apps/desktop/src/components/layout/WelcomeScreen.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useI18n } from "vue-i18n";
-import { FilePlus2, Plus, History, Upload, Database, Search, ShieldCheck, Sparkles } from "@lucide/vue";
+import { FilePlus2, Plus, History, Download, Database, Search, ShieldCheck, Sparkles } from "@lucide/vue";
 import DatabaseIcon from "@/components/icons/DatabaseIcon.vue";
 import {
   connectionDriverLabel,
@@ -110,7 +110,7 @@ const { t } = useI18n();
               class="flex items-center gap-2 rounded-md px-3 py-2 text-left text-sm hover:bg-muted/50"
               @click="emit('import-config')"
             >
-              <Upload class="h-4 w-4" /> {{ t("sidebar.import") }}
+              <Download class="h-4 w-4" /> {{ t("sidebar.import") }}
             </button>
             <div class="mt-2 rounded-md bg-muted/30 px-3 py-2 text-xs leading-5 text-muted-foreground">
               <Search class="mr-1 inline h-3.5 w-3.5" />

From 57c936bf8e33d4cde3a2e450c8185a2f4241b0eb Mon Sep 17 00:00:00 2001
From: dqn <someonegdeng@qq.com>
Date: Wed, 3 Jun 2026 15:35:37 +0800
Subject: [PATCH 2/2] fix(desktop): swap import/export icons for data/database
 context menu items

Import now uses Download icon and Export uses Upload icon (they were
reversed), consistent with the connection import/export icon fix.
---
 apps/desktop/src/components/objects/ObjectBrowser.vue | 10 +++++-----
 apps/desktop/src/components/sidebar/TreeItem.vue      | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/desktop/src/components/objects/ObjectBrowser.vue b/apps/desktop/src/components/objects/ObjectBrowser.vue
index ef8fbc6ba..17dab464e 100644
--- a/apps/desktop/src/components/objects/ObjectBrowser.vue
+++ b/apps/desktop/src/components/objects/ObjectBrowser.vue
@@ -17,7 +17,7 @@ import {
   Eraser,
   Eye,
   FileCode,
-  FileUp,
+  Upload,
   Loader2,
   Network,
   Pencil,
@@ -1197,7 +1197,7 @@ watch(
 function exportDataSubmenu(item: ObjectBrowserRow): ContextMenuItem {
   return {
     label: t("contextMenu.exportData"),
-    icon: Download,
+    icon: Upload,
     children: [
       { label: "CSV", action: () => exportData(item, "csv") },
       { label: "JSON", action: () => exportData(item, "json") },
@@ -1219,12 +1219,12 @@ function getTableMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
     { label: t("contextMenu.newQuery"), action: () => openNewQuery(item), icon: TerminalSquare },
     ...(canOpenDiagram.value ? [{ label: t("diagram.open"), action: () => openDiagram(item), icon: Network }] : []),
     ...(canOpenTableImport.value
-      ? [{ label: t("contextMenu.importData"), action: () => openTableImport(item), icon: FileUp }]
+      ? [{ label: t("contextMenu.importData"), action: () => openTableImport(item), icon: Download }]
       : []),
     { label: t("dataCompare.title"), action: () => openDataCompare(item), icon: ArrowRightLeft },
     { label: "", separator: true },
     exportDataSubmenu(item),
-    { label: t("contextMenu.exportDatabase"), action: () => openDatabaseExport(item), icon: Download },
+    { label: t("contextMenu.exportDatabase"), action: () => openDatabaseExport(item), icon: Upload },
     { label: t("contextMenu.exportStructure"), action: () => exportStructure(item), icon: FileCode },
     { label: "", separator: true },
     { label: t("contextMenu.duplicateStructure"), action: () => requestDuplicateStructure(item), icon: CopyPlus },
@@ -1269,7 +1269,7 @@ function getViewMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
     ...(canOpenDiagram.value ? [{ label: t("diagram.open"), action: () => openDiagram(item), icon: Network }] : []),
     { label: "", separator: true },
     exportDataSubmenu(item),
-    { label: t("contextMenu.exportDatabase"), action: () => openDatabaseExport(item), icon: Download },
+    { label: t("contextMenu.exportDatabase"), action: () => openDatabaseExport(item), icon: Upload },
     { label: t("contextMenu.exportStructure"), action: () => exportStructure(item), icon: FileCode },
     { label: "", separator: true },
     {
diff --git a/apps/desktop/src/components/sidebar/TreeItem.vue b/apps/desktop/src/components/sidebar/TreeItem.vue
index 704f39448..68b6a4a4c 100644
--- a/apps/desktop/src/components/sidebar/TreeItem.vue
+++ b/apps/desktop/src/components/sidebar/TreeItem.vue
@@ -29,9 +29,9 @@ import {
   Pin,
   ArrowRightLeft,
   Download,
+  Upload,
   FileCode,
   Network,
-  FileUp,
   PencilRuler,
   Search,
   FolderInput,
@@ -2785,7 +2785,7 @@ const shortcutDelete = "Delete";
 function exportDataSubmenu(): ContextMenuItem {
   return {
     label: t("contextMenu.exportData"),
-    icon: Download,
+    icon: Upload,
     children: [
       { label: "CSV", action: () => exportData("csv") },
       { label: "JSON", action: () => exportData("json") },
@@ -2944,7 +2944,7 @@ function treeItemMenuItems(): ContextMenuItem[] {
     items.push({ label: t("transfer.dataTransfer"), action: openTransfer, icon: ArrowRightLeft });
     items.push({ label: t("diff.title"), action: openSchemaDiff, icon: ArrowRightLeft });
     items.push({ label: t("dataCompare.title"), action: openDataCompare, icon: ArrowRightLeft });
-    items.push({ label: t("contextMenu.exportDatabase"), action: openDatabaseExport, icon: Download });
+    items.push({ label: t("contextMenu.exportDatabase"), action: openDatabaseExport, icon: Upload });
     if (canCloseDatabaseConnection.value) {
       items.push({ label: "", separator: true });
       items.push({ label: t("contextMenu.closeDatabaseConnection"), action: closeDatabaseConnection, icon: Unplug });
@@ -3023,14 +3023,14 @@ function treeItemMenuItems(): ContextMenuItem[] {
       items.push({ label: t("diagram.open"), action: openDiagram, icon: Network });
     }
     if (canOpenTableImport.value) {
-      items.push({ label: t("contextMenu.importData"), action: openTableImport, icon: FileUp });
+      items.push({ label: t("contextMenu.importData"), action: openTableImport, icon: Download });
     }
     if (isTableNotView.value) {
       items.push({ label: t("dataCompare.title"), action: openDataCompare, icon: ArrowRightLeft });
     }
     items.push({ label: "", separator: true });
     items.push(exportDataSubmenu());
-    items.push({ label: t("contextMenu.exportDatabase"), action: openDatabaseExport, icon: Download });
+    items.push({ label: t("contextMenu.exportDatabase"), action: openDatabaseExport, icon: Upload });
     items.push({ label: t("contextMenu.exportStructure"), action: exportStructure, icon: FileCode });
     items.push(copyStructureAsSubmenu());
     if (isTableNotView.value) {