Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-22 06:54:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2022-12-11 11:58:09 +08:00
commit 872b341d11
11 changed files with 38 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/protyle/export/util.ts
View file

@ -15,7 +15,7 @@ import {openByMobile} from "../util/compatibility";
export const afterExport = (exportPath: string, msgId: string) => {
/// #if !BROWSER
showMessage(`${window.siyuan.languages.exported}${escapeHtml(exportPath)}
showMessage(`${window.siyuan.languages.exported} ${escapeHtml(exportPath)}
<div class="fn__space"></div>
<button class="b3-button b3-button--white">${window.siyuan.languages.showInFolder}</button>`, 6000, "info", msgId);
document.querySelector(`#message [data-id="${msgId}"] button`).addEventListener("click", () => {

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

@ -383,6 +383,7 @@ const initWindow = () => {
id: ipcData.rootId,
pdf: true,
removeAssets: ipcData.removeAssets,
merge: ipcData.mergeSubdocs,
savePath: result.filePaths[0]
}, () => {
const pdfFilePath = path.join(result.filePaths[0], replaceLocalPath(ipcData.rootTitle) + ".pdf");