Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-21 17:10:12 +01:00
Code Issues 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:09:11 +08:00
parent 5bd06ea506
commit f4a918cd5b
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
kernel/model/block.go
View file

@ -113,6 +113,11 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) {
var defNodeChildren []*ast.Node var defNodeChildren []*ast.Node
if ast.NodeListItem == defNode.Parent.Type { if ast.NodeListItem == defNode.Parent.Type {
defNode = defNode.Parent defNode = defNode.Parent
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 { } else if ast.NodeHeading == defNode.Type && includeChildren {
defNodeChildren = treenode.HeadingChildren(defNode) defNodeChildren = treenode.HeadingChildren(defNode)
} }
@ -131,6 +136,11 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) {
li.SetIALAttr("updated", newID[:14]) li.SetIALAttr("updated", newID[:14])
li.AppendChild(refNode) li.AppendChild(refNode)
defNode.InsertAfter(li) defNode.InsertAfter(li)
if !includeChildren {
for _, c := range defNodeChildren {
li.AppendChild(c)
}
}
newID = ast.NewNodeID() newID = ast.NewNodeID()
list := &ast.Node{ID: newID, Type: ast.NodeList, ListData: &ast.ListData{Typ: defNode.Parent.ListData.Typ}} list := &ast.Node{ID: newID, Type: ast.NodeList, ListData: &ast.ListData{Typ: defNode.Parent.ListData.Typ}}