Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Vanessa 2022-12-04 00:28:36 +08:00
commit 05a506f2aa
10 changed files with 52 additions and 30 deletions

View file

@ -664,10 +664,10 @@ const addConfigMoreMenu = async (config: ISearchOption, edit: Protyle, element:
}).element);
window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.saveSearch,
label: window.siyuan.languages.saveCriterion,
click() {
const saveDialog = new Dialog({
title: window.siyuan.languages.saveSearch,
title: window.siyuan.languages.saveCriterion,
content: `<div class="b3-dialog__content">
<input class="b3-text-field fn__block" placeholder="${window.siyuan.languages.memo}">
</div>
@ -754,7 +754,7 @@ const addConfigMoreMenu = async (config: ISearchOption, edit: Protyle, element:
});
if (searchSubMenu.length > 0) {
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.useSearch,
label: window.siyuan.languages.useCriterion,
type: "submenu",
submenu: searchSubMenu
}).element);