0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 块引用与所引用的内容块进行交换 https://github.com/siyuan-note/siyuan/issues/4981

Browse source
This commit is contained in:
Liang Ding 2022-10-02 23:27:00 +08:00
parent f4a918cd5b
commit da8b9a7d9c
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
kernel/model/block.go
View file

@ -113,13 +113,15 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) {
var defNodeChildren []*ast.Node
if ast.NodeListItem == defNode.Parent.Type {
defNode = defNode.Parent
} else if ast.NodeHeading == defNode.Type && includeChildren {
defNodeChildren = treenode.HeadingChildren(defNode)
}
if ast.NodeListItem == defNode.Type {
for c := defNode.FirstChild; nil != c; c = c.Next {
if ast.NodeList == c.Type {
defNodeChildren = append(defNodeChildren, c)
}
}
} else if ast.NodeHeading == defNode.Type && includeChildren {
defNodeChildren = treenode.HeadingChildren(defNode)
}
refPivot := parse.NewParagraph()
@ -128,6 +130,11 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) {
if ast.NodeListItem == defNode.Type {
if ast.NodeListItem == refNode.Type {
defNode.InsertAfter(refNode)
if !includeChildren {
for _, c := range defNodeChildren {
refNode.AppendChild(c)
}
}
refPivot.InsertAfter(defNode)
} else {
newID := ast.NewNodeID()