diff --git a/kernel/api/block.go b/kernel/api/block.go index ca079e9a2..f5d5ea50d 100644 --- a/kernel/api/block.go +++ b/kernel/api/block.go @@ -42,7 +42,8 @@ func swapBlockRef(c *gin.Context) { refID := arg["refID"].(string) defID := arg["defID"].(string) - err := model.SwapBlockRef(refID, defID) + includeChildren := arg["includeChildren"].(bool) + err := model.SwapBlockRef(refID, defID, includeChildren) if nil != err { ret.Code = -1 ret.Msg = err.Error() diff --git a/kernel/model/block.go b/kernel/model/block.go index 36dcb9b3f..2c5275236 100644 --- a/kernel/model/block.go +++ b/kernel/model/block.go @@ -90,7 +90,7 @@ func RecentUpdatedBlocks() (ret []*Block) { return } -func SwapBlockRef(refID, defID string) (err error) { +func SwapBlockRef(refID, defID string, includeChildren bool) (err error) { refTree, err := loadTreeByBlockID(refID) if nil != err { return @@ -112,6 +112,8 @@ func SwapBlockRef(refID, defID string) (err error) { } if ast.NodeListItem == defNode.Parent.Type { defNode = defNode.Parent + } else if ast.NodeHeading == defNode.Type && includeChildren { + } 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.SetIALAttr("id", newID) li.SetIALAttr("updated", newID[:14]) - li.AppendChild(refNode) + li.AppendChild(defNode) refPivot.InsertAfter(li) newID = ast.NewNodeID() list := &ast.Node{ID: newID, Type: ast.NodeList, ListData: &ast.ListData{Typ: refNode.Parent.ListData.Typ}} list.SetIALAttr("id", newID) list.SetIALAttr("updated", newID[:14]) - list.AppendChild(defNode) + list.AppendChild(refNode) defNode.InsertAfter(list) } else { defNode.InsertAfter(refNode)