From 434cc5eccd3c729d2a3851de8119c575dd1addb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=99=B4=E5=A4=A9?= <keh5@vip.qq.com>
Date: Sat, 28 Feb 2026 12:50:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E4=BD=93=E9=AA=8C=EF=BC=8C=E6=AF=8F?=
 =?UTF-8?q?=E8=A1=8C=E6=97=A5=E5=BF=97=E9=80=92=E5=A2=9E=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E5=B9=B6=E6=98=BE=E7=A4=BA=E9=98=B6=E6=AE=B5=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/src/commands/config.rs | 9 ++++++---
 src/components/modal.js          | 5 ++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src-tauri/src/commands/config.rs b/src-tauri/src/commands/config.rs
index 6eae28f..cdfeee6 100644
--- a/src-tauri/src/commands/config.rs
+++ b/src-tauri/src/commands/config.rs
@@ -158,17 +158,20 @@ pub async fn upgrade_openclaw(app: tauri::AppHandle, source: String) -> Result<S
         .spawn()
         .map_err(|e| format!("执行升级命令失败: {e}"))?;
 
-    // 读取 stderr（npm 主要输出在 stderr）
     let stderr = child.stderr.take();
     let stdout = child.stdout.take();
 
-    let _ = app.emit("upgrade-progress", 30);
-
+    // stderr 每行递增进度（10→80 区间），让用户看到进度在动
     let app2 = app.clone();
     let handle = std::thread::spawn(move || {
+        let mut progress: u32 = 15;
         if let Some(pipe) = stderr {
             for line in BufReader::new(pipe).lines().map_while(Result::ok) {
                 let _ = app2.emit("upgrade-log", &line);
+                if progress < 75 {
+                    progress += 2;
+                    let _ = app2.emit("upgrade-progress", progress);
+                }
             }
         }
     });
diff --git a/src/components/modal.js b/src/components/modal.js
index bc7e9ad..d74a200 100644
--- a/src/components/modal.js
+++ b/src/components/modal.js
@@ -176,7 +176,10 @@ export function showUpgradeModal() {
     },
     setProgress(pct) {
       fill.style.width = pct + '%'
-      text.textContent = pct >= 100 ? '完成' : `升级中... ${pct}%`
+      if (pct >= 100) text.textContent = '完成'
+      else if (pct >= 75) text.textContent = '正在安装...'
+      else if (pct >= 30) text.textContent = '正在下载依赖...'
+      else text.textContent = '准备中...'
     },
     setDone(msg) {
       text.textContent = msg || '升级完成'