Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-19 05:28:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2026-01-16 23:03:49 +08:00
commit be79bdd1ee
19 changed files with 62 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -119,13 +119,6 @@ export const exportConfig = {
<div class="fn__hr"></div>
<textarea class="b3-text-field fn__block" id="imageWatermarkDesc"></textarea>
</div>
<div class="fn__flex b3-label config__item">
<div class="fn__flex-1">
${window.siyuan.languages.export25}
<div class="b3-label__text">${window.siyuan.languages.export26}</div>
</div>
<input class="b3-text-field fn__flex-center fn__size200" id="docxTemplate" placeholder="F:\\template.docx">
</div>
<div class="fn__flex b3-label config__item">
<div class="fn__flex-1">
${window.siyuan.languages.export13}
@ -156,6 +149,13 @@ export const exportConfig = {
<span class="fn__space"></span>
<button class="b3-button b3-button--outline fn__flex-center fn__size200" id="pandocBin"><svg><use xlink:href="#iconSettings"></use></svg>${window.siyuan.languages.config}</button>
</div>
<div class="fn__flex b3-label config__item">
<div class="fn__flex-1">
${window.siyuan.languages.export25}
<div class="b3-label__text">${window.siyuan.languages.export26}</div>
</div>
<input class="b3-text-field fn__flex-center fn__size200" id="pandocParams">
</div>
<div class="fn__flex b3-label config__item">
<div class="fn__flex-1 fn__flex-center">
${window.siyuan.languages.export} Data
@ -200,7 +200,7 @@ export const exportConfig = {
</div>`;
},
bindEvent: () => {
(exportConfig.element.querySelector("#docxTemplate") as HTMLInputElement).value = window.siyuan.config.export.docxTemplate;
(exportConfig.element.querySelector("#pandocParams") as HTMLInputElement).value = window.siyuan.config.export.pandocParams;
(exportConfig.element.querySelector("#pdfFooter") as HTMLInputElement).value = window.siyuan.config.export.pdfFooter;
(exportConfig.element.querySelector("#pdfWatermarkStr") as HTMLInputElement).value = window.siyuan.config.export.pdfWatermarkStr;
(exportConfig.element.querySelector("#pdfWatermarkDesc") as HTMLInputElement).value = window.siyuan.config.export.pdfWatermarkDesc;
@ -226,7 +226,7 @@ export const exportConfig = {
pdfWatermarkDesc: (exportConfig.element.querySelector("#pdfWatermarkDesc") as HTMLInputElement).value,
imageWatermarkStr: (exportConfig.element.querySelector("#imageWatermarkStr") as HTMLInputElement).value,
imageWatermarkDesc: (exportConfig.element.querySelector("#imageWatermarkDesc") as HTMLInputElement).value,
docxTemplate: (exportConfig.element.querySelector("#docxTemplate") as HTMLInputElement).value,
pandocParams: (exportConfig.element.querySelector("#pandocParams") as HTMLInputElement).value,
blockRefTextLeft: (exportConfig.element.querySelector("#blockRefTextLeft") as HTMLInputElement).value,
blockRefTextRight: (exportConfig.element.querySelector("#blockRefTextRight") as HTMLInputElement).value,
tagOpenMarker: (exportConfig.element.querySelector("#tagOpenMarker") as HTMLInputElement).value,

8
app/src/types/config.d.ts vendored
View file

@ -552,10 +552,6 @@ declare namespace Config {
* The symbol on the right side of the block reference anchor text during export
*/
blockRefTextRight: string;
/**
* The path of the template file used when exporting to Docx
*/
docxTemplate: string;
/**
* File annotation reference export mode
* - `0`: File name - page number - anchor text
@ -586,6 +582,10 @@ declare namespace Config {
* Pandoc executable file path
*/
pandocBin: string;
/**
* Pandoc parameters
*/
pandocParams: string;
/**
* Whether the beginning of the paragraph is empty two spaces.
* Insert two full-width spaces `U+3000` at the beginning of the paragraph.