|
@@ -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)
|