|
@@ -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) {
|