From 1f98334c60b544035c8542237fcacf214e297fa5 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Mon, 27 Feb 2023 09:54:36 +0800 Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/7496 --- app/electron/main.js | 10 ++++---- app/src/menus/navigation.ts | 49 ++++++++++++++++++++++--------------- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/app/electron/main.js b/app/electron/main.js index e424d43de..c06e9798b 100644 --- a/app/electron/main.js +++ b/app/electron/main.js @@ -673,11 +673,6 @@ app.whenReady().then(() => { } }); }); - ipcMain.on("siyuan-closetab", (event, data) => { - BrowserWindow.getAllWindows().forEach(item => { - item.webContents.send("siyuan-closetab", data); - }); - }); ipcMain.on("siyuan-export-pdf", (event, data) => { BrowserWindow.fromId(data.id).webContents.send("siyuan-export-pdf", data); }); @@ -851,6 +846,11 @@ app.whenReady().then(() => { item.webContents.send("siyuan-lock-screen"); }); }); + ipcMain.on("siyuan-closetab", (event, data) => { + BrowserWindow.getAllWindows().forEach(item => { + item.webContents.send("siyuan-closetab", data); + }); + }); if (firstOpen) { const firstOpenWindow = new BrowserWindow({ diff --git a/app/src/menus/navigation.ts b/app/src/menus/navigation.ts index 9e1094b8b..d95cd9cce 100644 --- a/app/src/menus/navigation.ts +++ b/app/src/menus/navigation.ts @@ -79,19 +79,17 @@ export const initNavigationMenu = (liElement: HTMLElement) => { name, type: "notebook" })); - } - window.siyuan.menus.menu.append(new MenuItem({ - label: window.siyuan.languages.config, - icon: "iconSettings", - click: () => { - fetchPost("/api/notebook/getNotebookConf", { - notebook: notebookId - }, (data) => { - onGetnotebookconf(data.data); - }); - } - }).element); - if (!window.siyuan.config.readonly) { + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.config, + icon: "iconSettings", + click: () => { + fetchPost("/api/notebook/getNotebookConf", { + notebook: notebookId + }, (data) => { + onGetnotebookconf(data.data); + }); + } + }).element); sortMenu("notebook", parseInt(liElement.parentElement.getAttribute("data-sortmode")), (sort) => { fetchPost("/api/notebook/setNotebookConf", { notebook: notebookId, @@ -116,6 +114,15 @@ export const initNavigationMenu = (liElement: HTMLElement) => { return true; }); } + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.riffCard, + iconHTML: '', + click: () => { + fetchPost("/api/riff/getNotebookRiffDueCards", {notebook: notebookId}, (response) => { + openCardByData(response.data, `${escapeHtml(name)}`); + }); + } + }).element); /// #if !MOBILE window.siyuan.menus.menu.append(new MenuItem({ label: window.siyuan.languages.search, @@ -125,13 +132,15 @@ export const initNavigationMenu = (liElement: HTMLElement) => { openSearch(window.siyuan.config.keymap.general.search.custom, undefined, notebookId); } }).element); - window.siyuan.menus.menu.append(new MenuItem({ - label: window.siyuan.languages.replace, - accelerator: window.siyuan.config.keymap.general.replace.custom, - click() { - openSearch(window.siyuan.config.keymap.general.replace.custom, undefined, notebookId); - } - }).element); + if (!window.siyuan.config.readonly) { + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.replace, + accelerator: window.siyuan.config.keymap.general.replace.custom, + click() { + openSearch(window.siyuan.config.keymap.general.replace.custom, undefined, notebookId); + } + }).element); + } /// #endif if (!window.siyuan.config.readonly) { window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);