0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 https://github.com/siyuan-note/siyuan/issues/11133

Browse source
This commit is contained in:
Vanessa 2024-04-29 12:28:14 +08:00
parent 40d80e0294
commit 2da15536d2
2 changed files with 36 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
app/src/boot/globalEvent/commandPanel.ts
View file

@ -21,17 +21,29 @@ export const commandPanel = (app: App) => {
<div class="fn__hr"></div>
<ul class="b3-list b3-list--background fn__flex-1" id="commands"></ul>
<div class="fn__hr"></div>
<div class="search__tip">
<kbd>↑/↓</kbd> ${window.siyuan.languages.searchTip1}
<kbd>Enter/Click</kbd> ${window.siyuan.languages.confirm}
<kbd>Esc</kbd> ${window.siyuan.languages.close}
</div>
</div>`
});
dialog.element.setAttribute("data-key", Constants.DIALOG_COMMANDPANEL);
const listElement = dialog.element.querySelector("#commands");
/// #if !MOBILE
let html = ""
Object.keys(window.siyuan.config.keymap.general).forEach((key) => {
html += `<li class="b3-list-item" data-command="${key}">
<span class="b3-list-item__text">${window.siyuan.languages[key]}</span>
<span class="b3-list-item__meta${isMobile() ? " fn__none" : ""}">${updateHotkeyTip(window.siyuan.config.keymap.general[key].custom)}</span>
</li>`;
});
listElement.insertAdjacentHTML("beforeend", html);
/// #endif
app.plugins.forEach(plugin => {
plugin.commands.forEach(command => {
const liElement = document.createElement("li");
liElement.classList.add("b3-list-item");
if (listElement.childElementCount === 0) {
liElement.classList.add("b3-list-item--focus");
}
liElement.innerHTML = `<span class="b3-list-item__text">${plugin.displayName}: ${command.langText || plugin.i18n[command.langKey]}</span>
<span class="b3-list-item__meta${isMobile() ? " fn__none" : ""}">${updateHotkeyTip(command.customHotkey)}</span>`;
liElement.addEventListener("click", () => {
@ -49,12 +61,9 @@ export const commandPanel = (app: App) => {
if (listElement.childElementCount === 0) {
const liElement = document.createElement("li");
liElement.classList.add("b3-list-item", "b3-list-item--focus");
liElement.innerHTML = `<span class="b3-list-item__text" style="-webkit-line-clamp: inherit;">${isMobile() ? window.siyuan.languages._kernel[122] : window.siyuan.languages.commandEmpty}</span>`;
liElement.innerHTML = `<span class="b3-list-item__text" style="-webkit-line-clamp: inherit;">${window.siyuan.languages._kernel[122]}</span>`;
liElement.addEventListener("click", () => {
dialog.destroy();
/// #if !MOBILE
openSetting(app).element.querySelector('.b3-tab-bar [data-name="bazaar"]').dispatchEvent(new CustomEvent("click"));
/// #endif
});
listElement.insertAdjacentElement("beforeend", liElement);
} else {
@ -72,7 +81,12 @@ export const commandPanel = (app: App) => {
if (event.key === "Enter") {
const currentElement = listElement.querySelector(".b3-list-item--focus");
if (currentElement) {
currentElement.dispatchEvent(new CustomEvent("click"));
const command = currentElement.getAttribute("data-command");
if (command) {
execByCommand(command, app);
} else {
currentElement.dispatchEvent(new CustomEvent("click"));
}
}
dialog.destroy();
} else if (event.key === "Escape") {
@ -108,3 +122,10 @@ const filterList = (inputElement: HTMLInputElement, listElement: Element) => {
}
});
};
const execByCommand = (command: string, app: App) => {
switch (command) {
case "openSetting":
break;
}
};

15
app/src/layout/topBar.ts
View file

@ -42,6 +42,9 @@ export const initBar = (app: App) => {
<div id="barPlugins" class="toolbar__item ariaLabel" aria-label="${window.siyuan.languages.plugin}">
<svg><use xlink:href="#iconPlugin"></use></svg>
</div>
<div id="barCommand" class="toolbar__item ariaLabel" aria-label="${window.siyuan.config.keymap.general.commandPanel.custom}">
<svg><use xlink:href="#iconLayoutBottom"></use></svg>
</div>
<div id="barSearch" class="toolbar__item ariaLabel" aria-label="${window.siyuan.languages.globalSearch} ${updateHotkeyTip(window.siyuan.config.keymap.general.globalSearch.custom)}">
<svg><use xlink:href="#iconSearch"></use></svg>
</div>
@ -179,6 +182,10 @@ export const initBar = (app: App) => {
openPlugin(app, target);
event.stopPropagation();
break;
} else if (targetId === "barCommand") {
commandPanel(app);
event.stopPropagation();
break;
} else if (targetId === "barZoom") {
if (!window.siyuan.menus.menu.element.classList.contains("fn__none") &&
window.siyuan.menus.menu.element.getAttribute("data-name") === "barZoom") {
@ -303,14 +310,6 @@ const openPlugin = (app: App, target: Element) => {
}
});
}
menu.addItem({
icon: "iconLayoutBottom",
accelerator: window.siyuan.config.keymap.general.commandPanel.custom,
label: window.siyuan.languages.commandPanel,
click() {
commandPanel(app);
}
});
menu.addSeparator();
let hasPlugin = false;
app.plugins.forEach((plugin) => {