Update ImageToolPage.jsx via upload script - 2026-10-23 11:12:47
This commit is contained in:
parent
228e398fc0
commit
638d2bb906
|
|
@ -22,6 +22,8 @@ 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 {
|
||||||
|
|
@ -308,7 +310,8 @@ export function ImageToolPage() {
|
||||||
const url = URL.createObjectURL(blob);
|
const url = URL.createObjectURL(blob);
|
||||||
// 没拿到写入权限的文件也照样处理出预览,只是item不带handle——导出时
|
// 没拿到写入权限的文件也照样处理出预览,只是item不带handle——导出时
|
||||||
// 会被跳过并提示,而不是假装能覆盖
|
// 会被跳过并提示,而不是假装能覆盖
|
||||||
next.push({ name: file.name, srcImage: img, outName: file.name, blob, url, handle: grantedSet.has(handle) ? handle : null });
|
// 覆盖后统一是 .jpg:原来就是 .jpg/.jpeg 的原地覆盖;PNG/WEBP 等保存时在原文件夹写成同名 .jpg 并删掉原文件
|
||||||
|
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);
|
||||||
}
|
}
|
||||||
|
|
@ -354,8 +357,44 @@ export function ImageToolPage() {
|
||||||
if (exportMode === 'overwrite') {
|
if (exportMode === 'overwrite') {
|
||||||
let written = 0;
|
let written = 0;
|
||||||
let skipped = 0;
|
let skipped = 0;
|
||||||
|
let converted = 0;
|
||||||
|
// 不是 .jpg 的原图(PNG/WEBP 等):要改成 .jpg 就得在它所在的文件夹里新建 .jpg 并删掉原文件,
|
||||||
|
// 浏览器只能通过"选择文件夹"拿到这个权限——在任何等待之前先弹出(浏览器要求紧跟着点击)
|
||||||
|
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 (!dirHandle) { skipped++; continue; }
|
||||||
|
try {
|
||||||
|
// 确认原图确实在选的文件夹里(同一个文件),避免写到别的地方或误删
|
||||||
|
const orig = await dirHandle.getFileHandle(it.name);
|
||||||
|
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 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();
|
||||||
|
|
@ -369,9 +408,9 @@ 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} 张,另外 ${skipped} 张没有可写权限被跳过(需要用"选择要覆盖的图片"按钮重新选)`, true);
|
say(`已覆盖 ${written} 张(其中 ${converted} 张由 PNG 等转成了 .jpg),另外 ${skipped} 张被跳过:没有可写权限,或不是 .jpg 但没选对所在文件夹`, true);
|
||||||
} else {
|
} else {
|
||||||
say(`已覆盖保存 ${written} 张原图`);
|
say(converted ? `已覆盖保存 ${written} 张,全部为 .jpg(其中 ${converted} 张由 PNG 等转换,原文件已替换)` : `已覆盖保存 ${written} 张原图(.jpg)`);
|
||||||
}
|
}
|
||||||
} else if (exportMode === 'folder') {
|
} else if (exportMode === 'folder') {
|
||||||
let dirHandle;
|
let dirHandle;
|
||||||
|
|
@ -481,7 +520,7 @@ export function ImageToolPage() {
|
||||||
</label>
|
</label>
|
||||||
<label style={{ fontSize: 12, display: 'flex', alignItems: 'center', gap: 6, opacity: SUPPORTS_FS_ACCESS ? 1 : 0.4 }}>
|
<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')} />
|
<input type="radio" disabled={!SUPPORTS_FS_ACCESS} checked={exportMode === 'overwrite'} onChange={() => setExportMode('overwrite')} />
|
||||||
直接覆盖原图(谨慎,会修改源文件,建议先备份){!SUPPORTS_FS_ACCESS && '(此浏览器不支持)'}
|
直接覆盖原图,统一存为 .jpg(谨慎,会修改源文件,建议先备份;PNG 等会转成同名 .jpg 并替换原文件){!SUPPORTS_FS_ACCESS && '(此浏览器不支持)'}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
{exportMode === 'overwrite' ? (
|
{exportMode === 'overwrite' ? (
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue