diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss index d4f18183c..23f546931 100644 --- a/app/src/assets/scss/business/_av.scss +++ b/app/src/assets/scss/business/_av.scss @@ -44,6 +44,10 @@ } } + &__views { + align-items: center; + } + &__title { outline: none; font-weight: bold; diff --git a/app/src/boot/globalEvent/keydown.ts b/app/src/boot/globalEvent/keydown.ts index 48bd595ab..8c9832d04 100644 --- a/app/src/boot/globalEvent/keydown.ts +++ b/app/src/boot/globalEvent/keydown.ts @@ -491,7 +491,7 @@ const fileTreeKeydown = (app: App, event: KeyboardEvent) => { if (matchHotKey(window.siyuan.config.keymap.general.selectOpen1.custom, event)) { event.preventDefault(); const element = document.querySelector(".layout__wnd--active > .fn__flex > .layout-tab-bar > .item--focus") || - document.querySelector(".layout-tab-bar > .item--focus"); + document.querySelector("ul.layout-tab-bar > .item--focus"); if (element) { const tab = getInstanceById(element.getAttribute("data-id")) as Tab; if (tab && tab.model instanceof Editor) { @@ -1119,9 +1119,9 @@ export const windowKeyDown = (app: App, event: KeyboardEvent) => { return; } let tabHtml = ""; - let currentTabElement = document.querySelector(".layout__wnd--active .layout-tab-bar > .item--focus"); + let currentTabElement = document.querySelector(".layout__wnd--active ul.layout-tab-bar > .item--focus"); if (!currentTabElement) { - currentTabElement = document.querySelector(".layout-tab-bar > .item--focus"); + currentTabElement = document.querySelector("ul.layout-tab-bar > .item--focus"); } if (currentTabElement) { const currentId = currentTabElement.getAttribute("data-id"); diff --git a/app/src/layout/dock/Files.ts b/app/src/layout/dock/Files.ts index afb8d80bd..e189c51f3 100644 --- a/app/src/layout/dock/Files.ts +++ b/app/src/layout/dock/Files.ts @@ -192,7 +192,7 @@ export class Files extends Model { break; } else if (type === "focus") { const element = document.querySelector(".layout__wnd--active > .fn__flex > .layout-tab-bar > .item--focus") || - document.querySelector(".layout-tab-bar > .item--focus"); + document.querySelector("ul.layout-tab-bar > .item--focus"); if (element) { const tab = getInstanceById(element.getAttribute("data-id")) as Tab; if (tab && tab.model instanceof Editor) { diff --git a/app/src/layout/dock/index.ts b/app/src/layout/dock/index.ts index 284a5d7c1..60b7c2fd9 100644 --- a/app/src/layout/dock/index.ts +++ b/app/src/layout/dock/index.ts @@ -366,7 +366,7 @@ export class Dock { } // 关闭 dock 后设置光标 if (!document.querySelector(".layout__center .layout__wnd--active")) { - const currentElement = document.querySelector(".layout__center .layout-tab-bar .item--focus"); + const currentElement = document.querySelector(".layout__center ul.layout-tab-bar .item--focus"); if (currentElement) { getAllTabs().find(item => { if (item.id === currentElement.getAttribute("data-id")) { diff --git a/app/src/protyle/render/av/openMenuPanel.ts b/app/src/protyle/render/av/openMenuPanel.ts index eb8f86766..b58363b4b 100644 --- a/app/src/protyle/render/av/openMenuPanel.ts +++ b/app/src/protyle/render/av/openMenuPanel.ts @@ -72,7 +72,7 @@ export const openMenuPanel = (options: { `); avPanelElement = document.querySelector(".av__panel"); const menuElement = avPanelElement.lastElementChild as HTMLElement; - const tabRect = options.blockElement.querySelector(".layout-tab-bar")?.getBoundingClientRect(); + const tabRect = options.blockElement.querySelector(".av__views")?.getBoundingClientRect(); if (["select", "date", "asset"].includes(options.type)) { const cellRect = options.cellElements[options.cellElements.length - 1].getBoundingClientRect(); if (options.type === "select") { diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts index 139b9b700..76b801f7d 100644 --- a/app/src/protyle/render/av/render.ts +++ b/app/src/protyle/render/av/render.ts @@ -215,33 +215,33 @@ ${cell.color ? `color:${cell.color};` : ""}">${text}`; setTimeout(() => { e.firstElementChild.outerHTML = `
-
+
${tabHTML}
- +
- +
- +
- +
- +
- ${response.data.isMirror ? ` + ${response.data.isMirror ? `
` : ""}
${response.data.name || ""}