合并最新master

保留外部生成 processing 阶段与 warning 降级契约
合入图集快速编辑校验、素材分组与后台统计更新
解决图片画布文档和外部生成状态映射冲突
This commit is contained in:
2026-07-16 04:35:51 +00:00
65 changed files with 3395 additions and 268 deletions
@@ -124,6 +124,27 @@ describe('ImageCanvasQuickEditPanelView', () => {
expect(rememberImageModel).toHaveBeenCalledWith('gpt-image-2');
});
it('renders the failure message inside the quick edit alert', () => {
render(
<QuickEditPanelHarness
initialPanel={{
sourceLayerId: 'layer-a',
prompt: '调整图集布局',
size: '1024x1024',
aspectRatio: '1:1',
imageSize: '1K',
model: 'gpt-image-2',
status: 'failed',
errorMessage: '图集快速编辑失败',
}}
/>,
);
expect(screen.getByRole('alert').textContent).toContain(
'图集快速编辑失败',
);
});
it('submits without rendering a standalone close button', () => {
const submitQuickEdit = vi.fn();
render(
@@ -53,6 +53,7 @@ function createQuickEditDialog(
mode: isQuickEdit ? 'quick-edit' : 'generate',
prompt: panel.prompt,
status: panel.status,
errorMessage: panel.errorMessage,
sourceLayerId: panel.sourceLayerId,
generationReferences: panel.quickEditReferences,
assetLabel: panel.assetLabel,