Vanessa 2026-03-07 11:43:20 +08:00
parent 18b748b853
commit 8fca15e9ba
2 changed files with 9 additions and 10 deletions

View file

@ -61,9 +61,6 @@ export class Menu {
}
public showSubMenu(subMenuElement: HTMLElement) {
subMenuElement.querySelectorAll(".b3-list-item--focus").forEach((item) => {
item.classList.remove("b3-list-item--focus");
});
const itemRect = subMenuElement.parentElement.getBoundingClientRect();
subMenuElement.style.top = (itemRect.top - 8) + "px";
subMenuElement.style.left = (itemRect.right + 8) + "px";

View file

@ -351,13 +351,13 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
label: `<input class="b3-text-field fn__block" style="margin: 4px 0" placeholder="${window.siyuan.languages.search}">
<div class="b3-list b3-list--background" style="max-width: 50vw"></div>`,
bind(menuElement) {
const genListHTML = () => {
const genListHTML = (isInit = false) => {
let html = "";
window.siyuan.storage[Constants.LOCAL_LAYOUTS].sort((a: ISaveLayout, b: ISaveLayout) => {
return a.name.localeCompare(b.name, undefined, {numeric: true});
}).forEach((item: ISaveLayout) => {
if (inputElement.value === "" || item.name.toLowerCase().indexOf(inputElement.value.toLowerCase()) > -1) {
html += `<div data-name="${item.name}" class="b3-list-item b3-list-item--narrow b3-list-item--hide-action">
html += `<div data-name="${item.name}" class="b3-list-item b3-list-item--narrow b3-list-item--hide-action ${!isInit && !html ? "b3-list-item--focus" : ""}">
<div class="b3-list-item__text">${item.name}</div>
<span class="b3-list-item__meta">${item.time ? dayjs(item.time).format("YYYY-MM-DD HH:mm") : ""}</span>
<span class="b3-list-item__action">
@ -371,8 +371,12 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
const inputElement = menuElement.querySelector(".b3-text-field") as HTMLInputElement;
const listElement = menuElement.querySelector(".b3-list");
inputElement.addEventListener("focus", () => {
const listItemElement = inputElement.nextElementSibling?.querySelector(".b3-list-item");
listItemElement?.classList.add("b3-list-item--focus");
if (!menuElement.querySelector(".b3-list-item--focus")) {
menuElement.querySelector(".b3-list-item")?.classList.add("b3-list-item--focus");
}
});
inputElement.addEventListener("blur", () => {
menuElement.querySelector(".b3-list-item--focus")?.classList.remove("b3-list-item--focus");
});
inputElement.addEventListener("keydown", (event) => {
event.stopPropagation();
@ -398,8 +402,6 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
}
event.stopPropagation();
listElement.innerHTML = genListHTML();
const listItemElement = inputElement.nextElementSibling?.querySelector(".b3-list-item");
listItemElement?.classList.add("b3-list-item--focus");
});
listElement.addEventListener("click", (event: MouseEvent) => {
if (window.siyuan.config.readonly) {
@ -438,7 +440,7 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
event.stopPropagation();
}
});
listElement.innerHTML = genListHTML();
listElement.innerHTML = genListHTML(true);
}
});
}