From f4a918cd5b69f9427d0e0f7638c67e1bf4feba8d Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 2 Oct 2022 23:09:11 +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/model/block.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/kernel/model/block.go b/kernel/model/block.go index 8a6ad85ab..bc2f3b910 100644 --- a/kernel/model/block.go +++ b/kernel/model/block.go @@ -113,6 +113,11 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) { var defNodeChildren []*ast.Node if ast.NodeListItem == defNode.Parent.Type { 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 { defNodeChildren = treenode.HeadingChildren(defNode) } @@ -131,6 +136,11 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) { li.SetIALAttr("updated", newID[:14]) li.AppendChild(refNode) defNode.InsertAfter(li) + if !includeChildren { + for _, c := range defNodeChildren { + li.AppendChild(c) + } + } newID = ast.NewNodeID() list := &ast.Node{ID: newID, Type: ast.NodeList, ListData: &ast.ListData{Typ: defNode.Parent.ListData.Typ}}