From 7c7b649923f56f781f2af9ad0582c99748796f5f Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 24 Mar 2023 16:37:06 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E5=B5=8C=E5=85=A5=E5=9D=97=20SQL=20?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=B8=AD=E5=AD=98=E5=9C=A8=E6=8D=A2=E8=A1=8C?= =?UTF-8?q?=E6=97=B6=E6=97=A0=E6=B3=95=E5=AF=BC=E5=87=BA=20Fix=20https://g?= =?UTF-8?q?ithub.com/siyuan-note/siyuan/issues/7771?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/export.go | 2 ++ kernel/model/render.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/kernel/model/export.go b/kernel/model/export.go index 3a4c17b5a..4ef74b48d 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -1561,6 +1561,7 @@ func exportTree(tree *parse.Tree, wysiwyg, expandKaTexMacros, keepFold bool, var defMd string stmt := n.ChildByType(ast.NodeBlockQueryEmbedScript).TokensStr() stmt = html.UnescapeString(stmt) + stmt = strings.ReplaceAll(stmt, editor.IALValEscNewLine, "\n") embedBlocks := searchEmbedBlock(n.ID, stmt, nil, 0, false) if 1 > len(embedBlocks) { return ast.WalkContinue @@ -1875,6 +1876,7 @@ func resolveFootnotesDefs(refFootnotes *[]*refAsFootnotes, rootID string, blockR } else if ast.NodeBlockQueryEmbed == n.Type { stmt := n.ChildByType(ast.NodeBlockQueryEmbedScript).TokensStr() stmt = html.UnescapeString(stmt) + stmt = strings.ReplaceAll(stmt, editor.IALValEscNewLine, "\n") sqlBlocks := sql.SelectBlocksRawStmt(stmt, Conf.Search.Limit) for _, b := range sqlBlocks { subNodes := renderBlockMarkdownR0(b.ID, &rendered) diff --git a/kernel/model/render.go b/kernel/model/render.go index 10198ea25..1c9ccc3bd 100644 --- a/kernel/model/render.go +++ b/kernel/model/render.go @@ -18,6 +18,7 @@ package model import ( "bytes" + "github.com/88250/lute/editor" "regexp" "strings" @@ -203,6 +204,7 @@ func renderBlockMarkdownR0(id string, rendered *[]string) (ret []*ast.Node) { if ast.NodeBlockQueryEmbed == n.Type { stmt := n.ChildByType(ast.NodeBlockQueryEmbedScript).TokensStr() stmt = html.UnescapeString(stmt) + stmt = strings.ReplaceAll(stmt, editor.IALValEscNewLine, "\n") sqlBlocks := sql.SelectBlocksRawStmt(stmt, Conf.Search.Limit) for _, sqlBlock := range sqlBlocks { subNodes := renderBlockMarkdownR0(sqlBlock.ID, rendered)