Merge branch 'prod' into dev

This commit is contained in:
北枳 2025-10-13 20:59:55 +08:00
commit ed5e9196a4
2 changed files with 9 additions and 3 deletions

View File

@ -460,6 +460,9 @@ export const MediaViewer = React.memo(function MediaViewer({
className="relative w-full h-full rounded-lg overflow-hidden"
key={`render-video-${taskObject.final.url}`}
ref={videoContentRef}
style={{
minWidth: placeholderWidth
}}
>
<div className="relative w-full h-full group">
{/* 背景模糊的视频 */}
@ -565,7 +568,7 @@ export const MediaViewer = React.memo(function MediaViewer({
key={`render-video-${urls}`}
ref={videoContentRef}
style={{
width: taskObject.videos.data[currentSketchIndex].video_status !== 1 ? placeholderWidth : '100%'
minWidth: placeholderWidth
}}
>
{/* 背景模糊的图片 */}
@ -775,7 +778,7 @@ export const MediaViewer = React.memo(function MediaViewer({
className="relative w-full h-full rounded-lg group overflow-hidden"
key={`render-sketch-${currentSketch.url}`}
style={{
width: currentSketch.status === 1 ? '100%' : placeholderWidth
minWidth: placeholderWidth
}}
>
{/* 状态 */}

View File

@ -324,7 +324,10 @@ export function useWorkflowData({}: UseWorkflowDataProps = {}) {
if (task.task_name === 'watermark_videos') {
if (task.task_status === 'COMPLETED') {
taskCurrent.currentStage = 'final_video';
taskCurrent.final.url = task.task_result.video_url.result.watermarked_url || task.task_result.video_url;
const videoUrl = task.task_result.video_url;
taskCurrent.final.url = (videoUrl && typeof videoUrl === 'object')
? videoUrl.result?.watermarked_url
: videoUrl;
taskCurrent.final.note = 'watermark';
taskCurrent.status = 'COMPLETED';
// 停止轮询