From 5b39560d7d2a2338c8e895089c52284fb0f1e7eb Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Sat, 24 Sep 2022 22:18:48 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E5=AF=BC=E5=87=BA=20PDF=20=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E4=BF=9D=E7=95=99=E6=8A=98=E5=8F=A0=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=20https://github.com/siyuan-note/siyuan/issues/5941?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/api/export.go     | 6 +++++-
 kernel/model/file.go     | 5 -----
 kernel/model/history.go  | 5 -----
 kernel/model/template.go | 2 --
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/kernel/api/export.go b/kernel/api/export.go
index b2b4ddc07..319dd540e 100644
--- a/kernel/api/export.go
+++ b/kernel/api/export.go
@@ -194,7 +194,11 @@ func exportPreviewHTML(c *gin.Context) {
 
 	id := arg["id"].(string)
 	tpl := arg["tpl"].(string)
-	name, content := model.ExportHTML(id, "", true, false)
+	keepFold := false
+	if arg["keepFold"] != nil {
+		keepFold = arg["keepFold"].(bool)
+	}
+	name, content := model.ExportHTML(id, "", true, keepFold)
 	// 导出 PDF 预览时点击块引转换后的脚注跳转不正确 https://github.com/siyuan-note/siyuan/issues/5894
 	content = strings.ReplaceAll(content, "http://127.0.0.1:"+util.ServerPort+"/#", "#")
 	tpl = strings.ReplaceAll(tpl, "{tpl.name}", name)
diff --git a/kernel/model/file.go b/kernel/model/file.go
index a06de1821..c7d7e53b9 100644
--- a/kernel/model/file.go
+++ b/kernel/model/file.go
@@ -637,11 +637,6 @@ func GetDoc(startID, endID, id string, index int, keyword string, mode int, size
 				}
 			}
 
-			if treenode.IsBlockRef(n) {
-				appendRefTextRenderResultForBlockRef(n)
-				return ast.WalkSkipChildren
-			}
-
 			// 支持代码块搜索定位 https://github.com/siyuan-note/siyuan/issues/5520
 			if ast.NodeCodeBlockCode == n.Type && 0 < len(keywords) && !treenode.IsChartCodeBlockCode(n) {
 				text := string(n.Tokens)
diff --git a/kernel/model/history.go b/kernel/model/history.go
index b3f334e8f..019c634cf 100644
--- a/kernel/model/history.go
+++ b/kernel/model/history.go
@@ -179,11 +179,6 @@ func GetDocHistoryContent(historyPath, keyword string) (id, rootID, content stri
 			n.RemoveIALAttr("heading-fold")
 			n.RemoveIALAttr("fold")
 
-			if treenode.IsBlockRef(n) {
-				appendRefTextRenderResultForBlockRef(n)
-				return ast.WalkSkipChildren
-			}
-
 			if ast.NodeText == n.Type {
 				if 0 < len(keywords) {
 					// 搜索高亮
diff --git a/kernel/model/template.go b/kernel/model/template.go
index c30e094bd..28d9488f5 100644
--- a/kernel/model/template.go
+++ b/kernel/model/template.go
@@ -213,8 +213,6 @@ func renderTemplate(p, id string) (string, error) {
 			(ast.NodeBlockquote == n.Type && nil != n.FirstChild && nil != n.FirstChild.Next && ast.NodeKramdownBlockIAL == n.FirstChild.Next.Type) {
 			nodesNeedAppendChild = append(nodesNeedAppendChild, n)
 		}
-
-		appendRefTextRenderResultForBlockRef(n)
 		return ast.WalkContinue
 	})
 	for _, n := range nodesNeedAppendChild {