Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-03 15:28:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 Attribute View map to database table https://github.com/siyuan-note/siyuan/issues/7677

Browse source
This commit is contained in:
Liang Ding 2023-04-01 17:08:57 +08:00
parent b7e1dc4a36
commit 59e7fa0d7f
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
kernel/model/attribute_view.go
View file

@ -66,7 +66,6 @@ func (tx *Transaction) doInsertAttrViewBlock(operation *Operation) (ret *TxErr)
for _, av := range avs {
sql.RebuildAttributeViewQueue(av)
}
return
}
@ -78,11 +77,24 @@ func (tx *Transaction) doRemoveAttrViewBlock(operation *Operation) (ret *TxErr)
return &TxErr{code: TxErrCodeBlockNotFound, id: firstSrcID}
}
var avs []*av.AttributeView
avID := operation.ParentID
for _, id := range operation.SrcIDs {
if err = removeAttributeViewBlock(id, avID, tree, tx); nil != err {
var av *av.AttributeView
var avErr error
if av, avErr = removeAttributeViewBlock(id, avID, tree); nil != avErr {
return &TxErr{code: TxErrWriteAttributeView, id: avID}
}
if nil == av {
continue
}
avs = append(avs, av)
}
for _, av := range avs {
sql.RebuildAttributeViewQueue(av)
}
return
}
@ -140,27 +152,27 @@ func removeAttributeViewColumn(columnID string, avID string) (err error) {
return
}
func removeAttributeViewBlock(blockID, avID string, tree *parse.Tree, tx *Transaction) (err error) {
func removeAttributeViewBlock(blockID, avID string, tree *parse.Tree) (ret *av.AttributeView, err error) {
node := treenode.GetNodeInTree(tree, blockID)
if nil == node {
err = ErrBlockNotFound
return
}
attrView, err := av.ParseAttributeView(avID)
ret, err = av.ParseAttributeView(avID)
if nil != err {
return
}
for i, row := range attrView.Rows {
for i, row := range ret.Rows {
if row.Cells[0].Value == blockID {
// 从行中移除，但是不移除属性
attrView.Rows = append(attrView.Rows[:i], attrView.Rows[i+1:]...)
ret.Rows = append(ret.Rows[:i], ret.Rows[i+1:]...)
break
}
}
err = av.SaveAttributeView(attrView)
err = av.SaveAttributeView(ret)
return
}