From a0988df1537e1628c94e3f6b949d82932555bc62 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Sun, 2 Oct 2022 22:44:20 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E5=9D=97=E5=BC=95=E7=94=A8=E4=B8=8E?=
 =?UTF-8?q?=E6=89=80=E5=BC=95=E7=94=A8=E7=9A=84=E5=86=85=E5=AE=B9=E5=9D=97?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BA=A4=E6=8D=A2=20https://github.com/siyua?=
 =?UTF-8?q?n-note/siyuan/issues/4981?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/api/block.go   | 3 ++-
 kernel/model/block.go | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

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)