From 0ab785ebc318e3d28b9fbfe05161676088108a27 Mon Sep 17 00:00:00 2001 From: xiaoqidun Date: Sat, 17 Oct 2026 10:13:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=87=E6=A1=A3=E8=83=BD=E5=8A=9B):=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E6=A1=A3=E5=AF=BC=E5=85=A5=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=BD=93=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/webui/ofdgo.css | 25 ++++++++++++++++++++++++ assets/webui/ofdgo.js | 44 +++++++++++++++++++++++++++++++----------- 2 files changed, 58 insertions(+), 11 deletions(-) diff --git a/assets/webui/ofdgo.css b/assets/webui/ofdgo.css index c4d6478..a2fdd70 100644 --- a/assets/webui/ofdgo.css +++ b/assets/webui/ofdgo.css @@ -2205,6 +2205,31 @@ body[data-hide-meta] .meta-panel { text-align: left; } +#importDocuments { + min-height: 0; +} + +#importDocuments label { + display: flex; + align-items: center; + gap: 8px; + padding: 8px 10px; + cursor: pointer; +} + +#importDocuments label:hover { + background: var(--accent-soft); +} + +#importDocuments input { + flex: 0 0 auto; +} + +#importDocuments span { + min-width: 0; + overflow-wrap: anywhere; +} + .document-entry:last-child { border-bottom: 0; } diff --git a/assets/webui/ofdgo.js b/assets/webui/ofdgo.js index 3c29d33..aedc6f4 100644 --- a/assets/webui/ofdgo.js +++ b/assets/webui/ofdgo.js @@ -1165,12 +1165,10 @@ el.importPanel.addEventListener("close", () => { }); el.importFile.addEventListener("change", loadImportFile); el.importRange.addEventListener("change", () => { - const custom = el.importRange.value === "custom"; - el.importPagesRow.hidden = !custom; - el.importPages.disabled = !custom; - el.importPages.required = custom; - if (custom) el.importPages.focus(); + updateImportControls(); + if (!el.importPages.disabled) el.importPages.focus(); }); +el.importDocuments.addEventListener("change", () => updateImportControls()); el.importForm.addEventListener("submit", async event => { event.preventDefault(); if (document.body.hasAttribute("data-busy") || !(state.importDocumentMode ? state.importDocumentCount : state.importPageCount) || !el.importForm.reportValidity()) return; @@ -1180,7 +1178,8 @@ el.importForm.addEventListener("submit", async event => { if (!window.confirm(state.doc.encryption?.encrypted ? "按目标文档的加密策略导入，是否继续？" : "目标未加密，导入内容将按明文保存，是否继续？")) return; options.push(true); } - const range = el.importRange.value === "custom" ? el.importPages.value : ""; + const range = el.importRange.value === "custom" ? state.importDocumentMode ? selectedImportDocuments() : el.importPages.value : ""; + if (state.importDocumentMode && el.importRange.value === "custom" && !range) return; const saved = state.importDocumentMode ? await changeDocument("ofdgoImportDocuments", null, range, position, state.importEncrypted) : await changeDocument("ofdgoImportPages", null, range, position, el.importOutlines.checked, ...options); @@ -2171,7 +2170,7 @@ function openImportPanel(documents = false) { el.importForm.reset(); el.importStatus.textContent = ""; el.importDocuments.replaceChildren(); - el.importDocuments.hidden = !documents; + el.importDocuments.hidden = true; el.importPagesLabel.textContent = documents ? "文档" : "页码"; el.importPages.removeAttribute("title"); el.importPositionRow.hidden = documents; @@ -2181,9 +2180,27 @@ function openImportPanel(documents = false) { el.importPagesRow.hidden = true; el.importPages.disabled = true; el.importPages.required = false; + updateImportControls(); el.importPanel.showModal(); } +function selectedImportDocuments() { + return Array.from(el.importDocuments.children, row => row.children[0]).filter(input => input.checked).map(input => input.value).join(","); +} + +function updateImportControls(busy = document.body.hasAttribute("data-busy")) { + const custom = el.importRange.value === "custom"; + const documents = state.importDocumentMode; + const count = documents ? state.importDocumentCount : state.importPageCount; + el.importRange.disabled = busy || !count; + el.importDocuments.hidden = !documents || !custom || !count; + for (const row of el.importDocuments.children) row.children[0].disabled = busy; + el.importPagesRow.hidden = documents || !custom; + el.importPages.disabled = busy || documents || !custom; + el.importPages.required = !documents && custom; + el.importSubmit.disabled = busy || !count || (documents && custom && !selectedImportDocuments()); +} + async function loadImportFile() { const file = el.importFile.files[0]; const openSeq = state.openSeq; @@ -2207,8 +2224,13 @@ async function loadImportFile() { state.importEncrypted = Boolean(info?.encrypted); if (state.importDocumentMode) { el.importDocuments.replaceChildren(...(info?.documents || []).map(entry => { - const row = document.createElement("div"); - row.textContent = `${entry.index + 1} · ${entry.title || "未命名"}`; + const row = document.createElement("label"); + const input = document.createElement("input"); + input.type = "checkbox"; + input.value = String(entry.index + 1); + const name = document.createElement("span"); + name.textContent = `${entry.index + 1} · ${entry.title || "未命名"}`; + row.append(input, name); return row; })); el.importStatus.textContent = `共${state.importDocumentCount}个文档${info?.documentsSigned || state.doc.signatureCount ? " · 合并后需验签" : ""}`; @@ -2217,6 +2239,7 @@ async function loadImportFile() { el.importStatus.textContent = info?.signed ? "保留签章外观，原签名不再有效" : ""; } el.importSubmit.disabled = !(state.importDocumentMode ? state.importDocumentCount : state.importPageCount); + updateImportControls(false); } catch (err) { if (openSeq === state.openSeq && el.importPanel.open) el.importStatus.textContent = err.message; } finally { @@ -11999,8 +12022,7 @@ function setBusy(busy, text = "", percent = 0, status = "") { el.annotationForm.inert = busy; el.importForm.inert = busy && !state.importing; for (const input of [el.importFile, el.importRange, el.importPosition, el.importOutlines]) input.disabled = busy; - el.importPages.disabled = busy || el.importRange.value !== "custom"; - el.importSubmit.disabled = busy || !(state.importDocumentMode ? state.importDocumentCount : state.importPageCount); + updateImportControls(busy); el.batchPagesForm.inert = busy; el.objectStyleForm.inert = busy; el.objectBoundsForm.inert = busy;