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

This commit is contained in:
Vanessa 2023-03-07 11:03:22 +08:00
commit f740842e41
2 changed files with 3 additions and 0 deletions

View file

@ -192,6 +192,7 @@ const boot = () => {
webviewTag: true,
webSecurity: false,
contextIsolation: false,
autoplayPolicy: 'user-gesture-required' // 桌面端禁止自动播放多媒体 https://github.com/siyuan-note/siyuan/issues/7587
},
frame: "darwin" === process.platform,
titleBarStyle: "hidden",
@ -751,6 +752,7 @@ app.whenReady().then(() => {
nodeIntegration: true,
webviewTag: true,
webSecurity: false,
autoplayPolicy: 'user-gesture-required' // 桌面端禁止自动播放多媒体 https://github.com/siyuan-note/siyuan/issues/7587
},
});
win.loadURL(data.url);

View file

@ -468,6 +468,7 @@ const renderPDF = (id: string) => {
nodeIntegration: true,
webviewTag: true,
webSecurity: false,
autoplayPolicy: 'user-gesture-required' // 桌面端禁止自动播放多媒体 https://github.com/siyuan-note/siyuan/issues/7587
},
});
ipcRenderer.send(Constants.SIYUAN_EXPORT_PREVENT, window.siyuan.printWin.id);