From 608bce58a6bd4aa6b04e81a44f3b985e0d95cb04 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Mon, 26 Dec 2022 11:42:41 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E6=96=87=E6=A1=A3=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E4=B8=BA=E5=9B=BE=E7=89=87=E6=97=B6=E5=9B=BE=E7=89=87=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E4=B8=8D=E6=AD=A3=E7=A1=AE=20Fix=20https://github.com?=
 =?UTF-8?q?/siyuan-note/siyuan/issues/6925?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/protyle/export/util.ts | 1 +
 kernel/api/export.go           | 8 ++++++--
 kernel/model/export.go         | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/protyle/export/util.ts b/app/src/protyle/export/util.ts
index 69e264a83..39df0386c 100644
--- a/app/src/protyle/export/util.ts
+++ b/app/src/protyle/export/util.ts
@@ -45,6 +45,7 @@ export const exportImage = (id: string) => {
     fetchPost("/api/export/exportPreviewHTML", {
         id,
         keepFold: false,
+        image: true,
     }, (response) => {
         const previewElement = exportDialog.element.querySelector("#preview");
         previewElement.innerHTML = response.data.content;
diff --git a/kernel/api/export.go b/kernel/api/export.go
index 58cc11b50..f79044500 100644
--- a/kernel/api/export.go
+++ b/kernel/api/export.go
@@ -240,7 +240,11 @@ func exportPreviewHTML(c *gin.Context) {
 	if nil != arg["merge"] {
 		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
 	content = strings.ReplaceAll(content, "http://"+util.LocalHost+":"+util.ServerPort+"/#", "#")
 
@@ -271,7 +275,7 @@ func exportHTML(c *gin.Context) {
 	if nil != arg["merge"] {
 		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{}{
 		"id":      id,
 		"name":    name,
diff --git a/kernel/model/export.go b/kernel/model/export.go
index a359fa7b1..72cbe3c08 100644
--- a/kernel/model/export.go
+++ b/kernel/model/export.go
@@ -339,7 +339,7 @@ func ExportMarkdownHTML(id, savePath string, docx, merge bool) (name, dom string
 	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)
 	tree, _ := loadTreeByBlockID(id)
 
@@ -438,7 +438,7 @@ func ExportHTML(id, savePath string, pdf, keepFold, merge bool) (name, dom strin
 				return
 			}
 		}
-	} else { // 导出 PDF 需要将资源文件路径改为 HTTP 伺服
+	} else if pdf && !image { // 导出 PDF 需要将资源文件路径改为 HTTP 伺服
 		luteEngine.RenderOptions.LinkBase = "http://" + util.LocalHost + ":" + util.ServerPort + "/"
 	}