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

🎨 If a file with the same name exists during export PDF/Docx, it will be automatically renamed https://github.com/siyuan-note/siyuan/issues/11357

Browse source
This commit is contained in:
Daniel 2024-05-19 17:56:13 +08:00
parent c79238025c
commit 2456b3fd07
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/api/export.go
View file

@ -412,13 +412,17 @@ func exportDocx(c *gin.Context) {
if nil != arg["merge"] { if nil != arg["merge"] {
merge = arg["merge"].(bool) merge = arg["merge"].(bool)
} }
err := model.ExportDocx(id, savePath, removeAssets, merge)
fullPath, err := model.ExportDocx(id, savePath, removeAssets, merge)
if nil != err { if nil != err {
ret.Code = -1 ret.Code = -1
ret.Msg = err.Error() ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 7000} ret.Data = map[string]interface{}{"closeTimeout": 7000}
return return
} }
ret.Data = map[string]interface{}{
"path": fullPath,
}
} }
func exportMdHTML(c *gin.Context) { func exportMdHTML(c *gin.Context) {