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>
285 lines
7.7 KiB
TypeScript
285 lines
7.7 KiB
TypeScript
import type {
|
|
CanvasGenerationDialogState,
|
|
CanvasHistoryAction,
|
|
CanvasHistorySnapshot,
|
|
CanvasLayer,
|
|
GenerateDialogState,
|
|
} from './ImageCanvasEditorTypes';
|
|
|
|
const CANVAS_HISTORY_ACTION_LABELS: Record<
|
|
CanvasHistoryAction['type'],
|
|
string
|
|
> = {
|
|
'move-image': '移动图片',
|
|
'move-generation-result': '移动生成结果',
|
|
'delete-image': '删除图片',
|
|
'delete-generation-result': '删除生成结果',
|
|
'cut-image': '剪切图片',
|
|
'paste-image': '粘贴图片',
|
|
'duplicate-image': '复制图片',
|
|
'add-image': '添加图片',
|
|
'upload-image': '上传图片',
|
|
'generate-image': '生成图片',
|
|
'expand-image': '扩展图片',
|
|
'remove-background': '移除背景',
|
|
'perfect-pixel': '完美像素',
|
|
'split-atlas': '拆分图集',
|
|
'replace-image': '替换图片',
|
|
'show-image': '显示图片',
|
|
'hide-image': '隐藏图片',
|
|
'change-layer-order': '调整图片层级',
|
|
'group-images': '组合图片',
|
|
'ungroup-images': '取消组合',
|
|
'lock-image': '锁定图片',
|
|
'unlock-image': '解锁图片',
|
|
'flip-image': '翻转图片',
|
|
'change-asset-kind': '修改素材类型',
|
|
'change-viewport': '调整画布视图',
|
|
};
|
|
|
|
const PROTECTED_CANVAS_HISTORY_ACTION_TYPES = new Set<
|
|
CanvasHistoryAction['type']
|
|
>([
|
|
'paste-image',
|
|
'duplicate-image',
|
|
'add-image',
|
|
'upload-image',
|
|
'generate-image',
|
|
'expand-image',
|
|
'remove-background',
|
|
'perfect-pixel',
|
|
'split-atlas',
|
|
'replace-image',
|
|
]);
|
|
|
|
export function formatCanvasHistoryAction(action: CanvasHistoryAction): string {
|
|
return CANVAS_HISTORY_ACTION_LABELS[action.type];
|
|
}
|
|
|
|
export function isProtectedCanvasHistoryAction(
|
|
action: CanvasHistoryAction,
|
|
): boolean {
|
|
return PROTECTED_CANVAS_HISTORY_ACTION_TYPES.has(action.type);
|
|
}
|
|
|
|
function hasSameStableMediaReference(
|
|
current: {
|
|
src: string;
|
|
objectKey?: string | null;
|
|
assetObjectId?: string | null;
|
|
},
|
|
target: {
|
|
src: string;
|
|
objectKey?: string | null;
|
|
assetObjectId?: string | null;
|
|
},
|
|
): boolean {
|
|
if (current.objectKey && target.objectKey) {
|
|
return current.objectKey === target.objectKey;
|
|
}
|
|
if (current.assetObjectId && target.assetObjectId) {
|
|
return current.assetObjectId === target.assetObjectId;
|
|
}
|
|
return current.src === target.src;
|
|
}
|
|
|
|
function hasSameImageSequenceFrames(
|
|
current: CanvasLayer,
|
|
target: CanvasLayer,
|
|
): boolean {
|
|
const currentFrames = current.imageSequenceFrames ?? [];
|
|
const targetFrames = target.imageSequenceFrames ?? [];
|
|
if (currentFrames.length !== targetFrames.length) {
|
|
return false;
|
|
}
|
|
return currentFrames.every((currentFrame, index) => {
|
|
const targetFrame = targetFrames[index];
|
|
return (
|
|
targetFrame !== undefined &&
|
|
hasSameStableMediaReference(
|
|
{
|
|
src: currentFrame.imageSrc,
|
|
objectKey: currentFrame.objectKey,
|
|
assetObjectId: currentFrame.assetObjectId,
|
|
},
|
|
{
|
|
src: targetFrame.imageSrc,
|
|
objectKey: targetFrame.objectKey,
|
|
assetObjectId: targetFrame.assetObjectId,
|
|
},
|
|
)
|
|
);
|
|
});
|
|
}
|
|
|
|
function hasSameLayerContent(
|
|
current: CanvasLayer,
|
|
target: CanvasLayer,
|
|
): boolean {
|
|
return (
|
|
(current.mediaType ?? 'image') === (target.mediaType ?? 'image') &&
|
|
hasSameStableMediaReference(current, target) &&
|
|
hasSameImageSequenceFrames(current, target) &&
|
|
current.imageSequenceDurationMs === target.imageSequenceDurationMs
|
|
);
|
|
}
|
|
|
|
function cloneDialogPlaceholder(
|
|
dialog: GenerateDialogState,
|
|
): GenerateDialogState['placeholder'] {
|
|
return dialog.placeholder ? { ...dialog.placeholder } : undefined;
|
|
}
|
|
|
|
function mergeLayerForHistoryRestore(
|
|
target: CanvasLayer,
|
|
current: CanvasLayer | undefined,
|
|
restoreAssetKind: boolean,
|
|
): CanvasLayer {
|
|
if (!current) {
|
|
return { ...target };
|
|
}
|
|
const resourceAssetKind =
|
|
current.resourceAssetKind ?? target.resourceAssetKind;
|
|
const restoresLayerOverride =
|
|
target.assetKindOverride !== undefined ||
|
|
current.assetKindOverride !== undefined;
|
|
const assetKindOverride = restoreAssetKind
|
|
? (target.assetKindOverride ?? null)
|
|
: current.assetKindOverride;
|
|
return {
|
|
...current,
|
|
x: target.x,
|
|
y: target.y,
|
|
zIndex: target.zIndex,
|
|
groupId: target.groupId,
|
|
...(resourceAssetKind !== undefined ? { resourceAssetKind } : {}),
|
|
...(restoresLayerOverride ? { assetKindOverride } : {}),
|
|
assetKind: restoreAssetKind
|
|
? restoresLayerOverride
|
|
? (assetKindOverride ?? resourceAssetKind ?? null)
|
|
: target.assetKind
|
|
: current.assetKind,
|
|
hidden: target.hidden,
|
|
locked: target.locked,
|
|
flipX: target.flipX,
|
|
flipY: target.flipY,
|
|
};
|
|
}
|
|
|
|
function mergeDialogPlaceholderForHistoryRestore(
|
|
target: GenerateDialogState,
|
|
current: GenerateDialogState,
|
|
): GenerateDialogState['placeholder'] {
|
|
if (!current.placeholder) {
|
|
return cloneDialogPlaceholder(target);
|
|
}
|
|
if (!target.placeholder) {
|
|
return cloneDialogPlaceholder(current);
|
|
}
|
|
return {
|
|
...current.placeholder,
|
|
x: target.placeholder.x,
|
|
y: target.placeholder.y,
|
|
};
|
|
}
|
|
|
|
function mergeDialogForHistoryRestore<
|
|
TTarget extends GenerateDialogState,
|
|
TCurrent extends GenerateDialogState,
|
|
>(target: TTarget, current: TCurrent | undefined): TTarget | TCurrent {
|
|
if (!current) {
|
|
return {
|
|
...target,
|
|
placeholder: cloneDialogPlaceholder(target),
|
|
};
|
|
}
|
|
return {
|
|
...current,
|
|
composerOpen: target.composerOpen,
|
|
placeholder: mergeDialogPlaceholderForHistoryRestore(target, current),
|
|
};
|
|
}
|
|
|
|
export function mergeCanvasHistorySnapshotForRestore({
|
|
current,
|
|
target,
|
|
assetKindLayerIds,
|
|
}: {
|
|
current: CanvasHistorySnapshot;
|
|
target: CanvasHistorySnapshot;
|
|
assetKindLayerIds?: ReadonlySet<string>;
|
|
}): CanvasHistorySnapshot {
|
|
const currentLayerById = new Map(
|
|
current.layers.map((layer) => [layer.id, layer] as const),
|
|
);
|
|
const currentDialogById = new Map<string, GenerateDialogState>();
|
|
for (const dialog of current.inactiveGenerateDialogs) {
|
|
currentDialogById.set(dialog.id, dialog);
|
|
}
|
|
if (current.generateDialog?.id) {
|
|
currentDialogById.set(current.generateDialog.id, current.generateDialog);
|
|
}
|
|
|
|
const mergeTargetDialog = <T extends GenerateDialogState>(dialog: T): T =>
|
|
mergeDialogForHistoryRestore(
|
|
dialog,
|
|
dialog.id ? currentDialogById.get(dialog.id) : undefined,
|
|
) as T;
|
|
|
|
return {
|
|
...target,
|
|
layers: target.layers.map((layer) =>
|
|
mergeLayerForHistoryRestore(
|
|
layer,
|
|
currentLayerById.get(layer.id),
|
|
assetKindLayerIds?.has(layer.id) ?? true,
|
|
),
|
|
),
|
|
generateDialog: target.generateDialog
|
|
? mergeTargetDialog(target.generateDialog)
|
|
: null,
|
|
inactiveGenerateDialogs: target.inactiveGenerateDialogs.map(
|
|
(dialog): CanvasGenerationDialogState => mergeTargetDialog(dialog),
|
|
),
|
|
};
|
|
}
|
|
|
|
export function canRestoreCanvasHistorySnapshotWithoutContentLoss({
|
|
current,
|
|
target,
|
|
}: {
|
|
current: CanvasHistorySnapshot;
|
|
target: CanvasHistorySnapshot;
|
|
}): boolean {
|
|
const targetLayerById = new Map(
|
|
target.layers.map((layer) => [layer.id, layer] as const),
|
|
);
|
|
|
|
const preservesLayers = current.layers.every((currentLayer) => {
|
|
const targetLayer = targetLayerById.get(currentLayer.id);
|
|
if (!targetLayer) {
|
|
return false;
|
|
}
|
|
if (!currentLayer.hidden && targetLayer.hidden) {
|
|
return false;
|
|
}
|
|
return hasSameLayerContent(currentLayer, targetLayer);
|
|
});
|
|
if (!preservesLayers) {
|
|
return false;
|
|
}
|
|
|
|
const getDialogIds = (snapshot: CanvasHistorySnapshot): Set<string> =>
|
|
new Set(
|
|
[
|
|
snapshot.generateDialog?.id,
|
|
...snapshot.inactiveGenerateDialogs.map((dialog) => dialog.id),
|
|
].filter((dialogId): dialogId is string => Boolean(dialogId)),
|
|
);
|
|
const targetDialogIds = getDialogIds(target);
|
|
|
|
return [...getDialogIds(current)].every((dialogId) =>
|
|
targetDialogIds.has(dialogId),
|
|
);
|
|
}
|