From ec1926ba60190b3847fe71220bc09cf37b6d961b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=99=AF=E5=A4=A7=E4=BE=A0?= <dengjingren@foxmail.com>
Date: Thu, 5 Jun 2025 20:29:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=EF=BC=8C=E9=81=BF=E5=85=8D=E5=8D=A1?=
 =?UTF-8?q?=E2=80=9D=E6=AD=A3=E5=9C=A8=E6=90=9C=E7=B4=A2=EF=BC=8C=E8=AF=B7?=
 =?UTF-8?q?=E7=A8=8D=E5=80=99...=E2=80=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、通过进度有无变化来判定超时，避免误判
2、避免搜索期间误判完成，导致SSE被提前终止
---
 src/pages/resource.vue | 47 +++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/pages/resource.vue b/src/pages/resource.vue
index ed7a023a..1a3b3cdb 100644
--- a/src/pages/resource.vue
+++ b/src/pages/resource.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { debounce } from 'lodash-es'
 import NoDataFound from '@/components/NoDataFound.vue'
 import api from '@/api'
 import type { Context } from '@/api/types'
@@ -51,6 +52,9 @@ const progressText = ref('')
 // 加载进度
 const progressValue = ref(0)
 
+// 进度是否有效
+const progressEnabled = ref(false)
+
 // 加载进度SSE
 const progressEventSource = ref<EventSource>()
 
@@ -60,23 +64,28 @@ const errorTitle = ref(t('resource.noData'))
 // 错误描述
 const errorDescription = ref(t('resource.noResourceFound'))
 
+// 添加安全超时，确保进度条不会永远卡住
+const watchProgressValue = watch(progressValue,
+  debounce(async () => {
+    if (progressEventSource.value && progressValue.value < 100) {
+      console.warn("卡进度超时 关闭进度条")
+      stopLoadingProgress()
+    }
+  }, 60_000))
+
 // 使用SSE监听加载进度
 function startLoadingProgress() {
+  watchProgressValue.resume()
   progressText.value = t('resource.searching')
-  progressValue.value = 10 // 初始进度设为10%，确保进度条显示
+  progressValue.value = 0
+  progressEnabled.value = true
   progressEventSource.value = new EventSource(`${import.meta.env.VITE_API_BASE_URL}system/progress/search`)
   progressEventSource.value.onmessage = event => {
     const progress = JSON.parse(event.data)
     if (progress) {
       progressText.value = progress.text
       progressValue.value = progress.value
-
-      // 搜索完成条件调整：只有明确完成时才关闭
-      if (progress.text.includes('完成') && progress.value >= 99) {
-        setTimeout(() => {
-          stopLoadingProgress()
-        }, 1000) // 延迟1秒关闭，确保用户能看到100%
-      }
+      progressEnabled.value = progress.enable
     }
   }
 
@@ -86,26 +95,22 @@ function startLoadingProgress() {
       stopLoadingProgress()
     }, 1000)
   }
-
-  // 添加安全超时，确保不会永远卡住
-  setTimeout(() => {
-    if (progressEventSource.value && progressValue.value < 100) {
-      stopLoadingProgress()
-    }
-  }, 60000) // 60秒超时
 }
 
 // 停止监听加载进度
 function stopLoadingProgress() {
+  watchProgressValue.pause()
   if (progressEventSource.value) {
     progressEventSource.value.close()
     progressEventSource.value = undefined
+
+    // 确保进度显示100%，然后再渐进清零
+    progressValue.value = 100
+    setTimeout(() => {
+      progressValue.value = 0
+      progressEnabled.value = false
+    }, 1500) // 延长到1.5秒，让用户有足够时间看到完成状态
   }
-  // 确保进度显示100%，然后再渐进清零
-  progressValue.value = 100
-  setTimeout(() => {
-    progressValue.value = 0
-  }, 1500) // 延长到1.5秒，让用户有足够时间看到完成状态
 }
 
 // 设置视图类型
@@ -186,7 +191,7 @@ onUnmounted(() => {
   <div>
     <!-- 加载进度条 -->
     <VFadeTransition>
-      <div v-if="progressValue > 0" class="search-progress-container">
+      <div v-if="progressValue > 0 || progressEnabled" class="search-progress-container">
         <VCard elevation="3" class="search-progress-card">
           <div class="progress-header">
             <VIcon icon="mdi-movie-search" color="primary" size="small" class="me-2" />