diff --git a/app/src/boot/onGetConfig.ts b/app/src/boot/onGetConfig.ts index 20dc28403..9ab92cdf8 100644 --- a/app/src/boot/onGetConfig.ts +++ b/app/src/boot/onGetConfig.ts @@ -341,6 +341,7 @@ export const initWindow = async (app: App) => { removeAssets: ipcData.removeAssets, keepFold: ipcData.keepFold, mergeSubdocs: ipcData.mergeSubdocs, + watermark: ipcData.watermark, landscape: ipcData.pdfOptions.landscape, marginType: ipcData.pdfOptions.marginType, pageSize: ipcData.pdfOptions.pageSize, @@ -380,6 +381,7 @@ ${response.data.replace("%pages", "").replace("%pa merge: ipcData.mergeSubdocs, path: pdfFilePath, removeAssets: ipcData.removeAssets, + watermark: ipcData.watermark }, () => { afterExport(pdfFilePath, msgId); if (ipcData.removeAssets) { diff --git a/app/src/config/exportConfig.ts b/app/src/config/exportConfig.ts index b4b997239..05c0c78db 100644 --- a/app/src/config/exportConfig.ts +++ b/app/src/config/exportConfig.ts @@ -77,16 +77,15 @@ export const exportConfig = { -
-
- ${window.siyuan.languages.export27} -
${window.siyuan.languages.export28}
-
- -
-
${window.siyuan.languages.export29}
-
- +
+ ${window.siyuan.languages.export27} +
${window.siyuan.languages.export28}
+
+ +
+
${window.siyuan.languages.export29}
+
+
diff --git a/app/src/config/search.ts b/app/src/config/search.ts index 8dfd93cc9..56a52f222 100644 --- a/app/src/config/search.ts +++ b/app/src/config/search.ts @@ -47,7 +47,7 @@ export const initConfigSearch = (element: HTMLElement, app: App) => { // 导出 getLang(["paragraphBeginningSpace", "md4", "export", "export1", "export2", "export5", "export11", "export13", "export14", "export15", "export19", "export20", "ref", "blockEmbed", "export17", "export18", - "export23", "export24"]), + "export23", "export24", "export25", "export26", "export27", "export28", "export29"]), // 外观 getLang(["language", "language1", "appearance", "appearance1", "appearance2", "appearance3", "appearance4", diff --git a/app/src/protyle/export/index.ts b/app/src/protyle/export/index.ts index 2d78e09a0..1d1fe76ec 100644 --- a/app/src/protyle/export/index.ts +++ b/app/src/protyle/export/index.ts @@ -163,7 +163,7 @@ const renderPDF = (id: string) => {
-
- -