diff --git a/kernel/api/export.go b/kernel/api/export.go index 3f9d920fe..2d464280c 100644 --- a/kernel/api/export.go +++ b/kernel/api/export.go @@ -487,7 +487,16 @@ func exportMdContent(c *gin.Context) { imgTag = arg["imgTag"].(bool) } - hPath, content := model.ExportMarkdownContent(id, refMode, embedMode, yfm, fillCSSVar, adjustHeadingLevel, imgTag) + addTitleMode := 0 // 0:未指定(遵循全局设置 Conf.Export.AddTitle),1:添加标题,2:不添加标题 + if nil != arg["addTitle"] { + if arg["addTitle"].(bool) { + addTitleMode = 1 + } else { + addTitleMode = 2 + } + } + + hPath, content := model.ExportMarkdownContent(id, refMode, embedMode, addTitleMode, yfm, fillCSSVar, adjustHeadingLevel, imgTag) ret.Data = map[string]interface{}{ "hPath": hPath, "content": content, diff --git a/kernel/model/export.go b/kernel/model/export.go index 4f7b8b8ec..e4f52b85b 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -2221,19 +2221,26 @@ func walkRelationAvs(avID string, exportAvIDs *hashset.Set) { } } -func ExportMarkdownContent(id string, refMode, embedMode int, addYfm, fillCSSVar, adjustHeadingLv, imgTag bool) (hPath, exportedMd string) { +func ExportMarkdownContent(id string, refMode, embedMode, addTitleMode int, addYfm, fillCSSVar, adjustHeadingLv, imgTag bool) (hPath, exportedMd string) { bt := treenode.GetBlockTree(id) if nil == bt { return } + addTitle := Conf.Export.AddTitle + if 1 == addTitleMode { // 0:未指定(遵循全局设置 Conf.Export.AddTitle),1:添加标题,2:不添加标题 + addTitle = true + } else if 2 == addTitleMode { + addTitle = false + } + tree := prepareExportTree(bt) hPath = tree.HPath exportedMd = exportMarkdownContent0(id, tree, "", false, adjustHeadingLv, imgTag, ".md", refMode, embedMode, Conf.Export.FileAnnotationRefMode, Conf.Export.TagOpenMarker, Conf.Export.TagCloseMarker, Conf.Export.BlockRefTextLeft, Conf.Export.BlockRefTextRight, - Conf.Export.AddTitle, Conf.Export.InlineMemo, nil, true, fillCSSVar, map[string]*parse.Tree{}) + addTitle, Conf.Export.InlineMemo, nil, true, fillCSSVar, map[string]*parse.Tree{}) docIAL := parse.IAL2Map(tree.Root.KramdownIAL) if addYfm { exportedMd = yfm(docIAL) + exportedMd