From 14995a815def2a6443217b37272552d349583919 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 2 Oct 2022 22:09:54 +0800 Subject: [PATCH 1/6] =?UTF-8?q?:art:=20=E5=9D=97=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E4=B8=8E=E6=89=80=E5=BC=95=E7=94=A8=E7=9A=84=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=9D=97=E8=BF=9B=E8=A1=8C=E4=BA=A4=E6=8D=A2=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/4981?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/block.go | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/kernel/model/block.go b/kernel/model/block.go index 70adde70f..36dcb9b3f 100644 --- a/kernel/model/block.go +++ b/kernel/model/block.go @@ -99,7 +99,9 @@ func SwapBlockRef(refID, defID string) (err error) { if nil == refNode { return } - refParentType := refNode.Parent.Type + if ast.NodeListItem == refNode.Parent.Type { + refNode = refNode.Parent + } defTree, err := loadTreeByBlockID(defID) if nil != err { return @@ -108,12 +110,18 @@ func SwapBlockRef(refID, defID string) (err error) { if nil == defNode { return } + if ast.NodeListItem == defNode.Parent.Type { + defNode = defNode.Parent + } refPivot := parse.NewParagraph() refNode.InsertBefore(refPivot) if ast.NodeListItem == defNode.Type { - if ast.NodeListItem != refParentType { + if ast.NodeListItem == refNode.Type { + defNode.InsertAfter(refNode) + refPivot.InsertAfter(defNode) + } else { newID := ast.NewNodeID() li := &ast.Node{ID: newID, Type: ast.NodeListItem, ListData: &ast.ListData{Typ: defNode.Parent.ListData.Typ}} li.SetIALAttr("id", newID) @@ -127,19 +135,34 @@ func SwapBlockRef(refID, defID string) (err error) { list.SetIALAttr("updated", newID[:14]) list.AppendChild(defNode) refPivot.InsertAfter(list) + } + } else { + if ast.NodeListItem == refNode.Type { + newID := ast.NewNodeID() + 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) + 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) + defNode.InsertAfter(list) } else { defNode.InsertAfter(refNode) refPivot.InsertAfter(defNode) } - } else { - defNode.InsertAfter(refNode) - refPivot.InsertAfter(defNode) } refPivot.Unlink() + treenode.ReindexBlockTree(refTree) if err = writeJSONQueue(refTree); nil != err { return } + treenode.ReindexBlockTree(defTree) if err = writeJSONQueue(defTree); nil != err { return } From a0988df1537e1628c94e3f6b949d82932555bc62 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 2 Oct 2022 22:44:20 +0800 Subject: [PATCH 2/6] =?UTF-8?q?:art:=20=E5=9D=97=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E4=B8=8E=E6=89=80=E5=BC=95=E7=94=A8=E7=9A=84=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=9D=97=E8=BF=9B=E8=A1=8C=E4=BA=A4=E6=8D=A2=20https://github.?= =?UTF-8?q?com/siyuan-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) From b774f9804433951641c6cde9d380e5c3bcb1dcc4 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 2 Oct 2022 22:48:36 +0800 Subject: [PATCH 3/6] =?UTF-8?q?:art:=20=E5=9D=97=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E4=B8=8E=E6=89=80=E5=BC=95=E7=94=A8=E7=9A=84=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=9D=97=E8=BF=9B=E8=A1=8C=E4=BA=A4=E6=8D=A2=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/4981?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/block.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/kernel/model/block.go b/kernel/model/block.go index 2c5275236..d661ed8f1 100644 --- a/kernel/model/block.go +++ b/kernel/model/block.go @@ -110,10 +110,11 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) { if nil == defNode { return } + var defNodeChildren []*ast.Node if ast.NodeListItem == defNode.Parent.Type { defNode = defNode.Parent } else if ast.NodeHeading == defNode.Type && includeChildren { - + defNodeChildren = treenode.HeadingChildren(defNode) } refPivot := parse.NewParagraph() @@ -141,21 +142,24 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) { } else { if ast.NodeListItem == refNode.Type { newID := ast.NewNodeID() - 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(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(refNode) defNode.InsertAfter(list) + + newID = ast.NewNodeID() + 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(defNode) + refPivot.InsertAfter(li) } else { defNode.InsertAfter(refNode) refPivot.InsertAfter(defNode) + for i := len(defNodeChildren) - 1; -1 < i; i-- { + refPivot.InsertAfter(defNodeChildren[i]) + } } } refPivot.Unlink() From 5bd06ea506ff80764af4f2569aa60a3c57f622f0 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 2 Oct 2022 22:50:09 +0800 Subject: [PATCH 4/6] =?UTF-8?q?:art:=20=E5=9D=97=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E4=B8=8E=E6=89=80=E5=BC=95=E7=94=A8=E7=9A=84=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=9D=97=E8=BF=9B=E8=A1=8C=E4=BA=A4=E6=8D=A2=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/4981?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/block.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/model/block.go b/kernel/model/block.go index d661ed8f1..8a6ad85ab 100644 --- a/kernel/model/block.go +++ b/kernel/model/block.go @@ -158,7 +158,7 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) { defNode.InsertAfter(refNode) refPivot.InsertAfter(defNode) for i := len(defNodeChildren) - 1; -1 < i; i-- { - refPivot.InsertAfter(defNodeChildren[i]) + defNode.InsertAfter(defNodeChildren[i]) } } } From f4a918cd5b69f9427d0e0f7638c67e1bf4feba8d Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 2 Oct 2022 23:09:11 +0800 Subject: [PATCH 5/6] =?UTF-8?q?:art:=20=E5=9D=97=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E4=B8=8E=E6=89=80=E5=BC=95=E7=94=A8=E7=9A=84=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=9D=97=E8=BF=9B=E8=A1=8C=E4=BA=A4=E6=8D=A2=20https://github.?= =?UTF-8?q?com/siyuan-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}} From da8b9a7d9c2af802392bea2b4bfe6a65abd43103 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 2 Oct 2022 23:27:00 +0800 Subject: [PATCH 6/6] =?UTF-8?q?:art:=20=E5=9D=97=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E4=B8=8E=E6=89=80=E5=BC=95=E7=94=A8=E7=9A=84=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=9D=97=E8=BF=9B=E8=A1=8C=E4=BA=A4=E6=8D=A2=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/4981?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/block.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/kernel/model/block.go b/kernel/model/block.go index bc2f3b910..b037ba73d 100644 --- a/kernel/model/block.go +++ b/kernel/model/block.go @@ -113,13 +113,15 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) { var defNodeChildren []*ast.Node if ast.NodeListItem == defNode.Parent.Type { defNode = defNode.Parent + } else if ast.NodeHeading == defNode.Type && includeChildren { + defNodeChildren = treenode.HeadingChildren(defNode) + } + if ast.NodeListItem == defNode.Type { 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) } refPivot := parse.NewParagraph() @@ -128,6 +130,11 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) { if ast.NodeListItem == defNode.Type { if ast.NodeListItem == refNode.Type { defNode.InsertAfter(refNode) + if !includeChildren { + for _, c := range defNodeChildren { + refNode.AppendChild(c) + } + } refPivot.InsertAfter(defNode) } else { newID := ast.NewNodeID()