Pārlūkot izejas kodu

:art: Support for inserting custom blocks https://github.com/siyuan-note/siyuan/issues/8418

Daniel 2 gadi atpakaļ
vecāks
revīzija
6950bbaf6d
3 mainītis faili ar 6 papildinājumiem un 7 dzēšanām
  1. 1 1
      kernel/api/block_op.go
  2. 4 5
      kernel/model/block.go
  3. 1 1
      kernel/model/render.go

+ 1 - 1
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
 }

+ 4 - 5
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
 }
 

+ 1 - 1
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: