Files
Genarrative/src/components/image-editor/useImageCanvasAssetCanvasBridge.ts
T
k88936 a03f13d0a5
Project CI / Repository checks (push) Successful in 1m28s
Project CI / Frontend tests (push) Successful in 3m19s
Project CI / Backend tests (push) Successful in 4m3s
Project CI / Native shell tests (push) Successful in 13m58s
Fix/动作 前端展示下载+后端数据结构+精选 的问题 (#117)
原问题

```
历史角色动作是一个兼容例外:
后端允许它没有 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:
![shotmd-1785207959-compressed.webp](/attachments/e56454f0-49a3-4a8a-951f-c21960975f99)
after:
![shotmd-1785231365-compressed.webp](/attachments/886f07df-c25b-4ecc-acc9-160e1795a991)
精选模块: 主页展示, 审核部分UI:
![shotmd-1785500046-compressed.webp](/attachments/9ec3b679-0045-494a-9f20-134f7e73fecf)
![shotmd-1785499780-compressed.webp](/attachments/42396e63-5f26-4853-a367-0f3c15111add)
这两处序列帧们的加载设计为惰式的, 只有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>
2026-08-06 16:57:38 +08:00

240 lines
6.8 KiB
TypeScript

import {
type Dispatch,
type MutableRefObject,
type RefObject,
type SetStateAction,
useCallback,
useMemo,
} from 'react';
import {
createLayerFromAsset,
isLayerLinkedToAsset,
} from './ImageCanvasEditorModel';
import type {
AssetPointerDragState,
CanvasHistoryAction,
CanvasLayer,
CanvasViewport,
EditorAsset,
EditorAssetFolder,
} from './ImageCanvasEditorTypes';
import { useImageCanvasAssetPointerDragBridge } from './useImageCanvasAssetPointerDragBridge';
import { useImageCanvasCanvasDropWorkflow } from './useImageCanvasCanvasDropWorkflow';
type CanvasPoint = { x: number; y: number };
type UploadFilesToCanvasOptions = {
folderId?: string;
canvasPoint: CanvasPoint;
addToCanvas: true;
};
type UseImageCanvasAssetLayerCleanupOptions = {
layers: CanvasLayer[];
setLayers: Dispatch<SetStateAction<CanvasLayer[]>>;
setSelectedLayerId: Dispatch<SetStateAction<string | null>>;
setSelectedLayerIds: Dispatch<SetStateAction<string[]>>;
onDeleteLayerSideEffects?: (layerId: string) => void;
canDeleteLayers?: (targetLayerIds: string[]) => boolean;
discardHistoryEntriesContainingLayer?: (
matchesLayer: (layer: CanvasLayer) => boolean,
) => void;
};
type UseImageCanvasAssetCanvasBridgeOptions = {
assetPointerDragRef: RefObject<AssetPointerDragState | null>;
suppressAssetClickRef: RefObject<boolean>;
assets: EditorAsset[];
assetFolders: EditorAssetFolder[];
layerCounterRef: MutableRefObject<number>;
viewport: CanvasViewport;
canvasSize: { width: number; height: number };
resolveAssetFolderId: (clientX: number, clientY: number) => string | null;
resolveCanvasPoint: (clientX: number, clientY: number) => CanvasPoint | null;
getCanvasDropPoint: (clientX: number, clientY: number) => CanvasPoint;
setAssetPointerDrag: Dispatch<SetStateAction<AssetPointerDragState | null>>;
setActiveUploadFolderId: Dispatch<SetStateAction<string>>;
setUploadDropTarget: Dispatch<SetStateAction<'canvas' | 'assets' | null>>;
setHoveredLayerId: Dispatch<SetStateAction<string | null>>;
updateAssetMoveDropFolder: (folderId: string | null) => void;
moveAssetToFolder: (assetId: string, folderId: string) => void;
captureCanvasHistory: (action: CanvasHistoryAction) => void;
appendCanvasLayersWithResources: (nextLayers: CanvasLayer[]) => void;
selectSingleLayer: (layerId: string | null) => void;
addUploadedFiles: (
files: FileList | File[],
options: UploadFilesToCanvasOptions,
) => void;
onAssetError?: (message: string) => void;
};
export function useImageCanvasAssetLayerCleanup({
layers,
setLayers,
setSelectedLayerId,
setSelectedLayerIds,
onDeleteLayerSideEffects,
canDeleteLayers,
discardHistoryEntriesContainingLayer,
}: UseImageCanvasAssetLayerCleanupOptions) {
return useCallback(
(deletedAssets: EditorAsset[]) => {
if (!deletedAssets.length) {
return true;
}
const deletedLayerIds = layers
.filter((layer) =>
deletedAssets.some((asset) => isLayerLinkedToAsset(layer, asset)),
)
.map((layer) => layer.id);
if (
deletedLayerIds.length > 0 &&
canDeleteLayers?.(deletedLayerIds) === false
) {
return false;
}
discardHistoryEntriesContainingLayer?.((layer) =>
deletedAssets.some((asset) => isLayerLinkedToAsset(layer, asset)),
);
setLayers((currentLayers) =>
currentLayers.filter(
(layer) =>
!deletedAssets.some((asset) => isLayerLinkedToAsset(layer, asset)),
),
);
setSelectedLayerIds((currentIds) =>
currentIds.filter((layerId) =>
layers.every(
(layer) =>
layer.id !== layerId ||
!deletedAssets.some((asset) =>
isLayerLinkedToAsset(layer, asset),
),
),
),
);
setSelectedLayerId((currentId) => {
if (!currentId) {
return currentId;
}
const currentLayer = layers.find((layer) => layer.id === currentId);
return currentLayer &&
deletedAssets.some((asset) =>
isLayerLinkedToAsset(currentLayer, asset),
)
? null
: currentId;
});
deletedLayerIds.forEach((layerId) => onDeleteLayerSideEffects?.(layerId));
return true;
},
[
discardHistoryEntriesContainingLayer,
canDeleteLayers,
layers,
onDeleteLayerSideEffects,
setLayers,
setSelectedLayerId,
setSelectedLayerIds,
],
);
}
export function useImageCanvasAssetCanvasBridge({
assetPointerDragRef,
suppressAssetClickRef,
assets,
assetFolders,
layerCounterRef,
viewport,
canvasSize,
resolveAssetFolderId,
resolveCanvasPoint,
getCanvasDropPoint,
setAssetPointerDrag,
setActiveUploadFolderId,
setUploadDropTarget,
setHoveredLayerId,
updateAssetMoveDropFolder,
moveAssetToFolder,
captureCanvasHistory,
appendCanvasLayersWithResources,
selectSingleLayer,
addUploadedFiles,
onAssetError,
}: UseImageCanvasAssetCanvasBridgeOptions) {
const addAssetLayer = useCallback(
(asset: EditorAsset, position?: CanvasPoint) => {
const nextLayerIndex = layerCounterRef.current + 1;
let nextLayer: CanvasLayer;
try {
nextLayer = createLayerFromAsset(
asset,
nextLayerIndex,
viewport,
{
x: position?.x ?? canvasSize.width / 2,
y: position?.y ?? canvasSize.height / 2,
},
{ applyCascadeOffset: position === undefined },
);
} catch (error) {
onAssetError?.(
error instanceof Error ? error.message : '角色动作素材不完整。',
);
return;
}
setActiveUploadFolderId(asset.folderId);
layerCounterRef.current = nextLayerIndex;
captureCanvasHistory({ type: 'add-image', count: 1 });
appendCanvasLayersWithResources([nextLayer]);
selectSingleLayer(nextLayer.id);
setHoveredLayerId(null);
},
[
appendCanvasLayersWithResources,
canvasSize.height,
canvasSize.width,
captureCanvasHistory,
layerCounterRef,
onAssetError,
selectSingleLayer,
setActiveUploadFolderId,
setHoveredLayerId,
viewport,
],
);
useImageCanvasAssetPointerDragBridge({
assetPointerDragRef,
suppressAssetClickRef,
assets,
resolveAssetFolderId,
resolveCanvasPoint,
setAssetPointerDrag,
setUploadDropTarget,
updateAssetMoveDropFolder,
moveAssetToFolder,
addAssetLayer,
});
const canvasDropWorkflow = useImageCanvasCanvasDropWorkflow({
assets,
assetFolders,
setUploadDropTarget,
updateAssetMoveDropFolder,
getCanvasDropPoint,
addAssetLayer,
addUploadedFiles,
});
return useMemo(
() => ({
addAssetLayer,
...canvasDropWorkflow,
}),
[addAssetLayer, canvasDropWorkflow],
);
}