From 1e2c5f6e38e06720813e0a8160527b66a1807024 Mon Sep 17 00:00:00 2001 From: xiaoqidun Date: Sun, 1 Nov 2026 13:15:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2=E6=8A=A5=E9=94=99=E5=8F=8A?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=88=87=E6=8D=A2=E5=AE=9A=E4=BD=8D=E5=81=8F?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/webui/ofdgo.js | 6 +++--- assets/webui/ofdgo_edit.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/webui/ofdgo.js b/assets/webui/ofdgo.js index 22a89ff..76c79e2 100644 --- a/assets/webui/ofdgo.js +++ b/assets/webui/ofdgo.js @@ -743,8 +743,8 @@ const canvasEditor = new CanvasEditor(el.viewerPanel, { onPage: (index) => { if (index !== state.pageIndex) pageView.setCurrentPage(index); }, - onSelect: (item, previous) => { - if (item && item.index !== state.pageIndex) pageView.setCurrentPage(item.index); + onSelect: (item, previous, restoring) => { + if (!restoring && item && item.index !== state.pageIndex) pageView.setCurrentPage(item.index); updateObjectControls(item); const reason = objectEditReason(item), previousReason = objectEditReason(previous); if (state.editing && state.doc && !document.body.hasAttribute("data-busy") @@ -1858,7 +1858,7 @@ document.querySelector("#objectActionsButton").addEventListener("click", async ( settingsElements.Tabs.hidden = true; }); el.outlinesTab.addEventListener("click", () => showNavigation(el.outlinesTab)); -el.searchTab.addEventListener("click", focusSearch); +el.searchTab.addEventListener("click", () => focusSearch()); el.navigationTabs.addEventListener("keydown", (event) => { if (event.isComposing || event.altKey || event.ctrlKey || event.metaKey || event.shiftKey) { return; diff --git a/assets/webui/ofdgo_edit.js b/assets/webui/ofdgo_edit.js index 3135682..91fcebb 100644 --- a/assets/webui/ofdgo_edit.js +++ b/assets/webui/ofdgo_edit.js @@ -944,7 +944,7 @@ export class CanvasEditor { } this.pages.set(surface, { index, width: page.width, height: page.height, hitIndex: new ObjectIndex(items) }); surface.append(layer); - if (pending || selected.size) this.setSelection(selection); + if (pending || selected.size) this.setSelection(selection, true); if (pending) this.pendingSelection = null; if (crop && selection.length === 1 && selection[0].id === crop.item.id && ["x", "y", "width", "height"].every(key => selection[0][key] === crop.item[key])) { @@ -1049,7 +1049,7 @@ export class CanvasEditor { return this.selected?.items || (this.selected ? [this.selected] : []); } - setSelection(items) { + setSelection(items, restoring = false) { items = items.filter(item => !items.some(parent => parent !== item && item.id.startsWith(parent.id + "/"))); this.cancelNudge(); const previous = this.selected; @@ -1100,7 +1100,7 @@ export class CanvasEditor { for (const item of items) { if (item.parent) this.pageItems(item.index).find(parent => parent.id === item.parent)?.node.classList.add("edit-parent"); } - this.options.onSelect(this.selected, previous); + this.options.onSelect(this.selected, previous, restoring); } select(item, add = false) {