Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-19 16:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 https://github.com/siyuan-note/siyuan/issues/5066 add index for menu

Browse source
This commit is contained in:
Vanessa 2023-05-19 10:14:28 +08:00
parent 981c6688b8
commit 19dd0cd796
4 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/asset/index.ts
View file

@ -33,7 +33,7 @@ export class Asset extends Model {
this.element.addEventListener("click", (event) => { this.element.addEventListener("click", (event) => {
setPanelFocus(this.element.parentElement.parentElement); setPanelFocus(this.element.parentElement.parentElement);
this.app.plugins.forEach(item => { this.app.plugins.forEach(item => {
item.eventBus.emit("click-pdf", event); item.eventBus.emit("click-pdf", {event});
}); });
}); });
if (typeof this.pdfId === "string") { if (typeof this.pdfId === "string") {

15
app/src/menus/Menu.ts
View file

@ -82,13 +82,13 @@ export class Menu {
} }
} }
public addSeparator() { public addSeparator(index?: number) {
this.addItem({type: "separator"}); this.addItem({type: "separator", index});
} }
public addItem(option: IMenu) { public addItem(option: IMenu) {
const menuItem = new MenuItem(option); const menuItem = new MenuItem(option);
this.append(menuItem.element); this.append(menuItem.element, option.index);
return menuItem.element; return menuItem.element;
} }
@ -111,10 +111,17 @@ export class Menu {
window.siyuan.menus.menu.element.removeAttribute("data-name"); // 标识再次点击不消失 window.siyuan.menus.menu.element.removeAttribute("data-name"); // 标识再次点击不消失
} }
public append(element?: HTMLElement) { public append(element?: HTMLElement, index?: number) {
if (!element) { if (!element) {
return; return;
} }
if (typeof index === "number") {
const insertElement = this.element.querySelectorAll(".b3-menu__items > .b3-menu__separator")[index]
if (insertElement) {
insertElement.before(element);
return;
}
}
this.element.lastElementChild.append(element); this.element.lastElementChild.append(element);
} }

5
app/src/plugin/API.ts
View file

@ -2,7 +2,6 @@ import {confirmDialog} from "../dialog/confirmDialog";
import {Plugin} from "./index"; import {Plugin} from "./index";
import {showMessage} from "../dialog/message"; import {showMessage} from "../dialog/message";
import {Dialog} from "../dialog"; import {Dialog} from "../dialog";
import {MenuItem} from "../menus/Menu";
import {Menu as SiyuanMenu} from "../menus/Menu"; import {Menu as SiyuanMenu} from "../menus/Menu";
import {fetchGet, fetchPost, fetchSyncPost} from "../util/fetch"; import {fetchGet, fetchPost, fetchSyncPost} from "../util/fetch";
import {isMobile} from "../util/functions"; import {isMobile} from "../util/functions";
@ -42,11 +41,11 @@ export class Menu {
return this.menu.addItem(option); return this.menu.addItem(option);
} }
addSeparator() { addSeparator(index?: number) {
if (this.isOpen) { if (this.isOpen) {
return; return;
} }
this.menu.addSeparator(); this.menu.addSeparator(index);
} }
open(options: { x: number, y: number, h?: number, w?: number, isLeft: false }) { open(options: { x: number, y: number, h?: number, w?: number, isLeft: false }) {

1
app/src/types/index.d.ts vendored
View file

@ -724,6 +724,7 @@ declare interface IMenu {
iconHTML?: string iconHTML?: string
current?: boolean current?: boolean
bind?: (element: HTMLElement) => void bind?: (element: HTMLElement) => void
index?: number
} }
declare interface IBazaarItem { declare interface IBazaarItem {