Update ImageToolPage.jsx via upload script - 2026-10-23 11:29:58
This commit is contained in:
parent
64b53d8391
commit
f8569e4008
|
|
@ -22,8 +22,6 @@ import React, { useState, useRef, useEffect, useCallback } from 'react';
|
||||||
|
|
||||||
const LOGO_STORAGE_KEY = 'image-tool-logo-settings-v1';
|
const LOGO_STORAGE_KEY = 'image-tool-logo-settings-v1';
|
||||||
const SUPPORTS_FS_ACCESS = typeof window !== 'undefined' && 'showDirectoryPicker' in window;
|
const SUPPORTS_FS_ACCESS = typeof window !== 'undefined' && 'showDirectoryPicker' in window;
|
||||||
const isJpgName = (n) => /\.jpe?g$/i.test(n || '');
|
|
||||||
const jpgNameOf = (n) => (n || 'image').replace(/\.[^.]+$/, '') + '.jpg';
|
|
||||||
|
|
||||||
function loadLogoSettings() {
|
function loadLogoSettings() {
|
||||||
try {
|
try {
|
||||||
|
|
@ -193,13 +191,11 @@ 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 = 'overwrite'; // 只保留"覆盖原图"一种导出方式(统一存为 .jpg)
|
const exportMode = 'download'; // 只保留一种导出方式:浏览器下载(存为 .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);
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
// 浏览器不支持直接改名时,PNG 转 .jpg 需要图片所在文件夹的权限:选过一次就记住,本次打开页面期间不再问
|
|
||||||
const dirHandleRef = useRef(null);
|
|
||||||
const dropRef = useRef(null);
|
const dropRef = useRef(null);
|
||||||
const fileInputRef = useRef(null);
|
const fileInputRef = useRef(null);
|
||||||
|
|
||||||
|
|
@ -312,8 +308,7 @@ export function ImageToolPage() {
|
||||||
const url = URL.createObjectURL(blob);
|
const url = URL.createObjectURL(blob);
|
||||||
// 没拿到写入权限的文件也照样处理出预览,只是item不带handle——导出时
|
// 没拿到写入权限的文件也照样处理出预览,只是item不带handle——导出时
|
||||||
// 会被跳过并提示,而不是假装能覆盖
|
// 会被跳过并提示,而不是假装能覆盖
|
||||||
// 覆盖后统一是 .jpg:原来就是 .jpg/.jpeg 的原地覆盖;PNG/WEBP 等保存时在原文件夹写成同名 .jpg 并删掉原文件
|
next.push({ name: file.name, srcImage: img, outName: file.name, blob, url, handle: grantedSet.has(handle) ? handle : null });
|
||||||
next.push({ name: file.name, srcImage: img, outName: isJpgName(file.name) ? file.name : jpgNameOf(file.name), blob, url, handle: grantedSet.has(handle) ? handle : null });
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
say(String(e.message || e), true);
|
say(String(e.message || e), true);
|
||||||
}
|
}
|
||||||
|
|
@ -323,7 +318,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -359,48 +354,8 @@ export function ImageToolPage() {
|
||||||
if (exportMode === 'overwrite') {
|
if (exportMode === 'overwrite') {
|
||||||
let written = 0;
|
let written = 0;
|
||||||
let skipped = 0;
|
let skipped = 0;
|
||||||
let converted = 0;
|
|
||||||
let needFolder = 0; // PNG 等没能改成 .jpg 的张数(没拿到所在文件夹权限,比如图片直接放在桌面上)
|
|
||||||
let dirHandle = dirHandleRef.current;
|
|
||||||
let dirRefused = false;
|
|
||||||
for (const it of items) {
|
for (const it of items) {
|
||||||
if (!it.handle) { skipped++; continue; }
|
if (!it.handle) { skipped++; continue; }
|
||||||
if (!isJpgName(it.name)) {
|
|
||||||
// PNG/WEBP 等:把 JPG 写进原文件,再改名成同名 .jpg(同名 .jpg 已存在就直接覆盖它)
|
|
||||||
const target = jpgNameOf(it.name);
|
|
||||||
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 && !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);
|
|
||||||
await w.close();
|
|
||||||
await dirHandle.removeEntry(it.name);
|
|
||||||
}
|
|
||||||
written++; converted++;
|
|
||||||
} catch (e) {
|
|
||||||
skipped++;
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
try {
|
try {
|
||||||
// 权限已经在"选择要覆盖的图片"那一步问过了,这里正常不会再弹确认框
|
// 权限已经在"选择要覆盖的图片"那一步问过了,这里正常不会再弹确认框
|
||||||
const writable = await it.handle.createWritable();
|
const writable = await it.handle.createWritable();
|
||||||
|
|
@ -411,14 +366,12 @@ export function ImageToolPage() {
|
||||||
skipped++;
|
skipped++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (needFolder > 0) {
|
if (written === 0 && skipped > 0) {
|
||||||
say(`已覆盖 ${written} 张。另有 ${needFolder} 张 PNG 等没能改成 .jpg:浏览器不允许网页改动整个"桌面"文件夹。请把这些图片放进桌面上的一个子文件夹(比如"产品图"),从那里选择,保存时选这个子文件夹即可(只问一次)`, true);
|
say(`没有成功覆盖任何文件——这些图片可能不是通过"选择要覆盖的图片"这个按钮选的(拖拽/普通选择拿不到可写权限),需要重新用那个按钮选一遍`, true);
|
||||||
} else if (written === 0 && skipped > 0) {
|
|
||||||
say(`没有成功覆盖任何文件,请重新点"选择图片"选一遍`, true);
|
|
||||||
} else if (skipped > 0) {
|
} else if (skipped > 0) {
|
||||||
say(`已覆盖 ${written} 张,${skipped} 张失败`, true);
|
say(`已覆盖 ${written} 张,另外 ${skipped} 张没有可写权限被跳过(需要用"选择要覆盖的图片"按钮重新选)`, true);
|
||||||
} else {
|
} else {
|
||||||
say(`已覆盖保存 ${written} 张(.jpg)`);
|
say(`已覆盖保存 ${written} 张原图`);
|
||||||
}
|
}
|
||||||
} else if (exportMode === 'folder') {
|
} else if (exportMode === 'folder') {
|
||||||
let dirHandle;
|
let dirHandle;
|
||||||
|
|
@ -454,7 +407,7 @@ export function ImageToolPage() {
|
||||||
document.body.removeChild(a);
|
document.body.removeChild(a);
|
||||||
await new Promise((r) => setTimeout(r, 150)); // 浏览器一次性弹太多下载容易被拦截,错开一点
|
await new Promise((r) => setTimeout(r, 150)); // 浏览器一次性弹太多下载容易被拦截,错开一点
|
||||||
}
|
}
|
||||||
say(`已触发下载 ${items.length} 张(看浏览器下载记录/默认下载文件夹)`);
|
say(`已下载 ${items.length} 张 .jpg 到浏览器的下载位置(Chrome/Edge 设置里把下载位置改成"桌面",就会直接存到桌面)`);
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
say(`导出失败: ${e.message || e}`, true);
|
say(`导出失败: ${e.message || e}`, true);
|
||||||
|
|
@ -517,14 +470,32 @@ export function ImageToolPage() {
|
||||||
setLogoSettings={setLogoSettings}
|
setLogoSettings={setLogoSettings}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<button className="btn-primary" disabled={busy || !SUPPORTS_FS_ACCESS} onClick={pickFilesForOverwrite}>选择图片(处理后直接覆盖原图,存为 .jpg)</button>
|
{exportMode === 'overwrite' ? (
|
||||||
{!SUPPORTS_FS_ACCESS && <div style={{ fontSize: 12, color: 'var(--danger, #d33)' }}>这个浏览器不支持直接覆盖原图,请用 Chrome 或 Edge</div>}
|
<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}>
|
||||||
保存全部(覆盖原图)
|
下载全部(.jpg)
|
||||||
</button>
|
</button>
|
||||||
<button className="btn-ghost" onClick={clearAll}>清空</button>
|
<button className="btn-ghost" onClick={clearAll}>清空</button>
|
||||||
</>
|
</>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue