From 0ffa10034b7aec37511afb7295b810c223d5d6a7 Mon Sep 17 00:00:00 2001 From: mike Date: Tue, 22 Sep 2026 16:06:08 +0800 Subject: [PATCH] Update ImageToolPage.jsx via upload script - 2026-09-22 16:05:57 --- ImageToolPage.jsx | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/ImageToolPage.jsx b/ImageToolPage.jsx index 7e9e998..31de17c 100644 --- a/ImageToolPage.jsx +++ b/ImageToolPage.jsx @@ -281,6 +281,21 @@ export function ImageToolPage() { return; // 用户取消选择,不算错误 } setBusy(true); + + // 把"要不要允许写入"这个确认放在选完文件这一步一次性问完,这样之后点 + // "保存全部"就不会再弹出浏览器的权限确认框了。 + say(`请求写入权限... 0/${handles.length}`); + const grantedHandles = []; + for (let i = 0; i < handles.length; i++) { + const handle = handles[i]; + try { + const perm = await handle.requestPermission({ mode: 'readwrite' }); + if (perm === 'granted') grantedHandles.push(handle); + } catch (e) { /* 这个文件没授权成功,处理阶段会因为没handle而只读处理 */ } + say(`请求写入权限... ${i + 1}/${handles.length}`); + } + const grantedSet = new Set(grantedHandles); + say(`处理中... 0/${handles.length}`); const opts = readOpts(); const next = []; @@ -291,14 +306,19 @@ export function ImageToolPage() { const img = await loadImageFromFile(file); const blob = await processImage(img, opts, logoImage, logoSettings); const url = URL.createObjectURL(blob); - next.push({ name: file.name, srcImage: img, outName: file.name, blob, url, handle }); + // 没拿到写入权限的文件也照样处理出预览,只是item不带handle——导出时 + // 会被跳过并提示,而不是假装能覆盖 + next.push({ name: file.name, srcImage: img, outName: file.name, blob, url, handle: grantedSet.has(handle) ? handle : null }); } catch (e) { say(String(e.message || e), true); } say(`处理中... ${i + 1}/${handles.length}`); } setItems((prev) => [...prev, ...next]); - say(`已处理 ${next.length} 张,点"保存全部"会直接覆盖原文件`); + const deniedCount = handles.length - grantedHandles.length; + say(deniedCount > 0 + ? `已处理 ${next.length} 张,其中 ${deniedCount} 张没给写入权限,保存时会跳过这几张` + : `已处理 ${next.length} 张,点"保存全部"会直接覆盖原文件(不会再弹权限确认)`); setBusy(false); } @@ -337,12 +357,7 @@ export function ImageToolPage() { for (const it of items) { if (!it.handle) { skipped++; continue; } try { - // Chrome某些版本 showOpenFilePicker 默认只给只读权限,直接调 - // createWritable() 会静默失败/抛错——显式申请一次读写权限。 - if (it.handle.requestPermission) { - const perm = await it.handle.requestPermission({ mode: 'readwrite' }); - if (perm !== 'granted') { skipped++; continue; } - } + // 权限已经在"选择要覆盖的图片"那一步问过了,这里正常不会再弹确认框 const writable = await it.handle.createWritable(); await writable.write(it.blob); await writable.close();