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

🐛 https://github.com/siyuan-note/siyuan/issues/4567

Browse source
This commit is contained in:
Vanessa 2023-01-05 22:30:44 +08:00
parent 15cce2c0a3
commit 7199b5b193
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/electron/main.js
View file

@ -662,7 +662,7 @@ app.whenReady().then(() => {
BrowserWindow.fromId(data.id).webContents.send('siyuan-export-pdf', data)
})
ipcMain.on('siyuan-export-close', (event, id) => {
BrowserWindow.fromId(id).webContents.send('siyuan-export-close', data)
BrowserWindow.fromId(id).webContents.send('siyuan-export-close', id)
})
ipcMain.on('siyuan-quit', (event, id) => {
const mainWindow = BrowserWindow.fromId(id)
@ -771,12 +771,14 @@ app.whenReady().then(() => {
mainWindow.show()
}
}
workspaces.find(item => {
if (item.id === data.id) {
resetTrayMenu(item.tray, data.languages, mainWindow)
return true
}
})
if ('win32' === process.platform || 'linux' === process.platform) {
workspaces.find(item => {
if (item.id === data.id) {
resetTrayMenu(item.tray, data.languages, mainWindow)
return true
}
})
}
})
})

5
app/src/protyle/export/index.ts
View file

@ -414,14 +414,15 @@ const renderPDF = (id: string) => {
actionElement.querySelector("#landscape").addEventListener('change', () => {
setPadding();
});
const currentWindowId = ${getCurrentWindow().id};
actionElement.querySelector('.b3-button--cancel').addEventListener('click', () => {
const {ipcRenderer} = require("electron");
ipcRenderer.send("${Constants.SIYUAN_EXPORT_CLOSE}", getCurrentWindow().id)
ipcRenderer.send("${Constants.SIYUAN_EXPORT_CLOSE}", currentWindowId)
});
actionElement.querySelector('.b3-button--text').addEventListener('click', () => {
const {ipcRenderer} = require("electron");
ipcRenderer.send("${Constants.SIYUAN_EXPORT_PDF}", {
id: getCurrentWindow().id,
id: currentWindowId,
pdfOptions:{
printBackground: true,
landscape: actionElement.querySelector("#landscape").checked,