mirror of
https://github.com/farion1231/cc-switch.git
synced 2026-08-01 21:16:12 +08:00
fix(config): resolve common config sync issues across frontend and backend
- Fix backfill pollution: extract custom config from live when common config enabled - Fix proxy backup: merge common config before backup to preserve full config - Unify null override semantics: null no longer overrides in both frontend and backend - Add missing i18n keys for common config UI - Hide format button in readonly JsonEditor - Add mapGeminiWarningToI18n for user-friendly warning messages
This commit is contained in:
@@ -38,7 +38,10 @@ import { applyTemplateValues } from "@/utils/providerConfigUtils";
|
||||
import { mergeProviderMeta } from "@/utils/providerMetaUtils";
|
||||
import { extractDifference, isPlainObject } from "@/utils/configMerge";
|
||||
import { extractTomlDifference } from "@/utils/tomlConfigMerge";
|
||||
import { parseGeminiCommonConfigSnippet } from "@/utils/providerConfigUtils";
|
||||
import {
|
||||
parseGeminiCommonConfigSnippet,
|
||||
mapGeminiWarningToI18n,
|
||||
} from "@/utils/providerConfigUtils";
|
||||
import { getCodexCustomTemplate } from "@/config/codexTemplates";
|
||||
import CodexConfigEditor from "./CodexConfigEditor";
|
||||
import { CommonConfigEditor } from "./CommonConfigEditor";
|
||||
@@ -979,7 +982,7 @@ export function ProviderForm({
|
||||
);
|
||||
// Show warning toast if keys were filtered
|
||||
if (warning) {
|
||||
toast.warning(warning);
|
||||
toast.warning(mapGeminiWarningToI18n(warning, t));
|
||||
}
|
||||
if (isPlainObject(envObj) && isPlainObject(commonEnvObj)) {
|
||||
const { customConfig } = extractDifference(envObj, commonEnvObj);
|
||||
|
||||
Reference in New Issue
Block a user