github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-07 12:39:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Liang Ding 2022-10-02 22:44:20 +08:00
parent 14995a815d
commit a0988df153
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/api/block.go
View File

@ -42,7 +42,8 @@ func swapBlockRef(c *gin.Context) {
refID := arg["refID"].(string) refID := arg["refID"].(string)
defID := arg["defID"].(string) defID := arg["defID"].(string)
err := model.SwapBlockRef(refID, defID) includeChildren := arg["includeChildren"].(bool)
err := model.SwapBlockRef(refID, defID, includeChildren)
if nil != err { if nil != err {
ret.Code = -1 ret.Code = -1
ret.Msg = err.Error() ret.Msg = err.Error()

8
kernel/model/block.go
View File

@ -90,7 +90,7 @@ func RecentUpdatedBlocks() (ret []*Block) {
return return
} }
func SwapBlockRef(refID, defID string) (err error) { func SwapBlockRef(refID, defID string, includeChildren bool) (err error) {
refTree, err := loadTreeByBlockID(refID) refTree, err := loadTreeByBlockID(refID)
if nil != err { if nil != err {
return return
@ -112,6 +112,8 @@ func SwapBlockRef(refID, defID string) (err error) {
} }
if ast.NodeListItem == defNode.Parent.Type { if ast.NodeListItem == defNode.Parent.Type {
defNode = defNode.Parent defNode = defNode.Parent
} else if ast.NodeHeading == defNode.Type && includeChildren {
} }
refPivot := parse.NewParagraph() refPivot := parse.NewParagraph()
@ -142,14 +144,14 @@ func SwapBlockRef(refID, defID string) (err error) {
li := &ast.Node{ID: newID, Type: ast.NodeListItem, ListData: &ast.ListData{Typ: refNode.Parent.ListData.Typ}} li := &ast.Node{ID: newID, Type: ast.NodeListItem, ListData: &ast.ListData{Typ: refNode.Parent.ListData.Typ}}
li.SetIALAttr("id", newID) li.SetIALAttr("id", newID)
li.SetIALAttr("updated", newID[:14]) li.SetIALAttr("updated", newID[:14])
li.AppendChild(refNode) li.AppendChild(defNode)
refPivot.InsertAfter(li) refPivot.InsertAfter(li)
newID = ast.NewNodeID() newID = ast.NewNodeID()
list := &ast.Node{ID: newID, Type: ast.NodeList, ListData: &ast.ListData{Typ: refNode.Parent.ListData.Typ}} list := &ast.Node{ID: newID, Type: ast.NodeList, ListData: &ast.ListData{Typ: refNode.Parent.ListData.Typ}}
list.SetIALAttr("id", newID) list.SetIALAttr("id", newID)
list.SetIALAttr("updated", newID[:14]) list.SetIALAttr("updated", newID[:14])
list.AppendChild(defNode) list.AppendChild(refNode)
defNode.InsertAfter(list) defNode.InsertAfter(list)
} else { } else {
defNode.InsertAfter(refNode) defNode.InsertAfter(refNode)