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

🐛 文档导出为图片时图片地址不正确 Fix https://github.com/siyuan-note/siyuan/issues/6925

Browse source
This commit is contained in:
Liang Ding 2022-12-26 11:42:41 +08:00
parent 4ed549cdb1
commit 608bce58a6
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/protyle/export/util.ts
View file

@ -45,6 +45,7 @@ export const exportImage = (id: string) => {
fetchPost("/api/export/exportPreviewHTML", { fetchPost("/api/export/exportPreviewHTML", {
id, id,
keepFold: false, keepFold: false,
image: true,
}, (response) => { }, (response) => {
const previewElement = exportDialog.element.querySelector("#preview"); const previewElement = exportDialog.element.querySelector("#preview");
previewElement.innerHTML = response.data.content; previewElement.innerHTML = response.data.content;

8
kernel/api/export.go
View file

@ -240,7 +240,11 @@ func exportPreviewHTML(c *gin.Context) {
if nil != arg["merge"] { if nil != arg["merge"] {
merge = arg["merge"].(bool) merge = arg["merge"].(bool)
} }
name, content := model.ExportHTML(id, "", true, keepFold, merge) image := false
if nil != arg["image"] {
image = arg["image"].(bool)
}
name, content := model.ExportHTML(id, "", true, image, keepFold, merge)
// 导出 PDF 预览时点击块引转换后的脚注跳转不正确 https://github.com/siyuan-note/siyuan/issues/5894 // 导出 PDF 预览时点击块引转换后的脚注跳转不正确 https://github.com/siyuan-note/siyuan/issues/5894
content = strings.ReplaceAll(content, "http://"+util.LocalHost+":"+util.ServerPort+"/#", "#") content = strings.ReplaceAll(content, "http://"+util.LocalHost+":"+util.ServerPort+"/#", "#")
@ -271,7 +275,7 @@ func exportHTML(c *gin.Context) {
if nil != arg["merge"] { if nil != arg["merge"] {
merge = arg["merge"].(bool) merge = arg["merge"].(bool)
} }
name, content := model.ExportHTML(id, savePath, pdf, keepFold, merge) name, content := model.ExportHTML(id, savePath, pdf, false, keepFold, merge)
ret.Data = map[string]interface{}{ ret.Data = map[string]interface{}{
"id": id, "id": id,
"name": name, "name": name,

4
kernel/model/export.go
View file

@ -339,7 +339,7 @@ func ExportMarkdownHTML(id, savePath string, docx, merge bool) (name, dom string
return return
} }
func ExportHTML(id, savePath string, pdf, keepFold, merge bool) (name, dom string) { func ExportHTML(id, savePath string, pdf, image, keepFold, merge bool) (name, dom string) {
savePath = strings.TrimSpace(savePath) savePath = strings.TrimSpace(savePath)
tree, _ := loadTreeByBlockID(id) tree, _ := loadTreeByBlockID(id)
@ -438,7 +438,7 @@ func ExportHTML(id, savePath string, pdf, keepFold, merge bool) (name, dom strin
return return
} }
} }
} else { // 导出 PDF 需要将资源文件路径改为 HTTP 伺服 } else if pdf && !image { // 导出 PDF 需要将资源文件路径改为 HTTP 伺服
luteEngine.RenderOptions.LinkBase = "http://" + util.LocalHost + ":" + util.ServerPort + "/" luteEngine.RenderOptions.LinkBase = "http://" + util.LocalHost + ":" + util.ServerPort + "/"
} }