a03f13d0a5
原问题
```
历史角色动作是一个兼容例外:
后端允许它没有 editor_project_resource 资源行,只要布局自身保存了完整图片序列帧。
```
- 把生成动作的原视频asstetkind改为 video, 只把图片序列作为action
- db asset新增字段image_sequence_frames_json image_seq_duration_ms等, (原来动作的这些数据存在generation-input中,并不合适)
修改了externaljob,把这部分数据正确填写到数据库中。
- 为避免到处fallback,做了数据库迁移, 脚本: `scripts/spacetime-normalize-editor-character-actions.mjs` 手动进行过画布+素材库中动作序列帧+原始视频 迁移的测试
- 移除preview_video_path字段, reason:
>preview video
→ separate resource/asset with assetKind="video"
final transparent action
→ assetKind="character-animation"
→ source_resource_id points to the preview-video resource
→ image_sequence_frames_json contains the actual playable result
>
> So preview_video_path on the final action duplicates the source video resource’s image_src.
- 移除每个frame的index字段 原因: 这个只用于后端内部处理时有一个并发请求, 每个赋一个index方便收集, 后续没有再用到,且与数组本身重复
- 清除副产品preview video的generation_input_json, 因为会影响改造功能, 迁移后预览视频不提供改造(参数), 只有序列帧动作有改造
仍存在的共性问题: #134
- 导出:
下载改为完整序列帧, 封面不再作为fallback, 部分帧读取失败时行为:仍生成 ZIP,并记录失败帧, 不变
画布放置:
before:

after:

精选模块: 主页展示, 审核部分UI:


这两处序列帧们的加载设计为惰式的, 只有hover和单独preview才会全部加载
Reviewed-on: http://192.168.35.82/git/GenarrativeAI/Genarrative/pulls/117
Reviewed-by: 段舒康 <kdletters@qq.com>
Co-authored-by: 王德宇 <kvtodev@outlook.com>
Co-committed-by: 王德宇 <kvtodev@outlook.com>
424 lines
13 KiB
TypeScript
424 lines
13 KiB
TypeScript
/* @vitest-environment jsdom */
|
|
|
|
import { act, render, screen } from '@testing-library/react';
|
|
import { useRef, useState } from 'react';
|
|
import { describe, expect, it, vi } from 'vitest';
|
|
|
|
import type {
|
|
AssetPointerDragState,
|
|
CanvasLayer,
|
|
EditorAsset,
|
|
EditorAssetFolder,
|
|
} from './ImageCanvasEditorTypes';
|
|
import {
|
|
useImageCanvasAssetCanvasBridge,
|
|
useImageCanvasAssetLayerCleanup,
|
|
} from './useImageCanvasAssetCanvasBridge';
|
|
|
|
const defaultAsset: EditorAsset = {
|
|
id: 'asset-1',
|
|
label: '素材一',
|
|
src: 'data:image/png;base64,asset-1',
|
|
width: 320,
|
|
height: 240,
|
|
folderId: 'project',
|
|
sourceKind: 'uploaded',
|
|
sourceType: 'uploaded',
|
|
persisted: true,
|
|
assetObjectId: 'asset-object-1',
|
|
};
|
|
|
|
const defaultFolder: EditorAssetFolder = {
|
|
id: 'project',
|
|
label: '项目素材',
|
|
collapsed: false,
|
|
systemDefault: true,
|
|
persisted: true,
|
|
};
|
|
|
|
function createLayer(overrides: Partial<CanvasLayer> = {}): CanvasLayer {
|
|
return {
|
|
id: 'layer-asset-1',
|
|
resourceId: 'asset-object-1',
|
|
title: '素材一',
|
|
src: 'data:image/png;base64,asset-1',
|
|
x: 10,
|
|
y: 20,
|
|
width: 320,
|
|
height: 240,
|
|
originalWidth: 320,
|
|
originalHeight: 240,
|
|
zIndex: 1,
|
|
sourceType: 'uploaded',
|
|
sourceAssetId: 'asset-1',
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
function dispatchPointerEvent(
|
|
type: string,
|
|
init: MouseEventInit & { pointerId: number },
|
|
) {
|
|
const event = new MouseEvent(type, {
|
|
bubbles: true,
|
|
cancelable: true,
|
|
...init,
|
|
});
|
|
Object.defineProperty(event, 'pointerId', { value: init.pointerId });
|
|
window.dispatchEvent(event);
|
|
}
|
|
|
|
function AssetCanvasBridgeHarness({
|
|
asset = defaultAsset,
|
|
resolveCanvasPoint = vi.fn(() => null),
|
|
appendCanvasLayersWithResources = vi.fn(),
|
|
captureCanvasHistory = vi.fn(),
|
|
selectSingleLayer = vi.fn(),
|
|
onAssetError = vi.fn(),
|
|
}: {
|
|
asset?: EditorAsset;
|
|
resolveCanvasPoint?: (
|
|
clientX: number,
|
|
clientY: number,
|
|
) => {
|
|
x: number;
|
|
y: number;
|
|
} | null;
|
|
appendCanvasLayersWithResources?: (nextLayers: CanvasLayer[]) => void;
|
|
captureCanvasHistory?: () => void;
|
|
selectSingleLayer?: (layerId: string | null) => void;
|
|
onAssetError?: (message: string) => void;
|
|
}) {
|
|
const assetPointerDragRef = useRef<AssetPointerDragState | null>({
|
|
assetId: asset.id,
|
|
pointerId: 7,
|
|
startClientX: 10,
|
|
startClientY: 10,
|
|
currentClientX: 40,
|
|
currentClientY: 40,
|
|
active: true,
|
|
dropFolderId: null,
|
|
});
|
|
const suppressAssetClickRef = useRef(false);
|
|
const layerCounterRef = useRef(0);
|
|
const [activeUploadFolderId, setActiveUploadFolderId] = useState('project');
|
|
const [hoveredLayerId, setHoveredLayerId] = useState<string | null>(
|
|
'hovered',
|
|
);
|
|
const [assetPointerDrag, setAssetPointerDrag] =
|
|
useState<AssetPointerDragState | null>(assetPointerDragRef.current);
|
|
const [uploadDropTarget, setUploadDropTarget] = useState<
|
|
'canvas' | 'assets' | null
|
|
>(null);
|
|
|
|
const bridge = useImageCanvasAssetCanvasBridge({
|
|
assetPointerDragRef,
|
|
suppressAssetClickRef,
|
|
assets: [asset],
|
|
assetFolders: [defaultFolder],
|
|
layerCounterRef,
|
|
viewport: { x: 10, y: 20, scale: 2 },
|
|
canvasSize: { width: 900, height: 640 },
|
|
resolveAssetFolderId: () => null,
|
|
resolveCanvasPoint,
|
|
getCanvasDropPoint: (clientX, clientY) => ({
|
|
x: clientX - 10,
|
|
y: clientY - 20,
|
|
}),
|
|
setAssetPointerDrag,
|
|
setActiveUploadFolderId,
|
|
setUploadDropTarget,
|
|
setHoveredLayerId,
|
|
updateAssetMoveDropFolder: vi.fn(),
|
|
moveAssetToFolder: vi.fn(),
|
|
captureCanvasHistory,
|
|
appendCanvasLayersWithResources,
|
|
selectSingleLayer,
|
|
addUploadedFiles: vi.fn(),
|
|
onAssetError,
|
|
});
|
|
|
|
return (
|
|
<div>
|
|
<button type="button" onClick={() => bridge.addAssetLayer(asset)}>
|
|
添加到画布
|
|
</button>
|
|
<span data-testid="folder">{activeUploadFolderId}</span>
|
|
<span data-testid="hover">{hoveredLayerId ?? '-'}</span>
|
|
<span data-testid="drag">{assetPointerDrag ? 'dragging' : 'none'}</span>
|
|
<span data-testid="drop-target">{uploadDropTarget ?? '-'}</span>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
function AssetCleanupHarness({
|
|
deletedAssets = [],
|
|
initialLayers = [
|
|
createLayer({ id: 'linked', sourceAssetId: 'asset-1' }),
|
|
createLayer({
|
|
id: 'kept',
|
|
resourceId: 'asset-object-2',
|
|
src: 'data:image/png;base64,asset-2',
|
|
sourceAssetId: 'asset-2',
|
|
}),
|
|
],
|
|
onDeleteLayerSideEffects = vi.fn(),
|
|
canDeleteLayers,
|
|
discardHistoryEntriesContainingLayer = vi.fn(),
|
|
}: {
|
|
deletedAssets?: EditorAsset[];
|
|
initialLayers?: CanvasLayer[];
|
|
onDeleteLayerSideEffects?: (layerId: string) => void;
|
|
canDeleteLayers?: (targetLayerIds: string[]) => boolean;
|
|
discardHistoryEntriesContainingLayer?: (
|
|
matchesLayer: (layer: CanvasLayer) => boolean,
|
|
) => void;
|
|
}) {
|
|
const [layers, setLayers] = useState(initialLayers);
|
|
const [selectedLayerId, setSelectedLayerId] = useState<string | null>(
|
|
'linked',
|
|
);
|
|
const [selectedLayerIds, setSelectedLayerIds] = useState(['linked', 'kept']);
|
|
const cleanup = useImageCanvasAssetLayerCleanup({
|
|
layers,
|
|
setLayers,
|
|
setSelectedLayerId,
|
|
setSelectedLayerIds,
|
|
onDeleteLayerSideEffects,
|
|
canDeleteLayers,
|
|
discardHistoryEntriesContainingLayer,
|
|
});
|
|
|
|
return (
|
|
<div>
|
|
<button type="button" onClick={() => cleanup(deletedAssets)}>
|
|
清理素材
|
|
</button>
|
|
<span data-testid="layers">
|
|
{layers.map((layer) => layer.id).join(',')}
|
|
</span>
|
|
<span data-testid="selected">{selectedLayerId ?? '-'}</span>
|
|
<span data-testid="selected-many">{selectedLayerIds.join(',')}</span>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
describe('useImageCanvasAssetCanvasBridge', () => {
|
|
it('creates a canvas layer from an asset and clears hover state', () => {
|
|
const appendCanvasLayersWithResources = vi.fn();
|
|
const captureCanvasHistory = vi.fn();
|
|
const selectSingleLayer = vi.fn();
|
|
render(
|
|
<AssetCanvasBridgeHarness
|
|
appendCanvasLayersWithResources={appendCanvasLayersWithResources}
|
|
captureCanvasHistory={captureCanvasHistory}
|
|
selectSingleLayer={selectSingleLayer}
|
|
/>,
|
|
);
|
|
|
|
act(() => {
|
|
screen.getByRole('button', { name: '添加到画布' }).click();
|
|
});
|
|
|
|
expect(captureCanvasHistory).toHaveBeenCalledTimes(1);
|
|
expect(appendCanvasLayersWithResources).toHaveBeenCalledWith([
|
|
expect.objectContaining({
|
|
id: 'layer-asset-1-1',
|
|
sourceAssetId: 'asset-1',
|
|
x: 94,
|
|
y: 64,
|
|
width: 320,
|
|
height: 240,
|
|
}),
|
|
]);
|
|
expect(selectSingleLayer).toHaveBeenCalledWith('layer-asset-1-1');
|
|
expect(screen.getByTestId('folder').textContent).toBe('project');
|
|
expect(screen.getByTestId('hover').textContent).toBe('-');
|
|
});
|
|
|
|
it('keeps the upload folder unchanged when layer creation fails', () => {
|
|
const appendCanvasLayersWithResources = vi.fn();
|
|
const captureCanvasHistory = vi.fn();
|
|
const onAssetError = vi.fn();
|
|
render(
|
|
<AssetCanvasBridgeHarness
|
|
asset={{
|
|
...defaultAsset,
|
|
folderId: 'characters',
|
|
assetKind: 'character-animation',
|
|
imageSequenceFrames: [],
|
|
imageSequenceDurationMs: 1_000,
|
|
}}
|
|
appendCanvasLayersWithResources={appendCanvasLayersWithResources}
|
|
captureCanvasHistory={captureCanvasHistory}
|
|
onAssetError={onAssetError}
|
|
/>,
|
|
);
|
|
|
|
act(() => {
|
|
screen.getByRole('button', { name: '添加到画布' }).click();
|
|
});
|
|
|
|
expect(screen.getByTestId('folder').textContent).toBe('project');
|
|
expect(onAssetError).toHaveBeenCalledWith(
|
|
'角色动作素材“素材一”不完整:缺少可用序列帧。',
|
|
);
|
|
expect(captureCanvasHistory).not.toHaveBeenCalled();
|
|
expect(appendCanvasLayersWithResources).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('delegates active pointer drops over the canvas into the layer path', () => {
|
|
const appendCanvasLayersWithResources = vi.fn();
|
|
render(
|
|
<AssetCanvasBridgeHarness
|
|
resolveCanvasPoint={() => ({ x: 480, y: 640 })}
|
|
appendCanvasLayersWithResources={appendCanvasLayersWithResources}
|
|
/>,
|
|
);
|
|
|
|
act(() => {
|
|
dispatchPointerEvent('pointerup', {
|
|
pointerId: 7,
|
|
clientX: 48,
|
|
clientY: 64,
|
|
});
|
|
});
|
|
|
|
expect(appendCanvasLayersWithResources).toHaveBeenCalledWith([
|
|
expect.objectContaining({
|
|
sourceAssetId: 'asset-1',
|
|
x: 75,
|
|
y: 190,
|
|
}),
|
|
]);
|
|
expect(screen.getByTestId('drag').textContent).toBe('none');
|
|
expect(screen.getByTestId('drop-target').textContent).toBe('-');
|
|
});
|
|
|
|
it('removes canvas layers linked to deleted assets and keeps unrelated selection', () => {
|
|
const onDeleteLayerSideEffects = vi.fn();
|
|
const discardHistoryEntriesContainingLayer = vi.fn();
|
|
render(
|
|
<AssetCleanupHarness
|
|
deletedAssets={[defaultAsset]}
|
|
onDeleteLayerSideEffects={onDeleteLayerSideEffects}
|
|
discardHistoryEntriesContainingLayer={
|
|
discardHistoryEntriesContainingLayer
|
|
}
|
|
/>,
|
|
);
|
|
|
|
act(() => {
|
|
screen.getByRole('button', { name: '清理素材' }).click();
|
|
});
|
|
|
|
expect(screen.getByTestId('layers').textContent).toBe('kept');
|
|
expect(screen.getByTestId('selected').textContent).toBe('-');
|
|
expect(screen.getByTestId('selected-many').textContent).toBe('kept');
|
|
expect(onDeleteLayerSideEffects).toHaveBeenCalledWith('linked');
|
|
const matchesLayer =
|
|
discardHistoryEntriesContainingLayer.mock.calls[0]?.[0];
|
|
expect(discardHistoryEntriesContainingLayer).toHaveBeenCalledTimes(1);
|
|
expect(matchesLayer(createLayer({ sourceAssetId: 'asset-1' }))).toBe(true);
|
|
expect(
|
|
matchesLayer(
|
|
createLayer({
|
|
id: 'layer-other',
|
|
resourceId: 'resource-other',
|
|
src: 'data:image/png;base64,other',
|
|
objectKey: 'uploads/other.png',
|
|
assetObjectId: 'asset-object-other',
|
|
sourceResourceId: 'source-resource-other',
|
|
sourceAssetId: 'asset-other',
|
|
}),
|
|
),
|
|
).toBe(false);
|
|
});
|
|
|
|
it('keeps linked layers and history when asset cleanup is blocked', () => {
|
|
const onDeleteLayerSideEffects = vi.fn();
|
|
const discardHistoryEntriesContainingLayer = vi.fn();
|
|
const canDeleteLayers = vi.fn().mockReturnValue(false);
|
|
render(
|
|
<AssetCleanupHarness
|
|
deletedAssets={[defaultAsset]}
|
|
onDeleteLayerSideEffects={onDeleteLayerSideEffects}
|
|
canDeleteLayers={canDeleteLayers}
|
|
discardHistoryEntriesContainingLayer={
|
|
discardHistoryEntriesContainingLayer
|
|
}
|
|
/>,
|
|
);
|
|
|
|
act(() => {
|
|
screen.getByRole('button', { name: '清理素材' }).click();
|
|
});
|
|
|
|
expect(canDeleteLayers).toHaveBeenCalledWith(['linked']);
|
|
expect(screen.getByTestId('layers').textContent).toBe('linked,kept');
|
|
expect(screen.getByTestId('selected').textContent).toBe('linked');
|
|
expect(onDeleteLayerSideEffects).not.toHaveBeenCalled();
|
|
expect(discardHistoryEntriesContainingLayer).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('invalidates matching history even when no linked layer is currently mounted', () => {
|
|
const discardHistoryEntriesContainingLayer = vi.fn();
|
|
render(
|
|
<AssetCleanupHarness
|
|
deletedAssets={[defaultAsset]}
|
|
initialLayers={[]}
|
|
discardHistoryEntriesContainingLayer={
|
|
discardHistoryEntriesContainingLayer
|
|
}
|
|
/>,
|
|
);
|
|
|
|
act(() => {
|
|
screen.getByRole('button', { name: '清理素材' }).click();
|
|
});
|
|
|
|
const matchesLayer =
|
|
discardHistoryEntriesContainingLayer.mock.calls[0]?.[0];
|
|
expect(discardHistoryEntriesContainingLayer).toHaveBeenCalledTimes(1);
|
|
expect(matchesLayer(createLayer({ sourceAssetId: 'asset-1' }))).toBe(true);
|
|
});
|
|
|
|
it('removes canvas layers linked by the asset source resource id', () => {
|
|
render(
|
|
<AssetCleanupHarness
|
|
deletedAssets={[
|
|
{
|
|
...defaultAsset,
|
|
id: 'asset-generated',
|
|
src: '/generated-character-drafts/editor/asset-library/copied.png',
|
|
assetObjectId: undefined,
|
|
sourceResourceId: 'resource-generated',
|
|
},
|
|
]}
|
|
initialLayers={[
|
|
createLayer({
|
|
id: 'linked-by-resource',
|
|
resourceId: 'resource-generated',
|
|
src: '/generated-character-drafts/editor/project/generated.png',
|
|
assetObjectId: undefined,
|
|
sourceAssetId: null,
|
|
}),
|
|
createLayer({
|
|
id: 'kept',
|
|
resourceId: 'resource-kept',
|
|
src: '/generated-character-drafts/editor/project/kept.png',
|
|
assetObjectId: undefined,
|
|
sourceAssetId: null,
|
|
}),
|
|
]}
|
|
/>,
|
|
);
|
|
|
|
act(() => {
|
|
screen.getByRole('button', { name: '清理素材' }).click();
|
|
});
|
|
|
|
expect(screen.getByTestId('layers').textContent).toBe('kept');
|
|
});
|
|
});
|