0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2023-06-30 16:26:50 +08:00
commit 3de29e8bd8
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
kernel/model/attribute_view.go
View file

@ -104,10 +104,11 @@ func (tx *Transaction) doInsertAttrViewBlock(operation *Operation) (ret *TxErr)
avID := operation.ParentID
var avs []*av.AttributeView
previousID := operation.PreviousID
for _, id := range operation.SrcIDs {
var av *av.AttributeView
var avErr error
if av, avErr = addAttributeViewBlock(id, avID, tree, tx); nil != avErr {
if av, avErr = addAttributeViewBlock(id, previousID, avID, tree, tx); nil != avErr {
return &TxErr{code: TxErrWriteAttributeView, id: avID, msg: avErr.Error()}
}
@ -243,7 +244,7 @@ func removeAttributeViewBlock(blockID, avID string, tree *parse.Tree) (ret *av.A
return
}
func addAttributeViewBlock(blockID, avID string, tree *parse.Tree, tx *Transaction) (ret *av.AttributeView, err error) {
func addAttributeViewBlock(blockID, previousRowID, avID string, tree *parse.Tree, tx *Transaction) (ret *av.AttributeView, err error) {
node := treenode.GetNodeInTree(tree, blockID)
if nil == node {
err = ErrBlockNotFound
@ -287,7 +288,17 @@ func addAttributeViewBlock(blockID, avID string, tree *parse.Tree, tx *Transacti
}
}
ret.Rows = append(ret.Rows, row)
if "" == previousRowID {
ret.Rows = append([]*av.Row{row}, ret.Rows...)
} else {
for i, r := range ret.Rows {
if r.ID == previousRowID {
ret.Rows = append(ret.Rows[:i+1], append([]*av.Row{row}, ret.Rows[i+1:]...)...)
break
}
}
}
err = av.SaveAttributeView(ret)
return
}