Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 22:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2025-10-12 11:31:05 +08:00
commit bf38219c0a
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
kernel/model/transaction.go
View file

@ -912,12 +912,8 @@ func (tx *Transaction) doDelete(operation *Operation) (ret *TxErr) {
node.Next.Unlink() node.Next.Unlink()
} }
next := node.Next
node.Unlink() node.Unlink()
parentFoldedHeading := treenode.GetParentFoldedHeading(next)
unfoldHeading(parentFoldedHeading)
if nil != parent && ast.NodeListItem == parent.Type && nil == parent.FirstChild { if nil != parent && ast.NodeListItem == parent.Type && nil == parent.FirstChild {
needAppendEmptyListItem := true needAppendEmptyListItem := true
for _, op := range tx.DoOperations { for _, op := range tx.DoOperations {
@ -1281,8 +1277,15 @@ func (tx *Transaction) doInsert(operation *Operation) (ret *TxErr) {
} }
node.InsertAfter(insertedNode) node.InsertAfter(insertedNode)
parentFoldedHeading := treenode.GetParentFoldedHeading(insertedNode) keepFold := false
unfoldHeading(parentFoldedHeading) if nil != operation.Context && nil != operation.Context["keepFold"] {
keepFoldArg := operation.Context["keepFold"]
keepFold = keepFoldArg.(bool)
}
if !keepFold {
parentFoldedHeading := treenode.GetParentFoldedHeading(insertedNode)
unfoldHeading(parentFoldedHeading)
}
} else { } else {
node = treenode.GetNodeInTree(tree, operation.ParentID) node = treenode.GetNodeInTree(tree, operation.ParentID)
if nil == node { if nil == node {