${window.siyuan.languages.ref}
@@ -218,6 +234,8 @@ export const exportConfig = {
removeAssetsID: (exportConfig.element.querySelector("#removeAssetsID") as HTMLInputElement).checked,
markdownYFM: (exportConfig.element.querySelector("#markdownYFM") as HTMLInputElement).checked,
inlineMemo: (exportConfig.element.querySelector("#inlineMemo") as HTMLInputElement).checked,
+ includeSubDocs: (exportConfig.element.querySelector("#includeSubDocs") as HTMLInputElement).checked,
+ includeRelatedDocs: (exportConfig.element.querySelector("#includeRelatedDocs") as HTMLInputElement).checked,
blockRefMode: parseInt((exportConfig.element.querySelector("#blockRefMode") as HTMLSelectElement).value, 10),
blockEmbedMode: parseInt((exportConfig.element.querySelector("#blockEmbedMode") as HTMLSelectElement).value, 10),
fileAnnotationRefMode: parseInt((exportConfig.element.querySelector("#fileAnnotationRefMode") as HTMLSelectElement).value, 10),
diff --git a/app/src/config/search.ts b/app/src/config/search.ts
index 5665bcf07..94b0bb7ea 100644
--- a/app/src/config/search.ts
+++ b/app/src/config/search.ts
@@ -56,7 +56,8 @@ export const initConfigSearch = (element: HTMLElement, app: App) => {
// 导出
getLang(["paragraphBeginningSpace", "md4", "export", "export1", "export2", "export5", "export11",
"export13", "export14", "export15", "export19", "export20", "ref", "blockEmbed", "export17", "export18",
- "export23", "export24", "export25", "export26", "export27", "export28", "export29", "removeAssetsID", "removeAssetsIDTip"]),
+ "export23", "export24", "export25", "export26", "export27", "export28", "export29", "removeAssetsID", "removeAssetsIDTip",
+ "includeSubDocs", "includeSubDocsTip", "includeRelatedDocs", "includeRelatedDocsTip"]),
// 外观
getLang(["language", "language1", "appearance", "appearance1", "appearance2", "appearance3", "appearance4",
diff --git a/app/src/types/config.d.ts b/app/src/types/config.d.ts
index a9c42e90f..efd08c075 100644
--- a/app/src/types/config.d.ts
+++ b/app/src/types/config.d.ts
@@ -578,6 +578,14 @@ declare namespace Config {
* Whether to export the inline memo
*/
inlineMemo: boolean;
+ /**
+ * Whether to include sub-documents when exporting
+ */
+ includeSubDocs: boolean;
+ /**
+ * Whether to include related documents when exporting
+ */
+ includeRelatedDocs: boolean;
/**
* Pandoc executable file path
*/
diff --git a/kernel/conf/export.go b/kernel/conf/export.go
index 962fd3d5b..aa2afae93 100644
--- a/kernel/conf/export.go
+++ b/kernel/conf/export.go
@@ -38,6 +38,8 @@ type Export struct {
RemoveAssetsID bool `json:"removeAssetsID"` // Markdown 导出时是否移除资源文件名 ID 部分 https://github.com/siyuan-note/siyuan/issues/16065
MarkdownYFM bool `json:"markdownYFM"` // Markdown 导出时是否添加 YAML Front Matter https://github.com/siyuan-note/siyuan/issues/7727
InlineMemo bool `json:"inlineMemo"` // 是否导出行级备注 https://github.com/siyuan-note/siyuan/issues/14605
+ IncludeSubDocs bool `json:"includeSubDocs"` // 是否导出子文档 https://github.com/siyuan-note/siyuan/issues/13635
+ IncludeRelatedDocs bool `json:"includeRelatedDocs"` // 是否导出关联文档 https://github.com/siyuan-note/siyuan/issues/13635
PDFFooter string `json:"pdfFooter"` // PDF 导出时页脚内容
PDFWatermarkStr string `json:"pdfWatermarkStr"` // PDF 导出时水印文本或水印文件路径
PDFWatermarkDesc string `json:"pdfWatermarkDesc"` // PDF 导出时水印位置、大小和样式等
diff --git a/kernel/model/export.go b/kernel/model/export.go
index 07a68e185..7f77f86d6 100644
--- a/kernel/model/export.go
+++ b/kernel/model/export.go
@@ -514,9 +514,12 @@ func ExportSYs(ids []string) (zipPath string) {
bts := treenode.GetBlockTrees(ids)
for _, bt := range bts {
docPaths = append(docPaths, bt.Path)
- docFiles := box.ListFiles(strings.TrimSuffix(bt.Path, ".sy"))
- for _, docFile := range docFiles {
- docPaths = append(docPaths, docFile.path)
+
+ if Conf.Export.IncludeSubDocs {
+ docFiles := box.ListFiles(strings.TrimSuffix(bt.Path, ".sy"))
+ for _, docFile := range docFiles {
+ docPaths = append(docPaths, docFile.path)
+ }
}
}
zipPath = exportSYZip(block.BoxID, path.Dir(block.Path), baseFolderName, docPaths)
@@ -1705,9 +1708,12 @@ func ExportPandocConvertZip(ids []string, pandocTo, ext string) (name, zipPath s
bts := treenode.GetBlockTrees(ids)
for _, bt := range bts {
docPaths = append(docPaths, bt.Path)
- docFiles := box.ListFiles(strings.TrimSuffix(bt.Path, ".sy"))
- for _, docFile := range docFiles {
- docPaths = append(docPaths, docFile.path)
+
+ if Conf.Export.IncludeSubDocs {
+ docFiles := box.ListFiles(strings.TrimSuffix(bt.Path, ".sy"))
+ for _, docFile := range docFiles {
+ docPaths = append(docPaths, docFile.path)
+ }
}
}
@@ -3617,6 +3623,9 @@ func exportRefTrees(tree *parse.Tree, defBlockIDs *[]string, retTrees, treeCache
}
*defBlockIDs = append(*defBlockIDs, defID)
+ if !Conf.Export.IncludeRelatedDocs {
+ return ast.WalkSkipChildren
+ }
exportRefTrees(defTree, defBlockIDs, retTrees, treeCache)
} else if treenode.IsBlockLink(n) {
defID := strings.TrimPrefix(n.TextMarkAHref, "siyuan://blocks/")
@@ -3641,6 +3650,9 @@ func exportRefTrees(tree *parse.Tree, defBlockIDs *[]string, retTrees, treeCache
}
*defBlockIDs = append(*defBlockIDs, defID)
+ if !Conf.Export.IncludeRelatedDocs {
+ return ast.WalkSkipChildren
+ }
exportRefTrees(defTree, defBlockIDs, retTrees, treeCache)
} else if ast.NodeAttributeView == n.Type {
// 导出数据库所在文档时一并导出绑定块所在文档
@@ -3684,6 +3696,9 @@ func exportRefTrees(tree *parse.Tree, defBlockIDs *[]string, retTrees, treeCache
}
*defBlockIDs = append(*defBlockIDs, val.BlockID)
+ if !Conf.Export.IncludeRelatedDocs {
+ return ast.WalkSkipChildren
+ }
exportRefTrees(defTree, defBlockIDs, retTrees, treeCache)
}
}