mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-16 14:40:12 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
bf38219c0a
1 changed files with 9 additions and 6 deletions
|
|
@ -912,12 +912,8 @@ func (tx *Transaction) doDelete(operation *Operation) (ret *TxErr) {
|
|||
node.Next.Unlink()
|
||||
}
|
||||
|
||||
next := node.Next
|
||||
node.Unlink()
|
||||
|
||||
parentFoldedHeading := treenode.GetParentFoldedHeading(next)
|
||||
unfoldHeading(parentFoldedHeading)
|
||||
|
||||
if nil != parent && ast.NodeListItem == parent.Type && nil == parent.FirstChild {
|
||||
needAppendEmptyListItem := true
|
||||
for _, op := range tx.DoOperations {
|
||||
|
|
@ -1281,8 +1277,15 @@ func (tx *Transaction) doInsert(operation *Operation) (ret *TxErr) {
|
|||
}
|
||||
node.InsertAfter(insertedNode)
|
||||
|
||||
parentFoldedHeading := treenode.GetParentFoldedHeading(insertedNode)
|
||||
unfoldHeading(parentFoldedHeading)
|
||||
keepFold := false
|
||||
if nil != operation.Context && nil != operation.Context["keepFold"] {
|
||||
keepFoldArg := operation.Context["keepFold"]
|
||||
keepFold = keepFoldArg.(bool)
|
||||
}
|
||||
if !keepFold {
|
||||
parentFoldedHeading := treenode.GetParentFoldedHeading(insertedNode)
|
||||
unfoldHeading(parentFoldedHeading)
|
||||
}
|
||||
} else {
|
||||
node = treenode.GetNodeInTree(tree, operation.ParentID)
|
||||
if nil == node {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue