diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index c793a4980..5b9e78212 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -957,7 +957,7 @@ "export27": "Export PDF watermark", "export28": "Watermark text or watermark file path", "export29": "Watermark position, size and style, etc.", - "export9": "Export image watermark", + "export30": "Export image watermark", "theme11": "Use theme in light mode", "theme12": "Use theme in dark mode", "theme2": "Select the icons used in the user interface", @@ -975,6 +975,7 @@ "export6": "About the handling of anchor text in PDF annotations when exporting", "export7": "File Name - Page Number - Anchor Text", "export8": "Just anchor text", + "export9": "Anchor hash (only for exporting Notebook)", "graphConfig2": "Reference Count filter", "selectOpen": "Always Select Opened Doc", "selectOpen1": "Select Opened Doc", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index f1b9c6a63..6916a8166 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -957,7 +957,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", + "export30": "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", @@ -975,6 +975,7 @@ "export6": "Sobre el manejo del texto ancla en las anotaciones PDF al exportar", "export7": "Nombre de archivo - Número de página - Texto ancla", "export8": "Sólo texto ancla", + "export9": "Hash de anclaje (sólo para exportar Notebook)", "graphConfig2": "Filtro de recuento de referencias", "selectOpen": "Seleccionar siempre el documento abierto", "selectOpen1": "Seleccionar documento abierto", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 58afe8d05..f3484456e 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -957,7 +957,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", + "export30": "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", @@ -975,6 +975,7 @@ "export6": "À propos de la gestion du texte d'ancrage dans les annotations PDF lors de l'exportation", "export7": "Nom de fichier - Numéro de page - Texte d'ancrage", "export8": "Anchor text only", + "export9": "Hash d'ancrage (uniquement pour l'exportation de Notebook)", "graphConfig2": "Filtre de compte de blocs de référence", "selectOpen": "Localisez toujours les documents ouverts", "selectOpen1": "Localiser les documents ouverts", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index e21649ce9..ac9e40e32 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -957,7 +957,7 @@ "export27": "導出 PDF 浮水印", "export28": "浮水印文字或浮水印檔案路徑", "export29": "浮水印位置、大小和樣式等", - "export9": "匯出圖片浮水印", + "export30": "匯出圖片浮水印", "theme11": "淺色模式下使用主題", "theme12": "深色模式下使用主題", "theme2": "選擇外觀使用的圖示", @@ -975,6 +975,7 @@ "export6": "導出時關於 PDF 標註引出處錨文字的處理方式", "export7": "文件名 - 頁碼 - 錨文字", "export8": "僅錨文字", + "export9": "錨點哈希（僅支援導出筆記本）", "graphConfig2": "引用塊次數過濾", "selectOpen": "定位打開的文檔", "selectOpen1": "定位打開的文檔", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 7881a0c34..a88395198 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -957,7 +957,7 @@ "export27": "导出 PDF 水印", "export28": "水印文本或水印文件路径", "export29": "水印位置、大小和样式等", - "export9": "导出图片水印", + "export30": "导出图片水印", "theme11": "明亮模式下使用主题", "theme12": "暗黑模式下使用主题", "theme2": "选择外观使用的图标", @@ -975,6 +975,7 @@ "export6": "导出时关于 PDF 标注引出处锚文本的处理方式", "export7": "文件名 - 页码 - 锚文本", "export8": "仅锚文本", + "export9": "锚点哈希（仅支持导出笔记本）", "graphConfig2": "引用块次数过滤", "selectOpen": "始终定位打开的文档", "selectOpen1": "定位打开的文档", diff --git a/app/src/config/exportConfig.ts b/app/src/config/exportConfig.ts index bad8637a3..392a355f0 100644 --- a/app/src/config/exportConfig.ts +++ b/app/src/config/exportConfig.ts @@ -46,6 +46,7 @@ export const exportConfig = { +
@@ -88,7 +89,7 @@ export const exportConfig = {
- ${window.siyuan.languages.export9} + ${window.siyuan.languages.export30}
${window.siyuan.languages.export28}
diff --git a/app/src/protyle/export/util.ts b/app/src/protyle/export/util.ts index 1f0de91d0..3697c4544 100644 --- a/app/src/protyle/export/util.ts +++ b/app/src/protyle/export/util.ts @@ -42,7 +42,7 @@ export const exportImage = (id: string) => { diff --git a/kernel/model/export.go b/kernel/model/export.go index 0bf005791..a26753307 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -1338,7 +1338,7 @@ func ExportPandocConvertZip(id, pandocTo, ext string) (name, zipPath string) { docPaths = append(docPaths, docFile.path) } - zipPath = exportPandocConvertZip(false, boxID, baseFolderName, docPaths, Conf.Export.BlockRefMode, "gfm+footnotes+hard_line_breaks", pandocTo, ext) + zipPath = exportPandocConvertZip(false, boxID, baseFolderName, docPaths, "gfm+footnotes+hard_line_breaks", pandocTo, ext) name = strings.TrimSuffix(filepath.Base(block.Path), ".sy") return } @@ -1366,7 +1366,7 @@ func BatchExportMarkdown(boxID, folderPath string) (zipPath string) { for _, docFile := range docFiles { docPaths = append(docPaths, docFile.path) } - zipPath = exportPandocConvertZip(true, boxID, baseFolderName, docPaths, Conf.Export.BlockRefMode, "", "", ".md") + zipPath = exportPandocConvertZip(true, boxID, baseFolderName, docPaths, "", "", ".md") return } @@ -2583,7 +2583,7 @@ func processFileAnnotationRef(refID string, n *ast.Node, fileAnnotationRefMode i return ast.WalkSkipChildren } -func exportPandocConvertZip(exportNotebook bool, boxID, baseFolderName string, docPaths []string, exportRefMode int, +func exportPandocConvertZip(exportNotebook bool, boxID, baseFolderName string, docPaths []string, pandocFrom, pandocTo, ext string) (zipPath string) { dir, name := path.Split(baseFolderName) name = util.FilterFileName(name) @@ -2602,6 +2602,12 @@ func exportPandocConvertZip(exportNotebook bool, boxID, baseFolderName string, d return } + exportRefMode := Conf.Export.BlockRefMode + if !exportNotebook && 5 == exportRefMode { + // 非笔记本导出不支持锚点哈希，将其切换为锚文本块链 + exportRefMode = 2 + } + var defBlockIDs []string if exportNotebook && 5 == exportRefMode { // Add a Ref export mode `Anchor hash` for notebook Markdown exporting https://github.com/siyuan-note/siyuan/issues/10265