Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 15:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

📝 https://github.com/siyuan-note/siyuan/issues/9961

Browse source
This commit is contained in:
Vanessa 2023-12-27 10:04:16 +08:00
parent a16d6f7982
commit 53035e3d80
5 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/boot/onGetConfig.ts
View file

@ -341,6 +341,7 @@ export const initWindow = async (app: App) => {
removeAssets: ipcData.removeAssets, removeAssets: ipcData.removeAssets,
keepFold: ipcData.keepFold, keepFold: ipcData.keepFold,
mergeSubdocs: ipcData.mergeSubdocs, mergeSubdocs: ipcData.mergeSubdocs,
watermark: ipcData.watermark,
landscape: ipcData.pdfOptions.landscape, landscape: ipcData.pdfOptions.landscape,
marginType: ipcData.pdfOptions.marginType, marginType: ipcData.pdfOptions.marginType,
pageSize: ipcData.pdfOptions.pageSize, pageSize: ipcData.pdfOptions.pageSize,
@ -380,6 +381,7 @@ ${response.data.replace("%pages", "<span class=totalPages></span>").replace("%pa
merge: ipcData.mergeSubdocs, merge: ipcData.mergeSubdocs,
path: pdfFilePath, path: pdfFilePath,
removeAssets: ipcData.removeAssets, removeAssets: ipcData.removeAssets,
watermark: ipcData.watermark
}, () => { }, () => {
afterExport(pdfFilePath, msgId); afterExport(pdfFilePath, msgId);
if (ipcData.removeAssets) { if (ipcData.removeAssets) {

13
app/src/config/exportConfig.ts
View file

@ -77,16 +77,15 @@ export const exportConfig = {
</div> </div>
<input class="b3-text-field fn__flex-center fn__size200" id="pdfFooter"> <input class="b3-text-field fn__flex-center fn__size200" id="pdfFooter">
</div> </div>
<div class="fn__flex b3-label config__item"> <div class="b3-label config__item">
<div class="fn__flex-1">
${window.siyuan.languages.export27} ${window.siyuan.languages.export27}
<div class="b3-label__text">${window.siyuan.languages.export28}</div> <div class="b3-label__text">${window.siyuan.languages.export28}</div>
</div> <div class="fn__hr"></div>
<input class="b3-text-field fn__flex-center fn__size200" id="pdfWatermarkStr"> <input class="b3-text-field fn__block" id="pdfWatermarkStr">
<div class="fn__flex-1"> <div class="fn__hr"></div>
<div class="b3-label__text">${window.siyuan.languages.export29}</div> <div class="b3-label__text">${window.siyuan.languages.export29}</div>
</div> <div class="fn__hr"></div>
<input class="b3-text-field fn__flex-center fn__size200" id="pdfWatermarkDesc"> <textarea class="b3-text-field fn__block" id="pdfWatermarkDesc"></textarea>
</div> </div>
<div class="fn__flex b3-label config__item"> <div class="fn__flex b3-label config__item">
<div class="fn__flex-1"> <div class="fn__flex-1">

2
app/src/config/search.ts
View file

@ -47,7 +47,7 @@ export const initConfigSearch = (element: HTMLElement, app: App) => {
// 导出 // 导出
getLang(["paragraphBeginningSpace", "md4", "export", "export1", "export2", "export5", "export11", getLang(["paragraphBeginningSpace", "md4", "export", "export1", "export2", "export5", "export11",
"export13", "export14", "export15", "export19", "export20", "ref", "blockEmbed", "export17", "export18", "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", getLang(["language", "language1", "appearance", "appearance1", "appearance2", "appearance3", "appearance4",

20
app/src/protyle/export/index.ts
View file

@ -163,7 +163,7 @@ const renderPDF = (id: string) => {
</head> </head>
<body> <body>
<div id="action"> <div id="action">
<label class="b3-label"> <div class="b3-label">
<div> <div>
${window.siyuan.languages.exportPDF0} ${window.siyuan.languages.exportPDF0}
</div> </div>
@ -176,8 +176,8 @@ const renderPDF = (id: string) => {
<option ${localData.pageSize === "Letter" ? "selected" : ""} value="Letter">Letter</option> <option ${localData.pageSize === "Letter" ? "selected" : ""} value="Letter">Letter</option>
<option ${localData.pageSize === "Tabloid" ? "selected" : ""} value="Tabloid">Tabloid</option> <option ${localData.pageSize === "Tabloid" ? "selected" : ""} value="Tabloid">Tabloid</option>
</select> </select>
</label> </div>
<label class="b3-label"> <div class="b3-label">
<div> <div>
${window.siyuan.languages.exportPDF2} ${window.siyuan.languages.exportPDF2}
</div> </div>
@ -202,15 +202,15 @@ const renderPDF = (id: string) => {
<div>${window.siyuan.languages.marginLeft}</div> <div>${window.siyuan.languages.marginLeft}</div>
<input id="marginsLeft" class="b3-text-field fn__block" value="${localData.marginLeft || 0}" type="number" min="0" step="0.01"> <input id="marginsLeft" class="b3-text-field fn__block" value="${localData.marginLeft || 0}" type="number" min="0" step="0.01">
</div> </div>
</label> </div>
<label class="b3-label"> <div class="b3-label">
<div> <div>
${window.siyuan.languages.exportPDF3} ${window.siyuan.languages.exportPDF3}
<span id="scaleTip" style="float: right;color: var(--b3-theme-on-background);">${localData.scale || 1}</span> <span id="scaleTip" style="float: right;color: var(--b3-theme-on-background);">${localData.scale || 1}</span>
</div> </div>
<span class="fn__hr"></span> <span class="fn__hr"></span>
<input style="width: 192px" value="${localData.scale || 1}" id="scale" step="0.1" class="b3-slider" type="range" min="0.1" max="2"> <input style="width: 192px" value="${localData.scale || 1}" id="scale" step="0.1" class="b3-slider" type="range" min="0.1" max="2">
</label> </div>
<label class="b3-label"> <label class="b3-label">
<div> <div>
${window.siyuan.languages.exportPDF1} ${window.siyuan.languages.exportPDF1}
@ -239,6 +239,13 @@ const renderPDF = (id: string) => {
<span class="fn__hr"></span> <span class="fn__hr"></span>
<input id="mergeSubdocs" class="b3-switch" type="checkbox" ${localData.mergeSubdocs ? "checked" : ""}> <input id="mergeSubdocs" class="b3-switch" type="checkbox" ${localData.mergeSubdocs ? "checked" : ""}>
</label> </label>
<label class="b3-label">
<div>
${window.siyuan.languages.export27}
</div>
<span class="fn__hr"></span>
<input id="watermark" class="b3-switch" type="checkbox" ${localData.watermark ? "checked" : ""}>
</label>
<div class="fn__flex"> <div class="fn__flex">
<div class="fn__flex-1"></div> <div class="fn__flex-1"></div>
<button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button> <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button>
@ -513,6 +520,7 @@ id="preview">
}, },
keepFold: keepFoldElement.checked, keepFold: keepFoldElement.checked,
mergeSubdocs: mergeSubdocsElement.checked, mergeSubdocs: mergeSubdocsElement.checked,
watermark: actionElement.querySelector('#watermark').checked,
removeAssets: actionElement.querySelector("#removeAssets").checked, removeAssets: actionElement.querySelector("#removeAssets").checked,
rootId: "${id}", rootId: "${id}",
rootTitle: response.data.name, rootTitle: response.data.name,

1
app/src/protyle/util/compatibility.ts
View file

@ -207,6 +207,7 @@ export const getLocalStorage = (cb: () => void) => {
removeAssets: true, removeAssets: true,
keepFold: false, keepFold: false,
mergeSubdocs: false, mergeSubdocs: false,
watermark: false
}; };
defaultStorage[Constants.LOCAL_EXPORTIMG] = { defaultStorage[Constants.LOCAL_EXPORTIMG] = {
keepFold: false, keepFold: false,