From 9c2a9383fc0bb28413400ed93c8ddce671b2130e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=BE=B7=E5=AE=87?= Date: Thu, 24 Sep 2026 17:32:39 +0800 Subject: [PATCH] =?UTF-8?q?3D=20=E4=B8=A4=E4=B8=AA=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B9=9F=E9=9A=8F=E5=A4=B1=E7=84=A6=E4=B8=8E?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=94=B6=E8=B5=B7=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - src/components/image-editor/ImageCanvasGenerationDialogModel.ts:hideGeneratedLayerComposerAfterBlur 与 closeGenerateComposerDialog 的模式清单补上 model3d-text-to-model / model3d-image-to-model,此前点空白画布或关闭操作都收不起 3D 面板(其它生成模式都能收起) - src/components/image-editor/ImageCanvasGenerationDialogModel.test.ts:补两个 3D 模式的收起断言 --- .../ImageCanvasGenerationDialogModel.test.ts | 13 +++++++++++++ .../ImageCanvasGenerationDialogModel.ts | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/components/image-editor/ImageCanvasGenerationDialogModel.test.ts b/src/components/image-editor/ImageCanvasGenerationDialogModel.test.ts index 50272e3be..2e4153947 100644 --- a/src/components/image-editor/ImageCanvasGenerationDialogModel.test.ts +++ b/src/components/image-editor/ImageCanvasGenerationDialogModel.test.ts @@ -1986,5 +1986,18 @@ describe('ImageCanvasGenerationDialogModel', () => { ...generateDialog, composerOpen: false, }); + + // 3D 两个模式同样要在失焦与关闭时收起面板,与其它生成模式一致。 + for (const mode of ['model3d-text-to-model', 'model3d-image-to-model']) { + const model3dDialog = { ...generateDialog, mode } as GenerateDialogState; + expect(hideGeneratedLayerComposerAfterBlur(model3dDialog), mode).toEqual({ + ...model3dDialog, + composerOpen: false, + }); + expect(closeGenerateComposerDialog(model3dDialog), mode).toEqual({ + ...model3dDialog, + composerOpen: false, + }); + } }); }); diff --git a/src/components/image-editor/ImageCanvasGenerationDialogModel.ts b/src/components/image-editor/ImageCanvasGenerationDialogModel.ts index 0b01bc6d6..81af2a047 100644 --- a/src/components/image-editor/ImageCanvasGenerationDialogModel.ts +++ b/src/components/image-editor/ImageCanvasGenerationDialogModel.ts @@ -2415,7 +2415,9 @@ export function hideGeneratedLayerComposerAfterBlur( dialog?.mode === 'video' || dialog?.mode === 'publication' || dialog?.mode === 'audio-sound-effect' || - dialog?.mode === 'audio-background-music') && + dialog?.mode === 'audio-background-music' || + dialog?.mode === 'model3d-text-to-model' || + dialog?.mode === 'model3d-image-to-model') && dialog.status !== 'generating' ? { ...dialog, @@ -2438,7 +2440,9 @@ export function closeGenerateComposerDialog( dialog?.mode === 'video' || dialog?.mode === 'publication' || dialog?.mode === 'audio-sound-effect' || - dialog?.mode === 'audio-background-music' + dialog?.mode === 'audio-background-music' || + dialog?.mode === 'model3d-text-to-model' || + dialog?.mode === 'model3d-image-to-model' ? { ...dialog, composerOpen: false,