From 6950bbaf6df2f86404ff148c1772d00e233e689b Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Fri, 2 Jun 2023 22:36:27 +0800 Subject: [PATCH] :art: Support for inserting custom blocks https://github.com/siyuan-note/siyuan/issues/8418 --- kernel/api/block_op.go | 2 +- kernel/model/block.go | 9 ++++----- kernel/model/render.go | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/kernel/api/block_op.go b/kernel/api/block_op.go index 3e70a740e..8e94d3ac3 100644 --- a/kernel/api/block_op.go +++ b/kernel/api/block_op.go @@ -348,7 +348,7 @@ func dataBlockDOM(data string, luteEngine *lute.Lute) (ret string) { if "" == ret { // 使用 API 插入空字符串出现错误 https://github.com/siyuan-note/siyuan/issues/3931 blankParagraph := treenode.NewParagraph() - ret = lute.RenderNodeBlockDOM(blankParagraph, luteEngine.ParseOptions, luteEngine.RenderOptions) + ret = luteEngine.RenderNodeBlockDOM(blankParagraph) } return } diff --git a/kernel/model/block.go b/kernel/model/block.go index dd781023a..5789bd25b 100644 --- a/kernel/model/block.go +++ b/kernel/model/block.go @@ -22,7 +22,6 @@ import ( "strconv" "time" - "github.com/88250/lute" "github.com/88250/lute/ast" "github.com/88250/lute/parse" "github.com/siyuan-note/siyuan/kernel/sql" @@ -313,7 +312,7 @@ func GetHeadingDeleteTransaction(id string) (transaction *Transaction, err error op.PreviousID = n.Previous.ID } op.Action = "insert" - op.Data = lute.RenderNodeBlockDOM(n, luteEngine.ParseOptions, luteEngine.RenderOptions) + op.Data = luteEngine.RenderNodeBlockDOM(n) transaction.UndoOperations = append(transaction.UndoOperations, op) } return @@ -391,7 +390,7 @@ func GetHeadingLevelTransaction(id string, level int) (transaction *Transaction, op := &Operation{} op.ID = c.ID op.Action = "update" - op.Data = lute.RenderNodeBlockDOM(c, luteEngine.ParseOptions, luteEngine.RenderOptions) + op.Data = luteEngine.RenderNodeBlockDOM(c) transaction.UndoOperations = append(transaction.UndoOperations, op) c.HeadingLevel += diff @@ -404,7 +403,7 @@ func GetHeadingLevelTransaction(id string, level int) (transaction *Transaction, op = &Operation{} op.ID = c.ID op.Action = "update" - op.Data = lute.RenderNodeBlockDOM(c, luteEngine.ParseOptions, luteEngine.RenderOptions) + op.Data = luteEngine.RenderNodeBlockDOM(c) transaction.DoOperations = append(transaction.DoOperations, op) } return @@ -421,7 +420,7 @@ func GetBlockDOM(id string) (ret string) { } node := treenode.GetNodeInTree(tree, id) luteEngine := NewLute() - ret = lute.RenderNodeBlockDOM(node, luteEngine.ParseOptions, luteEngine.RenderOptions) + ret = luteEngine.RenderNodeBlockDOM(node) return } diff --git a/kernel/model/render.go b/kernel/model/render.go index 217cbc307..69cffc5d6 100644 --- a/kernel/model/render.go +++ b/kernel/model/render.go @@ -78,7 +78,7 @@ func renderOutline(heading *ast.Node, luteEngine *lute.Lute) (ret string) { case ast.NodeBackslashContent: buf.Write(n.Tokens) case ast.NodeTextMark: - dom := lute.RenderNodeBlockDOM(n, luteEngine.ParseOptions, luteEngine.RenderOptions) + dom := luteEngine.RenderNodeBlockDOM(n) buf.WriteString(dom) return ast.WalkSkipChildren case ast.NodeImage: