Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-03 11:20:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

♻️ fix https://github.com/siyuan-note/siyuan/pull/11733

Browse source
This commit is contained in:
Vanessa 2024-07-05 21:00:21 +08:00
parent f25b36ff38
commit cd40ec50bb
21 changed files with 341 additions and 398 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -165,6 +165,9 @@ export class MenuItem {
public element: HTMLElement;
constructor(options: IMenu) {
if (options.ignore) {
return;
}
if (options.type === "empty") {
this.element = document.createElement("div");
this.element.innerHTML = options.label;

4
app/src/menus/commonMenuItem.ts
View file

@ -448,7 +448,6 @@ export const exportMd = (id: string) => {
label: window.siyuan.languages.template,
iconClass: "ft__error",
icon: "iconMarkdown",
disabled: window.siyuan.config.readonly,
click: async () => {
const result = await fetchSyncPost("/api/block/getRefText", {id: id});
@ -508,9 +507,8 @@ export const exportMd = (id: string) => {
});
});
return;
} else if (response.code === 0) {
showMessage(window.siyuan.languages.exportTplSucc);
}
showMessage(window.siyuan.languages.exportTplSucc);
});
dialog.destroy();
});

274
app/src/menus/navigation.ts
View file

@ -73,51 +73,53 @@ const initMultiMenu = (selectItemElements: NodeListOf<Element>, app: App) => {
return window.siyuan.menus.menu;
}
window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
const riffCardMenu = [{
iconHTML: "",
accelerator: window.siyuan.config.keymap.editor.general.quickMakeCard.custom,
label: window.siyuan.languages.quickMakeCard,
click: () => {
transaction(undefined, [{
action: "addFlashcards",
deckID: Constants.QUICK_DECK_ID,
blockIDs,
}], [{
action: "removeFlashcards",
deckID: Constants.QUICK_DECK_ID,
blockIDs,
}]);
}
}, {
iconHTML: "",
label: window.siyuan.languages.removeCard,
click: () => {
transaction(undefined, [{
action: "removeFlashcards",
deckID: Constants.QUICK_DECK_ID,
blockIDs,
}], [{
action: "addFlashcards",
deckID: Constants.QUICK_DECK_ID,
blockIDs,
}]);
}
}];
if (window.siyuan.config.flashcard.deck) {
riffCardMenu.push({
if (!window.siyuan.config.readonly) {
const riffCardMenu = [{
iconHTML: "",
label: window.siyuan.languages.addToDeck,
accelerator: window.siyuan.config.keymap.editor.general.quickMakeCard.custom,
label: window.siyuan.languages.quickMakeCard,
click: () => {
makeCard(app, blockIDs);
transaction(undefined, [{
action: "addFlashcards",
deckID: Constants.QUICK_DECK_ID,
blockIDs,
}], [{
action: "removeFlashcards",
deckID: Constants.QUICK_DECK_ID,
blockIDs,
}]);
}
});
}, {
iconHTML: "",
label: window.siyuan.languages.removeCard,
click: () => {
transaction(undefined, [{
action: "removeFlashcards",
deckID: Constants.QUICK_DECK_ID,
blockIDs,
}], [{
action: "addFlashcards",
deckID: Constants.QUICK_DECK_ID,
blockIDs,
}]);
}
}];
if (window.siyuan.config.flashcard.deck) {
riffCardMenu.push({
iconHTML: "",
label: window.siyuan.languages.addToDeck,
click: () => {
makeCard(app, blockIDs);
}
});
}
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.riffCard,
icon: "iconRiffCard",
submenu: riffCardMenu,
}).element);
window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
}
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.riffCard,
icon: "iconRiffCard",
submenu: riffCardMenu,
}).element);
window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
openEditorTab(app, blockIDs);
if (app.plugins) {
emitOpenMenu({
@ -201,33 +203,35 @@ export const initNavigationMenu = (app: App, liElement: HTMLElement) => {
submenu: subMenu,
}).element);
}
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.riffCard,
type: "submenu",
icon: "iconRiffCard",
submenu: [{
iconHTML: "",
label: window.siyuan.languages.spaceRepetition,
accelerator: window.siyuan.config.keymap.editor.general.spaceRepetition.custom,
click: () => {
fetchPost("/api/riff/getNotebookRiffDueCards", {notebook: notebookId}, (response) => {
openCardByData(app, response.data, "notebook", notebookId, name);
});
/// #if MOBILE
closePanel();
/// #endif
}
}, {
iconHTML: "",
label: window.siyuan.languages.manage,
click: () => {
viewCards(app, notebookId, name, "Notebook");
/// #if MOBILE
closePanel();
/// #endif
}
}],
}).element);
if (!window.siyuan.config.readonly) {
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.riffCard,
type: "submenu",
icon: "iconRiffCard",
submenu: [{
iconHTML: "",
label: window.siyuan.languages.spaceRepetition,
accelerator: window.siyuan.config.keymap.editor.general.spaceRepetition.custom,
click: () => {
fetchPost("/api/riff/getNotebookRiffDueCards", {notebook: notebookId}, (response) => {
openCardByData(app, response.data, "notebook", notebookId, name);
});
/// #if MOBILE
closePanel();
/// #endif
}
}, {
iconHTML: "",
label: window.siyuan.languages.manage,
click: () => {
viewCards(app, notebookId, name, "Notebook");
/// #if MOBILE
closePanel();
/// #endif
}
}],
}).element);
}
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.search,
accelerator: window.siyuan.config.keymap.general.search.custom,
@ -471,76 +475,78 @@ export const initFileMenu = (app: App, notebookId: string, pathString: string, l
});
}
}).element);
const riffCardMenu = [{
iconHTML: "",
label: window.siyuan.languages.spaceRepetition,
accelerator: window.siyuan.config.keymap.editor.general.spaceRepetition.custom,
click: () => {
fetchPost("/api/riff/getTreeRiffDueCards", {rootID: id}, (response) => {
openCardByData(app, response.data, "doc", id, name);
});
/// #if MOBILE
closePanel();
/// #endif
}
}, {
iconHTML: "",
label: window.siyuan.languages.manage,
click: () => {
fetchPost("/api/filetree/getHPathByID", {
id
}, (response) => {
viewCards(app, id, pathPosix().join(getNotebookName(notebookId), response.data), "Tree");
});
/// #if MOBILE
closePanel();
/// #endif
}
}, {
iconHTML: "",
accelerator: window.siyuan.config.keymap.editor.general.quickMakeCard.custom,
label: window.siyuan.languages.quickMakeCard,
click: () => {
transaction(undefined, [{
action: "addFlashcards",
deckID: Constants.QUICK_DECK_ID,
blockIDs: [id]
}], [{
action: "removeFlashcards",
deckID: Constants.QUICK_DECK_ID,
blockIDs: [id]
}]);
}
}, {
iconHTML: "",
label: window.siyuan.languages.removeCard,
click: () => {
transaction(undefined, [{
action: "removeFlashcards",
deckID: Constants.QUICK_DECK_ID,
blockIDs: [id]
}], [{
action: "addFlashcards",
deckID: Constants.QUICK_DECK_ID,
blockIDs: [id]
}]);
}
}];
if (window.siyuan.config.flashcard.deck) {
riffCardMenu.push({
if (!window.siyuan.config.readonly) {
const riffCardMenu = [{
iconHTML: "",
label: window.siyuan.languages.addToDeck,
label: window.siyuan.languages.spaceRepetition,
accelerator: window.siyuan.config.keymap.editor.general.spaceRepetition.custom,
click: () => {
makeCard(app, [id]);
fetchPost("/api/riff/getTreeRiffDueCards", {rootID: id}, (response) => {
openCardByData(app, response.data, "doc", id, name);
});
/// #if MOBILE
closePanel();
/// #endif
}
});
}, {
iconHTML: "",
label: window.siyuan.languages.manage,
click: () => {
fetchPost("/api/filetree/getHPathByID", {
id
}, (response) => {
viewCards(app, id, pathPosix().join(getNotebookName(notebookId), response.data), "Tree");
});
/// #if MOBILE
closePanel();
/// #endif
}
}, {
iconHTML: "",
accelerator: window.siyuan.config.keymap.editor.general.quickMakeCard.custom,
label: window.siyuan.languages.quickMakeCard,
click: () => {
transaction(undefined, [{
action: "addFlashcards",
deckID: Constants.QUICK_DECK_ID,
blockIDs: [id]
}], [{
action: "removeFlashcards",
deckID: Constants.QUICK_DECK_ID,
blockIDs: [id]
}]);
}
}, {
iconHTML: "",
label: window.siyuan.languages.removeCard,
click: () => {
transaction(undefined, [{
action: "removeFlashcards",
deckID: Constants.QUICK_DECK_ID,
blockIDs: [id]
}], [{
action: "addFlashcards",
deckID: Constants.QUICK_DECK_ID,
blockIDs: [id]
}]);
}
}];
if (window.siyuan.config.flashcard.deck) {
riffCardMenu.push({
iconHTML: "",
label: window.siyuan.languages.addToDeck,
click: () => {
makeCard(app, [id]);
}
});
}
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.riffCard,
type: "submenu",
icon: "iconRiffCard",
submenu: riffCardMenu,
}).element);
}
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.riffCard,
type: "submenu",
icon: "iconRiffCard",
submenu: riffCardMenu,
}).element);
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.search,
icon: "iconSearch",

58
app/src/menus/workspace.ts
View file

@ -391,25 +391,27 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
submenu
}).element);
}
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.riffCard,
type: "submenu",
icon: "iconRiffCard",
submenu: [{
iconHTML: "",
label: window.siyuan.languages.spaceRepetition,
accelerator: window.siyuan.config.keymap.general.riffCard.custom,
click: () => {
openCard(app);
}
}, {
iconHTML: "",
label: window.siyuan.languages.manage,
click: () => {
viewCards(app, "", window.siyuan.languages.all, "");
}
}],
}).element);
if (!window.siyuan.config.readonly) {
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.riffCard,
type: "submenu",
icon: "iconRiffCard",
submenu: [{
iconHTML: "",
label: window.siyuan.languages.spaceRepetition,
accelerator: window.siyuan.config.keymap.general.riffCard.custom,
click: () => {
openCard(app);
}
}, {
iconHTML: "",
label: window.siyuan.languages.manage,
click: () => {
viewCards(app, "", window.siyuan.languages.all, "");
}
}],
}).element);
}
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.recentDocs,
icon: "iconFile",
@ -436,16 +438,14 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
}).element);
window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
}
if (!isIPad()) {
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.userGuide,
icon: "iconHelp",
disabled: window.siyuan.config.readonly,
click: () => {
mountHelp();
}
}).element);
}
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.userGuide,
icon: "iconHelp",
ignore: isIPad() || window.siyuan.config.readonly,
click: () => {
mountHelp();
}
}).element);
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.feedback,
icon: "iconFeedback",