Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 15:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Daniel 2023-06-02 22:36:27 +08:00
parent 156fc97c54
commit 6950bbaf6d
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/api/block_op.go
View file

@ -348,7 +348,7 @@ func dataBlockDOM(data string, luteEngine *lute.Lute) (ret string) {
if "" == ret { if "" == ret {
// 使用 API 插入空字符串出现错误 https://github.com/siyuan-note/siyuan/issues/3931 // 使用 API 插入空字符串出现错误 https://github.com/siyuan-note/siyuan/issues/3931
blankParagraph := treenode.NewParagraph() blankParagraph := treenode.NewParagraph()
ret = lute.RenderNodeBlockDOM(blankParagraph, luteEngine.ParseOptions, luteEngine.RenderOptions) ret = luteEngine.RenderNodeBlockDOM(blankParagraph)
} }
return return
} }

9
kernel/model/block.go
View file

@ -22,7 +22,6 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/88250/lute"
"github.com/88250/lute/ast" "github.com/88250/lute/ast"
"github.com/88250/lute/parse" "github.com/88250/lute/parse"
"github.com/siyuan-note/siyuan/kernel/sql" "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.PreviousID = n.Previous.ID
} }
op.Action = "insert" op.Action = "insert"
op.Data = lute.RenderNodeBlockDOM(n, luteEngine.ParseOptions, luteEngine.RenderOptions) op.Data = luteEngine.RenderNodeBlockDOM(n)
transaction.UndoOperations = append(transaction.UndoOperations, op) transaction.UndoOperations = append(transaction.UndoOperations, op)
} }
return return
@ -391,7 +390,7 @@ func GetHeadingLevelTransaction(id string, level int) (transaction *Transaction,
op := &Operation{} op := &Operation{}
op.ID = c.ID op.ID = c.ID
op.Action = "update" op.Action = "update"
op.Data = lute.RenderNodeBlockDOM(c, luteEngine.ParseOptions, luteEngine.RenderOptions) op.Data = luteEngine.RenderNodeBlockDOM(c)
transaction.UndoOperations = append(transaction.UndoOperations, op) transaction.UndoOperations = append(transaction.UndoOperations, op)
c.HeadingLevel += diff c.HeadingLevel += diff
@ -404,7 +403,7 @@ func GetHeadingLevelTransaction(id string, level int) (transaction *Transaction,
op = &Operation{} op = &Operation{}
op.ID = c.ID op.ID = c.ID
op.Action = "update" op.Action = "update"
op.Data = lute.RenderNodeBlockDOM(c, luteEngine.ParseOptions, luteEngine.RenderOptions) op.Data = luteEngine.RenderNodeBlockDOM(c)
transaction.DoOperations = append(transaction.DoOperations, op) transaction.DoOperations = append(transaction.DoOperations, op)
} }
return return
@ -421,7 +420,7 @@ func GetBlockDOM(id string) (ret string) {
} }
node := treenode.GetNodeInTree(tree, id) node := treenode.GetNodeInTree(tree, id)
luteEngine := NewLute() luteEngine := NewLute()
ret = lute.RenderNodeBlockDOM(node, luteEngine.ParseOptions, luteEngine.RenderOptions) ret = luteEngine.RenderNodeBlockDOM(node)
return return
} }

2
kernel/model/render.go
View file

@ -78,7 +78,7 @@ func renderOutline(heading *ast.Node, luteEngine *lute.Lute) (ret string) {
case ast.NodeBackslashContent: case ast.NodeBackslashContent:
buf.Write(n.Tokens) buf.Write(n.Tokens)
case ast.NodeTextMark: case ast.NodeTextMark:
dom := lute.RenderNodeBlockDOM(n, luteEngine.ParseOptions, luteEngine.RenderOptions) dom := luteEngine.RenderNodeBlockDOM(n)
buf.WriteString(dom) buf.WriteString(dom)
return ast.WalkSkipChildren return ast.WalkSkipChildren
case ast.NodeImage: case ast.NodeImage: