Merge remote-tracking branch 'origin/main'

This commit is contained in:
ddCat
2026-08-10 00:28:12 +08:00
24 changed files with 1323 additions and 24 deletions

View File

@@ -42,9 +42,13 @@ type CanvasNodeToolbarProps = {
onAngle: (node: CanvasNodeData) => void;
onViewImage: (node: CanvasNodeData) => void;
onExtractVideoLastFrame: (node: CanvasNodeData) => void;
onExtractAudioFromVideo: (node: CanvasNodeData) => void;
onTrimVideoRegenerate: (node: CanvasNodeData) => void;
onSubtitles: (node: CanvasNodeData) => void;
onTimeline: (node: CanvasNodeData) => void;
extractingVideoFrame: boolean;
extractingAudio: boolean;
trimmingVideo: boolean;
onReversePrompt: (node: CanvasNodeData) => void;
onRetry: (node: CanvasNodeData) => void;
onToggleFreeResize: (node: CanvasNodeData) => void;
@@ -105,9 +109,13 @@ export function CanvasNodeToolbar({
onAngle,
onViewImage,
onExtractVideoLastFrame,
onExtractAudioFromVideo,
onTrimVideoRegenerate,
onSubtitles,
onTimeline,
extractingVideoFrame,
extractingAudio,
trimmingVideo,
onReversePrompt,
onRetry,
onToggleFreeResize,
@@ -243,7 +251,7 @@ export function CanvasNodeToolbar({
onNodeToggleDialog: onToggleDialog, onNodeAnnotate: onAnnotate, onNodeGenerateImage: onGenerateImage, onNodeUpload: onUpload, onNodeDownload: onDownload,
onNodeSaveAsset: onSaveAsset, onNodeMaskEdit: onMaskEdit, onNodeEmotion: onEmotion, onNodePortraitTexture: onPortraitTexture, onNodeCrop: onCrop,
onNodeSplit: onSplit, onNodeUpscale: onUpscale, onNodeSuperResolve: onSuperResolve, onNodeAngle: onAngle, onNodeViewImage: onViewImage,
onNodeExtractVideoLastFrame: onExtractVideoLastFrame, onNodeReversePrompt: onReversePrompt, onNodeToggleFreeResize: onToggleFreeResize,
onNodeExtractVideoLastFrame: onExtractVideoLastFrame, onNodeExtractAudioFromVideo: onExtractAudioFromVideo, onNodeTrimVideoRegenerate: onTrimVideoRegenerate, onNodeReversePrompt: onReversePrompt, onNodeToggleFreeResize: onToggleFreeResize,
onNodeSubtitles: onSubtitles, onNodeTimeline: onTimeline, onNodeToggleLocked: onToggleLocked, onNodeCopyPrompt: copyImagePrompt,
} as Partial<ToolbarHandlers> as ToolbarHandlers;
@@ -259,6 +267,8 @@ export function CanvasNodeToolbar({
node,
nodeMetadata: node.metadata,
extractingVideoFrame,
extractingAudio,
trimmingVideo,
mergingVideos: false,
addPanelOpen: false,
appearancePanelOpen: false,

View File

@@ -139,7 +139,7 @@ export function CanvasToolbar({
onNodeInfo: () => {}, onNodeDelete: () => {}, onNodeRetry: () => {}, onNodeEditText: () => {}, onNodeDecreaseFont: () => {}, onNodeIncreaseFont: () => {},
onNodeToggleDialog: () => {}, onNodeAnnotate: () => {}, onNodeGenerateImage: () => {}, onNodeUpload: () => {}, onNodeDownload: () => {}, onNodeSaveAsset: () => {},
onNodeMaskEdit: () => {}, onNodeEmotion: () => {}, onNodePortraitTexture: () => {}, onNodeCrop: () => {}, onNodeSplit: () => {}, onNodeUpscale: () => {},
onNodeSuperResolve: () => {}, onNodeAngle: () => {}, onNodeViewImage: () => {}, onNodeExtractVideoLastFrame: () => {}, onNodeSubtitles: () => {}, onNodeTimeline: () => {}, onNodeReversePrompt: () => {},
onNodeSuperResolve: () => {}, onNodeAngle: () => {}, onNodeViewImage: () => {}, onNodeExtractVideoLastFrame: () => {}, onNodeExtractAudioFromVideo: () => {}, onNodeTrimVideoRegenerate: () => {}, onNodeSubtitles: () => {}, onNodeTimeline: () => {}, onNodeReversePrompt: () => {},
onNodeToggleFreeResize: () => {}, onNodeToggleLocked: () => {}, onNodeCopyPrompt: () => {},
} as ToolbarHandlers;
@@ -153,6 +153,8 @@ export function CanvasToolbar({
canUndo,
canRedo,
extractingVideoFrame: false,
extractingAudio: false,
trimmingVideo: false,
mergingVideos: false,
addPanelOpen: addOpen,
appearancePanelOpen: appearanceOpen,

View File

@@ -0,0 +1,422 @@
import { useEffect, useMemo, useRef, useState } from "react";
import { App, Button, Input, InputNumber, Modal, Select } from "antd";
import { AudioLines, Check, ListVideo, Plus, Scissors, SkipBack, SkipForward, Trash2 } from "lucide-react";
import { nanoid } from "nanoid";
import { ModelPicker } from "@/components/model-picker";
import { canvasThemes } from "@/lib/canvas-theme";
import { buildTimelineImportSegments, type CanvasTimelineSegmentItem } from "@/lib/canvas/canvas-video-timeline-segments";
import { listVideoReferenceModels } from "@/lib/canvas/canvas-video-regeneration";
import { modelCapabilityConfigFor } from "@/lib/model-capabilities";
import { navigateToSettings } from "@/lib/settings-navigation";
import { useThemeStore } from "@/stores/use-theme-store";
import { resolveMediaUrl } from "@/services/file-storage";
import { cacheResourceObjectUrl } from "@/services/resource-blob-cache";
import { resourceIdFromStorageKey } from "@/services/api/resources";
import { modelDisplayName, type AiConfig } from "@/stores/use-config-store";
import { type CanvasConnection, type CanvasNodeData, type CanvasVideoEditOperation } from "@/types/canvas";
import type { TimelineProject } from "@/types/timeline";
export type CanvasVideoSegmentItem = CanvasTimelineSegmentItem;
export type CanvasVideoSegmentParams = {
mode: "audio" | "video";
startMs: number;
endMs: number;
prompt?: string;
segments?: CanvasVideoSegmentItem[];
model?: string;
operation?: CanvasVideoEditOperation;
};
type CanvasVideoSegmentDialogProps = {
node: CanvasNodeData;
nodes: CanvasNodeData[];
connections: CanvasConnection[];
open: boolean;
mode: "audio" | "video";
config: AiConfig;
timeline?: TimelineProject | null;
onClose: () => void;
onConfirm: (params: CanvasVideoSegmentParams) => void;
};
const MIN_SEGMENT_MS = 100;
export function CanvasVideoSegmentDialog({ node, nodes, connections, open, mode, config, timeline, onClose, onConfirm }: CanvasVideoSegmentDialogProps) {
const { message } = App.useApp();
const theme = canvasThemes[useThemeStore((state) => state.theme)];
const videoRef = useRef<HTMLVideoElement>(null);
const segmentsSeededRef = useRef(false);
const [videoUrl, setVideoUrl] = useState("");
const [videoError, setVideoError] = useState(false);
const [durationMs, setDurationMs] = useState(0);
const [startSec, setStartSec] = useState(0);
const [endSec, setEndSec] = useState(0);
const [prompt, setPrompt] = useState("");
const [segments, setSegments] = useState<CanvasVideoSegmentItem[]>([]);
const [model, setModel] = useState("");
const [operation, setOperation] = useState<CanvasVideoEditOperation>("extend");
const eligibleModels = useMemo(() => listVideoReferenceModels(config), [config]);
// 打开弹窗时解析视频地址,读取时长并初始化起止时间。
useEffect(() => {
if (!open) return;
let cancelled = false;
setVideoUrl("");
setVideoError(false);
setDurationMs(0);
setStartSec(0);
setEndSec(0);
setPrompt("");
setSegments([]);
segmentsSeededRef.current = false;
const defaultModel = config.videoModel || config.model || "";
const initialModel = eligibleModels.includes(defaultModel) ? defaultModel : eligibleModels[0] || defaultModel;
setModel(initialModel);
const profile = initialModel ? modelCapabilityConfigFor(config, initialModel).video : undefined;
setOperation(profile?.operations.includes("extend") ? "extend" : (profile?.operations[0] as CanvasVideoEditOperation | undefined) || "extend");
const storageKey = node.metadata?.storageKey || "";
const fallback = node.metadata?.content || "";
const applyUrl = (url: string) => {
if (!cancelled) setVideoUrl(url);
};
if (resourceIdFromStorageKey(storageKey)) {
void cacheResourceObjectUrl(storageKey)
.then((cached) => {
if (cancelled) return;
if (cached) setVideoUrl(cached);
else void resolveMediaUrl(storageKey, fallback).then(applyUrl);
})
.catch(() => {
if (!cancelled) void resolveMediaUrl(storageKey, fallback).then(applyUrl);
});
} else {
void resolveMediaUrl(storageKey, fallback).then(applyUrl);
}
return () => {
cancelled = true;
};
}, [config, eligibleModels, node, open]);
// 视频模式等待时长元数据就绪后,默认放入一个完整时长的片段。
useEffect(() => {
if (!open || mode !== "video" || segmentsSeededRef.current || !durationMs) return;
segmentsSeededRef.current = true;
setSegments([{ id: nanoid(), startMs: 0, endMs: durationMs, sourceNodeId: node.id }]);
}, [durationMs, mode, open]);
const isVideoMode = mode === "video";
const durationSec = durationMs > 0 ? durationMs / 1000 : 0;
const hasTimelineVideoClips = Boolean(timeline?.clips.some((clip) => clip.kind === "video"));
const videoProfile = useMemo(() => (model ? modelCapabilityConfigFor(config, model).video : undefined), [config, model]);
const defaultModel = config.videoModel || config.model || "";
const defaultModelSupported = eligibleModels.includes(defaultModel);
const hasEligibleModels = eligibleModels.length > 0;
const firstEligibleModel = eligibleModels[0] || "";
// 切换模型后保持所选模式仍然有效,优先回退到“视频续写”。
useEffect(() => {
if (!videoProfile?.operations.length || videoProfile.operations.includes(operation)) return;
setOperation(videoProfile.operations.includes("extend") ? "extend" : (videoProfile.operations[0] as CanvasVideoEditOperation));
}, [operation, videoProfile]);
const operationOptions = (videoProfile?.operations || []).map((value) => {
const operation = value as CanvasVideoEditOperation;
return { value: operation, label: videoOperationLabel(operation) };
});
const rangeMs = useMemo(() => {
const start = Math.max(0, Math.round((startSec || 0) * 1000));
const end = durationMs > 0 ? Math.min(durationMs, Math.round((endSec || 0) * 1000)) : Math.round((endSec || 0) * 1000);
return { startMs: start, endMs: Math.max(start, end) };
}, [durationMs, endSec, startSec]);
const addManualSegment = () => {
const last = segments[segments.length - 1];
const maxEndMs = durationMs || last?.endMs || 0;
const startMs = last ? Math.min(maxEndMs, last.endMs) : 0;
const endMs = Math.max(startMs + MIN_SEGMENT_MS, maxEndMs);
setSegments((current) => [...current, { id: nanoid(), startMs, endMs, sourceNodeId: node.id }]);
};
const importTimelineSegments = () => {
try {
const result = buildTimelineImportSegments(node, nodes, connections, timeline, durationMs);
if (!result.ok) {
message.warning(result.error);
return;
}
setSegments(result.segments);
setPrompt((current) => current || `按时间线截取的 ${result.segments.length} 段视频,保持画面主体与镜头,重新生成每一段`);
message.success(`已从时间线导入 ${result.segments.length} 个片段`);
} catch (error) {
console.warn("时间线片段导入失败", error);
message.warning("读取时间线片段失败,请刷新后重试");
}
};
const updateSegment = (id: string, patch: Partial<Pick<CanvasVideoSegmentItem, "startMs" | "endMs">>) => {
setSegments((current) => current.map((item) => (item.id === id ? { ...item, ...patch } : item)));
};
const removeSegment = (id: string) => {
setSegments((current) => current.filter((item) => item.id !== id));
};
const handleConfirm = () => {
if (isVideoMode) {
if (!model) {
message.warning("请选择视频模型");
return;
}
if (!segments.length) {
message.warning("请至少添加一个截取片段");
return;
}
for (const segment of segments) {
if (segment.endMs - segment.startMs < MIN_SEGMENT_MS) {
message.warning("片段时长至少 0.1 秒");
return;
}
}
onConfirm({
mode: "video",
startMs: 0,
endMs: 0,
segments: segments.map(({ id, startMs, endMs, sourceNodeId, sourceStorageKey, sourceUrl }) => ({ id, startMs, endMs, sourceNodeId, sourceStorageKey, sourceUrl })),
model,
operation,
prompt: prompt.trim(),
});
return;
}
if (!durationMs) {
message.warning("视频时长未就绪,请稍候再试");
return;
}
if (rangeMs.endMs - rangeMs.startMs < MIN_SEGMENT_MS) {
message.warning("片段时长至少 0.1 秒");
return;
}
onConfirm({ mode: "audio", startMs: rangeMs.startMs, endMs: rangeMs.endMs });
};
const title = (
<div className="flex min-w-0 items-center gap-2.5">
<span className="grid size-8 shrink-0 place-items-center rounded-lg" style={{ background: theme.accent.primarySoft, color: theme.accent.primary }}>
{isVideoMode ? <Scissors className="size-4" /> : <AudioLines className="size-4" />}
</span>
<div className="min-w-0">
<div className="truncate font-semibold leading-6">{isVideoMode ? "截取片段并批量重生成" : "从视频提取声音"}</div>
<div className="truncate text-xs opacity-45">{node.title || "视频节点"}</div>
</div>
</div>
);
return (
<Modal title={title} open={open} onCancel={onClose} footer={null} width={680} centered destroyOnHidden>
<div className="space-y-4">
<div className="flex min-h-0 items-center justify-center overflow-hidden rounded-xl border bg-black" style={{ borderColor: theme.toolbar.border }}>
{videoUrl ? (
<video
ref={videoRef}
src={videoUrl}
controls
playsInline
preload="metadata"
className="block max-h-[var(--video-segment-preview-max-height)] w-full"
onLoadedMetadata={(event) => {
const video = event.currentTarget;
if (Number.isFinite(video.duration) && video.duration > 0) {
const totalMs = Math.round(video.duration * 1000);
setDurationMs(totalMs);
setEndSec(totalMs / 1000);
}
}}
onError={() => setVideoError(true)}
/>
) : (
<div className="grid h-40 w-full place-items-center text-xs opacity-60">{videoError ? "视频预览加载失败,请检查素材是否仍然可用" : "正在加载视频…"}</div>
)}
</div>
{isVideoMode ? (
<div className="space-y-2.5">
{!defaultModelSupported ? (
<div className="flex flex-wrap items-center justify-between gap-2 rounded-lg border px-3 py-2 text-xs" style={{ background: theme.accent.primarySoft + "1a", borderColor: theme.accent.primarySoft, color: theme.node.muted }}>
<span className="min-w-0 flex-1">
{hasEligibleModels
? `当前默认模型${defaultModel ? `「${modelDisplayName(config, defaultModel)}」` : ""}不支持参考视频,已自动切换到「${modelDisplayName(config, firstEligibleModel)}」。`
: "当前配置中没有支持参考视频的视频模型,请先到设置里配置 Seedance / Agent Plan / NewAPI 渠道。"}
</span>
{!hasEligibleModels ? (
<Button size="small" type="primary" onClick={() => navigateToSettings({ section: "channels", continueCreation: true })}>
去设置配置渠道
</Button>
) : null}
</div>
) : null}
<div className="flex flex-wrap items-center justify-between gap-2">
<div className="flex items-center gap-2 text-sm">
<span className="opacity-60">时长</span>
<span>{durationSec ? formatSegmentTime(durationSec) : "未知"}</span>
<span className="opacity-60">已选</span>
<span>{segments.length} 段</span>
</div>
<div className="flex items-center gap-2">
<Button size="small" icon={<Plus className="size-3.5" />} disabled={!durationSec} onClick={addManualSegment}>
添加片段
</Button>
<Button size="small" icon={<ListVideo className="size-3.5" />} disabled={!hasTimelineVideoClips} onClick={importTimelineSegments}>
从时间线导入
</Button>
</div>
</div>
{segments.length ? (
<div className="thin-scrollbar max-h-56 space-y-2 overflow-y-auto pr-1">
{segments.map((segment, index) => (
<div key={segment.id} className="rounded-lg border px-2.5 py-2" style={{ borderColor: theme.toolbar.border }}>
<div className="grid grid-cols-[auto_1fr_1fr_auto] items-center gap-2">
<span className="w-14 shrink-0 text-xs font-medium">片段 {index + 1}</span>
<div className="flex min-w-0 items-center gap-1">
<span className="shrink-0 text-xs opacity-60">起点</span>
<InputNumber
size="small"
min={0}
max={Math.max(0, durationSec - 0.1)}
step={0.1}
value={segment.startMs / 1000}
onChange={(value) => updateSegment(segment.id, { startMs: Math.round((value ?? 0) * 1000) })}
className="w-full"
aria-label={`片段 ${index + 1} 起点(秒)`}
/>
</div>
<div className="flex min-w-0 items-center gap-1">
<span className="shrink-0 text-xs opacity-60">终点</span>
<InputNumber
size="small"
min={0}
max={Math.max(0, durationSec)}
step={0.1}
value={segment.endMs / 1000}
onChange={(value) => updateSegment(segment.id, { endMs: Math.round((value ?? 0) * 1000) })}
className="w-full"
aria-label={`片段 ${index + 1} 终点(秒)`}
/>
</div>
<Button size="small" type="text" danger icon={<Trash2 className="size-3.5" />} aria-label={`删除片段 ${index + 1}`} onClick={() => removeSegment(segment.id)} />
</div>
</div>
))}
</div>
) : (
<div className="rounded-lg border border-dashed px-3 py-3 text-xs opacity-55" style={{ borderColor: theme.toolbar.border }}>
还没有片段:手动添加起点/终点,或从时间线导入该节点的已有片段。
</div>
)}
<div className="grid gap-3 md:grid-cols-2">
<label className="block min-w-0">
<div className="mb-1.5 text-sm font-medium">重生成模型</div>
<ModelPicker config={config} value={model} onChange={setModel} capability="video" fullWidth onMissingConfig={() => message.warning("请先配置支持参考视频的视频模型")} />
</label>
<label className="block min-w-0">
<div className="mb-1.5 text-sm font-medium">生成模式</div>
<Select className="w-full" size="small" value={operation} options={operationOptions} placeholder="选择生成模式" onChange={(value) => setOperation(value as CanvasVideoEditOperation)} />
</label>
</div>
<label className="block">
<div className="mb-1.5 text-sm font-medium">生成提示词</div>
<Input.TextArea autoSize={{ minRows: 2, maxRows: 4 }} value={prompt} placeholder="描述要生成的视频内容,例如:保持画面主体与镜头,重新生成这一段视频" onChange={(event) => setPrompt(event.target.value)} />
<div className="mt-1 text-xs opacity-45">每个片段都会生成独立片段节点和新生成结果节点;片段将作为参考视频送入所选模型,时长需符合模型参考视频限制(Seedance 单段 2-15 秒)。</div>
</label>
</div>
) : (
<div className="flex flex-wrap items-center gap-x-6 gap-y-2 rounded-lg border px-3 py-2 text-sm" style={{ borderColor: theme.toolbar.border }}>
<div className="flex items-center gap-2">
<span className="opacity-60">时长</span>
<span>{durationSec ? formatSegmentTime(durationSec) : "未知"}</span>
</div>
<div className="flex items-center gap-2">
<span className="opacity-60">起点</span>
<InputNumber size="small" min={0} max={Math.max(0, durationSec - 0.1)} step={0.1} value={startSec} onChange={(value) => setStartSec(value ?? 0)} className="w-28" aria-label="片段起点(秒)" />
<Button
size="small"
type="text"
icon={<SkipBack className="size-3.5" />}
aria-label="跳转到起点"
onClick={() => {
if (videoRef.current) videoRef.current.currentTime = startSec;
}}
/>
</div>
<div className="flex items-center gap-2">
<span className="opacity-60">终点</span>
<InputNumber size="small" min={0} max={Math.max(0, durationSec)} step={0.1} value={endSec} onChange={(value) => setEndSec(value ?? 0)} className="w-28" aria-label="片段终点(秒)" />
<Button
size="small"
type="text"
icon={<SkipForward className="size-3.5" />}
aria-label="跳转到终点"
onClick={() => {
if (videoRef.current) videoRef.current.currentTime = endSec;
}}
/>
</div>
<div className="flex items-center gap-2">
<span className="opacity-60">片段</span>
<span>{formatSegmentTime((rangeMs.endMs - rangeMs.startMs) / 1000)}</span>
</div>
<Button
size="small"
disabled={!durationSec}
onClick={() => {
setStartSec(0);
setEndSec(durationSec);
}}
>
使用全部
</Button>
<div className="w-full text-xs opacity-45">提取的 MP3 会保存到素材库,并生成一个音频节点放在当前视频节点下游。</div>
</div>
)}
<div className="flex items-center justify-end gap-2">
<Button onClick={onClose}>取消</Button>
<Button type="primary" icon={<Check className="size-4" />} disabled={isVideoMode ? !segments.length : !durationSec} onClick={handleConfirm}>
{isVideoMode ? (segments.length > 1 ? `截取 ${segments.length} 段并生成` : "截取并生成") : "提取音频"}
</Button>
</div>
</div>
</Modal>
);
}
function videoOperationLabel(operation: CanvasVideoEditOperation) {
const labels: Record<CanvasVideoEditOperation, string> = {
text_to_video: "文生视频",
image_to_video: "图生视频",
extend: "视频续写",
inpaint: "局部修改",
replace_element: "元素替换",
camera_motion: "运镜调整",
style_transfer: "风格迁移",
audio_to_video: "音频生视频",
compare_versions: "版本对比",
concat: "拼接成片",
};
return labels[operation] || operation;
}
function formatSegmentTime(seconds: number) {
const total = Math.max(0, seconds);
const hours = Math.floor(total / 3600);
const minutes = Math.floor((total % 3600) / 60);
const rawSeconds = total % 60;
const secs = rawSeconds % 1 === 0 ? String(Math.floor(rawSeconds)).padStart(2, "0") : rawSeconds.toFixed(1).padStart(4, "0");
return hours > 0 ? `${hours}:${String(minutes).padStart(2, "0")}:${secs}` : `${minutes}:${secs}`;
}

View File

@@ -24,6 +24,8 @@ const settingsMockContext: ToolContext = {
canUndo: false,
canRedo: false,
extractingVideoFrame: false,
extractingAudio: false,
trimmingVideo: false,
mergingVideos: false,
addPanelOpen: false,
appearancePanelOpen: false,