diff --git a/components/pages/work-flow/use-workflow-data.tsx b/components/pages/work-flow/use-workflow-data.tsx index e73d092..86dd3e4 100644 --- a/components/pages/work-flow/use-workflow-data.tsx +++ b/components/pages/work-flow/use-workflow-data.tsx @@ -82,6 +82,15 @@ export function useWorkflowData() { const [isPauseWorkFlow, setIsPauseWorkFlow] = useState(false); const [mode, setMode] = useState<'automatic' | 'manual'>('automatic'); + const taskData: any = { + sketch: { data: [], total_count: -1 }, + character: { data: [], total_count: -1 }, + shot_sketch: { data: [], total_count: -1 }, + video: { data: [], total_count: -1 }, + status: '0' + }; + let loadingText: any = LOADING_TEXT_MAP.initializing; + const dispatch = useAppDispatch(); const { sketchCount, videoCount } = useAppSelector((state) => state.workflow); @@ -194,8 +203,8 @@ export function useWorkflowData() { throw new Error(response.message); } - let loadingText: any = LOADING_TEXT_MAP.initializing; - let finalStep = '0', sketchCount = 0, isChange = false; + + let sketchCount = 0; const all_task_data = response.data; // all_task_data 下标0 和 下标1 换位置 const temp = all_task_data[0]; @@ -206,8 +215,9 @@ export function useWorkflowData() { for (const task of all_task_data) { // 如果有已完成的数据,同步到状态 - if (task.task_name === 'generate_sketch' && task.task_result) { - finalStep = '1'; + console.log('000000000', taskData); + if (task.task_name === 'generate_sketch' && (task.task_status !== 'COMPLETED' || taskData.sketch.total_count !== taskData.sketch.data.length)) { + taskData.status = '1'; const realSketchResultData = task.task_result.data.filter((item: any) => item.image_path); if (realSketchResultData.length >= 0) { // 正在生成草图中 替换 sketch 数据 @@ -218,6 +228,7 @@ export function useWorkflowData() { script: sketch.sketch_name }); } + taskData.sketch.data = sketchList; setTaskSketch(sketchList); setTaskScenes(sketchList); updateSketchCount(sketchList.length); @@ -226,15 +237,16 @@ export function useWorkflowData() { } if (task.task_status === 'COMPLETED') { // 草图生成完成 + taskData.sketch.total_count = taskData.sketch.data.length; setIsGeneratingSketch(false); sketchCount = task.task_result.total_count; console.log('----------草图生成完成', sketchCount); loadingText = LOADING_TEXT_MAP.sketchComplete; - finalStep = '2'; + taskData.status = '2'; } setTotalSketchCount(task.task_result.total_count); } - if (task.task_name === 'generate_character' && task.task_result) { + if (task.task_name === 'generate_character' && (task.task_status !== 'COMPLETED' || taskData.character.total_count !== taskData.character.data.length)) { if (task.task_result.data.length >= 0 && roles.length !== task.task_result.data.length) { // 正在生成角色中 替换角色数据 const characterList = []; @@ -247,21 +259,23 @@ export function useWorkflowData() { roleDescription: character.character_description }); } + taskData.character.data = characterList; setRoles(characterList); loadingText = LOADING_TEXT_MAP.newCharacter(characterList.length, task.task_result.total_count); } if (task.task_status === 'COMPLETED') { console.log('----------角色生成完成,有几个分镜', sketchCount); // 角色生成完成 - finalStep = '3'; + taskData.character.total_count = taskData.character.data.length; + taskData.status = '3'; loadingText = LOADING_TEXT_MAP.getShotSketchStatus; } } - if (task.task_name === 'generate_shot_sketch' && task.task_result) { + if (task.task_name === 'generate_shot_sketch' && (task.task_status !== 'COMPLETED' || taskData.shot_sketch.total_count !== taskData.shot_sketch.data.length)) { const realShotResultData = task.task_result.data.filter((item: any) => item.url); if (realShotResultData.length >= 0) { - finalStep = '1'; + taskData.status = '1'; console.log('----------正在生成草图中 替换 sketch 数据', taskShotSketch.length, realShotResultData.length); // 正在生成草图中 替换 sketch 数据 const sketchList = []; @@ -271,6 +285,7 @@ export function useWorkflowData() { script: sketch.description }); } + taskData.shot_sketch.data = sketchList; setTaskSketch(sketchList); setTaskShotSketch(sketchList); updateSketchCount(sketchList.length); @@ -279,16 +294,17 @@ export function useWorkflowData() { } if (task.task_status === 'COMPLETED') { // 草图生成完成 + taskData.shot_sketch.total_count = taskData.shot_sketch.data.length; setIsGeneratingSketch(false); setIsGeneratingVideo(true); sketchCount = task.task_result.total_count; console.log('----------草图生成完成', sketchCount); loadingText = LOADING_TEXT_MAP.getVideoStatus; - finalStep = '3'; + taskData.status = '3'; } setTotalSketchCount(task.task_result.total_count); } - if (task.task_name === 'generate_videos' && task.task_result) { + if (task.task_name === 'generate_videos' && (task.task_status !== 'COMPLETED' || taskData.video.total_count !== taskData.video.data.length)) { const realTaskResultData = task.task_result.data.filter((item: any) => item.urls && item.urls.length > 0); if (realTaskResultData.length >= 0) { console.log('----------正在生成视频中', realTaskResultData.length); @@ -303,6 +319,7 @@ export function useWorkflowData() { video_id: video.video_id, }); } + taskData.video.data = videoList; setTaskVideos(videoList); updateVideoCount(videoList.length); setIsGeneratingVideo(true); @@ -311,11 +328,12 @@ export function useWorkflowData() { if (task.task_status === 'COMPLETED') { console.log('----------视频生成完成'); // 视频生成完成 + taskData.video.total_count = taskData.video.data.length; setIsGeneratingVideo(false); - finalStep = '4'; + taskData.status = '4'; // 暂时没有音频生成 直接跳过 - finalStep = '5'; + taskData.status = '5'; loadingText = LOADING_TEXT_MAP.postProduction('generating rough cut video...'); } } @@ -325,7 +343,7 @@ export function useWorkflowData() { setFinal({ url: task.task_result.video, }) - finalStep = '5.5'; + taskData.status = '5.5'; loadingText = LOADING_TEXT_MAP.postProduction('generating fine-grained video clips...'); } } @@ -335,7 +353,7 @@ export function useWorkflowData() { setFinal({ url: task.task_result.video, }) - finalStep = '6'; + taskData.status = '6'; loadingText = LOADING_TEXT_MAP.complete; // 停止轮询 @@ -344,14 +362,14 @@ export function useWorkflowData() { } } - console.log('----------finalStep', finalStep); + console.log('----------finalStep', taskData.status); // 设置步骤 - setCurrentStep(finalStep); + setCurrentStep(taskData.status); setTaskObject(prev => { if (!prev) return null; return { ...prev, - taskStatus: finalStep + taskStatus: taskData.status }; }); setCurrentLoadingText(loadingText); diff --git a/components/script-renderer/ScriptRenderer.tsx b/components/script-renderer/ScriptRenderer.tsx index b4d63df..8890f90 100644 --- a/components/script-renderer/ScriptRenderer.tsx +++ b/components/script-renderer/ScriptRenderer.tsx @@ -114,12 +114,14 @@ export const ScriptRenderer: React.FC = ({ data, setIsPause if (contentEditableRef.current) { const text = contentEditableRef.current.innerText; console.log('contentEditableRef---text', text); - setAnyAttribute(block.id, text,(old: string)=>{ - if(old!==text){ - mode.includes('auto') && applyScript(); - setIsPauseWorkFlow(false); - } - }); + if (from !== 'tab') { + setAnyAttribute(block.id, text,(old: string)=>{ + if(old!==text){ + mode.includes('auto') && applyScript(); + setIsPauseWorkFlow(false); + } + }); + } } }; @@ -133,18 +135,20 @@ export const ScriptRenderer: React.FC = ({ data, setIsPause }); return; } - setIsPauseWorkFlow(true); setAddThemeTag(value); - setAnyAttribute('categories', value.join(','),(old: string)=>{ - if(old!==value.join(',')){ - mode.includes('auto') && applyScript(); - setIsPauseWorkFlow(false); - } - }); + if (from !== 'tab') { + setIsPauseWorkFlow(true); + setAnyAttribute('categories', value.join(','),(old: string)=>{ + if(old!==value.join(',')){ + mode.includes('auto') && applyScript(); + setIsPauseWorkFlow(false); + } + }); + } }; const handleEditBlock = (block: ScriptBlock) => { - setIsPauseWorkFlow(true); + from !== 'tab' && setIsPauseWorkFlow(true); setIsInit(false); setEditBlockId(block.id); setActiveBlockId(block.id); diff --git a/components/ui/edit-modal.tsx b/components/ui/edit-modal.tsx index f2c268e..c2d1628 100644 --- a/components/ui/edit-modal.tsx +++ b/components/ui/edit-modal.tsx @@ -288,7 +288,7 @@ export function EditModal({ whileTap={{ scale: 0.98 }} onClick={() => {handleSave()}} > - Save + Apply