diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 2ee133cd2..c027394f4 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -944,6 +944,7 @@ "export27": "Export PDF watermark", "export28": "Watermark text or watermark file path", "export29": "Watermark position, size and style, etc.", + "export9": "Export image watermark", "theme11": "Use theme in light mode", "theme12": "Use theme in dark mode", "theme2": "Select the icons used in the user interface", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index e84f16213..273570241 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -944,6 +944,7 @@ "export27": "Exportar marca de agua PDF", "export28": "Texto de marca de agua o ruta del archivo de marca de agua", "export29": "Posición, tamaño y estilo de la marca de agua, etc.", + "export9": "Exportar marca de agua de imagen", "theme11": "Usar tema en modo claro", "theme12": "Usar tema en modo oscuro", "theme2": "Selecciona los iconos utilizados en la interfaz de usuario", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 0e8d3d641..4c7d24556 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -944,6 +944,7 @@ "export27": "Exporter le filigrane PDF", "export28": "Texte du filigrane ou chemin du fichier de filigrane", "export29": "Position, taille et style du filigrane, etc.", + "export9": "Exporter le filigrane de l'image", "theme11": "Utiliser le thème en mode Clair", "theme12": "Utiliser le thème en mode sombre", "theme2": "Sélectionnez les icônes utilisées dans l'interface utilisateur", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 2d4f41590..f56918bf0 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -944,6 +944,7 @@ "export27": "導出 PDF 浮水印", "export28": "浮水印文字或浮水印檔案路徑", "export29": "浮水印位置、大小和樣式等", + "export9": "匯出圖片浮水印", "theme11": "淺色模式下使用主題", "theme12": "深色模式下使用主題", "theme2": "選擇外觀使用的圖示", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 1887c80bd..8d11b2801 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -944,6 +944,7 @@ "export27": "导出 PDF 水印", "export28": "水印文本或水印文件路径", "export29": "水印位置、大小和样式等", + "export9": "导出图片水印", "theme11": "明亮模式下使用主题", "theme12": "暗黑模式下使用主题", "theme2": "选择外观使用的图标", diff --git a/app/src/config/exportConfig.ts b/app/src/config/exportConfig.ts index 05c0c78db..39d21b5f2 100644 --- a/app/src/config/exportConfig.ts +++ b/app/src/config/exportConfig.ts @@ -87,6 +87,16 @@ export const exportConfig = {
+
+ ${window.siyuan.languages.export9} +
${window.siyuan.languages.export28}
+
+ +
+
${window.siyuan.languages.export29}
+
+ +
${window.siyuan.languages.export25} @@ -151,6 +161,8 @@ export const exportConfig = { (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; + (exportConfig.element.querySelector("#imageWatermarkStr") as HTMLInputElement).value = window.siyuan.config.export.imageWatermarkStr; + (exportConfig.element.querySelector("#imageWatermarkDesc") as HTMLInputElement).value = window.siyuan.config.export.imageWatermarkDesc; (exportConfig.element.querySelector("#blockRefTextLeft") as HTMLInputElement).value = window.siyuan.config.export.blockRefTextLeft; (exportConfig.element.querySelector("#blockRefTextRight") as HTMLInputElement).value = window.siyuan.config.export.blockRefTextRight; (exportConfig.element.querySelector("#tagOpenMarker") as HTMLInputElement).value = window.siyuan.config.export.tagOpenMarker; @@ -167,6 +179,8 @@ export const exportConfig = { pdfFooter: (exportConfig.element.querySelector("#pdfFooter") as HTMLInputElement).value, pdfWatermarkStr: (exportConfig.element.querySelector("#pdfWatermarkStr") as HTMLInputElement).value, 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, blockRefTextLeft: (exportConfig.element.querySelector("#blockRefTextLeft") as HTMLInputElement).value, blockRefTextRight: (exportConfig.element.querySelector("#blockRefTextRight") as HTMLInputElement).value, diff --git a/app/src/config/search.ts b/app/src/config/search.ts index 56a52f222..0608cd7c2 100644 --- a/app/src/config/search.ts +++ b/app/src/config/search.ts @@ -45,7 +45,7 @@ export const initConfigSearch = (element: HTMLElement, app: App) => { getLang(["assets", "unreferencedAssets", "missingAssets"]), // 导出 - getLang(["paragraphBeginningSpace", "md4", "export", "export1", "export2", "export5", "export11", + getLang(["paragraphBeginningSpace", "md4", "export", "export1", "export2", "export5", "export9", "export11", "export13", "export14", "export15", "export19", "export20", "ref", "blockEmbed", "export17", "export18", "export23", "export24", "export25", "export26", "export27", "export28", "export29"]), diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index 27f26d44b..e268f2e7f 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -596,6 +596,8 @@ interface IExport { pdfFooter: string; pdfWatermarkStr: string; pdfWatermarkDesc: string; + imageWatermarkStr: string; + imageWatermarkDesc: string; docxTemplate: string; }