Merge pull request #1510 from QwenLM/mingholy/fix/merge-settings-generationConfig

Fix credential management and authentication flows with improved generation config preservation
This commit is contained in:
Mingholy 2026-01-19 19:01:56 +08:00 committed by GitHub
commit 8de81b6299
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 1058 additions and 100 deletions

View file

@ -275,7 +275,7 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
persistModelSelection(settings, effectiveModelId);
persistAuthTypeSelection(settings, effectiveAuthType);
const baseUrl = after?.baseUrl ?? '(default)';
const baseUrl = after?.baseUrl ?? t('(default)');
const maskedKey = maskApiKey(after?.apiKey);
uiState?.historyManager.addItem(
{
@ -322,7 +322,7 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
<>
<ConfigRow
label="Base URL"
value={effectiveConfig?.baseUrl ?? ''}
value={effectiveConfig?.baseUrl ?? t('(default)')}
badge={formatSourceBadge(sources['baseUrl'])}
/>
<ConfigRow