From 64b53d8391a2daf8b689539e8cdbc88152c778ec Mon Sep 17 00:00:00 2001 From: mike Date: Fri, 23 Oct 2026 11:24:38 +0800 Subject: [PATCH] Update ImageToolPage.jsx via upload script - 2026-10-23 11:24:33 --- ImageToolPage.jsx | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/ImageToolPage.jsx b/ImageToolPage.jsx index 367a39f..22d307a 100644 --- a/ImageToolPage.jsx +++ b/ImageToolPage.jsx @@ -198,6 +198,8 @@ export function ImageToolPage() { const [status, setStatus] = useState(''); const [statusErr, setStatusErr] = useState(false); const [busy, setBusy] = useState(false); + // 浏览器不支持直接改名时,PNG 转 .jpg 需要图片所在文件夹的权限:选过一次就记住,本次打开页面期间不再问 + const dirHandleRef = useRef(null); const dropRef = useRef(null); const fileInputRef = useRef(null); @@ -358,7 +360,9 @@ export function ImageToolPage() { let written = 0; let skipped = 0; let converted = 0; - let dirHandle = null; // 浏览器不支持直接改名时才用:选一次图片所在文件夹 + let needFolder = 0; // PNG 等没能改成 .jpg 的张数(没拿到所在文件夹权限,比如图片直接放在桌面上) + let dirHandle = dirHandleRef.current; + let dirRefused = false; for (const it of items) { if (!it.handle) { skipped++; continue; } if (!isJpgName(it.name)) { @@ -377,9 +381,14 @@ export function ImageToolPage() { } } if (!moved) { - if (!dirHandle) dirHandle = await window.showDirectoryPicker({ mode: 'readwrite' }); - const orig = await dirHandle.getFileHandle(it.name); - if (orig.isSameEntry && !(await orig.isSameEntry(it.handle))) { skipped++; continue; } + if (!dirHandle && !dirRefused) { + try { dirHandle = await window.showDirectoryPicker({ mode: 'readwrite', startIn: it.handle }); dirHandleRef.current = dirHandle; } + catch (e) { dirRefused = true; } + } + if (!dirHandle) { needFolder++; continue; } + let orig = null; + try { orig = await dirHandle.getFileHandle(it.name); } catch (e) { orig = null; } + if (!orig || (orig.isSameEntry && !(await orig.isSameEntry(it.handle)))) { needFolder++; continue; } const fh = await dirHandle.getFileHandle(target, { create: true }); const w = await fh.createWritable(); await w.write(it.blob); @@ -402,7 +411,9 @@ export function ImageToolPage() { skipped++; } } - if (written === 0 && skipped > 0) { + if (needFolder > 0) { + say(`已覆盖 ${written} 张。另有 ${needFolder} 张 PNG 等没能改成 .jpg:浏览器不允许网页改动整个"桌面"文件夹。请把这些图片放进桌面上的一个子文件夹(比如"产品图"),从那里选择,保存时选这个子文件夹即可(只问一次)`, true); + } else if (written === 0 && skipped > 0) { say(`没有成功覆盖任何文件,请重新点"选择图片"选一遍`, true); } else if (skipped > 0) { say(`已覆盖 ${written} 张,${skipped} 张失败`, true);