合并主分支

解决合并冲突

src/components/image-editor/ImageCanvasGenerationDialogModel.test.ts

@@ -26,6 +26,7 @@ import {
   createQuickEditPanelDraft,
   createRedrawPanelDraft,
   createSameSourceGenerationDialogDraft,
+  createSceneGenerationDialogDraft,
   createSoundEffectGenerationDialogDraft,
   createSpecDialogDraft,
   createUiDesignGenerationDialogDraft,
@@ -160,6 +161,29 @@ describe('ImageCanvasGenerationDialogModel', () => {
     });
   });
 
+  it('creates scene generation dialogs with product defaults', () => {
+    const canvasSize = { width: 960, height: 720 };
+    const viewport = { x: 0, y: 0, scale: 1 };
+
+    expect(
+      createSceneGenerationDialogDraft({ canvasSize, viewport }),
+    ).toMatchObject({
+      mode: 'scene',
+      prompt: '',
+      status: 'idle',
+      sceneStylePreset: 'anime',
+      sceneCustomStyle: '',
+      generationReferences: [],
+      imageModel: IMAGE_MODEL_NANOBANANA2,
+      aspectRatio: '16:9',
+      imageSize: '1K',
+      placeholder: {
+        originalWidth: 1024,
+        originalHeight: 576,
+      },
+    });
+  });
+
   it('creates character and icon generation drafts with the selected model dimensions', () => {
     const canvasSize = { width: 960, height: 720 };
     const viewport = { x: 0, y: 0, scale: 1 };
@@ -1404,6 +1428,25 @@ describe('ImageCanvasGenerationDialogModel', () => {
     };
     expect(appendGenerationReference(specDialog, videoLayer)).toBe(specDialog);
 
+    const sceneDialog: GenerateDialogState = {
+      mode: 'scene',
+      prompt: '',
+      status: 'idle',
+      generationReferences: [],
+    };
+    const sceneWithReference = appendGenerationReference(
+      sceneDialog,
+      sourceLayer,
+    );
+    expect(sceneWithReference).toMatchObject({
+      generationReferences: [{ label: '参考图' }],
+    });
+    expect(
+      appendGenerationReference(sceneWithReference, createLayer({ id: 'other' })),
+    ).toMatchObject({
+      generationReferences: [{ label: '参考图' }, { label: '源图' }],
+    });
+
     const uiDialog: GenerateDialogState = {
       mode: 'ui-design',
       prompt: '',