github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-17 09:30:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Vanessa 2024-11-16 17:36:18 +08:00
commit c8b8b28bcc
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/model/transaction.go
View File

@ -358,6 +358,10 @@ func (tx *Transaction) doMove(operation *Operation) (ret *TxErr) {
return return
} }
if isMovingParentIntoChild(srcNode, targetNode) {
return
}
for i := len(headingChildren) - 1; -1 < i; i-- { for i := len(headingChildren) - 1; -1 < i; i-- {
c := headingChildren[i] c := headingChildren[i]
targetNode.InsertAfter(c) targetNode.InsertAfter(c)
@ -407,6 +411,10 @@ func (tx *Transaction) doMove(operation *Operation) (ret *TxErr) {
return return
} }
if isMovingParentIntoChild(srcNode, targetNode) {
return
}
processed := false processed := false
if ast.NodeSuperBlock == targetNode.Type { if ast.NodeSuperBlock == targetNode.Type {
// 在布局节点后插入 // 在布局节点后插入
@ -474,6 +482,15 @@ func isMovingFoldHeadingIntoSelf(targetNode *ast.Node, headingChildren []*ast.No
return false return false
} }
func isMovingParentIntoChild(srcNode, targetNode *ast.Node) bool {
for parent := targetNode.Parent; nil != parent; parent = parent.Parent {
if parent.ID == srcNode.ID {
return true
}
}
return false
}
func (tx *Transaction) doPrependInsert(operation *Operation) (ret *TxErr) { func (tx *Transaction) doPrependInsert(operation *Operation) (ret *TxErr) {
var err error var err error
block := treenode.GetBlockTree(operation.ParentID) block := treenode.GetBlockTree(operation.ParentID)