feat(canvas): 分镜脚本 - 关联画布资产并自动物化视频引用
This commit is contained in:
1 parent
c2a05db80f
commit
1758ba6062
21 files changed
+684
-249
No files matched your search
@@ -5,6 +5,7 @@ import type { ColumnsType } from "antd/es/table";
|
||||
import { ChevronDown, ChevronUp, Clapperboard, Copy, Expand, Film, Grid3X3, Image as ImageIcon, ListTree, Merge, MoreHorizontal, Plus, RefreshCw, Send, Square, Trash2, Video } from "lucide-react";
|
||||
|
||||
import { CanvasResourceMentionTextarea } from "@/components/canvas/canvas-resource-mention-textarea";
|
||||
import { StoryboardAssetsCell } from "@/components/canvas/storyboard-assets-cell";
|
||||
import { ModelPicker } from "@/components/model-picker";
|
||||
import { buildGenerationConfig } from "@/lib/canvas/canvas-project-generation";
|
||||
import type { CanvasResourceReference } from "@/lib/canvas/canvas-resource-references";
|
||||
@@ -33,13 +34,16 @@ import type { TaskStatus } from "@/services/api/task-center";
|
||||
|
||||
const STORYBOARD_PROMPT_MIN_HEIGHT = 40;
|
||||
const STORYBOARD_PROMPT_MAX_HEIGHT = 116;
|
||||
const SCRIPT_GRID_TEMPLATE = "72px minmax(220px, 1fr) minmax(300px, 1.4fr) minmax(220px, 1fr) 58px";
|
||||
const SCRIPT_GRID_TEMPLATE = "64px 76px minmax(300px, 1.55fr) minmax(220px, 1fr) 180px";
|
||||
const EMPTY_STORYBOARD_ROWS: StoryboardRow[] = [];
|
||||
const DEFAULT_STORYBOARD_COLUMNS: StoryboardColumn[] = ["shotNumber", "plotDescription", "videoMotionPrompt", "dialogue"];
|
||||
const DEFAULT_STORYBOARD_COLUMNS: StoryboardColumn[] = ["shotNumber", "durationSeconds", "videoMotionPrompt", "dialogue", "assets"];
|
||||
const LEGACY_STORYBOARD_COLUMNS: StoryboardColumn[] = ["shotNumber", "durationSeconds", "plotDescription", "dialogue"];
|
||||
const PREVIOUS_DEFAULT_STORYBOARD_COLUMNS: StoryboardColumn[] = ["shotNumber", "plotDescription", "videoMotionPrompt", "dialogue"];
|
||||
|
||||
function resolveStoryboardVisibleColumns(columns?: StoryboardColumn[]) {
|
||||
if (!columns?.length || (columns.length === LEGACY_STORYBOARD_COLUMNS.length && LEGACY_STORYBOARD_COLUMNS.every((column) => columns.includes(column)))) {
|
||||
const isLegacyDefault = columns?.length === LEGACY_STORYBOARD_COLUMNS.length && LEGACY_STORYBOARD_COLUMNS.every((column) => columns.includes(column));
|
||||
const isPreviousDefault = columns?.length === PREVIOUS_DEFAULT_STORYBOARD_COLUMNS.length && PREVIOUS_DEFAULT_STORYBOARD_COLUMNS.every((column) => columns.includes(column));
|
||||
if (!columns?.length || isLegacyDefault || isPreviousDefault) {
|
||||
return DEFAULT_STORYBOARD_COLUMNS;
|
||||
}
|
||||
return columns;
|
||||
@@ -62,12 +66,14 @@ const columnOptions: Array<{ label: string; value: StoryboardColumn }> = [
|
||||
{ label: "时间节拍", value: "timeBeats" },
|
||||
{ label: "图片提示词", value: "imageGenerationPrompt" },
|
||||
{ label: "视频提示词", value: "videoMotionPrompt" },
|
||||
{ label: "关联资产", value: "assets" },
|
||||
{ label: "连续性出口", value: "continuityOut" },
|
||||
{ label: "负面要求", value: "negativePrompt" },
|
||||
];
|
||||
|
||||
export function CanvasScriptNodeContent({
|
||||
node,
|
||||
nodes,
|
||||
batch,
|
||||
pipeline,
|
||||
scale,
|
||||
@@ -97,6 +103,7 @@ export function CanvasScriptNodeContent({
|
||||
workspaceMode = "professional",
|
||||
}: {
|
||||
node: CanvasNodeData;
|
||||
nodes: CanvasNodeData[];
|
||||
batch?: CanvasGenerationBatch;
|
||||
pipeline: CanvasStoryboardPipelineProgress;
|
||||
scale: number;
|
||||
@@ -285,10 +292,10 @@ export function CanvasScriptNodeContent({
|
||||
<HeaderCell borderColor={theme.node.stroke} align="center">
|
||||
序号
|
||||
</HeaderCell>
|
||||
<HeaderCell borderColor={theme.node.stroke}>画面</HeaderCell>
|
||||
<HeaderCell borderColor={theme.node.stroke} align="center">时长</HeaderCell>
|
||||
<HeaderCell borderColor={theme.node.stroke}>视频提示词</HeaderCell>
|
||||
<HeaderCell borderColor={theme.node.stroke}>台词/旁白</HeaderCell>
|
||||
<span className="text-center">操作</span>
|
||||
<span className="px-3">关联资产</span>
|
||||
</div>
|
||||
<div
|
||||
data-canvas-wheel-scroll
|
||||
@@ -307,33 +314,36 @@ export function CanvasScriptNodeContent({
|
||||
{rows.length ? (
|
||||
rows.map((row) => (
|
||||
<div key={row.id} className="relative grid border-b" style={{ height: STORYBOARD_ROW_HEIGHT, borderColor: theme.node.stroke, gridTemplateColumns: SCRIPT_GRID_TEMPLATE }}>
|
||||
<div className="flex flex-col items-center justify-center border-r tabular-nums" style={{ color: theme.node.muted, borderColor: theme.node.stroke }}>
|
||||
<span className="text-sm">{row.shotNumber}</span>
|
||||
<div className="flex flex-col items-center justify-center gap-0.5 border-r tabular-nums" style={{ color: theme.node.muted, borderColor: theme.node.stroke }}>
|
||||
<div className="flex items-center gap-0.5">
|
||||
<span className="text-sm">{row.shotNumber}</span>
|
||||
<Dropdown
|
||||
trigger={["click"]}
|
||||
menu={{ items: [{ key: "delete", label: "删除镜头", icon: <Trash2 className="size-3.5" />, danger: true, disabled: rows.length <= 1, onClick: () => onRemoveRow(row.id) }] }}
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
className="grid size-5 place-items-center rounded outline-none opacity-45 transition hover:bg-black/5 hover:opacity-100 focus-visible:ring-2 dark:hover:bg-white/10"
|
||||
aria-label={`镜头 ${row.shotNumber} 操作`}
|
||||
onMouseDown={(event) => event.stopPropagation()}
|
||||
onPointerDown={(event) => event.stopPropagation()}
|
||||
onClick={(event) => event.stopPropagation()}
|
||||
>
|
||||
<MoreHorizontal className="size-3" />
|
||||
</button>
|
||||
</Dropdown>
|
||||
</div>
|
||||
{batchItemByRowId.get(row.id) ? (
|
||||
<span className="max-w-16 truncate text-[var(--fs-micro)] leading-3" title={generationBatchItemLabel(batchItemByRowId.get(row.id)!)}>
|
||||
<span className="max-w-14 truncate text-[var(--fs-micro)] leading-3" title={generationBatchItemLabel(batchItemByRowId.get(row.id)!)}>
|
||||
{generationBatchItemLabel(batchItemByRowId.get(row.id)!)}
|
||||
</span>
|
||||
) : null}
|
||||
</div>
|
||||
<CompactInput value={row.plotDescription} placeholder="描述画面内容" onChange={(value) => onUpdateRow(row.id, { plotDescription: value })} borderColor={theme.node.stroke} />
|
||||
<CompactDurationInput value={row.durationSeconds} borderColor={theme.node.stroke} onChange={(durationSeconds) => onUpdateRow(row.id, { durationSeconds })} />
|
||||
<CompactInput value={row.videoMotionPrompt} placeholder="描述视频运动、镜头和动作" onChange={(value) => onUpdateRow(row.id, { videoMotionPrompt: value })} borderColor={theme.node.stroke} />
|
||||
<CompactInput value={row.dialogue} placeholder="台词或旁白" onChange={(value) => onUpdateRow(row.id, { dialogue: value })} borderColor={theme.node.stroke} />
|
||||
<div className="grid h-full place-items-center">
|
||||
<button
|
||||
type="button"
|
||||
disabled={rows.length <= 1}
|
||||
className="grid size-7 place-items-center rounded outline-none opacity-55 transition enabled:hover:bg-red-500/10 enabled:hover:opacity-100 focus-visible:ring-2 disabled:cursor-not-allowed disabled:opacity-20"
|
||||
style={{ color: theme.accent.danger, "--tw-ring-color": theme.accent.danger } as CSSProperties}
|
||||
title={rows.length <= 1 ? "至少保留一个镜头" : "删除镜头"}
|
||||
aria-label={`删除镜头 ${row.shotNumber}`}
|
||||
onMouseDown={(event) => event.stopPropagation()}
|
||||
onClick={(event) => {
|
||||
event.stopPropagation();
|
||||
onRemoveRow(row.id);
|
||||
}}
|
||||
>
|
||||
<Trash2 className="size-3.5" />
|
||||
</button>
|
||||
<div className="flex h-full min-w-0 items-center px-3">
|
||||
<StoryboardAssetsCell bindings={row.assetBindings || []} nodes={nodes} />
|
||||
</div>
|
||||
</div>
|
||||
))
|
||||
@@ -588,6 +598,7 @@ function batchItemTone(item?: CanvasGenerationBatchItem): CanvasNodeStatus | und
|
||||
|
||||
export function CanvasScriptEditor({
|
||||
node,
|
||||
nodes,
|
||||
open,
|
||||
onClose,
|
||||
onUpdateRows,
|
||||
@@ -597,6 +608,7 @@ export function CanvasScriptEditor({
|
||||
onVideoInputModeChange,
|
||||
}: {
|
||||
node: CanvasNodeData | null;
|
||||
nodes: CanvasNodeData[];
|
||||
open: boolean;
|
||||
onClose: () => void;
|
||||
onUpdateRows: (rows: StoryboardRow[]) => void;
|
||||
@@ -610,18 +622,19 @@ export function CanvasScriptEditor({
|
||||
const rows = node?.metadata?.storyboard?.rows || EMPTY_STORYBOARD_ROWS;
|
||||
const visibleColumns = resolveStoryboardVisibleColumns(node?.metadata?.storyboard?.visibleColumns);
|
||||
const videoInputMode = node?.metadata?.storyboardVideoInputMode || "direct";
|
||||
const nodeById = useMemo(() => new Map(nodes.map((item) => [item.id, item])), [nodes]);
|
||||
const filteredRows = useMemo(() => {
|
||||
const keyword = query.trim().toLowerCase();
|
||||
return keyword
|
||||
? rows.filter((row) =>
|
||||
[row.plotDescription, row.dialogue, row.camera, row.motion, row.timeBeats, row.imageGenerationPrompt, row.videoMotionPrompt, row.negativePrompt].some((value) =>
|
||||
[row.plotDescription, row.dialogue, row.camera, row.motion, row.timeBeats, row.imageGenerationPrompt, row.videoMotionPrompt, row.negativePrompt, ...(row.assetBindings || []).map((binding) => nodeById.get(binding.nodeId)?.title || "")].some((value) =>
|
||||
String(value || "")
|
||||
.toLowerCase()
|
||||
.includes(keyword),
|
||||
),
|
||||
)
|
||||
: rows;
|
||||
}, [query, rows]);
|
||||
}, [nodeById, query, rows]);
|
||||
useEffect(() => {
|
||||
setSelectedIds((current) => {
|
||||
const next = current.filter((id) => rows.some((row) => row.id === id));
|
||||
@@ -651,13 +664,15 @@ export function CanvasScriptEditor({
|
||||
title: option.label,
|
||||
dataIndex: option.value,
|
||||
key: option.value,
|
||||
width: option.value === "shotNumber" ? 72 : option.value === "durationSeconds" ? 100 : option.value === "plotDescription" || option.value === "dialogue" || option.value === "timeBeats" || option.value.endsWith("Prompt") ? 260 : 170,
|
||||
width: option.value === "shotNumber" ? 72 : option.value === "durationSeconds" ? 100 : option.value === "assets" ? 220 : option.value === "plotDescription" || option.value === "dialogue" || option.value === "timeBeats" || option.value.endsWith("Prompt") ? 260 : 170,
|
||||
fixed: option.value === "shotNumber" ? ("left" as const) : undefined,
|
||||
render: (_: unknown, row: StoryboardRow) =>
|
||||
option.value === "shotNumber" ? (
|
||||
<span className="font-semibold">{row.shotNumber}</span>
|
||||
) : option.value === "durationSeconds" ? (
|
||||
<InputNumber min={1} max={60} value={row.durationSeconds} addonAfter="s" onChange={(value) => updateRow(row.id, { durationSeconds: Number(value) || 1 })} />
|
||||
) : option.value === "assets" ? (
|
||||
<StoryboardAssetsCell bindings={row.assetBindings || []} nodes={nodes} />
|
||||
) : option.value === "shotSize" ? (
|
||||
<Select
|
||||
className="w-full"
|
||||
@@ -752,6 +767,25 @@ function CompactInput({ value, placeholder, borderColor, onChange }: { value: st
|
||||
);
|
||||
}
|
||||
|
||||
function CompactDurationInput({ value, borderColor, onChange }: { value: number; borderColor: string; onChange: (value: number) => void }) {
|
||||
return (
|
||||
<label className="flex h-full items-center justify-center gap-1 border-r text-xs tabular-nums text-foreground/60" style={{ borderColor }}>
|
||||
<input
|
||||
type="number"
|
||||
min={1}
|
||||
max={60}
|
||||
value={value}
|
||||
className="w-9 bg-transparent text-right outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-primary)]"
|
||||
aria-label="镜头时长(秒)"
|
||||
onChange={(event) => onChange(Math.max(1, Math.min(60, Number(event.target.value) || 1)))}
|
||||
onMouseDown={(event) => event.stopPropagation()}
|
||||
onPointerDown={(event) => event.stopPropagation()}
|
||||
/>
|
||||
秒
|
||||
</label>
|
||||
);
|
||||
}
|
||||
|
||||
function HeaderCell({ children, borderColor, align = "left" }: { children: ReactNode; borderColor: string; align?: "left" | "center" }) {
|
||||
return (
|
||||
<span className={`flex h-full items-center border-r px-4 ${align === "center" ? "justify-center text-center" : "justify-start"}`} style={{ borderColor }}>
|
||||
@@ -802,7 +836,7 @@ function editorRow(shotNumber: number): StoryboardRow {
|
||||
optionalDetails: [],
|
||||
continuityOut: "",
|
||||
negativePrompt: "",
|
||||
referenceNodeIds: [],
|
||||
assetBindings: [],
|
||||
status: "idle",
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
import { useEffect, useMemo, useState } from "react";
|
||||
import { Modal, Tooltip } from "antd";
|
||||
import { Image as ImageIcon, Music2, Play, UserRound } from "lucide-react";
|
||||
|
||||
import { isStoryboardPreviewAsset } from "@/lib/canvas/canvas-storyboard-materializer";
|
||||
import { resolveMediaUrl } from "@/services/file-storage";
|
||||
import { CanvasNodeType, type CanvasNodeData, type StoryboardAssetBinding } from "@/types/canvas";
|
||||
|
||||
const ROLE_LABELS: Record<StoryboardAssetBinding["role"], string> = {
|
||||
character: "角色",
|
||||
environment: "场景",
|
||||
wardrobe: "服装",
|
||||
prop: "道具",
|
||||
weapon: "武器",
|
||||
style: "风格",
|
||||
motion: "动态",
|
||||
audio: "音频",
|
||||
};
|
||||
|
||||
export function StoryboardAssetsCell({ bindings, nodes, limit = 4 }: { bindings: StoryboardAssetBinding[]; nodes: CanvasNodeData[]; limit?: number }) {
|
||||
const [previewNode, setPreviewNode] = useState<CanvasNodeData | null>(null);
|
||||
const nodeById = useMemo(() => new Map(nodes.map((node) => [node.id, node])), [nodes]);
|
||||
const assets = bindings.map((binding) => ({ binding, node: nodeById.get(binding.nodeId) })).filter((item) => !item.node || isStoryboardPreviewAsset(item.node));
|
||||
const visible = assets.slice(0, limit);
|
||||
const hiddenCount = Math.max(0, assets.length - visible.length);
|
||||
|
||||
if (!assets.length) return <span className="text-[var(--fs-caption)] text-foreground/35">未关联</span>;
|
||||
return (
|
||||
<>
|
||||
<div className="flex min-w-0 items-center gap-1.5" aria-label={`已关联 ${assets.length} 个资产`}>
|
||||
{visible.map(({ binding, node }) => (
|
||||
<Tooltip key={binding.nodeId} title={`${node?.title || "资产已失效"} · ${ROLE_LABELS[binding.role]}`}>
|
||||
<button
|
||||
type="button"
|
||||
disabled={!node}
|
||||
className="relative grid size-9 shrink-0 place-items-center overflow-hidden rounded-md border border-foreground/10 bg-foreground/[0.035] text-foreground/45 outline-none transition enabled:hover:border-foreground/30 enabled:hover:text-foreground/70 focus-visible:ring-2 focus-visible:ring-[var(--color-primary)] disabled:cursor-not-allowed"
|
||||
aria-label={`预览${node?.title || "失效资产"}`}
|
||||
onMouseDown={(event) => event.stopPropagation()}
|
||||
onPointerDown={(event) => event.stopPropagation()}
|
||||
onClick={(event) => {
|
||||
event.stopPropagation();
|
||||
if (node) setPreviewNode(node);
|
||||
}}
|
||||
>
|
||||
{node ? <AssetThumbnail node={node} /> : <ImageIcon className="size-4" />}
|
||||
<span className="absolute bottom-0.5 right-0.5 rounded bg-black/65 px-1 text-[8px] leading-3 text-white">{ROLE_LABELS[binding.role].slice(0, 1)}</span>
|
||||
</button>
|
||||
</Tooltip>
|
||||
))}
|
||||
{hiddenCount ? <span className="shrink-0 text-[var(--fs-caption)] font-medium text-foreground/45">+{hiddenCount}</span> : null}
|
||||
</div>
|
||||
<AssetPreviewModal node={previewNode} onClose={() => setPreviewNode(null)} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
function AssetThumbnail({ node }: { node: CanvasNodeData }) {
|
||||
const source = useNodeMediaSource(node);
|
||||
if (node.type === CanvasNodeType.Audio) return <Music2 className="size-4" />;
|
||||
if (node.metadata?.workflowKind === "character" && !source) return <UserRound className="size-4" />;
|
||||
if (node.type === CanvasNodeType.Video) {
|
||||
return source ? (
|
||||
<>
|
||||
<video src={source} muted playsInline preload="metadata" className="size-full object-cover" aria-hidden />
|
||||
<span className="absolute inset-0 grid place-items-center bg-black/15"><Play className="size-3.5 fill-white text-white" /></span>
|
||||
</>
|
||||
) : <Play className="size-4" />;
|
||||
}
|
||||
return source ? <img src={source} alt="" loading="lazy" decoding="async" draggable={false} className="size-full object-cover" /> : <ImageIcon className="size-4" />;
|
||||
}
|
||||
|
||||
function AssetPreviewModal({ node, onClose }: { node: CanvasNodeData | null; onClose: () => void }) {
|
||||
const source = useNodeMediaSource(node);
|
||||
return (
|
||||
<Modal title={node?.title || "资产预览"} open={Boolean(node)} onCancel={onClose} footer={null} width={880} centered destroyOnHidden>
|
||||
{node ? (
|
||||
<div className="grid min-h-56 place-items-center overflow-hidden rounded-lg bg-black/[0.035] p-3 dark:bg-white/[0.035]" data-canvas-no-zoom>
|
||||
{node.type === CanvasNodeType.Video && source ? <video src={source} controls autoPlay playsInline className="max-h-[68vh] max-w-full rounded-md" />
|
||||
: node.type === CanvasNodeType.Audio && source ? <audio src={source} controls autoPlay className="w-full max-w-xl" />
|
||||
: source ? <img src={source} alt={node.title || "资产预览"} className="max-h-[68vh] max-w-full object-contain" />
|
||||
: <span className="text-sm text-foreground/45">当前资产没有可预览的媒体内容</span>}
|
||||
</div>
|
||||
) : null}
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
|
||||
function useNodeMediaSource(node: CanvasNodeData | null) {
|
||||
const fallback = node ? node.metadata?.workflowKind === "character"
|
||||
? node.metadata.characterCoverUrl || ""
|
||||
: node.type === CanvasNodeType.Drawing
|
||||
? node.metadata?.drawingPreviewUrl || node.metadata?.content || ""
|
||||
: node.metadata?.content || "" : "";
|
||||
const storageKey = node?.metadata?.storageKey;
|
||||
const [source, setSource] = useState(fallback);
|
||||
useEffect(() => {
|
||||
let cancelled = false;
|
||||
setSource(fallback);
|
||||
if (storageKey) void resolveMediaUrl(storageKey, fallback).then((url) => {
|
||||
if (!cancelled) setSource(url || fallback);
|
||||
}).catch(() => {
|
||||
if (!cancelled) setSource(fallback);
|
||||
});
|
||||
return () => { cancelled = true; };
|
||||
}, [fallback, storageKey]);
|
||||
return source;
|
||||
}
|
||||
@@ -47,7 +47,7 @@ export const NODE_SPECS = {
|
||||
workflowKind: "script",
|
||||
storyboard: {
|
||||
rows: [],
|
||||
visibleColumns: ["shotNumber", "plotDescription", "videoMotionPrompt", "dialogue"],
|
||||
visibleColumns: ["shotNumber", "durationSeconds", "videoMotionPrompt", "dialogue", "assets"],
|
||||
referenceNodeIds: [],
|
||||
},
|
||||
},
|
||||
|
||||
@@ -23,7 +23,7 @@ function copyStoryboardRow(row: StoryboardRow, idMap: ReadonlyMap<string, string
|
||||
...character,
|
||||
characterImageNodeId: remapReferenceId(character.characterImageNodeId, idMap),
|
||||
})),
|
||||
referenceNodeIds: remapReferenceIds(row.referenceNodeIds || [], idMap) || [],
|
||||
assetBindings: (row.assetBindings || []).map((binding) => ({ ...binding, nodeId: remapReferenceId(binding.nodeId, idMap)! })),
|
||||
imageNodeId,
|
||||
videoNodeId,
|
||||
status: hasCopiedOutput ? row.status : "idle",
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import { NODE_DEFAULT_SIZE, getNodeSpec } from "@/constant/canvas";
|
||||
import { STORYBOARD_HEADER_HEIGHT, STORYBOARD_ROW_HEIGHT, storyboardTableHeight } from "@/lib/canvas/canvas-storyboard-layout";
|
||||
import { normalizeStoryboardAssetBindings } from "@/lib/canvas/canvas-storyboard-assets";
|
||||
import { bindingForConnectedNode, storyboardComposerContent, storyboardRowReferenceNodeIds } from "@/lib/canvas/canvas-storyboard-materializer";
|
||||
import type { CanvasImageAngleParams } from "@/components/canvas/canvas-node-angle-dialog";
|
||||
import type { NodeGenerationInput } from "@/components/canvas/canvas-node-generation";
|
||||
import { isFrameNode } from "@/lib/canvas/canvas-frame";
|
||||
@@ -45,7 +47,7 @@ export function createCanvasNode(type: CanvasNodeType, position: Position, metad
|
||||
width: spec.width,
|
||||
height: spec.height,
|
||||
metadata: type === CanvasNodeType.Script
|
||||
? { ...spec.metadata, ...metadata, storyboard: metadata?.storyboard || { rows: [1, 2, 3].map((shotNumber) => createStoryboardRow(shotNumber)), visibleColumns: ["shotNumber", "plotDescription", "videoMotionPrompt", "dialogue"], referenceNodeIds: [] } }
|
||||
? { ...spec.metadata, ...metadata, storyboard: metadata?.storyboard || { rows: [1, 2, 3].map((shotNumber) => createStoryboardRow(shotNumber)), visibleColumns: ["shotNumber", "durationSeconds", "videoMotionPrompt", "dialogue", "assets"], referenceNodeIds: [] } }
|
||||
: { ...spec.metadata, ...metadata, ...(type === CanvasNodeType.Drawing ? { drawingId: metadata?.drawingId || `${id}-document` } : {}) },
|
||||
};
|
||||
}
|
||||
@@ -74,7 +76,7 @@ export function createStoryboardRow(shotNumber: number, patch: Partial<Storyboar
|
||||
optionalDetails: [],
|
||||
continuityOut: "",
|
||||
negativePrompt: "",
|
||||
referenceNodeIds: [],
|
||||
assetBindings: [],
|
||||
status: "idle",
|
||||
...patch,
|
||||
};
|
||||
@@ -90,7 +92,12 @@ export function storyboardPromptTemplateMetadata(row: StoryboardRow, kind: "imag
|
||||
|
||||
export function cinematicStoryboardColumns(columns?: StoryboardColumn[]): StoryboardColumn[] {
|
||||
return Array.from(new Set([
|
||||
...(columns || ["shotNumber", "plotDescription", "videoMotionPrompt", "dialogue"]),
|
||||
"shotNumber",
|
||||
"durationSeconds",
|
||||
"videoMotionPrompt",
|
||||
"dialogue",
|
||||
"assets",
|
||||
...(columns || []),
|
||||
"shotSize",
|
||||
"narrativeIntent",
|
||||
"viewerPOV",
|
||||
@@ -115,7 +122,7 @@ export function storyboardRowsFromTask(task: GenerationTask) {
|
||||
id: `shot-${Date.now()}-${index + 1}-${Math.random().toString(36).slice(2, 6)}`,
|
||||
shotNumber: index + 1,
|
||||
status: "idle",
|
||||
referenceNodeIds: Array.isArray(row.referenceNodeIds) ? row.referenceNodeIds : [],
|
||||
assetBindings: normalizeStoryboardAssetBindings(row.assetBindings),
|
||||
});
|
||||
next.characters = Array.isArray(row.characters) ? row.characters : [];
|
||||
next.mustHave = Array.isArray(row.mustHave) ? row.mustHave : [];
|
||||
@@ -225,13 +232,15 @@ export function attachNodeToStoryboardRow(nodes: CanvasNodeData[], connection: P
|
||||
if (!scriptNodeId || !linkedNode || !scriptNode) return nodes;
|
||||
const row = rowId ? scriptNode.metadata?.storyboard?.rows.find((item) => item.id === rowId) : undefined;
|
||||
const videoPrompt = row ? (row.videoMotionPrompt || row.plotDescription).trim() : "";
|
||||
const videoComposerContent = row ? storyboardComposerContent(videoPrompt, storyboardRowReferenceNodeIds(scriptNode, row, nodes, [], false)) : "";
|
||||
|
||||
return nodes.map((node) => {
|
||||
if (row && node.id === linkedNode.id && scriptNodeId === connection.fromNodeId && node.type === CanvasNodeType.Video) {
|
||||
return { ...node, title: `镜头 ${row.shotNumber} · 视频`, metadata: { ...node.metadata, prompt: videoPrompt, composerContent: videoPrompt, ...storyboardPromptTemplateMetadata(row, "video"), workflowKind: "shot" as const, workflowTitle: `镜头 ${row.shotNumber} 视频`, shotIndex: row.shotNumber, generationMode: "video" as const, videoEditOperation: node.metadata?.videoEditOperation || "text_to_video", seconds: String(row.durationSeconds) } };
|
||||
return { ...node, title: `镜头 ${row.shotNumber} · 视频`, metadata: { ...node.metadata, prompt: videoPrompt, composerContent: videoComposerContent, ...storyboardPromptTemplateMetadata(row, "video"), workflowKind: "shot" as const, workflowTitle: `镜头 ${row.shotNumber} 视频`, shotIndex: row.shotNumber, generationMode: "video" as const, videoEditOperation: node.metadata?.videoEditOperation || "text_to_video", seconds: String(row.durationSeconds) } };
|
||||
}
|
||||
if (node.id !== scriptNodeId || node.type !== CanvasNodeType.Script) return node;
|
||||
const storyboard = node.metadata?.storyboard;
|
||||
const binding = bindingForConnectedNode(linkedNode);
|
||||
return {
|
||||
...node,
|
||||
metadata: {
|
||||
@@ -239,8 +248,10 @@ export function attachNodeToStoryboardRow(nodes: CanvasNodeData[], connection: P
|
||||
storyboard: {
|
||||
rows: (storyboard?.rows || []).map((item) => item.id !== rowId ? item : scriptNodeId === connection.fromNodeId
|
||||
? { ...item, imageNodeId: linkedNode.type === CanvasNodeType.Image ? linkedNode.id : item.imageNodeId, videoNodeId: linkedNode.type === CanvasNodeType.Video ? linkedNode.id : item.videoNodeId }
|
||||
: { ...item, referenceNodeIds: Array.from(new Set([...(item.referenceNodeIds || []), linkedNode.id])) }),
|
||||
visibleColumns: storyboard?.visibleColumns || ["shotNumber", "plotDescription", "videoMotionPrompt", "dialogue"],
|
||||
: binding && !(item.assetBindings || []).some((candidate) => candidate.nodeId === linkedNode.id)
|
||||
? { ...item, assetBindings: [...(item.assetBindings || []), binding] }
|
||||
: item),
|
||||
visibleColumns: storyboard?.visibleColumns || ["shotNumber", "durationSeconds", "videoMotionPrompt", "dialogue", "assets"],
|
||||
referenceNodeIds: handleId === "storyboard:context" ? Array.from(new Set([...(storyboard?.referenceNodeIds || []), linkedNode.id])) : storyboard?.referenceNodeIds || [],
|
||||
},
|
||||
},
|
||||
@@ -402,7 +413,7 @@ export function removeCanvasNodes(nodes: CanvasNodeData[], requestedIds: Set<str
|
||||
referenceNodeIds: storyboard.referenceNodeIds.filter((id) => !removedIds.has(id)),
|
||||
rows: storyboard.rows.map((row) => ({
|
||||
...row,
|
||||
referenceNodeIds: (row.referenceNodeIds || []).filter((id) => !removedIds.has(id)),
|
||||
assetBindings: (row.assetBindings || []).filter((binding) => !removedIds.has(binding.nodeId)),
|
||||
imageNodeId: row.imageNodeId && !removedIds.has(row.imageNodeId) ? row.imageNodeId : undefined,
|
||||
videoNodeId: row.videoNodeId && !removedIds.has(row.videoNodeId) ? row.videoNodeId : undefined,
|
||||
})),
|
||||
|
||||
@@ -53,7 +53,7 @@ export function createShortDramaPipeline(center: Position) {
|
||||
workflowTitle: "分镜脚本",
|
||||
storyboard: {
|
||||
rows: [],
|
||||
visibleColumns: ["shotNumber", "plotDescription", "videoMotionPrompt", "dialogue"],
|
||||
visibleColumns: ["shotNumber", "durationSeconds", "videoMotionPrompt", "dialogue", "assets"],
|
||||
referenceNodeIds: [],
|
||||
},
|
||||
});
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
import { CanvasNodeType, type CanvasNodeData, type StoryboardAssetBinding, type StoryboardAssetRole } from "@/types/canvas";
|
||||
|
||||
export type StoryboardAssetCatalogItem = {
|
||||
id: string;
|
||||
title: string;
|
||||
type: "image" | "video" | "audio" | "character";
|
||||
category?: string;
|
||||
tags: string[];
|
||||
prompt: string;
|
||||
characterAssetId?: string;
|
||||
characterVersionId?: string;
|
||||
};
|
||||
|
||||
const OUTPUT_WORKFLOW_KINDS = new Set(["shot", "action_board", "final"]);
|
||||
const STORYBOARD_ASSET_ROLES = new Set<StoryboardAssetRole>(["character", "environment", "wardrobe", "prop", "weapon", "style", "motion", "audio"]);
|
||||
|
||||
export function buildStoryboardAssetCatalog(nodes: CanvasNodeData[]): StoryboardAssetCatalogItem[] {
|
||||
return nodes.flatMap((node): StoryboardAssetCatalogItem[] => {
|
||||
const type = storyboardAssetType(node);
|
||||
if (!type || OUTPUT_WORKFLOW_KINDS.has(node.metadata?.workflowKind || "")) return [];
|
||||
if (!node.metadata?.content && !node.metadata?.storageKey && !node.metadata?.assetId && type !== "character") return [];
|
||||
const prompt = compactStoryboardAssetText(node.metadata?.prompt || node.metadata?.workflowDescription || node.metadata?.characterPrompt || "");
|
||||
return [{
|
||||
id: node.id,
|
||||
title: compactStoryboardAssetText(node.title, 120) || "未命名资产",
|
||||
type,
|
||||
category: node.metadata?.assetCategory,
|
||||
tags: Array.from(new Set((node.metadata?.assetTags || []).map((tag) => compactStoryboardAssetText(tag, 64)).filter(Boolean))).slice(0, 12),
|
||||
prompt,
|
||||
characterAssetId: node.metadata?.characterAssetId,
|
||||
characterVersionId: node.metadata?.characterVersionId,
|
||||
}];
|
||||
}).slice(0, 60);
|
||||
}
|
||||
|
||||
export function storyboardAssetRoleForNode(node: CanvasNodeData): StoryboardAssetRole | null {
|
||||
if (node.metadata?.workflowKind === "character" || node.metadata?.assetCategory === "character") return "character";
|
||||
if (node.type === CanvasNodeType.Audio) return "audio";
|
||||
if (node.type === CanvasNodeType.Video) return "motion";
|
||||
const category = node.metadata?.assetCategory;
|
||||
if (category === "environment" || category === "wardrobe" || category === "prop" || category === "weapon" || category === "style") return category;
|
||||
if (node.type === CanvasNodeType.Image || node.type === CanvasNodeType.Drawing) return "style";
|
||||
return null;
|
||||
}
|
||||
|
||||
export function normalizeStoryboardAssetBindings(bindings: StoryboardAssetBinding[] | undefined, nodes?: CanvasNodeData[]) {
|
||||
const nodeIds = nodes ? new Set(nodes.map((node) => node.id)) : null;
|
||||
const seen = new Set<string>();
|
||||
return (bindings || []).flatMap((binding): StoryboardAssetBinding[] => {
|
||||
const nodeId = String(binding?.nodeId || "").trim();
|
||||
if (!nodeId || seen.has(nodeId) || !STORYBOARD_ASSET_ROLES.has(binding.role) || (nodeIds && !nodeIds.has(nodeId))) return [];
|
||||
seen.add(nodeId);
|
||||
return [{ nodeId, role: binding.role, priority: Math.max(0, Math.min(100, Math.round(Number(binding.priority) || 0))) }];
|
||||
}).sort((left, right) => right.priority - left.priority);
|
||||
}
|
||||
|
||||
function storyboardAssetType(node: CanvasNodeData): StoryboardAssetCatalogItem["type"] | null {
|
||||
if (node.metadata?.workflowKind === "character" && node.metadata.characterAssetId && node.metadata.characterVersionId) return "character";
|
||||
if (node.type === CanvasNodeType.Image || node.type === CanvasNodeType.Drawing) return "image";
|
||||
if (node.type === CanvasNodeType.Video) return "video";
|
||||
if (node.type === CanvasNodeType.Audio) return "audio";
|
||||
return null;
|
||||
}
|
||||
|
||||
function compactStoryboardAssetText(value: string, limit = 600) {
|
||||
const normalized = value.replace(/\s+/g, " ").trim();
|
||||
return normalized.length > limit ? `${normalized.slice(0, limit)}…` : normalized;
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
import { nanoid } from "nanoid";
|
||||
|
||||
import { storyboardAssetRoleForNode } from "@/lib/canvas/canvas-storyboard-assets";
|
||||
import { CanvasNodeType, type CanvasConnection, type CanvasNodeData, type StoryboardAssetBinding, type StoryboardRow } from "@/types/canvas";
|
||||
|
||||
export function storyboardRowReferenceNodeIds(
|
||||
scriptNode: CanvasNodeData,
|
||||
row: StoryboardRow,
|
||||
nodes: CanvasNodeData[],
|
||||
connections: CanvasConnection[],
|
||||
includeFirstFrame: boolean,
|
||||
targetNodeId?: string,
|
||||
) {
|
||||
const characterAssetIds = new Set((row.characters || []).map((character) => character.characterAssetId).filter((assetId): assetId is string => Boolean(assetId)));
|
||||
const characterNodeIds = nodes
|
||||
.filter((node) => node.metadata?.workflowKind === "character" && Boolean(node.metadata.characterAssetId) && characterAssetIds.has(node.metadata.characterAssetId!))
|
||||
.map((node) => node.id);
|
||||
const referenceIds = new Set([
|
||||
...(scriptNode.metadata?.storyboard?.referenceNodeIds || []),
|
||||
...(row.assetBindings || []).map((binding) => binding.nodeId),
|
||||
...characterNodeIds,
|
||||
...connections.filter((connection) => connection.toNodeId === scriptNode.id && connection.toHandleId === `row:${row.id}`).map((connection) => connection.fromNodeId),
|
||||
...(targetNodeId ? connections.filter((connection) => !connection.relation && connection.toNodeId === targetNodeId).map((connection) => connection.fromNodeId) : []),
|
||||
...(includeFirstFrame && row.imageNodeId ? [row.imageNodeId] : []),
|
||||
]);
|
||||
if (!includeFirstFrame && row.imageNodeId) referenceIds.delete(row.imageNodeId);
|
||||
referenceIds.delete(scriptNode.id);
|
||||
return Array.from(referenceIds).filter((nodeId) => nodes.some((node) => node.id === nodeId));
|
||||
}
|
||||
|
||||
export function storyboardComposerContent(prompt: string, referenceNodeIds: string[]) {
|
||||
const mentions = Array.from(new Set(referenceNodeIds)).map((nodeId) => `@[node:${nodeId}]`);
|
||||
return mentions.length ? [`参考资产:${mentions.join(" ")}`, prompt.trim()].filter(Boolean).join("\n") : prompt.trim();
|
||||
}
|
||||
|
||||
export function reconcileStoryboardTargetConnections(
|
||||
connections: CanvasConnection[],
|
||||
scriptNode: CanvasNodeData,
|
||||
row: StoryboardRow,
|
||||
targetNodeId: string,
|
||||
referenceNodeIds: string[],
|
||||
) {
|
||||
const desired = new Set(referenceNodeIds.filter((nodeId) => nodeId !== targetNodeId && nodeId !== scriptNode.id));
|
||||
const next = connections.filter((connection) => {
|
||||
if (connection.storyboardRowId !== row.id || connection.toNodeId !== targetNodeId) return true;
|
||||
if (connection.relation === "storyboard-output") return connection.fromNodeId === scriptNode.id;
|
||||
if (connection.relation === "storyboard-asset-reference") return desired.has(connection.fromNodeId);
|
||||
return true;
|
||||
});
|
||||
if (!next.some((connection) => connection.fromNodeId === scriptNode.id && connection.toNodeId === targetNodeId && connection.fromHandleId === `row:${row.id}`)) {
|
||||
next.push({ id: nanoid(), fromNodeId: scriptNode.id, toNodeId: targetNodeId, fromHandleId: `row:${row.id}`, relation: "storyboard-output", storyboardRowId: row.id });
|
||||
}
|
||||
desired.forEach((fromNodeId) => {
|
||||
if (!next.some((connection) => connection.fromNodeId === fromNodeId && connection.toNodeId === targetNodeId)) {
|
||||
next.push({ id: nanoid(), fromNodeId, toNodeId: targetNodeId, relation: "storyboard-asset-reference", storyboardRowId: row.id });
|
||||
}
|
||||
});
|
||||
return next;
|
||||
}
|
||||
|
||||
export function bindingForConnectedNode(node: CanvasNodeData): StoryboardAssetBinding | null {
|
||||
const role = storyboardAssetRoleForNode(node);
|
||||
return role ? { nodeId: node.id, role, priority: defaultRolePriority(role) } : null;
|
||||
}
|
||||
|
||||
export function isStoryboardPreviewAsset(node: CanvasNodeData) {
|
||||
return node.type === CanvasNodeType.Image || node.type === CanvasNodeType.Drawing || node.type === CanvasNodeType.Video || node.type === CanvasNodeType.Audio || node.metadata?.workflowKind === "character";
|
||||
}
|
||||
|
||||
function defaultRolePriority(role: StoryboardAssetBinding["role"]) {
|
||||
if (role === "character") return 100;
|
||||
if (role === "environment") return 90;
|
||||
if (role === "prop" || role === "weapon" || role === "wardrobe") return 80;
|
||||
if (role === "motion" || role === "audio") return 70;
|
||||
return 60;
|
||||
}
|
||||
@@ -22,7 +22,7 @@ export function upsertProjectChapterStoryboard(
|
||||
|
||||
const storyboard: StoryboardData = {
|
||||
rows,
|
||||
visibleColumns: existing?.metadata?.storyboard?.visibleColumns || ["shotNumber", "plotDescription", "videoMotionPrompt", "dialogue"],
|
||||
visibleColumns: existing?.metadata?.storyboard?.visibleColumns || ["shotNumber", "durationSeconds", "videoMotionPrompt", "dialogue", "assets"],
|
||||
referenceNodeIds: existing?.metadata?.storyboard?.referenceNodeIds || [],
|
||||
};
|
||||
const scriptNode: CanvasNodeData = existing
|
||||
@@ -75,7 +75,7 @@ function createChapterStoryboardNode(nodes: CanvasNodeData[], unit: Pick<Project
|
||||
chapterTitle: unit.title,
|
||||
storyboard: {
|
||||
rows,
|
||||
visibleColumns: ["shotNumber", "plotDescription", "videoMotionPrompt", "dialogue"],
|
||||
visibleColumns: ["shotNumber", "durationSeconds", "videoMotionPrompt", "dialogue", "assets"],
|
||||
referenceNodeIds: [],
|
||||
},
|
||||
});
|
||||
|
||||
@@ -1601,6 +1601,7 @@ function InfiniteCanvasPage() {
|
||||
return (
|
||||
<CanvasScriptNodeContent
|
||||
node={contentNode}
|
||||
nodes={nodesRef.current}
|
||||
batch={visibleGenerationBatch(contentNode)}
|
||||
pipeline={pipeline}
|
||||
scale={viewport.k}
|
||||
@@ -2385,6 +2386,7 @@ function InfiniteCanvasPage() {
|
||||
|
||||
<CanvasScriptEditor
|
||||
node={activeScriptNode}
|
||||
nodes={nodes}
|
||||
open={Boolean(activeScriptNode)}
|
||||
onClose={() => setScriptEditorNodeId(null)}
|
||||
onUpdateRows={(rows) => activeScriptNode && replaceScriptRows(activeScriptNode.id, rows)}
|
||||
|
||||
@@ -8,7 +8,7 @@ import {
|
||||
buildGenerationConfig,
|
||||
generationTaskMetadata,
|
||||
resetGenerationTaskMetadata,
|
||||
logicalModelIDForConfig,
|
||||
logicalModelIDForConfig,
|
||||
} from "@/lib/canvas/canvas-project-generation";
|
||||
import {
|
||||
cinematicStoryboardColumns,
|
||||
@@ -19,7 +19,9 @@ import {
|
||||
storyboardPromptTemplateMetadata,
|
||||
} from "@/lib/canvas/canvas-project-domain";
|
||||
import { buildNodeMentionReferences } from "@/lib/canvas/canvas-resource-references";
|
||||
import { buildStoryboardAssetCatalog } from "@/lib/canvas/canvas-storyboard-assets";
|
||||
import { resolveStoryboardGenerationContext } from "@/lib/canvas/canvas-storyboard-context";
|
||||
import { reconcileStoryboardTargetConnections, storyboardComposerContent, storyboardRowReferenceNodeIds } from "@/lib/canvas/canvas-storyboard-materializer";
|
||||
import { generationErrorMessage } from "@/lib/generation-error";
|
||||
import { navigateToSettings } from "@/lib/settings-navigation";
|
||||
import { createGenerationTask, waitForGenerationTask } from "@/services/api/task-center";
|
||||
@@ -80,7 +82,7 @@ export function useCanvasStoryboard({
|
||||
...node.metadata,
|
||||
storyboard: {
|
||||
rows: updater(node.metadata?.storyboard?.rows || []),
|
||||
visibleColumns: node.metadata?.storyboard?.visibleColumns || ["shotNumber", "plotDescription", "videoMotionPrompt", "dialogue"],
|
||||
visibleColumns: node.metadata?.storyboard?.visibleColumns || ["shotNumber", "durationSeconds", "videoMotionPrompt", "dialogue", "assets"],
|
||||
referenceNodeIds: node.metadata?.storyboard?.referenceNodeIds || [],
|
||||
},
|
||||
},
|
||||
@@ -89,9 +91,11 @@ export function useCanvasStoryboard({
|
||||
|
||||
const replaceScriptRows = useCallback((nodeId: string, rows: StoryboardRow[]) => {
|
||||
const rowIds = new Set(rows.map((row) => `row:${row.id}`));
|
||||
const storyboardRowIds = new Set(rows.map((row) => row.id));
|
||||
const previousRows = new Map((nodesRef.current.find((node) => node.id === nodeId)?.metadata?.storyboard?.rows || []).map((row) => [row.id, row]));
|
||||
const nextRows = rows.map((row) => invalidateEditedPromptVariables(previousRows.get(row.id), row));
|
||||
setConnections((current) => current
|
||||
.filter((connection) => !connection.storyboardRowId || storyboardRowIds.has(connection.storyboardRowId))
|
||||
.filter((connection) => connection.fromNodeId !== nodeId || !connection.fromHandleId || rowIds.has(connection.fromHandleId))
|
||||
.filter((connection) => connection.toNodeId !== nodeId || !connection.toHandleId || rowIds.has(connection.toHandleId)));
|
||||
updateScriptRows(nodeId, () => nextRows);
|
||||
@@ -139,9 +143,9 @@ export function useCanvasStoryboard({
|
||||
operation: "storyboard_rows",
|
||||
prompt: expandedPrompt,
|
||||
model: generationConfig.model,
|
||||
...(logicalModelIDForConfig(generationConfig) ? { logicalModelId: logicalModelIDForConfig(generationConfig) } : {}),
|
||||
...(logicalModelIDForConfig(generationConfig) ? { logicalModelId: logicalModelIDForConfig(generationConfig) } : {}),
|
||||
input: {
|
||||
canvasSnapshot: { nodes: nodesRef.current, connections: connectionsRef.current },
|
||||
canvasAssets: buildStoryboardAssetCatalog(nodesRef.current),
|
||||
requirements: "输出可直接编辑并用于批量生成图片和视频的分镜表。",
|
||||
projectStyle: storyboardContext.projectStyle,
|
||||
characters: storyboardContext.characters,
|
||||
@@ -189,32 +193,25 @@ export function useCanvasStoryboard({
|
||||
const imageSpec = NODE_DEFAULT_SIZE[CanvasNodeType.Image];
|
||||
const startX = scriptNode.position.x + scriptNode.width + 120;
|
||||
const nextNodes = [...nodesRef.current];
|
||||
const nextConnections = [...connectionsRef.current];
|
||||
let nextConnections = [...connectionsRef.current];
|
||||
const targets: Array<{ row: StoryboardRow; node: CanvasNodeData; prompt: string }> = [];
|
||||
rows.forEach((row, index) => {
|
||||
const prompt = (row.imageGenerationPrompt || row.plotDescription).trim();
|
||||
const existing = row.imageNodeId ? nextNodes.find((node) => node.id === row.imageNodeId && node.type === CanvasNodeType.Image) : undefined;
|
||||
const existingMetadata = existing?.metadata?.content ? existing.metadata : resetGenerationTaskMetadata(existing?.metadata);
|
||||
const referenceIds = storyboardRowReferenceNodeIds(scriptNode, row, nextNodes, nextConnections, false, existing?.id);
|
||||
const composerContent = storyboardComposerContent(prompt, referenceIds);
|
||||
const imageNode = existing
|
||||
? { ...existing, metadata: { ...existingMetadata, prompt, ...storyboardPromptTemplateMetadata(row, "image"), workflowKind: "shot" as const, workflowTitle: `镜头 ${row.shotNumber} 分镜图`, shotIndex: row.shotNumber } }
|
||||
: createCanvasNode(CanvasNodeType.Image, { x: startX + imageSpec.width / 2, y: scriptNode.position.y + index * (imageSpec.height + 36) + imageSpec.height / 2 }, { prompt, ...storyboardPromptTemplateMetadata(row, "image"), workflowKind: "shot", workflowTitle: `镜头 ${row.shotNumber} 分镜图`, shotIndex: row.shotNumber, status: NODE_STATUS_IDLE });
|
||||
? { ...existing, metadata: { ...existingMetadata, prompt, composerContent, ...storyboardPromptTemplateMetadata(row, "image"), workflowKind: "shot" as const, workflowTitle: `镜头 ${row.shotNumber} 分镜图`, shotIndex: row.shotNumber } }
|
||||
: createCanvasNode(CanvasNodeType.Image, { x: startX + imageSpec.width / 2, y: scriptNode.position.y + index * (imageSpec.height + 36) + imageSpec.height / 2 }, { prompt, composerContent, ...storyboardPromptTemplateMetadata(row, "image"), workflowKind: "shot", workflowTitle: `镜头 ${row.shotNumber} 分镜图`, shotIndex: row.shotNumber, status: NODE_STATUS_IDLE });
|
||||
if (!existing) {
|
||||
imageNode.title = `镜头 ${row.shotNumber} · 分镜图`;
|
||||
nextNodes.push(imageNode);
|
||||
nextConnections.push({ id: nanoid(), fromNodeId: scriptNode.id, toNodeId: imageNode.id, fromHandleId: `row:${row.id}` });
|
||||
} else {
|
||||
const existingIndex = nextNodes.findIndex((node) => node.id === existing.id);
|
||||
nextNodes[existingIndex] = imageNode;
|
||||
}
|
||||
const referenceIds = new Set([
|
||||
...(scriptNode.metadata?.storyboard?.referenceNodeIds || []),
|
||||
...(row.referenceNodeIds || []),
|
||||
...characterReferenceNodeIds(row, nextNodes),
|
||||
...nextConnections.filter((connection) => connection.toNodeId === scriptNode.id && connection.toHandleId === `row:${row.id}`).map((connection) => connection.fromNodeId),
|
||||
]);
|
||||
referenceIds.forEach((referenceId) => {
|
||||
if (referenceId !== imageNode.id && !nextConnections.some((connection) => connection.fromNodeId === referenceId && connection.toNodeId === imageNode.id)) nextConnections.push({ id: nanoid(), fromNodeId: referenceId, toNodeId: imageNode.id });
|
||||
});
|
||||
nextConnections = reconcileStoryboardTargetConnections(nextConnections, scriptNode, row, imageNode.id, referenceIds);
|
||||
targets.push({ row, node: imageNode, prompt });
|
||||
});
|
||||
const imageNodeByRowId = new Map(targets.map((target) => [target.row.id, target.node.id]));
|
||||
@@ -225,7 +222,7 @@ export function useCanvasStoryboard({
|
||||
...scriptNode.metadata,
|
||||
storyboard: {
|
||||
rows: (scriptNode.metadata?.storyboard?.rows || []).map((row) => ({ ...row, imageNodeId: imageNodeByRowId.get(row.id) || row.imageNodeId })),
|
||||
visibleColumns: scriptNode.metadata?.storyboard?.visibleColumns || ["shotNumber", "plotDescription", "videoMotionPrompt", "dialogue"],
|
||||
visibleColumns: scriptNode.metadata?.storyboard?.visibleColumns || ["shotNumber", "durationSeconds", "videoMotionPrompt", "dialogue", "assets"],
|
||||
referenceNodeIds: scriptNode.metadata?.storyboard?.referenceNodeIds || [],
|
||||
},
|
||||
},
|
||||
@@ -280,29 +277,27 @@ export function useCanvasStoryboard({
|
||||
const startLeft = scriptNode.position.x + scriptNode.width + 120;
|
||||
const videoModel = buildGenerationConfig(effectiveConfig, undefined, "video").model;
|
||||
const nextNodes = [...nodesRef.current];
|
||||
const nextConnections = [...connectionsRef.current];
|
||||
let nextConnections = [...connectionsRef.current];
|
||||
const videoNodeByRowId = new Map<string, string>();
|
||||
let createdCount = 0;
|
||||
rows.forEach((row, index) => {
|
||||
const prompt = (row.videoMotionPrompt || row.plotDescription).trim();
|
||||
const existingIndex = row.videoNodeId ? nextNodes.findIndex((node) => node.id === row.videoNodeId && node.type === CanvasNodeType.Video) : -1;
|
||||
const existing = existingIndex >= 0 ? nextNodes[existingIndex] : undefined;
|
||||
const referenceIds = storyboardRowReferenceNodeIds(scriptNode, row, nextNodes, nextConnections, false, existing?.id);
|
||||
const composerContent = storyboardComposerContent(prompt, referenceIds);
|
||||
if (existingIndex >= 0) {
|
||||
const existing = nextNodes[existingIndex];
|
||||
const existingMetadata = existing.metadata?.content ? existing.metadata : resetGenerationTaskMetadata(existing.metadata);
|
||||
nextNodes[existingIndex] = { ...existing, metadata: { ...existingMetadata, prompt, composerContent: prompt, model: videoModel, ...storyboardPromptTemplateMetadata(row, "video"), seconds: String(row.durationSeconds), shotIndex: row.shotNumber, workflowKind: "shot", workflowTitle: `镜头 ${row.shotNumber} 视频`, generationMode: "video", videoEditOperation: existing.metadata?.videoEditOperation || "text_to_video" } };
|
||||
storyboardRowReferenceNodeIds(scriptNode, row, nextNodes, nextConnections, false).forEach((referenceId) => {
|
||||
if (!nextConnections.some((connection) => connection.fromNodeId === referenceId && connection.toNodeId === existing.id)) nextConnections.push({ id: nanoid(), fromNodeId: referenceId, toNodeId: existing.id });
|
||||
});
|
||||
nextNodes[existingIndex] = { ...existing, metadata: { ...existingMetadata, prompt, composerContent, model: videoModel, ...storyboardPromptTemplateMetadata(row, "video"), seconds: String(row.durationSeconds), shotIndex: row.shotNumber, workflowKind: "shot", workflowTitle: `镜头 ${row.shotNumber} 视频`, generationMode: "video", videoEditOperation: existing.metadata?.videoEditOperation || "text_to_video" } };
|
||||
nextConnections = reconcileStoryboardTargetConnections(nextConnections, scriptNode, row, existing.id, referenceIds);
|
||||
videoNodeByRowId.set(row.id, existing.id);
|
||||
return;
|
||||
}
|
||||
const videoNode = createCanvasNode(CanvasNodeType.Video, { x: startLeft + videoSpec.width / 2, y: scriptNode.position.y + index * (videoSpec.height + 36) + videoSpec.height / 2 }, { prompt, composerContent: prompt, model: videoModel, ...storyboardPromptTemplateMetadata(row, "video"), workflowKind: "shot", workflowTitle: `镜头 ${row.shotNumber} 视频`, shotIndex: row.shotNumber, generationMode: "video", videoEditOperation: "text_to_video", status: NODE_STATUS_IDLE, seconds: String(row.durationSeconds) });
|
||||
const videoNode = createCanvasNode(CanvasNodeType.Video, { x: startLeft + videoSpec.width / 2, y: scriptNode.position.y + index * (videoSpec.height + 36) + videoSpec.height / 2 }, { prompt, composerContent, model: videoModel, ...storyboardPromptTemplateMetadata(row, "video"), workflowKind: "shot", workflowTitle: `镜头 ${row.shotNumber} 视频`, shotIndex: row.shotNumber, generationMode: "video", videoEditOperation: "text_to_video", status: NODE_STATUS_IDLE, seconds: String(row.durationSeconds) });
|
||||
videoNode.title = `镜头 ${row.shotNumber} · 视频`;
|
||||
nextNodes.push(videoNode);
|
||||
nextConnections.push({ id: nanoid(), fromNodeId: scriptNode.id, toNodeId: videoNode.id, fromHandleId: `row:${row.id}` });
|
||||
storyboardRowReferenceNodeIds(scriptNode, row, nextNodes, nextConnections, false).forEach((referenceId) => {
|
||||
if (!nextConnections.some((connection) => connection.fromNodeId === referenceId && connection.toNodeId === videoNode.id)) nextConnections.push({ id: nanoid(), fromNodeId: referenceId, toNodeId: videoNode.id });
|
||||
});
|
||||
nextConnections = reconcileStoryboardTargetConnections(nextConnections, scriptNode, row, videoNode.id, referenceIds);
|
||||
videoNodeByRowId.set(row.id, videoNode.id);
|
||||
createdCount += 1;
|
||||
});
|
||||
@@ -313,7 +308,7 @@ export function useCanvasStoryboard({
|
||||
...scriptNode.metadata,
|
||||
storyboard: {
|
||||
rows: allRows.map((row) => ({ ...row, videoNodeId: videoNodeByRowId.get(row.id) || row.videoNodeId })),
|
||||
visibleColumns: scriptNode.metadata?.storyboard?.visibleColumns || ["shotNumber", "plotDescription", "videoMotionPrompt", "dialogue"],
|
||||
visibleColumns: scriptNode.metadata?.storyboard?.visibleColumns || ["shotNumber", "durationSeconds", "videoMotionPrompt", "dialogue", "assets"],
|
||||
referenceNodeIds: scriptNode.metadata?.storyboard?.referenceNodeIds || [],
|
||||
},
|
||||
},
|
||||
@@ -361,12 +356,9 @@ export function useCanvasStoryboard({
|
||||
const targetById = new Map(targets.map((target) => [target.videoNode.id, target]));
|
||||
const nextNodes = nodesRef.current.map((node) => {
|
||||
const target = targetById.get(node.id);
|
||||
return target ? { ...node, metadata: { ...node.metadata, prompt: target.prompt, composerContent: target.prompt, model: videoModel, ...storyboardPromptTemplateMetadata(target.row, "video"), generationMode: "video" as const, videoEditOperation: "text_to_video" as const, videoStartFrameNodeId: undefined } } : node;
|
||||
return target ? { ...node, metadata: { ...node.metadata, prompt: target.prompt, composerContent: target.videoNode.metadata?.composerContent || target.prompt, model: videoModel, ...storyboardPromptTemplateMetadata(target.row, "video"), generationMode: "video" as const, videoEditOperation: "text_to_video" as const, videoStartFrameNodeId: undefined } } : node;
|
||||
});
|
||||
const dedicatedFirstFrameConnections = new Set(targets
|
||||
.filter((target) => Boolean(target.row.imageNodeId))
|
||||
.map((target) => `${target.row.imageNodeId}:${target.videoNode.id}`));
|
||||
const nextConnections = connectionsRef.current.filter((connection) => !dedicatedFirstFrameConnections.has(`${connection.fromNodeId}:${connection.toNodeId}`));
|
||||
const nextConnections = connectionsRef.current;
|
||||
nodesRef.current = nextNodes;
|
||||
connectionsRef.current = nextConnections;
|
||||
setNodes(nextNodes);
|
||||
@@ -449,26 +441,25 @@ export function useCanvasStoryboard({
|
||||
const currentRows = targetRows.map((row) => currentScriptNode.metadata?.storyboard?.rows.find((item) => item.id === row.id) || row);
|
||||
const startX = Math.max(...currentRows.map((row) => nodesRef.current.find((node) => node.id === row.imageNodeId)?.position.x || currentScriptNode.position.x + currentScriptNode.width)) + videoSpec.width + 120;
|
||||
const nextNodes = [...nodesRef.current];
|
||||
const nextConnections = [...connectionsRef.current];
|
||||
let nextConnections = [...connectionsRef.current];
|
||||
const targets: Array<{ row: StoryboardRow; node: CanvasNodeData; prompt: string }> = [];
|
||||
currentRows.forEach((row, index) => {
|
||||
const prompt = (row.videoMotionPrompt || row.plotDescription).trim();
|
||||
const existing = row.videoNodeId ? nextNodes.find((node) => node.id === row.videoNodeId && node.type === CanvasNodeType.Video) : undefined;
|
||||
const referenceIds = storyboardRowReferenceNodeIds(currentScriptNode, row, nextNodes, nextConnections, true, existing?.id);
|
||||
const composerContent = storyboardComposerContent(prompt, referenceIds);
|
||||
const existingMetadata = existing?.metadata?.content ? existing.metadata : resetGenerationTaskMetadata(existing?.metadata);
|
||||
const videoNode = existing
|
||||
? { ...existing, metadata: { ...existingMetadata, prompt, composerContent: prompt, model: videoModel, ...storyboardPromptTemplateMetadata(row, "video"), workflowKind: "shot" as const, workflowTitle: `镜头 ${row.shotNumber} 视频`, shotIndex: row.shotNumber, generationMode: "video" as const, videoEditOperation: "image_to_video" as const, videoStartFrameNodeId: row.imageNodeId, seconds: String(row.durationSeconds) } }
|
||||
: createCanvasNode(CanvasNodeType.Video, { x: startX, y: currentScriptNode.position.y + index * (videoSpec.height + 36) + videoSpec.height / 2 }, { prompt, model: videoModel, ...storyboardPromptTemplateMetadata(row, "video"), workflowKind: "shot", workflowTitle: `镜头 ${row.shotNumber} 视频`, shotIndex: row.shotNumber, generationMode: "video", videoEditOperation: "image_to_video", videoStartFrameNodeId: row.imageNodeId, status: NODE_STATUS_IDLE, seconds: String(row.durationSeconds) });
|
||||
? { ...existing, metadata: { ...existingMetadata, prompt, composerContent, model: videoModel, ...storyboardPromptTemplateMetadata(row, "video"), workflowKind: "shot" as const, workflowTitle: `镜头 ${row.shotNumber} 视频`, shotIndex: row.shotNumber, generationMode: "video" as const, videoEditOperation: "image_to_video" as const, videoStartFrameNodeId: row.imageNodeId, seconds: String(row.durationSeconds) } }
|
||||
: createCanvasNode(CanvasNodeType.Video, { x: startX, y: currentScriptNode.position.y + index * (videoSpec.height + 36) + videoSpec.height / 2 }, { prompt, composerContent, model: videoModel, ...storyboardPromptTemplateMetadata(row, "video"), workflowKind: "shot", workflowTitle: `镜头 ${row.shotNumber} 视频`, shotIndex: row.shotNumber, generationMode: "video", videoEditOperation: "image_to_video", videoStartFrameNodeId: row.imageNodeId, status: NODE_STATUS_IDLE, seconds: String(row.durationSeconds) });
|
||||
if (!existing) {
|
||||
videoNode.title = `镜头 ${row.shotNumber} · 视频`;
|
||||
nextNodes.push(videoNode);
|
||||
nextConnections.push({ id: nanoid(), fromNodeId: currentScriptNode.id, toNodeId: videoNode.id, fromHandleId: `row:${row.id}` });
|
||||
} else {
|
||||
const existingIndex = nextNodes.findIndex((node) => node.id === existing.id);
|
||||
nextNodes[existingIndex] = videoNode;
|
||||
}
|
||||
storyboardRowReferenceNodeIds(currentScriptNode, row, nextNodes, nextConnections, true).forEach((referenceId) => {
|
||||
if (!nextConnections.some((connection) => connection.fromNodeId === referenceId && connection.toNodeId === videoNode.id)) nextConnections.push({ id: nanoid(), fromNodeId: referenceId, toNodeId: videoNode.id });
|
||||
});
|
||||
nextConnections = reconcileStoryboardTargetConnections(nextConnections, currentScriptNode, row, videoNode.id, referenceIds);
|
||||
targets.push({ row, node: videoNode, prompt });
|
||||
});
|
||||
nodesRef.current = nextNodes;
|
||||
@@ -494,13 +485,6 @@ export function useCanvasStoryboard({
|
||||
};
|
||||
}
|
||||
|
||||
function characterReferenceNodeIds(row: StoryboardRow, nodes: CanvasNodeData[]) {
|
||||
const assetIds = new Set(row.characters.map((character) => character.characterAssetId).filter((assetId): assetId is string => Boolean(assetId)));
|
||||
return nodes
|
||||
.filter((node) => node.metadata?.workflowKind === "character" && Boolean(node.metadata.characterAssetId) && assetIds.has(node.metadata.characterAssetId!))
|
||||
.map((node) => node.id);
|
||||
}
|
||||
|
||||
function invalidateEditedPromptVariables(previous: StoryboardRow | undefined, next: StoryboardRow) {
|
||||
if (!previous) return next;
|
||||
return {
|
||||
@@ -510,19 +494,6 @@ function invalidateEditedPromptVariables(previous: StoryboardRow | undefined, ne
|
||||
};
|
||||
}
|
||||
|
||||
function storyboardRowReferenceNodeIds(scriptNode: CanvasNodeData, row: StoryboardRow, nodes: CanvasNodeData[], connections: CanvasConnection[], includeFirstFrame: boolean) {
|
||||
const referenceIds = new Set([
|
||||
...(scriptNode.metadata?.storyboard?.referenceNodeIds || []),
|
||||
...(row.referenceNodeIds || []),
|
||||
...characterReferenceNodeIds(row, nodes),
|
||||
...connections.filter((connection) => connection.toNodeId === scriptNode.id && connection.toHandleId === `row:${row.id}`).map((connection) => connection.fromNodeId),
|
||||
...(includeFirstFrame && row.imageNodeId ? [row.imageNodeId] : []),
|
||||
]);
|
||||
if (!includeFirstFrame && row.imageNodeId) referenceIds.delete(row.imageNodeId);
|
||||
referenceIds.delete(scriptNode.id);
|
||||
return Array.from(referenceIds);
|
||||
}
|
||||
|
||||
function activeGenerationBatchNodeIds(node: CanvasNodeData, mode: CanvasGenerationBatchMode) {
|
||||
return new Set((node.metadata?.generationBatches || [])
|
||||
.filter((batch) => batch.mode === mode)
|
||||
|
||||
+13
-1
@@ -70,9 +70,18 @@ export type StoryboardColumn =
|
||||
| "timeBeats"
|
||||
| "imageGenerationPrompt"
|
||||
| "videoMotionPrompt"
|
||||
| "assets"
|
||||
| "continuityOut"
|
||||
| "negativePrompt";
|
||||
|
||||
export type StoryboardAssetRole = "character" | "environment" | "wardrobe" | "prop" | "weapon" | "style" | "motion" | "audio";
|
||||
|
||||
export type StoryboardAssetBinding = {
|
||||
nodeId: string;
|
||||
role: StoryboardAssetRole;
|
||||
priority: number;
|
||||
};
|
||||
|
||||
export type StoryboardCharacterReference = {
|
||||
characterName: string;
|
||||
characterAssetId?: string;
|
||||
@@ -106,7 +115,7 @@ export type StoryboardRow = {
|
||||
optionalDetails: string[];
|
||||
continuityOut: string;
|
||||
negativePrompt: string;
|
||||
referenceNodeIds: string[];
|
||||
assetBindings: StoryboardAssetBinding[];
|
||||
imageNodeId?: string;
|
||||
videoNodeId?: string;
|
||||
status?: CanvasNodeStatus;
|
||||
@@ -232,6 +241,7 @@ export type CanvasNodeMetadata = {
|
||||
characterIds?: string[];
|
||||
referenceSetId?: string;
|
||||
referenceAssetNodeIds?: string[];
|
||||
assetBindings?: StoryboardAssetBinding[];
|
||||
characterName?: string;
|
||||
characterPrompt?: string;
|
||||
characterAliases?: string[];
|
||||
@@ -392,6 +402,8 @@ export type CanvasConnection = {
|
||||
toHandleId?: string;
|
||||
fromAnchorRatio?: number;
|
||||
toAnchorRatio?: number;
|
||||
relation?: "storyboard-output" | "storyboard-asset-reference";
|
||||
storyboardRowId?: string;
|
||||
};
|
||||
|
||||
export type CanvasDisplayConnection = {
|
||||
|
||||
Reference in new issue
Block a user