xiaoqidun/ofdgo
1
0 Fork 0
mirror of https://github.com/xiaoqidun/ofdgo.git synced 2026-10-30 13:34:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat(关闭标签): 末标签关闭行为统一
build.yaml / build (push) Successful in 48s
Details

Browse Source
This commit is contained in:
xiaoqidun committed 2026-10-22 21:37:26 +08:00
1 parent bcac3673f6
commit c2d525e77f
1 file changed
+7 -3
Download Patch File Download Diff File Expand all files Collapse all files
assets/webui/ofdgo.js
+7 -3
View File
@@ -2473,8 +2473,10 @@ async function closeWorkspace() {
if (workspace.closing) return; if (workspace.closing) return;
workspace.closing = true; workspace.closing = true;
try { try {
await Promise.all(workspace.tabs.filter(tab => tab.state.saving && tab.saveCompletion).map(tab => tab.saveCompletion));
if (workspace.tabs.some(tab => tab.state.saving)) { setStatus("文档正在保存，请稍后关闭"); return; } if (workspace.tabs.some(tab => tab.state.saving)) { setStatus("文档正在保存，请稍后关闭"); return; }
if (batch.running && !window.confirm("批量转换尚未完成，是否退出？")) return; if (batch.running && !window.confirm("批量转换尚未完成，是否退出？")) return;
if (workspace.tabs.some(tab => tab.opening || tab.state.exporting) && !window.confirm("文档正在处理，是否取消并退出？")) return;
const dirty = workspace.tabs.some(tab => tab.state.dirty) || canvasEditor.textChanged() || canvasEditor.cropChanged() || canvasEditor.nudgeChanged(); const dirty = workspace.tabs.some(tab => tab.state.dirty) || canvasEditor.textChanged() || canvasEditor.cropChanged() || canvasEditor.nudgeChanged();
if (dirty && (workspace.switching || workspace.tabs.some(tab => tab.closing) || document.body.hasAttribute("data-busy") || formDialogOpen())) { if (dirty && (workspace.switching || workspace.tabs.some(tab => tab.closing) || document.body.hasAttribute("data-busy") || formDialogOpen())) {
setStatus("操作正在进行，请完成或取消后关闭"); setStatus("操作正在进行，请完成或取消后关闭");
@@ -2551,7 +2553,7 @@ function renderDocumentTabs() {
const icon = document.createElement("span"); const icon = document.createElement("span");
icon.className = "close-icon"; icon.className = "close-icon";
close.append(icon); close.append(icon);
close.disabled = !tab.state.doc && !tab.opening && !tab.error && workspace.tabs.length === 1; close.disabled = !nativeHost && !tab.state.doc && !tab.opening && !tab.error && workspace.tabs.length === 1;
close.addEventListener("click", async event => { close.addEventListener("click", async event => {
event.stopPropagation(); event.stopPropagation();
await closeFile(tab); await closeFile(tab);
@@ -2887,6 +2889,7 @@ async function closeFile(tab = null) {
tab = documentTab(); tab = documentTab();
} }
if (tab.closed || tab.closing || workspace.closing) return; if (tab.closed || tab.closing || workspace.closing) return;
if (nativeHost && workspace.tabs.length === 1) return closeWorkspace();
if (!tab.state.doc && !tab.opening && !tab.error && workspace.tabs.length === 1) return; if (!tab.state.doc && !tab.opening && !tab.error && workspace.tabs.length === 1) return;
tab.closing = true; tab.closing = true;
if (implicit) { if (implicit) {
@@ -2896,6 +2899,7 @@ async function closeFile(tab = null) {
try { try {
if (tab.state.saving && tab.saveCompletion) await tab.saveCompletion; if (tab.state.saving && tab.saveCompletion) await tab.saveCompletion;
if (tab.closed) return; if (tab.closed) return;
if ((tab.opening || tab.state.exporting) && !window.confirm("文档正在处理，是否取消并关闭？")) return;
if (tab.state.dirty || tab === workspace.active && (canvasEditor.input || canvasEditor.crop || canvasEditor.nudge)) { if (tab.state.dirty || tab === workspace.active && (canvasEditor.input || canvasEditor.crop || canvasEditor.nudge)) {
if (tab !== workspace.active && !await activateDocumentTab(tab)) return; if (tab !== workspace.active && !await activateDocumentTab(tab)) return;
if (!await confirmDocumentClose(tab) || tab.closed || workspace.closing) return; if (!await confirmDocumentClose(tab) || tab.closed || workspace.closing) return;
@@ -13496,7 +13500,7 @@ function updateControls() {
updateStructureControls(); updateStructureControls();
const hasDoc = Boolean(state.doc); const hasDoc = Boolean(state.doc);
el.newButton.disabled = workspace.closing; el.newButton.disabled = workspace.closing;
el.closeButton.disabled = !(hasDoc || documentTab().opening || documentTab().error) || workspace.closing; el.closeButton.disabled = !nativeHost && !(hasDoc || documentTab().opening || documentTab().error) || workspace.closing;
updateDocumentControls(); updateDocumentControls();
updateDisplayControls(); updateDisplayControls();
updateEditorTools(); updateEditorTools();
@@ -13745,7 +13749,7 @@ function setBusy(busy, text = "", percent = 0, status = "", tab = documentTab())
el.newButton.disabled = false; el.newButton.disabled = false;
el.documentNewTab.disabled = workspace.closing; el.documentNewTab.disabled = workspace.closing;
el.pageLayoutButton.disabled = busy || !(state.doc?.pageCount > 1); el.pageLayoutButton.disabled = busy || !(state.doc?.pageCount > 1);
el.closeButton.disabled = !(state.doc || tab.opening || tab.error) || workspace.closing; el.closeButton.disabled = !nativeHost && !(state.doc || tab.opening || tab.error) || workspace.closing;
el.refreshAppButton.disabled = busy; el.refreshAppButton.disabled = busy;
updateStructureControls(); updateStructureControls();
updateDocumentControls(); updateDocumentControls();