diff --git a/app/electron/main.js b/app/electron/main.js index 065397845..cc07200a9 100644 --- a/app/electron/main.js +++ b/app/electron/main.js @@ -870,7 +870,7 @@ app.whenReady().then(() => { modal: true, show: true, width: 1032, - height: 650, + height: 725, resizable: false, frame: "darwin" === process.platform, icon: path.join(appDir, "stage", "icon-large.png"), diff --git a/app/src/protyle/export/index.ts b/app/src/protyle/export/index.ts index 1d1fe76ec..915c6fcf2 100644 --- a/app/src/protyle/export/index.ts +++ b/app/src/protyle/export/index.ts @@ -13,6 +13,7 @@ import {Dialog} from "../../dialog"; import {pathPosix} from "../../util/pathName"; import {replaceLocalPath} from "../../editor/rename"; import {setStorageVal} from "../util/compatibility"; +import {needSubscribe} from "../../util/needSubscribe"; export const saveExport = (option: IExportOptions) => { /// #if !BROWSER @@ -245,6 +246,7 @@ const renderPDF = (id: string) => { +
${window.siyuan.languages._kernel[29]}
@@ -448,7 +450,13 @@ id="preview"> mergeSubdocsElement.addEventListener('change', () => { refreshPreview(); }); - + const watermarkElement = actionElement.querySelector('#watermark'); + watermarkElement.addEventListener('change', () => { + if (watermarkElement.checked && ${needSubscribe("")}) { + watermarkElement.nextElementSibling.style.display = ""; + watermarkElement.checked = false; + } + }); const refreshPreview = () => { previewElement.innerHTML = '
' fetchPost("/api/export/exportPreviewHTML", { @@ -520,7 +528,7 @@ id="preview"> }, keepFold: keepFoldElement.checked, mergeSubdocs: mergeSubdocsElement.checked, - watermark: actionElement.querySelector('#watermark').checked, + watermark: watermarkElement.checked, removeAssets: actionElement.querySelector("#removeAssets").checked, rootId: "${id}", rootTitle: response.data.name, diff --git a/app/src/protyle/export/util.ts b/app/src/protyle/export/util.ts index a8e602a24..fe845d876 100644 --- a/app/src/protyle/export/util.ts +++ b/app/src/protyle/export/util.ts @@ -29,11 +29,9 @@ export const exportImage = (id: string) => { const exportDialog = new Dialog({ title: window.siyuan.languages.exportAsImage, content: `
-
-
-