Update ImageToolPage.jsx via upload script - 2026-10-23 11:20:53
This commit is contained in:
parent
638d2bb906
commit
ee0657bcfe
|
|
@ -193,7 +193,7 @@ export function ImageToolPage() {
|
||||||
const [size, setSize] = useState(1000);
|
const [size, setSize] = useState(1000);
|
||||||
const [margin, setMargin] = useState(4);
|
const [margin, setMargin] = useState(4);
|
||||||
const [quality, setQuality] = useState(95);
|
const [quality, setQuality] = useState(95);
|
||||||
const [exportMode, setExportMode] = useState('download'); // download | folder | overwrite
|
const exportMode = 'overwrite'; // 只保留"覆盖原图"一种导出方式(统一存为 .jpg)
|
||||||
const [items, setItems] = useState([]); // { name, outName, srcImage, blob, url, handle? }
|
const [items, setItems] = useState([]); // { name, outName, srcImage, blob, url, handle? }
|
||||||
const [status, setStatus] = useState('');
|
const [status, setStatus] = useState('');
|
||||||
const [statusErr, setStatusErr] = useState(false);
|
const [statusErr, setStatusErr] = useState(false);
|
||||||
|
|
@ -321,7 +321,7 @@ export function ImageToolPage() {
|
||||||
const deniedCount = handles.length - grantedHandles.length;
|
const deniedCount = handles.length - grantedHandles.length;
|
||||||
say(deniedCount > 0
|
say(deniedCount > 0
|
||||||
? `已处理 ${next.length} 张,其中 ${deniedCount} 张没给写入权限,保存时会跳过这几张`
|
? `已处理 ${next.length} 张,其中 ${deniedCount} 张没给写入权限,保存时会跳过这几张`
|
||||||
: `已处理 ${next.length} 张,点"保存全部"会直接覆盖原文件(不会再弹权限确认)`);
|
: `已处理 ${next.length} 张,点"保存全部"直接覆盖原图`);
|
||||||
setBusy(false);
|
setBusy(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -358,37 +358,34 @@ export function ImageToolPage() {
|
||||||
let written = 0;
|
let written = 0;
|
||||||
let skipped = 0;
|
let skipped = 0;
|
||||||
let converted = 0;
|
let converted = 0;
|
||||||
// 不是 .jpg 的原图(PNG/WEBP 等):要改成 .jpg 就得在它所在的文件夹里新建 .jpg 并删掉原文件,
|
let dirHandle = null; // 浏览器不支持直接改名时才用:选一次图片所在文件夹
|
||||||
// 浏览器只能通过"选择文件夹"拿到这个权限——在任何等待之前先弹出(浏览器要求紧跟着点击)
|
|
||||||
const nonJpg = items.filter((it) => it.handle && !isJpgName(it.name));
|
|
||||||
let dirHandle = null;
|
|
||||||
if (nonJpg.length) {
|
|
||||||
say(`有 ${nonJpg.length} 张不是 .jpg(如 PNG),要转成 .jpg 覆盖,请选择这些图片所在的文件夹`);
|
|
||||||
try {
|
|
||||||
dirHandle = await window.showDirectoryPicker({ mode: 'readwrite' });
|
|
||||||
} catch (e) {
|
|
||||||
dirHandle = null; // 没选文件夹:这些图跳过,.jpg 的照常覆盖
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for (const it of items) {
|
for (const it of items) {
|
||||||
if (!it.handle) { skipped++; continue; }
|
if (!it.handle) { skipped++; continue; }
|
||||||
if (!isJpgName(it.name)) {
|
if (!isJpgName(it.name)) {
|
||||||
if (!dirHandle) { skipped++; continue; }
|
// PNG/WEBP 等:把 JPG 写进原文件,再改名成同名 .jpg(同名 .jpg 已存在就直接覆盖它)
|
||||||
|
const target = jpgNameOf(it.name);
|
||||||
try {
|
try {
|
||||||
// 确认原图确实在选的文件夹里(同一个文件),避免写到别的地方或误删
|
const w0 = await it.handle.createWritable();
|
||||||
|
await w0.write(it.blob);
|
||||||
|
await w0.close();
|
||||||
|
let moved = false;
|
||||||
|
if (typeof it.handle.move === 'function') {
|
||||||
|
try { await it.handle.move(target); moved = true; }
|
||||||
|
catch (e) {
|
||||||
|
// 目标 .jpg 已存在时部分浏览器不允许改名:先删掉旧 .jpg 再改(需要文件夹权限,见下面)
|
||||||
|
moved = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!moved) {
|
||||||
|
if (!dirHandle) dirHandle = await window.showDirectoryPicker({ mode: 'readwrite' });
|
||||||
const orig = await dirHandle.getFileHandle(it.name);
|
const orig = await dirHandle.getFileHandle(it.name);
|
||||||
if (orig.isSameEntry && !(await orig.isSameEntry(it.handle))) { skipped++; continue; }
|
if (orig.isSameEntry && !(await orig.isSameEntry(it.handle))) { skipped++; continue; }
|
||||||
let target = jpgNameOf(it.name);
|
|
||||||
// 文件夹里已经有同名 .jpg(不是这次的图)时不去覆盖它,改名为 xxx_1.jpg
|
|
||||||
for (let n = 1; n < 100; n++) {
|
|
||||||
try { await dirHandle.getFileHandle(target); target = jpgNameOf(it.name).replace(/\.jpg$/, `_${n}.jpg`); }
|
|
||||||
catch (e) { break; }
|
|
||||||
}
|
|
||||||
const fh = await dirHandle.getFileHandle(target, { create: true });
|
const fh = await dirHandle.getFileHandle(target, { create: true });
|
||||||
const w = await fh.createWritable();
|
const w = await fh.createWritable();
|
||||||
await w.write(it.blob);
|
await w.write(it.blob);
|
||||||
await w.close();
|
await w.close();
|
||||||
await dirHandle.removeEntry(it.name);
|
await dirHandle.removeEntry(it.name);
|
||||||
|
}
|
||||||
written++; converted++;
|
written++; converted++;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
skipped++;
|
skipped++;
|
||||||
|
|
@ -406,11 +403,11 @@ export function ImageToolPage() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (written === 0 && skipped > 0) {
|
if (written === 0 && skipped > 0) {
|
||||||
say(`没有成功覆盖任何文件——这些图片可能不是通过"选择要覆盖的图片"这个按钮选的(拖拽/普通选择拿不到可写权限),需要重新用那个按钮选一遍`, true);
|
say(`没有成功覆盖任何文件,请重新点"选择图片"选一遍`, true);
|
||||||
} else if (skipped > 0) {
|
} else if (skipped > 0) {
|
||||||
say(`已覆盖 ${written} 张(其中 ${converted} 张由 PNG 等转成了 .jpg),另外 ${skipped} 张被跳过:没有可写权限,或不是 .jpg 但没选对所在文件夹`, true);
|
say(`已覆盖 ${written} 张,${skipped} 张失败`, true);
|
||||||
} else {
|
} else {
|
||||||
say(converted ? `已覆盖保存 ${written} 张,全部为 .jpg(其中 ${converted} 张由 PNG 等转换,原文件已替换)` : `已覆盖保存 ${written} 张原图(.jpg)`);
|
say(`已覆盖保存 ${written} 张(.jpg)`);
|
||||||
}
|
}
|
||||||
} else if (exportMode === 'folder') {
|
} else if (exportMode === 'folder') {
|
||||||
let dirHandle;
|
let dirHandle;
|
||||||
|
|
@ -509,46 +506,14 @@ export function ImageToolPage() {
|
||||||
setLogoSettings={setLogoSettings}
|
setLogoSettings={setLogoSettings}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<div style={{ fontSize: 13, fontWeight: 600 }}>导出方式</div>
|
<button className="btn-primary" disabled={busy || !SUPPORTS_FS_ACCESS} onClick={pickFilesForOverwrite}>选择图片(处理后直接覆盖原图,存为 .jpg)</button>
|
||||||
<label style={{ fontSize: 12, display: 'flex', alignItems: 'center', gap: 6 }}>
|
{!SUPPORTS_FS_ACCESS && <div style={{ fontSize: 12, color: 'var(--danger, #d33)' }}>这个浏览器不支持直接覆盖原图,请用 Chrome 或 Edge</div>}
|
||||||
<input type="radio" checked={exportMode === 'download'} onChange={() => setExportMode('download')} />
|
|
||||||
触发浏览器下载(兼容所有浏览器)
|
|
||||||
</label>
|
|
||||||
<label style={{ fontSize: 12, display: 'flex', alignItems: 'center', gap: 6, opacity: SUPPORTS_FS_ACCESS ? 1 : 0.4 }}>
|
|
||||||
<input type="radio" disabled={!SUPPORTS_FS_ACCESS} checked={exportMode === 'folder'} onChange={() => setExportMode('folder')} />
|
|
||||||
存到指定文件夹(比如桌面){!SUPPORTS_FS_ACCESS && '(此浏览器不支持)'}
|
|
||||||
</label>
|
|
||||||
<label style={{ fontSize: 12, display: 'flex', alignItems: 'center', gap: 6, opacity: SUPPORTS_FS_ACCESS ? 1 : 0.4 }}>
|
|
||||||
<input type="radio" disabled={!SUPPORTS_FS_ACCESS} checked={exportMode === 'overwrite'} onChange={() => setExportMode('overwrite')} />
|
|
||||||
直接覆盖原图,统一存为 .jpg(谨慎,会修改源文件,建议先备份;PNG 等会转成同名 .jpg 并替换原文件){!SUPPORTS_FS_ACCESS && '(此浏览器不支持)'}
|
|
||||||
</label>
|
|
||||||
|
|
||||||
{exportMode === 'overwrite' ? (
|
|
||||||
<button className="btn-primary" disabled={busy} onClick={pickFilesForOverwrite}>选择要覆盖的图片</button>
|
|
||||||
) : (
|
|
||||||
<div
|
|
||||||
ref={dropRef}
|
|
||||||
onClick={() => fileInputRef.current?.click()}
|
|
||||||
onDragOver={(e) => e.preventDefault()}
|
|
||||||
onDrop={handleDrop}
|
|
||||||
style={{
|
|
||||||
border: '2px dashed var(--line, #ddd)', borderRadius: 8, padding: 16,
|
|
||||||
textAlign: 'center', fontSize: 12, color: 'var(--ink-soft, #888)', cursor: 'pointer',
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
拖图片进来,或点击选择(可多选)
|
|
||||||
<input
|
|
||||||
ref={fileInputRef} type="file" accept="image/*" multiple style={{ display: 'none' }}
|
|
||||||
onChange={(e) => addFilesReadOnly(e.target.files)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{items.length > 0 && (
|
{items.length > 0 && (
|
||||||
<>
|
<>
|
||||||
<button className="btn-ghost" disabled={busy} onClick={reprocessAll}>按新设置重新处理已选图片</button>
|
<button className="btn-ghost" disabled={busy} onClick={reprocessAll}>按新设置重新处理已选图片</button>
|
||||||
<button className="btn-primary" disabled={busy} onClick={handleExport}>
|
<button className="btn-primary" disabled={busy} onClick={handleExport}>
|
||||||
{exportMode === 'overwrite' ? '保存全部(覆盖原图)' : exportMode === 'folder' ? '保存全部到文件夹' : '下载全部'}
|
保存全部(覆盖原图)
|
||||||
</button>
|
</button>
|
||||||
<button className="btn-ghost" onClick={clearAll}>清空</button>
|
<button className="btn-ghost" onClick={clearAll}>清空</button>
|
||||||
</>
|
</>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue