Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 07:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 支持合并子文档导出 Word/PDF https://github.com/siyuan-note/siyuan/issues/3219

Browse source
This commit is contained in:
Liang Ding 2022-12-10 18:23:12 +08:00
parent b6d961f347
commit dede06d20b
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 39 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
kernel/api/export.go
View file

@ -160,7 +160,11 @@ func exportDocx(c *gin.Context) {
id := arg["id"].(string)
savePath := arg["savePath"].(string)
removeAssets := arg["removeAssets"].(bool)
err := model.ExportDocx(id, savePath, removeAssets)
merge := false
if nil != arg["merge"] {
merge = arg["merge"].(bool)
}
err := model.ExportDocx(id, savePath, removeAssets, merge)
if nil != err {
ret.Code = 1
ret.Msg = err.Error()
@ -180,7 +184,7 @@ func exportMdHTML(c *gin.Context) {
id := arg["id"].(string)
savePath := arg["savePath"].(string)
name, content := model.ExportMarkdownHTML(id, savePath, false)
name, content := model.ExportMarkdownHTML(id, savePath, false, false)
ret.Data = map[string]interface{}{
"id": id,
"name": name,
@ -229,10 +233,14 @@ func exportPreviewHTML(c *gin.Context) {
id := arg["id"].(string)
keepFold := false
if arg["keepFold"] != nil {
if nil != arg["keepFold"] {
keepFold = arg["keepFold"].(bool)
}
name, content := model.ExportHTML(id, "", true, keepFold)
merge := false
if nil != arg["merge"] {
merge = arg["merge"].(bool)
}
name, content := model.ExportHTML(id, "", true, keepFold, merge)
// 导出 PDF 预览时点击块引转换后的脚注跳转不正确 https://github.com/siyuan-note/siyuan/issues/5894
content = strings.ReplaceAll(content, "http://"+util.LocalHost+":"+util.ServerPort+"/#", "#")
@ -256,10 +264,14 @@ func exportHTML(c *gin.Context) {
pdf := arg["pdf"].(bool)
savePath := arg["savePath"].(string)
keepFold := false
if arg["keepFold"] != nil {
if nil != arg["keepFold"] {
keepFold = arg["keepFold"].(bool)
}
name, content := model.ExportHTML(id, savePath, pdf, keepFold)
merge := false
if nil != arg["merge"] {
merge = arg["merge"].(bool)
}
name, content := model.ExportHTML(id, savePath, pdf, keepFold, merge)
ret.Data = map[string]interface{}{
"id": id,
"name": name,