GenarrativeAI/Genarrative
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整图片画布路由和画布数据模型

Browse Source 
将图片画布入口改为 /editor/canvas

新增 editor_canvas 表并关联 editor_project 默认画布

更新 project API 响应中的 canvas 快照兼容层

统一图片画布侧栏列表项和图标按钮组件

同步前端测试、SpacetimeDB bindings、技术文档和 TRACKING 记录
This commit is contained in:
kdletters
2026-06-13 22:09:45 +08:00
parent a1b9ac8544
commit 242860e2d3
21 changed files with 1649 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
src/components/image-editor/ImageCanvasEditorView.test.tsx
View File

@@ -284,7 +284,27 @@ describe('ImageCanvasEditorView', () => {
expect(screen.getByRole('button', { name: '当前缩放比例 50%' })).toBeTruthy();
});
it('opens a generation dialog before creating a generated layer', async () => {
it('shows the Lovart-style minimap and canvas background controls', () => {
render(<ImageCanvasEditorView />);
const viewport = screen.getByLabelText('画布工作区');
const panelToolbar = screen.getByRole('toolbar', { name: '画布面板入口' });
expect(screen.getByRole('button', { name: '画布小地图' })).toBeTruthy();
expect(within(panelToolbar).getByRole('button', { name: '画布背景色' })).toBeTruthy();
expect(within(panelToolbar).getByRole('button', { name: '切换小地图' })).toBeTruthy();
fireEvent.click(within(panelToolbar).getByRole('button', { name: '画布背景色' }));
expect(screen.getByRole('menu', { name: '画布背景色菜单' })).toBeTruthy();
fireEvent.click(screen.getByRole('menuitem', { name: '切换画布背景色为暖灰' }));
expect((viewport as HTMLElement).style.backgroundColor).toBe('rgb(243, 240, 234)');
fireEvent.click(within(panelToolbar).getByRole('button', { name: '切换小地图' }));
expect(screen.queryByRole('button', { name: '画布小地图' })).toBeNull();
});
it('opens a canvas generation frame and composer before creating a generated layer', async () => {
generateEditorImageMock.mockResolvedValueOnce({
imageSrc: 'data:image/png;base64,ZmFrZS1pbWFnZQ==',
width: 1024,
@@ -302,12 +322,19 @@ describe('ImageCanvasEditorView', () => {
fireEvent.click(within(bottomToolbar).getByRole('button', { name: '生成工具' }));
const generateDialog = screen.getByRole('dialog', { name: '生成图片' });
expect(generateDialog).toBeTruthy();
const initialComposerTop = Number.parseFloat(
(generateDialog as HTMLElement).style.top,
);
expect(screen.getByLabelText('图像生成占位图')).toBeTruthy();
expect(within(generateDialog).getByText('参考图')).toBeTruthy();
expect(within(generateDialog).getByRole('button', { name: '生成比例 1:1 2k 1张' })).toBeTruthy();
expect(within(generateDialog).getByRole('button', { name: '生成模型 GPT Image' })).toBeTruthy();
expect(screen.queryByRole('toolbar', { name: 'AI画布工具栏' })).toBeNull();
fireEvent.change(screen.getByLabelText('生成提示词'), {
target: { value: '一张明亮的拼图主视觉' },
});
fireEvent.click(screen.getByRole('button', { name: '生成' }));
fireEvent.click(within(generateDialog).getByRole('button', { name: '生成' }));
expect(screen.getByRole('status').textContent).toContain('生成中');
expect(generateEditorImageMock).toHaveBeenCalledWith({
@@ -315,15 +342,113 @@ describe('ImageCanvasEditorView', () => {
});
await waitFor(() => {
expect(screen.queryByRole('dialog', { name: '生成图片' })).toBeNull();
expect(screen.getByAltText(/画布图片：生成图片/)).toBeTruthy();
});
expect(screen.getByAltText(/画布图片：生成图片/)).toBeTruthy();
const anchoredGenerateDialog = screen.getByRole('dialog', { name: '生成图片' });
expect(anchoredGenerateDialog).toBeTruthy();
expect(
Number.parseFloat((anchoredGenerateDialog as HTMLElement).style.top),
).toBeCloseTo(initialComposerTop, 1);
expect(screen.queryByLabelText('图像生成占位图')).toBeNull();
const metadataButtons = screen.getAllByRole('button', {
name: /查看生成图片 .*元数据/,
});
expect(metadataButtons[0]).toBeTruthy();
});
it('drags the generation placeholder and places the generated layer there', async () => {
generateEditorImageMock.mockResolvedValueOnce({
imageSrc: 'data:image/png;base64,ZHJhZ2dlZC1mcmFtZQ==',
width: 1024,
height: 1024,
sourceType: 'generated',
prompt: '拖拽后的生成图',
actualPrompt: '拖拽后的生成图',
model: 'gpt-image-2',
provider: 'VectorEngine',
taskId: 'editor-drag-frame-1',
});
render(<ImageCanvasEditorView />);
fireEvent.click(screen.getByRole('button', { name: '生成工具' }));
const initialComposerTop = Number.parseFloat(
(screen.getByRole('dialog', { name: '生成图片' }) as HTMLElement).style.top,
);
const frame = screen.getByLabelText('图像生成占位图');
dispatchPointerEvent(frame, 'pointerdown', {
button: 0,
pointerId: 61,
clientX: 500,
clientY: 260,
});
dispatchPointerEvent(screen.getByLabelText('画布工作区'), 'pointermove', {
pointerId: 61,
clientX: 582,
clientY: 342,
});
dispatchPointerEvent(screen.getByLabelText('画布工作区'), 'pointerup', {
pointerId: 61,
clientX: 582,
clientY: 342,
});
const draggedComposerTop = Number.parseFloat(
(screen.getByRole('dialog', { name: '生成图片' }) as HTMLElement).style.top,
);
expect(draggedComposerTop).toBeGreaterThan(initialComposerTop);
fireEvent.change(screen.getByLabelText('生成提示词'), {
target: { value: '拖拽后的生成图' },
});
fireEvent.click(screen.getByRole('button', { name: '生成' }));
await waitFor(() => {
expect(screen.getByAltText(/画布图片：生成图片/)).toBeTruthy();
});
const generatedLayer = screen.getByAltText(/画布图片：生成图片/).closest('button')!;
const anchoredGenerateDialog = screen.getByRole('dialog', { name: '生成图片' });
expect(anchoredGenerateDialog).toBeTruthy();
expect(
Number.parseFloat((anchoredGenerateDialog as HTMLElement).style.top),
).toBeCloseTo(draggedComposerTop, 1);
expect(screen.queryByLabelText('图像生成占位图')).toBeNull();
expect(Number.parseFloat((generatedLayer as HTMLElement).style.left)).toBeGreaterThan(700);
expect(Number.parseFloat((generatedLayer as HTMLElement).style.top)).toBeGreaterThan(150);
});
it('keeps the generation composer when selecting another image', () => {
render(<ImageCanvasEditorView />);
fireEvent.click(screen.getByRole('button', { name: '生成工具' }));
expect(screen.getByRole('dialog', { name: '生成图片' })).toBeTruthy();
fireEvent.pointerDown(screen.getByAltText('画布图片：拼图素材').closest('button')!, {
button: 0,
pointerId: 62,
clientX: 120,
clientY: 120,
});
expect(screen.getByRole('dialog', { name: '生成图片' })).toBeTruthy();
expect(screen.getByLabelText('图像生成占位图')).toBeTruthy();
});
it('keeps the generation composer when clicking the canvas outside generation controls', () => {
render(<ImageCanvasEditorView />);
fireEvent.click(screen.getByRole('button', { name: '生成工具' }));
expect(screen.getByRole('dialog', { name: '生成图片' })).toBeTruthy();
fireEvent.pointerDown(screen.getByLabelText('画布工作区'), {
button: 0,
pointerId: 63,
clientX: 260,
clientY: 180,
});
expect(screen.getByRole('dialog', { name: '生成图片' })).toBeTruthy();
expect(screen.getByLabelText('图像生成占位图')).toBeTruthy();
});
it('shows generation errors instead of falling back to mock images', async () => {
generateEditorImageMock.mockRejectedValueOnce(new Error('VectorEngine 未配置'));
render(<ImageCanvasEditorView />);
@@ -339,6 +464,7 @@ describe('ImageCanvasEditorView', () => {
await waitFor(() => {
expect(screen.getByRole('alert').textContent).toContain('VectorEngine 未配置');
});
expect(screen.getByLabelText('图像生成占位图')).toBeTruthy();
expect(screen.queryByAltText(/画布图片：生成图片/)).toBeNull();
});
@@ -505,8 +631,9 @@ describe('ImageCanvasEditorView', () => {
fireEvent.click(screen.getByRole('button', { name: '生成' }));
await waitFor(() => {
expect(screen.queryByRole('dialog', { name: '生成图片' })).toBeNull();
expect(screen.getByAltText(/画布图片：生成图片/)).toBeTruthy();
});
expect(screen.getByRole('dialog', { name: '生成图片' })).toBeTruthy();
const metadataCornerButton = screen.getAllByRole('button', {
name: /查看生成图片 .*元数据/,

885
src/components/image-editor/ImageCanvasEditorView.tsx
View File

File diff suppressed because it is too large Load Diff

291
src/index.css
View File

@@ -3217,6 +3217,13 @@ html[data-mobile-keyboard-open='true'] .platform-mobile-bottom-dock {
padding: 0;
}
.image-canvas-editor__layer-row-button {
display: block;
border: 0;
background: transparent;
padding: 0;
}
.image-canvas-editor__asset-thumb {
display: block;
overflow: hidden;
@@ -3518,6 +3525,46 @@ html[data-mobile-keyboard-open='true'] .platform-mobile-bottom-dock {
box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.9);
}
.image-canvas-editor__generation-frame {
position: absolute;
z-index: 6;
display: grid;
place-items: center;
border: 2px solid #2f7df6;
background: #eeeeee;
color: #9ca3af;
cursor: move;
box-shadow: 0 16px 38px rgba(15, 23, 42, 0.08);
}
.image-canvas-editor__generation-frame-label,
.image-canvas-editor__generation-frame-size {
position: absolute;
top: -1.35rem;
display: inline-flex;
align-items: center;
gap: 0.25rem;
color: #2f7df6;
font-size: 0.76rem;
font-weight: 850;
line-height: 1;
white-space: nowrap;
}
.image-canvas-editor__generation-frame-label {
left: 0;
}
.image-canvas-editor__generation-frame-size {
right: 0;
}
.image-canvas-editor__generation-frame-icon {
display: grid;
place-items: center;
color: #c7c7c7;
}
.image-canvas-editor__metadata-corner {
position: absolute;
right: 0.35rem;
@@ -3571,6 +3618,49 @@ html[data-mobile-keyboard-open='true'] .platform-mobile-bottom-dock {
z-index: 9;
}
.image-canvas-editor__minimap {
position: absolute;
left: 0.85rem;
bottom: 4rem;
z-index: 10;
display: block;
width: 8.25rem;
height: 5.25rem;
overflow: hidden;
border: 1px solid #d9dee8;
border-radius: 0.5rem;
background: rgba(255, 255, 255, 0.92);
padding: 0;
box-shadow: 0 16px 34px rgba(15, 23, 42, 0.12);
}
.image-canvas-editor__minimap-stage {
position: relative;
display: block;
width: 100%;
height: 100%;
}
.image-canvas-editor__minimap-layer,
.image-canvas-editor__minimap-viewport {
position: absolute;
display: block;
border-radius: 0.12rem;
}
.image-canvas-editor__minimap-layer {
background: #d9dde3;
}
.image-canvas-editor__minimap-layer:nth-child(even) {
background: #eceff3;
}
.image-canvas-editor__minimap-viewport {
border: 1.5px solid #aeb7c5;
background: rgba(255, 255, 255, 0.2);
}
.image-canvas-editor__panel-dock {
position: absolute;
left: 0.85rem;
@@ -3602,6 +3692,52 @@ html[data-mobile-keyboard-open='true'] .platform-mobile-bottom-dock {
color 160ms ease;
}
.image-canvas-editor__background-control {
position: relative;
display: inline-flex;
}
.image-canvas-editor__background-swatch-current,
.image-canvas-editor__background-swatch {
display: block;
border: 1px solid #94a3b8;
border-radius: 999px;
}
.image-canvas-editor__background-swatch-current {
width: 0.9rem;
height: 0.9rem;
}
.image-canvas-editor__background-menu {
position: absolute;
bottom: calc(100% + 0.45rem);
left: 0;
display: inline-flex;
gap: 0.25rem;
border: 1px solid #d9dee8;
border-radius: 0.5rem;
background: #ffffff;
padding: 0.32rem;
box-shadow: 0 16px 34px rgba(15, 23, 42, 0.14);
}
.image-canvas-editor__background-menu button {
width: 1.75rem;
height: 1.75rem;
border-radius: 0.4rem;
}
.image-canvas-editor__background-menu button[aria-pressed='true'] {
border-color: #38bdf8;
background: #e0f2fe;
}
.image-canvas-editor__background-swatch {
width: 1rem;
height: 1rem;
}
.image-canvas-editor__panel-dock button:hover,
.image-canvas-editor__panel-dock button[aria-pressed='true'] {
transform: translateY(-1px);
@@ -3633,6 +3769,131 @@ html[data-mobile-keyboard-open='true'] .platform-mobile-bottom-dock {
color: #0369a1;
}
.image-canvas-editor__generation-composer {
position: absolute;
z-index: 13;
display: grid;
grid-template-columns: 3.8rem minmax(0, 1fr);
grid-template-rows: minmax(5.9rem, auto) auto auto;
width: min(34rem, calc(100% - 1.5rem));
min-height: 11.2rem;
gap: 0.45rem 0.75rem;
border: 1px solid #cfd6df;
border-radius: 1.35rem;
background: #ffffff;
padding: 0.5rem 0.65rem 0.65rem;
color: #1f2937;
box-shadow: 0 18px 46px rgba(15, 23, 42, 0.16);
transform: translateX(-50%);
}
.image-canvas-editor__generation-ref {
display: grid;
width: 3.5rem;
height: 4.25rem;
place-items: center;
align-self: start;
border: 0;
border-radius: 1rem;
background: #f2f2f2;
color: #a3a3a3;
font-size: 0.72rem;
font-weight: 760;
}
.image-canvas-editor__generation-ref span {
margin-top: -0.4rem;
}
.image-canvas-editor__generation-composer textarea {
min-height: 5.8rem;
resize: none;
border: 0;
background: transparent;
padding: 1.2rem 0.2rem 0.2rem;
color: #1f2937;
font: inherit;
font-size: 0.9rem;
font-weight: 720;
outline: none;
}
.image-canvas-editor__generation-composer textarea::placeholder {
color: #b5b5b5;
}
.image-canvas-editor__generation-composer-footer {
grid-column: 1 / -1;
display: grid;
grid-template-columns: minmax(0, 1fr) auto auto;
align-items: center;
gap: 0.5rem;
}
.image-canvas-editor__generation-ratio,
.image-canvas-editor__generation-model,
.image-canvas-editor__generation-submit,
.image-canvas-editor__generation-close {
display: inline-flex;
align-items: center;
justify-content: center;
border: 0;
background: transparent;
color: #374151;
font-size: 0.82rem;
font-weight: 800;
}
.image-canvas-editor__generation-ratio {
justify-self: start;
gap: 0.2rem;
}
.image-canvas-editor__generation-model {
gap: 0.25rem;
max-width: 7.2rem;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.image-canvas-editor__generation-submit {
min-width: 3.55rem;
height: 2.55rem;
gap: 0.15rem;
border-radius: 999px;
background: #f0f0f0;
color: #b6b6b6;
}
.image-canvas-editor__generation-submit:not(:disabled) {
color: #7f7f7f;
}
.image-canvas-editor__generation-submit:disabled {
cursor: wait;
}
.image-canvas-editor__generation-close {
position: absolute;
right: 0.6rem;
top: 0.55rem;
width: 2rem;
height: 2rem;
border-radius: 999px;
color: #94a3b8;
}
.image-canvas-editor__generation-close:hover {
background: #f1f5f9;
color: #334155;
}
.image-canvas-editor__generation-composer .image-canvas-editor__generate-status {
grid-column: 1 / -1;
padding: 0.45rem 0.6rem;
}
.image-canvas-editor__snap-guide {
position: absolute;
z-index: 7;
@@ -3655,29 +3916,6 @@ html[data-mobile-keyboard-open='true'] .platform-mobile-bottom-dock {
transform: translateY(-1px);
}
.image-canvas-editor__rulers {
position: absolute;
z-index: 4;
pointer-events: none;
background: rgba(241, 245, 249, 0.92);
}
.image-canvas-editor__rulers--top {
left: 0;
right: 0;
top: 0;
height: 1.25rem;
border-bottom: 1px solid #d9dee8;
}
.image-canvas-editor__rulers--left {
left: 0;
top: 0;
bottom: 0;
width: 1.25rem;
border-right: 1px solid #d9dee8;
}
.image-canvas-editor__modal-backdrop {
position: fixed;
inset: 0;
@@ -3871,6 +4109,13 @@ html[data-mobile-keyboard-open='true'] .platform-mobile-bottom-dock {
bottom: 3.85rem;
}
.image-canvas-editor__minimap {
left: 0.75rem;
bottom: 7rem;
width: 7.2rem;
height: 4.6rem;
}
}

10
src/routing/appPageRoutes.test.ts
View File

@@ -22,9 +22,13 @@ describe('appPageRoutes', () => {
});
it('resolves the image editor route', () => {
expect(resolveSelectionStageFromPath('/editor')).toBe('image-editor');
expect(resolveSelectionStageFromPath('/EDITOR/')).toBe('image-editor');
expect(resolvePathForSelectionStage('image-editor')).toBe('/editor');
expect(resolveSelectionStageFromPath('/editor/canvas')).toBe(
'image-editor',
);
expect(resolveSelectionStageFromPath('/EDITOR/CANVAS/')).toBe(
'image-editor',
);
expect(resolvePathForSelectionStage('image-editor')).toBe('/editor/canvas');
});
it('resolves jump-hop creation, gallery and runtime routes', () => {

2
src/routing/appPageRoutes.ts
View File

@@ -11,7 +11,7 @@ export const PUBLIC_WORK_QUERY_PARAM = 'work';
const STAGE_ROUTE_ENTRIES = [
['platform', '/'],
['image-editor', '/editor'],
['image-editor', '/editor/canvas'],
['profile-feedback', '/profile/feedback'],
['work-detail', '/works/detail'],
['detail', '/worlds/detail'],

32
src/services/image-editor/editorProjectClient.test.ts
View File

@@ -25,6 +25,14 @@ describe('editorProjectClient', () => {
project: {
projectId: 'editor-project-1',
title: '未命名画布',
canvas: {
canvasId: 'editor-project-1:canvas:default',
projectId: 'editor-project-1',
title: '默认画布',
viewport: { x: 0, y: 0, scale: 1 },
layers: [],
updatedAt: '2026-06-12T00:00:00.000Z',
},
viewport: { x: 0, y: 0, scale: 1 },
layers: [],
resources: [],
@@ -54,6 +62,14 @@ describe('editorProjectClient', () => {
project: {
projectId: 'editor-project-created',
title: '未命名画布',
canvas: {
canvasId: 'editor-project-created:canvas:default',
projectId: 'editor-project-created',
title: '默认画布',
viewport: { x: 0, y: 0, scale: 1 },
layers: [],
updatedAt: '2026-06-12T00:00:00.000Z',
},
viewport: { x: 0, y: 0, scale: 1 },
layers: [],
resources: [],
@@ -85,6 +101,14 @@ describe('editorProjectClient', () => {
project: {
projectId: 'editor-project-1',
title: '未命名画布',
canvas: {
canvasId: 'editor-project-1:canvas:default',
projectId: 'editor-project-1',
title: '默认画布',
viewport: { x: 12, y: 24, scale: 0.5 },
layers: [{ layerId: 'layer-1', resourceId: 'resource-1', x: 10, y: 20 }],
updatedAt: '2026-06-12T00:00:00.000Z',
},
viewport: { x: 12, y: 24, scale: 0.5 },
layers: [{ layerId: 'layer-1', resourceId: 'resource-1', x: 10, y: 20 }],
resources: [],
@@ -170,6 +194,14 @@ describe('editorProjectClient', () => {
project: {
projectId: 'editor-project-explicit',
title: '角色设定板',
canvas: {
canvasId: 'editor-project-explicit:canvas:default',
projectId: 'editor-project-explicit',
title: '默认画布',
viewport: { x: 0, y: 0, scale: 1 },
layers: [],
updatedAt: '2026-06-12T00:00:00.000Z',
},
viewport: { x: 0, y: 0, scale: 1 },
layers: [],
resources: [],

11
src/services/image-editor/editorProjectClient.ts
View File

@@ -68,12 +68,23 @@ export type EditorImageGenerationResult = {
export type EditorProjectSnapshot = {
projectId: string;
title: string;
canvas?: EditorCanvasSnapshot;
viewport: EditorCanvasViewport;
layers: EditorProjectLayerSnapshot[];
resources: EditorProjectResourceSnapshot[];
updatedAt: string;
};
export type EditorCanvasSnapshot = {
canvasId: string;
projectId: string;
title: string;
viewport: EditorCanvasViewport;
layers: EditorProjectLayerSnapshot[];
createdAt?: string;
updatedAt: string;
};
export type EditorProjectCreateInput = {
title?: string;
};