From 70d3ea3eaffbe471acff017d199810bb76e8413e Mon Sep 17 00:00:00 2001
From: linshen <32978552+linshenkx@users.noreply.github.com>
Date: Thu, 9 Oct 2025 00:16:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(ui):=20=E4=BF=AE=E5=A4=8D=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=AE=A1=E7=90=86=E5=99=A8=E4=B8=ADconnectio?=
 =?UTF-8?q?nConfig=E5=AD=97=E6=AE=B5=E8=A6=86=E7=9B=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复多个地方存在的字段覆盖问题：
- setProvider函数中baseURL被默认值覆盖
- updateExistingModel函数中baseURL优先级错误
- testFormConnection函数中connectionConfig处理逻辑
- refreshModelOptions函数中baseURL覆盖问题

现在用户自定义的baseURL和其他连接配置不会被系统默认值意外覆盖。
---
 .../ui/src/composables/useTextModelManager.ts  | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/ui/src/composables/useTextModelManager.ts b/packages/ui/src/composables/useTextModelManager.ts
index 78d2bf04..b614197b 100644
--- a/packages/ui/src/composables/useTextModelManager.ts
+++ b/packages/ui/src/composables/useTextModelManager.ts
@@ -322,8 +322,8 @@ export function useTextModelManager() {
     const providerMeta = providers.value.find(p => p.id === providerId)
     if (providerMeta?.defaultBaseURL) {
       form.value.connectionConfig = {
-        ...form.value.connectionConfig,
-        baseURL: providerMeta.defaultBaseURL
+        baseURL: form.value.connectionConfig.baseURL || providerMeta.defaultBaseURL,
+        ...form.value.connectionConfig
       }
     }
 
@@ -411,8 +411,8 @@ export function useTextModelManager() {
     try {
       const providerTemplateId = form.value.providerId || currentProviderType.value || 'custom'
       const connectionConfig: TextConnectionConfig = {
-        ...form.value.connectionConfig,
         baseURL,
+        ...form.value.connectionConfig,
         apiKey: form.value.displayMaskedKey && form.value.originalApiKey
           ? form.value.originalApiKey
           : form.value.connectionConfig.apiKey
@@ -494,8 +494,8 @@ export function useTextModelManager() {
     }
 
     const connectionConfig: TextConnectionConfig = {
-      ...form.value.connectionConfig,
-      baseURL: (form.value.connectionConfig.baseURL as string)?.trim() || existingConfig.connectionConfig?.baseURL
+      baseURL: (form.value.connectionConfig.baseURL as string)?.trim() || existingConfig.connectionConfig?.baseURL,
+      ...form.value.connectionConfig
     }
 
     if (form.value.displayMaskedKey) {
@@ -586,16 +586,12 @@ export function useTextModelManager() {
         : undefined
 
       const connectionConfig: TextConnectionConfig = {
+        baseURL: baseURL || existingConfig.connectionConfig?.baseURL,
         ...existingConfig.connectionConfig,
         ...form.value.connectionConfig,
-        baseURL: baseURL || existingConfig.connectionConfig?.baseURL,
         apiKey: form.value.displayMaskedKey && form.value.originalApiKey
           ? form.value.originalApiKey
-          : form.value.connectionConfig.apiKey
-      }
-
-      if (!connectionConfig.apiKey && existingConfig.connectionConfig?.apiKey) {
-        connectionConfig.apiKey = existingConfig.connectionConfig.apiKey
+          : (form.value.connectionConfig.apiKey || existingConfig.connectionConfig?.apiKey)
       }
 
       const tempConfig: TextModelConfig = {