@@ -555,7 +562,7 @@ ${getIconScript(servePath)}
renderPreview(response2.data);
})
};
-
+
actionElement.querySelector("#scale").addEventListener("input", () => {
const scale = actionElement.querySelector("#scale").value;
actionElement.querySelector("#scaleTip").innerText = scale;
@@ -585,38 +592,93 @@ ${getIconScript(servePath)}
actionElement.querySelector("#marginsLeft").addEventListener('change', () => {
setPadding();
});
- actionElement.querySelector("#landscape").addEventListener('change', () => {
+ actionElement.querySelector("#landscape").addEventListener('change', (e) => {
+ if (e.target.checked) {
+ actionElement.querySelector("#paged").checked = true;
+ }
setPadding();
});
+ actionElement.querySelector("#paged").addEventListener('change', (e) => {
+ // 不分页模式没有适配横向页面，强制纵向
+ if (!e.target.checked) {
+ const landscapeElement = actionElement.querySelector("#landscape");
+ if (landscapeElement.checked) {
+ landscapeElement.checked = false;
+ setPadding();
+ }
+ }
+ });
actionElement.querySelector('.b3-button--cancel').addEventListener('click', () => {
const {ipcRenderer} = require("electron");
ipcRenderer.send("${Constants.SIYUAN_CMD}", "destroy")
});
actionElement.querySelector('.b3-button--text').addEventListener('click', () => {
const {ipcRenderer} = require("electron");
- ipcRenderer.send("${Constants.SIYUAN_EXPORT_PDF}", {
- title: "${window.siyuan.languages.export} PDF",
- pdfOptions:{
- printBackground: true,
- landscape: actionElement.querySelector("#landscape").checked,
- marginType: actionElement.querySelector("#marginsType").value,
- margins: {
- top: parseFloat(document.querySelector("#marginsTop").value),
- bottom: parseFloat(document.querySelector("#marginsBottom").value),
- left: parseFloat(document.querySelector("#marginsLeft").value),
- right: parseFloat(document.querySelector("#marginsRight").value),
- },
- scale: parseFloat(actionElement.querySelector("#scale").value),
- pageSize: actionElement.querySelector("#pageSize").value,
- },
- keepFold: keepFoldElement.checked,
- mergeSubdocs: mergeSubdocsElement.checked,
- watermark: watermarkElement.checked,
- removeAssets: actionElement.querySelector("#removeAssets").checked,
- rootId: "${id}",
- rootTitle: response.data.name,
- parentWindowId: ${currentWindowId},
- })
+ const pageSizeValue = actionElement.querySelector("#pageSize").value;
+ const isPaged = actionElement.querySelector("#paged").checked;
+
+ const buildExportConfig = (pageSize) => {
+ // https://www.electronjs.org/docs/latest/api/web-contents#contentsprinttopdfoptions
+ // https://chromedevtools.github.io/devtools-protocol/tot/Page/#method-printToPDF
+ return {
+ title: "${window.siyuan.languages.export} PDF",
+ pdfOptions: {
+ printBackground: true,
+ landscape: actionElement.querySelector("#landscape").checked,
+ marginType: actionElement.querySelector("#marginsType").value,
+ margins: {
+ top: parseFloat(document.querySelector("#marginsTop").value) || 0,
+ bottom: parseFloat(document.querySelector("#marginsBottom").value) || 0,
+ left: parseFloat(document.querySelector("#marginsLeft").value) || 0,
+ right: parseFloat(document.querySelector("#marginsRight").value) || 0,
+ },
+ scale: parseFloat(actionElement.querySelector("#scale").value),
+ pageSize: pageSize,
+ },
+ keepFold: keepFoldElement.checked,
+ mergeSubdocs: mergeSubdocsElement.checked,
+ watermark: watermarkElement.checked,
+ removeAssets: actionElement.querySelector("#removeAssets").checked,
+ paged: isPaged,
+ pageSizeValue: pageSizeValue,
+ rootId: "${id}",
+ rootTitle: response.data.name,
+ parentWindowId: ${currentWindowId},
+ };
+ };
+
+ if (!isPaged) {
+ const getPageSizeDimensions = (pageSizeName) => {
+ // https://github.com/electron/electron/blob/3df3a6a736b93e0d69fa3b0c403b33f201287780/lib/browser/api/web-contents.ts#L89-L101
+ const pageSizes = {
+ "A3": { width: 11.7, height: 16.54 },
+ "A4": { width: 8.27, height: 11.7 },
+ "A5": { width: 5.83, height: 8.27 },
+ "Legal": { width: 8.5, height: 14 },
+ "Letter": { width: 8.5, height: 11 },
+ "Tabloid": { width: 11, height: 17 },
+ };
+ return pageSizes[pageSizeName] || pageSizes["A4"];
+ };
+
+ const previewContent = previewElement.querySelector(".protyle-wysiwyg") || previewElement;
+ const contentHeight = previewContent.scrollHeight || previewContent.offsetHeight;
+ // 英寸 = 像素 / PPI，但不知道 PPI 怎么得到，直接使用经典 96 DPI，实际导出之后页面末尾会有空白
+ const heightInches = contentHeight / 96;
+ // 获取页面大小对应的宽度
+ const selectedPageSize = getPageSizeDimensions(pageSizeValue);
+ // 高度根据内容动态计算
+ const marginTop = parseFloat(document.querySelector("#marginsTop").value) || 0;
+ const marginBottom = parseFloat(document.querySelector("#marginsBottom").value) || 0;
+ const totalHeightInches = heightInches + marginTop + marginBottom;
+ const dynamicPageSize = {
+ width: selectedPageSize.width,
+ height: totalHeightInches
+ };
+ ipcRenderer.send("${Constants.SIYUAN_EXPORT_PDF}", buildExportConfig(dynamicPageSize));
+ } else {
+ ipcRenderer.send("${Constants.SIYUAN_EXPORT_PDF}", buildExportConfig(pageSizeValue));
+ }
previewElement.classList.add("exporting");
previewElement.style.zoom = "";
previewElement.style.paddingTop = "6px";
diff --git a/app/src/protyle/util/compatibility.ts b/app/src/protyle/util/compatibility.ts
index 97d150b41..16d25c6e9 100644
--- a/app/src/protyle/util/compatibility.ts
+++ b/app/src/protyle/util/compatibility.ts
@@ -440,7 +440,8 @@ export const getLocalStorage = (cb: () => void) => {
removeAssets: true,
keepFold: false,
mergeSubdocs: false,
- watermark: false
+ watermark: false,
+ paged: true
};
defaultStorage[Constants.LOCAL_EXPORTIMG] = {
keepFold: false,