From 2d679122cf4fcc5bd47584a2937bde5d33251983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=BE=B7=E5=AE=87?= Date: Mon, 21 Sep 2026 19:24:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=89=8D=E7=AB=AF=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E5=9B=BE=E7=89=87=E6=A8=A1=E5=9E=8B=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E4=B8=8E=E5=BD=92=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 抽取 LEGACY_EDITOR_IMAGE_MODELS 作为单一来源 normalizeEditorImageModel 与 isLegacyEditorImageModel 复用该集合 --- .../image-editor/ImageCanvasGenerationModel.ts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/components/image-editor/ImageCanvasGenerationModel.ts b/src/components/image-editor/ImageCanvasGenerationModel.ts index 8b6fa5273..599f3a3dc 100644 --- a/src/components/image-editor/ImageCanvasGenerationModel.ts +++ b/src/components/image-editor/ImageCanvasGenerationModel.ts @@ -53,6 +53,11 @@ const IMAGE_MODEL_NANOBANANA_ALIASES = new Set([ 'nanobanana2', 'nano-banana', ]); +// 历史 GPT Image 2 别名统一映射到当前业务模型，判定与归一复用同一集合。 +const LEGACY_EDITOR_IMAGE_MODELS = new Set([ + IMAGE_MODEL_GPT_IMAGE_2, + IMAGE_MODEL_GPT_IMAGE_2_C, +]); export const SPEC_GENERATION_MODEL = IMAGE_MODEL_GPT_IMAGE_2_5; export const SPEC_GENERATION_ASPECT_RATIO = '16:9'; export const SPEC_GENERATION_IMAGE_SIZE = '2K'; @@ -639,21 +644,14 @@ export function normalizeEditorImageModel(model: string | null | undefined) { if (IMAGE_MODEL_NANOBANANA_ALIASES.has(normalizedModel)) { return IMAGE_MODEL_NANOBANANA2; } - if ( - normalizedModel === IMAGE_MODEL_GPT_IMAGE_2 || - normalizedModel === IMAGE_MODEL_GPT_IMAGE_2_C - ) { + if (LEGACY_EDITOR_IMAGE_MODELS.has(normalizedModel)) { return IMAGE_MODEL_GPT_IMAGE_2_5; } return normalizedModel; } export function isLegacyEditorImageModel(model: string | null | undefined) { - const normalizedModel = model?.trim(); - return ( - normalizedModel === IMAGE_MODEL_GPT_IMAGE_2 || - normalizedModel === IMAGE_MODEL_GPT_IMAGE_2_C - ); + return LEGACY_EDITOR_IMAGE_MODELS.has(model?.trim() ?? ''); } export function getEditorImageModelDisplayName(