From 8446c4dfb662df45fd24d219a3322e379c5a8bb2 Mon Sep 17 00:00:00 2001
From: Syngnat <yangguofeng919@gmail.com>
Date: Sun, 2 Aug 2026 12:42:05 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(connection-package):=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AF=BC=E5=87=BA=E6=97=B6=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 后端导出请求增加 connectionIds，仅打包所选连接
- 导出弹窗支持连接多选与未选校验
- 同步 Wails 绑定与传输测试
---
 .../ConnectionPackagePasswordModal.tsx        | 66 ++++++++++++++++++-
 frontend/src/utils/connectionExport.ts        |  1 +
 frontend/wailsjs/go/app/App.d.ts              |  4 +-
 frontend/wailsjs/go/app/App.js                |  8 +--
 frontend/wailsjs/go/models.ts                 | 59 +++++------------
 internal/app/cloud_backup.go                  |  2 +-
 internal/app/connection_package_transfer.go   | 63 ++++++++++++++++--
 .../app/connection_package_transfer_test.go   | 51 +++++++++++++-
 internal/app/connection_package_types.go      |  2 +
 9 files changed, 197 insertions(+), 59 deletions(-)

diff --git a/frontend/src/components/ConnectionPackagePasswordModal.tsx b/frontend/src/components/ConnectionPackagePasswordModal.tsx
index e91e8e40..ab4a9f41 100644
--- a/frontend/src/components/ConnectionPackagePasswordModal.tsx
+++ b/frontend/src/components/ConnectionPackagePasswordModal.tsx
@@ -1,12 +1,17 @@
 import Modal from './common/ResizableDraggableModal';
 import React from 'react';
-import { Button, Checkbox, Input, Typography } from 'antd';
+import { Button, Checkbox, Input, Select, Typography } from 'antd';
 import { useI18n } from '../i18n/provider';
 
 const { Text } = Typography;
 
 type ConnectionPackagePasswordModalMode = 'import' | 'export';
 
+export type ConnectionPackageExportOption = {
+  value: string;
+  label: string;
+};
+
 export interface ConnectionPackagePasswordModalProps {
   open: boolean;
   title: string;
@@ -18,6 +23,11 @@ export interface ConnectionPackagePasswordModalProps {
   confirmLoading?: boolean;
   confirmText?: string;
   cancelText?: string;
+  /** Export only: available connections for selection. */
+  connectionOptions?: ConnectionPackageExportOption[];
+  /** Export only: selected connection ids. Empty means none selected. */
+  selectedConnectionIds?: string[];
+  onSelectedConnectionIdsChange?: (ids: string[]) => void;
   onBack?: () => void;
   embedded?: boolean;
   onIncludeSecretsChange?: (value: boolean) => void;
@@ -38,6 +48,9 @@ export default function ConnectionPackagePasswordModal({
   confirmLoading,
   confirmText,
   cancelText,
+  connectionOptions = [],
+  selectedConnectionIds = [],
+  onSelectedConnectionIdsChange,
   onBack,
   embedded = false,
   onIncludeSecretsChange,
@@ -59,6 +72,9 @@ export default function ConnectionPackagePasswordModal({
     : (useFilePassword
       ? t('app.connection_package.dialog.help.share_file_password_separately')
       : t('app.connection_package.dialog.help.encrypted_passwords_recommend_file_password'));
+  const allConnectionIds = connectionOptions.map((item) => item.value);
+  const selectedCount = selectedConnectionIds.length;
+  const totalCount = connectionOptions.length;
 
   return (
     <Modal
@@ -87,6 +103,51 @@ export default function ConnectionPackagePasswordModal({
     >
       {isExportMode ? (
         <div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
+          <div>
+            <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 12, marginBottom: 6 }}>
+              <Text type="secondary">
+                {t('app.connection_package.dialog.export_connections_label')}
+              </Text>
+              <div style={{ display: 'flex', gap: 8 }}>
+                <Button
+                  size="small"
+                  type="text"
+                  disabled={totalCount === 0 || selectedCount === totalCount}
+                  onClick={() => onSelectedConnectionIdsChange?.(allConnectionIds)}
+                >
+                  {t('data_export.action.select_all')}
+                </Button>
+                <Button
+                  size="small"
+                  type="text"
+                  disabled={selectedCount === 0}
+                  onClick={() => onSelectedConnectionIdsChange?.([])}
+                >
+                  {t('data_export.action.clear')}
+                </Button>
+              </div>
+            </div>
+            <Select
+              mode="multiple"
+              allowClear
+              showSearch
+              optionFilterProp="label"
+              style={{ width: '100%' }}
+              placeholder={t('app.connection_package.dialog.export_connections_placeholder')}
+              value={selectedConnectionIds}
+              options={connectionOptions}
+              maxTagCount="responsive"
+              onChange={(next) => onSelectedConnectionIdsChange?.(
+                (Array.isArray(next) ? next : []).map((id) => String(id).trim()).filter(Boolean),
+              )}
+            />
+            <Text type="secondary" style={{ display: 'block', marginTop: 6, fontSize: 12 }}>
+              {t('app.connection_package.dialog.export_connections_summary', {
+                selected: selectedCount,
+                total: totalCount,
+              })}
+            </Text>
+          </div>
           <Checkbox
             checked={includeSecrets}
             onChange={(event) => onIncludeSecretsChange?.(event.target.checked)}
@@ -104,11 +165,12 @@ export default function ConnectionPackagePasswordModal({
       ) : null}
       {showFilePasswordInput ? (
         <Input.Password
-          autoFocus
+          autoFocus={!isExportMode}
           value={password}
           placeholder={placeholder}
           disabled={isExportMode && !useFilePassword}
           onChange={(event) => onPasswordChange(event.target.value)}
+          style={isExportMode ? { marginTop: 12 } : undefined}
         />
       ) : null}
       {isExportMode ? (
diff --git a/frontend/src/utils/connectionExport.ts b/frontend/src/utils/connectionExport.ts
index cb6a4bb3..41b440b5 100644
--- a/frontend/src/utils/connectionExport.ts
+++ b/frontend/src/utils/connectionExport.ts
@@ -10,6 +10,7 @@ export type ConnectionPackageDialogSnapshot = {
   password: string;
   error: string;
   confirmLoading: boolean;
+  selectedConnectionIds?: string[];
 };
 export type ConnectionPackageDialogUpdater = (
   current: ConnectionPackageDialogSnapshot,
diff --git a/frontend/wailsjs/go/app/App.d.ts b/frontend/wailsjs/go/app/App.d.ts
index 418cd410..17d31e8e 100755
--- a/frontend/wailsjs/go/app/App.d.ts
+++ b/frontend/wailsjs/go/app/App.d.ts
@@ -278,12 +278,12 @@ export function JVMStartMonitoring(arg1:connection.ConnectionConfig):Promise<con
 
 export function JVMStopMonitoring(arg1:connection.ConnectionConfig,arg2:string):Promise<connection.QueryResult>;
 
-export function ListInstalledFontFamilies():Promise<connection.QueryResult>;
-
 export function ListDatabaseCharsets(arg1:connection.ConnectionConfig):Promise<connection.QueryResult>;
 
 export function ListDatabaseCollations(arg1:connection.ConnectionConfig):Promise<connection.QueryResult>;
 
+export function ListInstalledFontFamilies():Promise<connection.QueryResult>;
+
 export function ListSQLDirectory(arg1:string):Promise<connection.QueryResult>;
 
 export function LogWindowDiagnostic(arg1:string,arg2:string):Promise<void>;
diff --git a/frontend/wailsjs/go/app/App.js b/frontend/wailsjs/go/app/App.js
index cb3076ca..a808e2f5 100755
--- a/frontend/wailsjs/go/app/App.js
+++ b/frontend/wailsjs/go/app/App.js
@@ -542,10 +542,6 @@ export function JVMStopMonitoring(arg1, arg2) {
   return window['go']['app']['App']['JVMStopMonitoring'](arg1, arg2);
 }
 
-export function ListInstalledFontFamilies() {
-  return window['go']['app']['App']['ListInstalledFontFamilies']();
-}
-
 export function ListDatabaseCharsets(arg1) {
   return window['go']['app']['App']['ListDatabaseCharsets'](arg1);
 }
@@ -554,6 +550,10 @@ export function ListDatabaseCollations(arg1) {
   return window['go']['app']['App']['ListDatabaseCollations'](arg1);
 }
 
+export function ListInstalledFontFamilies() {
+  return window['go']['app']['App']['ListInstalledFontFamilies']();
+}
+
 export function ListSQLDirectory(arg1) {
   return window['go']['app']['App']['ListSQLDirectory'](arg1);
 }
diff --git a/frontend/wailsjs/go/models.ts b/frontend/wailsjs/go/models.ts
index 02824b89..2c68f2cc 100755
--- a/frontend/wailsjs/go/models.ts
+++ b/frontend/wailsjs/go/models.ts
@@ -708,6 +708,7 @@ export namespace app {
 	export class ConnectionExportOptions {
 	    includeSecrets: boolean;
 	    filePassword?: string;
+	    connectionIds?: string[];
 	    redisDbAliases?: Record<string, any>;
 	
 	    static createFrom(source: any = {}) {
@@ -718,6 +719,7 @@ export namespace app {
 	        if ('string' === typeof source) source = JSON.parse(source);
 	        this.includeSecrets = source["includeSecrets"];
 	        this.filePassword = source["filePassword"];
+	        this.connectionIds = source["connectionIds"];
 	        this.redisDbAliases = source["redisDbAliases"];
 	    }
 	}
@@ -771,11 +773,11 @@ export namespace app {
 	    outcomeUnknown?: boolean;
 	    readOnly: boolean;
 	    serverMajor?: number;
-
+	
 	    static createFrom(source: any = {}) {
 	        return new ElasticsearchConsoleRequestResult(source);
 	    }
-
+	
 	    constructor(source: any = {}) {
 	        if ('string' === typeof source) source = JSON.parse(source);
 	        this.index = source["index"];
@@ -807,11 +809,11 @@ export namespace app {
 	    completed: number;
 	    failedIndex?: number;
 	    outcomeUnknown?: boolean;
-
+	
 	    static createFrom(source: any = {}) {
 	        return new ElasticsearchConsoleExecutionResult(source);
 	    }
-
+	
 	    constructor(source: any = {}) {
 	        if ('string' === typeof source) source = JSON.parse(source);
 	        this.success = source["success"];
@@ -824,7 +826,7 @@ export namespace app {
 	        this.failedIndex = source["failedIndex"];
 	        this.outcomeUnknown = source["outcomeUnknown"];
 	    }
-
+	
 		convertValues(a: any, classs: any, asMap: boolean = false): any {
 		    if (!a) {
 		        return a;
@@ -858,11 +860,11 @@ export namespace app {
 	    containsScript?: boolean;
 	    operationCount?: number;
 	    blockReason?: string;
-
+	
 	    static createFrom(source: any = {}) {
 	        return new ElasticsearchConsoleRequestInspection(source);
 	    }
-
+	
 	    constructor(source: any = {}) {
 	        if ('string' === typeof source) source = JSON.parse(source);
 	        this.index = source["index"];
@@ -893,11 +895,11 @@ export namespace app {
 	    blocked: boolean;
 	    blockReason?: string;
 	    serverMajor?: number;
-
+	
 	    static createFrom(source: any = {}) {
 	        return new ElasticsearchConsoleInspection(source);
 	    }
-
+	
 	    constructor(source: any = {}) {
 	        if ('string' === typeof source) source = JSON.parse(source);
 	        this.success = source["success"];
@@ -912,7 +914,7 @@ export namespace app {
 	        this.blockReason = source["blockReason"];
 	        this.serverMajor = source["serverMajor"];
 	    }
-
+	
 		convertValues(a: any, classs: any, asMap: boolean = false): any {
 		    if (!a) {
 		        return a;
@@ -931,8 +933,8 @@ export namespace app {
 		    return a;
 		}
 	}
-
-
+	
+	
 	export class ExportFileOptions {
 	    format: string;
 	    columns?: string[];
@@ -1586,38 +1588,6 @@ export namespace app {
 
 export namespace connection {
 	
-	export class DatabaseCharset {
-	    name: string;
-	    description?: string;
-	    defaultCollation?: string;
-	    maxLength?: number;
-	
-	    static createFrom(source: any = {}) {
-	        return new DatabaseCharset(source);
-	    }
-	
-	    constructor(source: any = {}) {
-	        if ('string' === typeof source) source = JSON.parse(source);
-	        this.name = source["name"];
-	        this.description = source["description"];
-	        this.defaultCollation = source["defaultCollation"];
-	        this.maxLength = source["maxLength"];
-	    }
-	}
-	export class DatabaseCollation {
-	    name: string;
-	    charset: string;
-	
-	    static createFrom(source: any = {}) {
-	        return new DatabaseCollation(source);
-	    }
-	
-	    constructor(source: any = {}) {
-	        if ('string' === typeof source) source = JSON.parse(source);
-	        this.name = source["name"];
-	        this.charset = source["charset"];
-	    }
-	}
 	export class UpdateRow {
 	    keys: Record<string, any>;
 	    values: Record<string, any>;
@@ -2825,3 +2795,4 @@ export namespace sync {
 	}
 
 }
+
diff --git a/internal/app/cloud_backup.go b/internal/app/cloud_backup.go
index edabf847..04dfb2e5 100644
--- a/internal/app/cloud_backup.go
+++ b/internal/app/cloud_backup.go
@@ -588,7 +588,7 @@ func (a *App) buildCloudBackupPayload(config CloudBackupConfig) ([]byte, error)
 	connections := connectionPackagePayload{}
 	if _, ok := selected[CloudBackupCategoryConnections]; ok {
 		var err error
-		connections, err = a.buildConnectionPackagePayload(nil)
+		connections, err = a.buildConnectionPackagePayload(nil, nil)
 		if err != nil {
 			return nil, err
 		}
diff --git a/internal/app/connection_package_transfer.go b/internal/app/connection_package_transfer.go
index c5fdcfa4..aa204acb 100644
--- a/internal/app/connection_package_transfer.go
+++ b/internal/app/connection_package_transfer.go
@@ -95,26 +95,81 @@ func collectRedisDbAliasesFromPackagePayload(payload connectionPackagePayload) m
 	return merged
 }
 
-func (a *App) buildConnectionPackagePayload(redisDbAliases map[string]map[string]string) (connectionPackagePayload, error) {
+func normalizeConnectionExportIDFilter(connectionIDs []string) map[string]struct{} {
+	if len(connectionIDs) == 0 {
+		return nil
+	}
+	filter := make(map[string]struct{}, len(connectionIDs))
+	for _, rawID := range connectionIDs {
+		id := strings.TrimSpace(rawID)
+		if id == "" {
+			continue
+		}
+		filter[id] = struct{}{}
+	}
+	if len(filter) == 0 {
+		return nil
+	}
+	return filter
+}
+
+func filterRedisDbAliasesByConnectionIDs(
+	aliases map[string]map[string]string,
+	filter map[string]struct{},
+) map[string]map[string]string {
+	if filter == nil || len(aliases) == 0 {
+		return aliases
+	}
+	filtered := make(map[string]map[string]string, len(filter))
+	for connectionID, itemAliases := range aliases {
+		id := strings.TrimSpace(connectionID)
+		if _, ok := filter[id]; !ok {
+			continue
+		}
+		filtered[id] = itemAliases
+	}
+	if len(filtered) == 0 {
+		return nil
+	}
+	return filtered
+}
+
+func (a *App) buildConnectionPackagePayload(
+	redisDbAliases map[string]map[string]string,
+	connectionIDs []string,
+) (connectionPackagePayload, error) {
 	repo := a.savedConnectionRepository()
 	items, err := repo.List()
 	if err != nil {
 		return connectionPackagePayload{}, err
 	}
 
-	aliasesByConnection := sanitizeConnectionPackageRedisDbAliases(redisDbAliases)
+	idFilter := normalizeConnectionExportIDFilter(connectionIDs)
+	aliasesByConnection := filterRedisDbAliasesByConnectionIDs(
+		sanitizeConnectionPackageRedisDbAliases(redisDbAliases),
+		idFilter,
+	)
 	connections := make([]connectionPackageItem, 0, len(items))
 	for _, item := range items {
+		itemID := strings.TrimSpace(item.ID)
+		if idFilter != nil {
+			if _, ok := idFilter[itemID]; !ok {
+				continue
+			}
+		}
 		bundle, bundleErr := repo.loadSecretBundle(item)
 		if bundleErr != nil {
 			return connectionPackagePayload{}, bundleErr
 		}
 		var itemAliases map[string]string
 		if aliasesByConnection != nil {
-			itemAliases = aliasesByConnection[strings.TrimSpace(item.ID)]
+			itemAliases = aliasesByConnection[itemID]
 		}
 		connections = append(connections, newConnectionPackageItem(item, bundle, itemAliases))
 	}
+	if idFilter != nil && len(connections) == 0 {
+		return connectionPackagePayload{}, errors.New(a.appText("app.connection_package.error.no_selected_connections", nil))
+	}
 
 	return connectionPackagePayload{
 		ExportedAt:     time.Now().UTC().Format(time.RFC3339),
@@ -124,7 +179,7 @@ func (a *App) buildConnectionPackagePayload(redisDbAliases map[string]map[string
 }
 
 func (a *App) buildExportedConnectionPackage(options ConnectionExportOptions) ([]byte, error) {
-	payload, err := a.buildConnectionPackagePayload(options.RedisDbAliases)
+	payload, err := a.buildConnectionPackagePayload(options.RedisDbAliases, options.ConnectionIDs)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/app/connection_package_transfer_test.go b/internal/app/connection_package_transfer_test.go
index 79657e1e..e67867a3 100644
--- a/internal/app/connection_package_transfer_test.go
+++ b/internal/app/connection_package_transfer_test.go
@@ -61,7 +61,7 @@ func TestBuildConnectionPackagePayloadIncludesSecretBundles(t *testing.T) {
 		t.Fatalf("SaveConnection returned error: %v", err)
 	}
 
-	payload, err := app.buildConnectionPackagePayload(nil)
+	payload, err := app.buildConnectionPackagePayload(nil, nil)
 	if err != nil {
 		t.Fatalf("buildConnectionPackagePayload returned error: %v", err)
 	}
@@ -1105,7 +1105,7 @@ func TestBuildExportedConnectionPackageCarriesRedisDbAliases(t *testing.T) {
 	}
 
 	// payload 内连接项也应携带别名（便于单项迁移）
-	payload, err := app.buildConnectionPackagePayload(aliases)
+	payload, err := app.buildConnectionPackagePayload(aliases, nil)
 	if err != nil {
 		t.Fatalf("buildConnectionPackagePayload returned error: %v", err)
 	}
@@ -1117,6 +1117,53 @@ func TestBuildExportedConnectionPackageCarriesRedisDbAliases(t *testing.T) {
 	}
 }
 
+func TestBuildConnectionPackagePayloadFiltersByConnectionIDs(t *testing.T) {
+	app := NewAppWithSecretStore(newFakeAppSecretStore())
+	app.configDir = t.TempDir()
+
+	for _, item := range []connection.SavedConnectionInput{
+		{
+			ID:   "conn-a",
+			Name: "A",
+			Config: connection.ConnectionConfig{
+				ID:   "conn-a",
+				Type: "mysql",
+				Host: "127.0.0.1",
+				Port: 3306,
+			},
+		},
+		{
+			ID:   "conn-b",
+			Name: "B",
+			Config: connection.ConnectionConfig{
+				ID:   "conn-b",
+				Type: "mysql",
+				Host: "127.0.0.1",
+				Port: 3307,
+			},
+		},
+	} {
+		if _, err := app.SaveConnection(item); err != nil {
+			t.Fatalf("SaveConnection %s: %v", item.ID, err)
+		}
+	}
+
+	payload, err := app.buildConnectionPackagePayload(nil, []string{"conn-b"})
+	if err != nil {
+		t.Fatalf("buildConnectionPackagePayload returned error: %v", err)
+	}
+	if len(payload.Connections) != 1 {
+		t.Fatalf("expected 1 connection, got %d", len(payload.Connections))
+	}
+	if payload.Connections[0].ID != "conn-b" {
+		t.Fatalf("expected conn-b, got %q", payload.Connections[0].ID)
+	}
+
+	if _, err := app.buildConnectionPackagePayload(nil, []string{"missing-id"}); err == nil {
+		t.Fatal("expected error when filter matches no connections")
+	}
+}
+
 func TestConnectionPackageRoundTripPreservesSchemaVisibilityByDatabase(t *testing.T) {
 	sourceApp := NewAppWithSecretStore(newFakeAppSecretStore())
 	sourceApp.configDir = t.TempDir()
diff --git a/internal/app/connection_package_types.go b/internal/app/connection_package_types.go
index c2403e8b..62977eea 100644
--- a/internal/app/connection_package_types.go
+++ b/internal/app/connection_package_types.go
@@ -223,6 +223,8 @@ func (i connectionPackageItem) MarshalJSON() ([]byte, error) {
 type ConnectionExportOptions struct {
 	IncludeSecrets bool   `json:"includeSecrets"`
 	FilePassword   string `json:"filePassword,omitempty"`
+	// ConnectionIDs 可选：仅导出指定连接；为空时导出全部连接。
+	ConnectionIDs []string `json:"connectionIds,omitempty"`
 	// RedisDbAliases 由前端传入（appearance.redisDbAliases），导出时写入连接包。
 	RedisDbAliases map[string]map[string]string `json:"redisDbAliases,omitempty"`
 }