Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-19 21:48:06 +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 2024-01-28 13:01:52 +08:00
commit 27edf57eb0
18 changed files with 895 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,6 +46,7 @@ export const exportConfig = {
<option value="2" ${window.siyuan.config.export.blockRefMode === 2 ? "selected" : ""}>${window.siyuan.languages.export2}</option>
<option value="3" ${window.siyuan.config.export.blockRefMode === 3 ? "selected" : ""}>${window.siyuan.languages.export3}</option>
<option value="4" ${window.siyuan.config.export.blockRefMode === 4 ? "selected" : ""}>${window.siyuan.languages.export4}</option>
<option value="5" ${window.siyuan.config.export.blockRefMode === 5 ? "selected" : ""}>${window.siyuan.languages.export9}</option>
</select>
</div>
<div class="fn__flex b3-label config__item">
@ -88,7 +89,7 @@ export const exportConfig = {
<textarea class="b3-text-field fn__block" id="pdfWatermarkDesc"></textarea>
</div>
<div class="b3-label config__item">
${window.siyuan.languages.export9}
${window.siyuan.languages.export30}
<div class="b3-label__text">${window.siyuan.languages.export28}</div>
<div class="fn__hr"></div>
<input class="b3-text-field fn__block" id="imageWatermarkStr">

2
app/src/protyle/export/util.ts
View file

@ -42,7 +42,7 @@ export const exportImage = (id: string) => {
<input id="keepFold" class="b3-switch fn__flex-center" type="checkbox" ${window.siyuan.storage[Constants.LOCAL_EXPORTIMG].keepFold ? "checked" : ""}>
</label>
<label class="fn__flex" style="margin-left: 24px">
${window.siyuan.languages.export9}
${window.siyuan.languages.export30}
<span class="fn__space"></span>
<input id="watermark" class="b3-switch fn__flex-center" type="checkbox" ${window.siyuan.storage[Constants.LOCAL_EXPORTIMG].watermark ? "checked" : ""}>
</label>