优化一键更新描述词

src/pages/projectDetail/projectDetail.js

@@ -481,6 +481,15 @@ const ProjectDetail = () => {
               description: description
             });
 
+            // 直接更新状态而不是重新加载
+            setSegments(prevSegments =>
+              prevSegments.map(seg =>
+                seg.id === segment.id
+                  ? { ...seg, description: description }
+                  : seg
+              )
+            );
+
             console.log(`分镜ID ${segment.id} 的描述词生成成功: ${description.slice(0, 30)}...`);
             successCount++;
           } catch (error) {
@@ -505,6 +514,15 @@ const ProjectDetail = () => {
                 await bookInfoService.updateBookInfo(segment.id, {
                   description: `[生成失败] ${errorMsg}`
                 });
+
+                // 直接更新状态而不是重新加载
+                setSegments(prevSegments =>
+                  prevSegments.map(seg =>
+                    seg.id === segment.id
+                      ? { ...seg, description: `[生成失败] ${errorMsg}` }
+                      : seg
+                  )
+                );
               }
             } catch (saveError) {
               console.error('保存错误信息失败:', saveError);
@@ -513,9 +531,6 @@ const ProjectDetail = () => {
         }
       }
 
-      // 刷新数据
-      await loadProjectDetail();
-
       // 显示结果统计
       if (errorCount > 0 && successCount > 0) {
         toast.warning(`描述词生成完成，成功: ${successCount}个，失败: ${errorCount}个`);
@@ -878,6 +893,15 @@ const ProjectDetail = () => {
       for (let i = 0; i < segmentsToProcess.length; i++) {
         const segment = segmentsToProcess[i];
 
+        // 每次处理前检查分镜的当前状态
+        const currentSegment = await getSegmentById(segment.id);
+        
+        // 如果分镜状态不是排队状态(0)，或者已经有图片，跳过处理
+        if (currentSegment.draw_status !== 0 || currentSegment.image_path) {
+          console.log(`分镜ID ${segment.id} 当前状态不是排队状态或已有图片，跳过处理`);
+          continue;
+        }
+
         // 每次处理前检查是否有分镜处于暂停状态(-1)
         // 获取最新的分镜状态
         const latestSegments = await bookInfoService.getBookInfoByBookId(parseInt(projectId));
@@ -906,6 +930,13 @@ const ProjectDetail = () => {
         progress.current = currentCompletedCount;
         setImageGenerationProgress({ ...progress });
 
+        // 再次检查分镜状态，确保没有被其他进程处理
+        const segmentBeforeUpdate = await getSegmentById(segment.id);
+        if (segmentBeforeUpdate.draw_status !== 0 || segmentBeforeUpdate.image_path) {
+          console.log(`分镜ID ${segment.id} 已被其他进程处理，跳过`);
+          continue;
+        }
+
         // 更新状态为绘画中(1)
         await bookInfoService.updateBookInfo(segment.id, {
           draw_status: 1 // 绘画中状态
@@ -920,8 +951,8 @@ const ProjectDetail = () => {
 
             // 再次检查当前分镜状态，确保没有被暂停
             const currentSegment = await getSegmentById(segment.id);
-            if (currentSegment.draw_status === -1) {
-              console.log('检测到当前分镜已被设置为暂停状态，跳过处理');
+            if (currentSegment.draw_status === -1 || currentSegment.image_path) {
+              console.log('检测到当前分镜已被设置为暂停状态或已有图片，跳过处理');
               return null;
             }
 
@@ -953,10 +984,10 @@ const ProjectDetail = () => {
             continue;
           }
 
-          // 检查分镜当前状态，如果已设置为暂停状态，则不保存结果
+          // 检查分镜当前状态，如果已设置为暂停状态或已有图片，则不保存结果
           const segmentAfterApiCall = await getSegmentById(segment.id);
-          if (segmentAfterApiCall.draw_status === -1) {
-            console.log('API请求完成后检测到分镜已被设置为暂停状态，不保存结果');
+          if (segmentAfterApiCall.draw_status === -1 || segmentAfterApiCall.image_path) {
+            console.log('API请求完成后检测到分镜已被设置为暂停状态或已有图片，不保存结果');
             setGeneratingImages(false);
             // 重置进度状态
             setImageGenerationProgress({ current: 0, total: 0 });
@@ -994,9 +1025,13 @@ const ProjectDetail = () => {
             });
 
             console.log(`分镜ID ${segment.id} 的图片生成成功: ${imagePath}`);
+            successCount++; // 增加成功计数
 
-            // 更新进度为1/1，表示图片生成100%完成
-            setImageGenerationProgress({ current: 1, total: 1 });
+            // 更新进度
+            const currentCompletedCount = (await bookInfoService.getBookInfoByBookId(parseInt(projectId)))
+              .filter(segment => segment.draw_status === 2 && segment.image_path).length;
+            progress.current = currentCompletedCount;
+            setImageGenerationProgress({ ...progress });
 
             // 实时更新图片显示
             setSegments(prevSegments =>
@@ -1130,6 +1165,15 @@ const ProjectDetail = () => {
       for (let i = 0; i < segmentsToProcess.length; i++) {
         const segment = segmentsToProcess[i];
 
+        // 每次处理前检查分镜的当前状态
+        const currentSegment = await getSegmentById(segment.id);
+        
+        // 如果分镜状态不是排队状态(0)，或者已经有图片，跳过处理
+        if (currentSegment.draw_status !== 0 || currentSegment.image_path) {
+          console.log(`分镜ID ${segment.id} 当前状态不是排队状态或已有图片，跳过处理`);
+          continue;
+        }
+
         // 每次处理前检查是否有分镜处于暂停状态(-1)
         // 获取最新的分镜状态
         const latestSegments = await bookInfoService.getBookInfoByBookId(parseInt(projectId));
@@ -1158,6 +1202,13 @@ const ProjectDetail = () => {
         progress.current = currentCompletedCount;
         setImageGenerationProgress({ ...progress });
 
+        // 再次检查分镜状态，确保没有被其他进程处理
+        const segmentBeforeUpdate = await getSegmentById(segment.id);
+        if (segmentBeforeUpdate.draw_status !== 0 || segmentBeforeUpdate.image_path) {
+          console.log(`分镜ID ${segment.id} 已被其他进程处理，跳过`);
+          continue;
+        }
+
         // 更新状态为绘画中(1)
         await bookInfoService.updateBookInfo(segment.id, {
           draw_status: 1 // 绘画中状态
@@ -1172,8 +1223,8 @@ const ProjectDetail = () => {
 
             // 再次检查当前分镜状态，确保没有被暂停
             const currentSegment = await getSegmentById(segment.id);
-            if (currentSegment.draw_status === -1) {
-              console.log('检测到当前分镜已被设置为暂停状态，跳过处理');
+            if (currentSegment.draw_status === -1 || currentSegment.image_path) {
+              console.log('检测到当前分镜已被设置为暂停状态或已有图片，跳过处理');
               return null;
             }
 
@@ -1205,10 +1256,10 @@ const ProjectDetail = () => {
             continue;
           }
 
-          // 检查分镜当前状态，如果已设置为暂停状态，则不保存结果
+          // 检查分镜当前状态，如果已设置为暂停状态或已有图片，则不保存结果
           const segmentAfterApiCall = await getSegmentById(segment.id);
-          if (segmentAfterApiCall.draw_status === -1) {
-            console.log('API请求完成后检测到分镜已被设置为暂停状态，不保存结果');
+          if (segmentAfterApiCall.draw_status === -1 || segmentAfterApiCall.image_path) {
+            console.log('API请求完成后检测到分镜已被设置为暂停状态或已有图片，不保存结果');
             setGeneratingImages(false);
             // 重置进度状态
             setImageGenerationProgress({ current: 0, total: 0 });
@@ -1244,9 +1295,13 @@ const ProjectDetail = () => {
             });
 
             console.log(`分镜ID ${segment.id} 的图片生成成功: ${imagePath}`);
+            successCount++; // 增加成功计数
 
-            // 更新进度为1/1，表示图片生成100%完成
-            setImageGenerationProgress({ current: 1, total: 1 });
+            // 更新进度
+            const currentCompletedCount = (await bookInfoService.getBookInfoByBookId(parseInt(projectId)))
+              .filter(segment => segment.draw_status === 2 && segment.image_path).length;
+            progress.current = currentCompletedCount;
+            setImageGenerationProgress({ ...progress });
 
             // 实时更新图片显示
             setSegments(prevSegments =>
@@ -2306,7 +2361,7 @@ const ProjectDetail = () => {
                     className="me-3"
                   >
                     {generatingDescriptions
-                      ? <span>生成中 <span className="generation-progress">{generationProgress.current}/{generationProgress.total}</span></span>
+                      ? `生成中 ${generationProgress.current}/${generationProgress.total}`
                       : (hasDescriptions ? '一键更新描述词' : '一键生成描述词')}
                   </Button>
                   {isPaused ? (
@@ -2336,7 +2391,7 @@ const ProjectDetail = () => {
                             size="sm"
                             onClick={pauseImageGeneration}
                           >
-                            暂停绘画 <span className="generation-progress">{imageGenerationProgress.current}/{imageGenerationProgress.total}</span>
+                            暂停绘画 {imageGenerationProgress.current}/{imageGenerationProgress.total}
                           </Button>
                         </div>
                       ) : (
@@ -2353,7 +2408,7 @@ const ProjectDetail = () => {
                               onClick={() => generateAllImages(false)}
                               disabled={!selectedStyle}
                             >
-                              继续绘画
+                              开始绘画
                             </Dropdown.Item>
                             <Dropdown.Item
                               onClick={() => generateAllImages(true)}