修复绘画进度问题

src/pages/projectDetail/projectDetail.js

@@ -834,17 +834,12 @@ const ProjectDetail = () => {
     return null;
   };
 
-  // 添加回一键生成所有分镜图片函数（重构版）
+  /**
+   * 生成所有分镜图片
+   */
   const generateAllImages = async (isForceRedraw = false) => {
-    // 如果已经在生成中，直接返回
-    if (isGenerating) {
-      console.log('已经在进行绘画任务，请等待完成或先暂停');
-      return;
-    }
-
-    // 检查是否有有效的Coze API token
-    if (!hasValidToken()) {
-      toast.error('未配置Coze API Token，请先在首页点击"配置Coze API"按钮进行设置');
+    if (generatingImages) {
+      toast.info('正在绘制图片中，请等待当前操作完成');
       return;
     }
 
@@ -860,6 +855,14 @@ const ProjectDetail = () => {
       // 获取需要处理的分镜
       let segmentsToProcess = [];
 
+      // 计算已经完成的图片数量
+      const existingCompletedCount = segments.filter(
+        segment => segment.image_path && segment.draw_status === 2
+      ).length;
+      
+      console.log(`当前已完成的图片数量: ${existingCompletedCount}`);
+      setCompletedDrawings(existingCompletedCount);
+
     if (isForceRedraw) {
         // 重绘：处理所有有描述词的分镜
       const segmentsToRedraw = segments.filter(
@@ -1031,23 +1034,27 @@ const ProjectDetail = () => {
             console.log(`分镜ID ${segment.id} 的图片生成成功: ${imagePath}`);
             successCount++;
             
-            // 更新处理进度
-            const newCompleted = completedDrawings + 1;
-            setCompletedDrawings(newCompleted);
-            
-            // 更新进度UI
-            setImageGenerationProgress({
-              current: newCompleted,
-              total: totalSegmentsToProcess
+            // 更新处理进度 - 修复进度计算问题
+            setCompletedDrawings(prevCount => {
+              const newCount = prevCount + 1;
+              console.log(`已完成图片数量更新：${prevCount} -> ${newCount}`);
+              
+              // 更新进度UI
+              setImageGenerationProgress({
+                current: newCount,
+                total: totalSegmentsToProcess
+              });
+              
+              // 保存进度到localStorage
+              localStorage.setItem(`project_${projectId}_image_generation`, JSON.stringify({
+                progress: { current: newCount, total: totalSegmentsToProcess },
+                timestamp: new Date().getTime(),
+                isPaused: false
+              }));
+              
+              return newCount;
             });
             
-            // 保存进度到localStorage
-            localStorage.setItem(`project_${projectId}_image_generation`, JSON.stringify({
-              progress: { current: newCompleted, total: totalSegmentsToProcess },
-              timestamp: new Date().getTime(),
-              isPaused: false
-            }));
-            
             // 实时更新UI
             setSegments(prevSegments =>
               prevSegments.map(seg =>
@@ -1252,7 +1259,20 @@ const ProjectDetail = () => {
           draw_status: 0 // 排队状态
         })
       ));
-
+      
+      // 计算已完成的图片数量
+      const completedCount = allSegments.filter(segment => 
+        segment.draw_status === 2 && segment.image_path
+      ).length;
+      
+      console.log(`恢复时已完成图片数量: ${completedCount}`);
+      setCompletedDrawings(completedCount);
+      
+      // 计算总数量（有描述词的分镜总数）
+      const totalCount = allSegments.filter(segment =>
+        segment.description && segment.description.trim() !== ''
+      ).length;
+      
       // 4. 更新UI状态
       setIsPaused(false);
       setSegments(prevSegments => 
@@ -1263,12 +1283,17 @@ const ProjectDetail = () => {
         )
       );
       
+      // 更新进度显示
+      setImageGenerationProgress({
+        current: completedCount,
+        total: totalCount
+      });
+      
       // 5. 更新localStorage中的暂停状态
       const storageItem = localStorage.getItem(`project_${projectId}_image_generation`);
       if (storageItem) {
-        const data = JSON.parse(storageItem);
         localStorage.setItem(`project_${projectId}_image_generation`, JSON.stringify({
-          ...data,
+          progress: { current: completedCount, total: totalCount },
           isPaused: false,
           timestamp: new Date().getTime()
         }));
@@ -1321,10 +1346,10 @@ const ProjectDetail = () => {
       setIsPaused(false);
 
       // 重新计算并设置进度，可以看出所有任务都已完成
-      const completedCount = allSegments.filter(segment =>
+      const completedCount = allSegments.filter(segment => 
         segment.draw_status === 2 && segment.image_path
       ).length;
-
+      
       // 在取消状态下，只计算已完成的分镜，因为其他都已被设置为完成状态
       setImageGenerationProgress({
         current: completedCount,
@@ -1559,8 +1584,8 @@ const ProjectDetail = () => {
           // 更新本地存储，标记为暂停状态
           const completedCount = segmentsData.filter(
             segment => segment.draw_status === 2 && segment.image_path
-          ).length;
-
+      ).length;
+      
           const totalCount = segmentsData.filter(segment =>
             segment.description && segment.description.trim() !== '' && (
               segment.draw_status === -1 ||
@@ -1572,8 +1597,8 @@ const ProjectDetail = () => {
 
           localStorage.setItem(`project_${projectId}_image_generation`, JSON.stringify({
             progress: {
-              current: completedCount,
-              total: totalCount
+        current: completedCount,
+        total: totalCount
             },
             timestamp: new Date().getTime(),
             isPaused: true