Deploy v4.6.18 download overlay completion fix

README.md

@@ -10,7 +10,7 @@ pinned: false
 
 # Global Marine Foundation Data Agent
 
-Current UI release: **v4.6.17**.
+Current UI release: **v4.6.18**.
 
 
 ## v3.4.0 稳定性重构（第一阶段）

VERSION

@@ -1 +1 @@
-4.6.17
+4.6.18

static/js/app.js

@@ -2701,6 +2701,25 @@ function triggerBrowserSave(url,filename){
   setTimeout(()=>a.remove(),0);
 }
 
+function finishNativeBrowserDownloadUi(filename="download"){
+  const overlay=$("downloadProgressOverlay"),bar=$("downloadProgressBar");
+  if(!overlay||!bar)return;
+  bar.classList.remove("indeterminate","error");
+  bar.classList.add("done");
+  bar.style.width="100%";
+  $("downloadProgressState").textContent="已交给浏览器";
+  $("downloadProgressAmount").textContent="浏览器管理";
+  $("downloadProgressSpeed").textContent="—";
+  $("downloadProgressElapsed").textContent="—";
+  $("downloadProgressHint").textContent="下载已由浏览器接管；实际完成状态以浏览器下载栏为准。";
+  $("downloadProgressCancel").disabled=true;
+  $("downloadProgressCancel").textContent="已交给浏览器";
+  clearTimeout(window.__nativeDownloadOverlayTimer);
+  window.__nativeDownloadOverlayTimer=setTimeout(()=>{
+    overlay.classList.remove("show");
+  },1800);
+}
+
 function downloadFetchUrl(sourceUrl){
   const u=new URL(sourceUrl,location.href);
   if(u.protocol==="blob:"||u.protocol==="data:"||u.origin===location.origin)return u.href;
@@ -2722,6 +2741,7 @@ function saveBlobWithProgress(blob,filename="download",options={}){
   const obj=URL.createObjectURL(blob);
   triggerBrowserSave(obj,filename);
   setTimeout(()=>URL.revokeObjectURL(obj),3000);
+  setTimeout(()=>$("downloadProgressOverlay")?.classList.remove("show"),1800);
   return true;
 }
 
@@ -2763,9 +2783,10 @@ async function downloadWithProgress(url,filename="download",options={}){
       $("downloadProgressHint").textContent=err.message||"请重新生成数据包";
       throw err
     }
-    $("downloadProgressState").textContent="浏览器流式下载";
-    $("downloadProgressHint").textContent="文件已验证，正在交给浏览器下载；可在浏览器下载栏查看进度。";
+    $("downloadProgressState").textContent="正在交给浏览器";
+    $("downloadProgressHint").textContent="文件已验证，浏览器将接管实际传输；完成状态以浏览器下载栏为准。";
     triggerBrowserSave(sourceUrl,filename);
+    finishNativeBrowserDownloadUi(filename);
     return true;
   }
 

static/js/project-package.js

@@ -56,7 +56,7 @@ async function renderProjectPackage(){
       if(!url)return;
       try{
         await downloadWithProgress(url,"project_data_package.zip",{title:"正在重新下载项目数据包"});
-        toast("已交给浏览器下载")
+        toast("已交给浏览器；实际完成状态请看浏览器下载栏")
       }catch(err){
         toast(err.status===410||err.status===404?"历史数据包已过期，请点击“重新生成”":"重新下载失败："+(err.message||String(err)))
       }
@@ -196,7 +196,7 @@ async function renderProjectPackage(){
         const btn=$("packageDownload");btn.disabled=true;btn.textContent="正在交给浏览器…";
         try{
           await downloadWithProgress(r.download_url,"project_data_package.zip",{title:"正在下载项目数据包"});
-          toast("已交给浏览器下载；可在浏览器下载栏查看进度");
+          toast("已交给浏览器；实际完成状态请看浏览器下载栏");
         }catch(err){
           toast("下载失败："+(err.message||String(err)));
         }finally{

tests/test_download_overlay_v4618.py

@@ -0,0 +1,21 @@
+from pathlib import Path
+ROOT=Path(__file__).resolve().parents[1]
+
+def test_version():
+    assert (ROOT/"VERSION").read_text(encoding="utf-8").strip()=="4.6.18"
+
+def test_native_download_handoff_finishes_overlay():
+    js=(ROOT/"static/js/app.js").read_text(encoding="utf-8")
+    assert "finishNativeBrowserDownloadUi" in js
+    assert 'textContent="已交给浏览器"' in js
+    assert 'overlay.classList.remove("show")' in js
+    assert "1800" in js
+
+def test_same_origin_calls_finish_helper():
+    js=(ROOT/"static/js/app.js").read_text(encoding="utf-8")
+    block=js[js.index("if(new URL(sourceUrl).origin===location.origin)"):js.index("const overlay=ensureDownloadProgressUi();",js.index("if(new URL(sourceUrl).origin===location.origin)")+1)]
+    assert "finishNativeBrowserDownloadUi(filename)" in block
+
+def test_project_package_copy_is_truthful():
+    js=(ROOT/"static/js/project-package.js").read_text(encoding="utf-8")
+    assert "实际完成状态请看浏览器下载栏" in js