From 2dec9f2434ac674218f4fb83c72394442ba603f5 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 26 Jan 2023 01:09:36 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E6=8A=98=E5=8F=A0=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0=E4=B8=8B=E6=96=B9=E5=90=8E=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E7=8A=B6=E6=80=81=E5=BC=82=E5=B8=B8=E5=B9=B6=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/7163?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/transaction.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/kernel/model/transaction.go b/kernel/model/transaction.go index a858bb64b..a047fe519 100644 --- a/kernel/model/transaction.go +++ b/kernel/model/transaction.go @@ -310,6 +310,14 @@ func (tx *Transaction) doMove(operation *Operation) (ret *TxErr) { targetNode = targetChildren[l-1] } } + + for _, headingChild := range headingChildren { + if headingChild.ID == targetNode.ID { + // 不能将折叠标题移动到自己下方节点的前或后 https://github.com/siyuan-note/siyuan/issues/7163 + return + } + } + for i := len(headingChildren) - 1; -1 < i; i-- { c := headingChildren[i] targetNode.InsertAfter(c) @@ -352,6 +360,13 @@ func (tx *Transaction) doMove(operation *Operation) (ret *TxErr) { return &TxErr{code: TxErrCodeBlockNotFound, id: targetParentID} } + for _, headingChild := range headingChildren { + if headingChild.ID == targetNode.ID { + // 不能将折叠标题移动到自己下方节点的前或后 https://github.com/siyuan-note/siyuan/issues/7163 + return + } + } + processed := false if ast.NodeSuperBlock == targetNode.Type { // 在布局节点后插入