@@ -594,35 +601,115 @@ ${getIconScript(servePath)}
});
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},
- })
- previewElement.classList.add("exporting");
- previewElement.style.zoom = "";
- previewElement.style.paddingTop = "6px";
- previewElement.style.paddingBottom = "0";
- fixBlockWidth();
- actionElement.remove();
+ const pageSizeValue = actionElement.querySelector("#pageSize").value;
+ const isLandscape = actionElement.querySelector("#landscape").checked;
+ const isPaged = actionElement.querySelector("#paged").checked;
+ let pageSize = pageSizeValue;
+
+ if (!isPaged) {
+ previewElement.classList.add("exporting");
+ previewElement.style.zoom = "";
+ previewElement.style.paddingTop = "6px";
+ previewElement.style.paddingBottom = "0";
+ fixBlockWidth();
+
+ const calculateAndExport = () => {
+ const getPageSizeDimensions = (pageSizeName, isLandscape) => {
+ const pageSizes = {
+ "A3": { width: 11.69, height: 16.54 },
+ "A4": { width: 8.27, height: 11.69 },
+ "A5": { width: 5.83, height: 8.27 },
+ "Legal": { width: 8.5, height: 14 },
+ "Letter": { width: 8.5, height: 11 },
+ "Tabloid": { width: 11, height: 17 },
+ };
+ const size = pageSizes[pageSizeName] || pageSizes["A4"];
+ return isLandscape ? { width: size.height, height: size.width } : size;
+ };
+
+ const previewContent = previewElement.querySelector(".protyle-wysiwyg") || previewElement;
+ const contentHeight = previewContent.scrollHeight || previewContent.offsetHeight;
+ // 将像素高度转换为英寸（1 英寸 = 96 像素），并添加一些边距
+ const heightInches = Math.max(contentHeight / 96 + 2, 11); // 最小高度 11 英寸
+ // 获取选择的页面大小的宽度
+ const selectedPageSize = getPageSizeDimensions(pageSizeValue, isLandscape);
+ const marginTop = parseFloat(document.querySelector("#marginsTop").value) || 0;
+ const marginBottom = parseFloat(document.querySelector("#marginsBottom").value) || 0;
+ const totalHeightInches = heightInches + marginTop + marginBottom;
+ // 使用选择的页面宽度，高度根据内容动态计算
+ const widthInches = isLandscape ? totalHeightInches : selectedPageSize.width;
+ const finalHeightInches = isLandscape ? selectedPageSize.width : totalHeightInches;
+
+ pageSize = {
+ width: widthInches,
+ height: finalHeightInches
+ };
+
+ ipcRenderer.send("${Constants.SIYUAN_EXPORT_PDF}", {
+ title: "${window.siyuan.languages.export} PDF",
+ pdfOptions:{
+ printBackground: true,
+ landscape: isLandscape,
+ marginType: actionElement.querySelector("#marginsType").value,
+ margins: {
+ top: marginTop,
+ bottom: marginBottom,
+ 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},
+ });
+ actionElement.remove();
+ };
+
+ // 使用 requestAnimationFrame 确保布局完成
+ requestAnimationFrame(() => {
+ requestAnimationFrame(calculateAndExport);
+ });
+ } else {
+ ipcRenderer.send("${Constants.SIYUAN_EXPORT_PDF}", {
+ title: "${window.siyuan.languages.export} PDF",
+ pdfOptions:{
+ printBackground: true,
+ landscape: isLandscape,
+ 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: 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},
+ })
+ previewElement.classList.add("exporting");
+ previewElement.style.zoom = "";
+ previewElement.style.paddingTop = "6px";
+ previewElement.style.paddingBottom = "0";
+ fixBlockWidth();
+ actionElement.remove();
+ }
});
setPadding();
renderPreview(response.data);
diff --git a/app/src/protyle/util/compatibility.ts b/app/src/protyle/util/compatibility.ts
index c790f992a9f..49eb341f24f 100644
--- a/app/src/protyle/util/compatibility.ts
+++ b/app/src/protyle/util/compatibility.ts
@@ -436,7 +436,8 @@ export const getLocalStorage = (cb: () => void) => {
removeAssets: true,
keepFold: false,
mergeSubdocs: false,
- watermark: false
+ watermark: false,
+ paged: true
};
defaultStorage[Constants.LOCAL_EXPORTIMG] = {
keepFold: false,