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

🎨 工作空间多开

Browse source
This commit is contained in:
Vanessa 2023-01-06 16:44:54 +08:00
parent aabc1d4a85
commit f316c44d35
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/electron/main.js
View file

@ -58,8 +58,8 @@ try {
app.exit() app.exit()
} }
const getServer = () => { const getServer = (port = kernelPort) => {
return 'http://127.0.0.1:' + kernelPort return 'http://127.0.0.1:' + port
} }
const sleep = (ms) => { const sleep = (ms) => {
@ -338,7 +338,8 @@ const boot = () => {
Menu.setApplicationMenu(menu) Menu.setApplicationMenu(menu)
// 当前页面链接使用浏览器打开 // 当前页面链接使用浏览器打开
currentWindow.webContents.on('will-navigate', (event, url) => { currentWindow.webContents.on('will-navigate', (event, url) => {
if (url.startsWith(getServer())) { const currentURL = new URL(event.sender.getURL())
if (url.startsWith(getServer(currentURL.port))) {
return return
} }
@ -750,7 +751,7 @@ app.whenReady().then(() => {
return true return true
} }
}) })
await fetch(getServer() + '/api/system/uiproc?pid=' + process.pid, await fetch(getServer(data.port) + '/api/system/uiproc?pid=' + process.pid,
{method: 'POST'}) {method: 'POST'})
}) })
ipcMain.on('siyuan-hotkey', (event, data) => { ipcMain.on('siyuan-hotkey', (event, data) => {
@ -932,10 +933,12 @@ powerMonitor.on('resume', async () => {
} }
writeLog('sync after system resume') writeLog('sync after system resume')
// TODO
fetch(getServer() + '/api/sync/performSync', {method: 'POST'}) fetch(getServer() + '/api/sync/performSync', {method: 'POST'})
}) })
powerMonitor.on('shutdown', () => { powerMonitor.on('shutdown', () => {
writeLog('system shutdown') writeLog('system shutdown')
// TODO
fetch(getServer() + '/api/system/exit', {method: 'POST'}) fetch(getServer() + '/api/system/exit', {method: 'POST'})
}) })

1
app/src/util/onGetConfig.ts
View file

@ -139,6 +139,7 @@ export const onGetConfig = (isStart: boolean) => {
languages: window.siyuan.languages["_trayMenu"], languages: window.siyuan.languages["_trayMenu"],
workspaceDir: window.siyuan.config.system.workspaceDir, workspaceDir: window.siyuan.config.system.workspaceDir,
id: getCurrentWindow().id, id: getCurrentWindow().id,
port: location.port
}); });
ipcRenderer.send(Constants.SIYUAN_HOTKEY, { ipcRenderer.send(Constants.SIYUAN_HOTKEY, {
languages: window.siyuan.languages["_trayMenu"], languages: window.siyuan.languages["_trayMenu"],