Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 15:10:12 +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 16:18:19 +08:00
parent 5a97fc5af7
commit 2de23a977b
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 84 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

36
kernel/model/attribute_view.go
View file

@ -48,11 +48,25 @@ func (tx *Transaction) doInsertAttrViewBlock(operation *Operation) (ret *TxErr)
}
avID := operation.ParentID
var avs []*av.AttributeView
for _, id := range operation.SrcIDs {
if err = addAttributeViewBlock(id, avID, tree, tx); nil != err {
return &TxErr{code: TxErrWriteAttributeView, id: avID, msg: err.Error()}
var av *av.AttributeView
var avErr error
if av, avErr = addAttributeViewBlock(id, avID, tree, tx); nil != avErr {
return &TxErr{code: TxErrWriteAttributeView, id: avID, msg: avErr.Error()}
}
if nil == av {
continue
}
avs = append(avs, av)
}
for _, av := range avs {
sql.RebuildAttributeViewQueue(av)
}
return
}
@ -150,7 +164,7 @@ func removeAttributeViewBlock(blockID, avID string, tree *parse.Tree, tx *Transa
return
}
func addAttributeViewBlock(blockID, avID string, tree *parse.Tree, tx *Transaction) (err error) {
func addAttributeViewBlock(blockID, avID string, tree *parse.Tree, tx *Transaction) (ret *av.AttributeView, err error) {
node := treenode.GetNodeInTree(tree, blockID)
if nil == node {
err = ErrBlockNotFound
@ -168,13 +182,13 @@ func addAttributeViewBlock(blockID, avID string, tree *parse.Tree, tx *Transacti
return
}
attrView, err := av.ParseAttributeView(avID)
ret, err = av.ParseAttributeView(avID)
if nil != err {
return
}
// 不允许重复添加相同的块到属性视图中
for _, row := range attrView.Rows {
for _, row := range ret.Rows {
if row.Cells[0].Value == blockID {
return
}
@ -182,11 +196,11 @@ func addAttributeViewBlock(blockID, avID string, tree *parse.Tree, tx *Transacti
row := av.NewRow()
row.Cells = append(row.Cells, &av.Cell{ID: ast.NewNodeID(), Value: blockID})
if 1 < len(attrView.Columns) {
// 将列作为属性添加到块中
if 1 < len(ret.Columns) {
attrs := parse.IAL2Map(node.KramdownIAL)
for _, col := range attrView.Columns[1:] {
attrs["av"+col.ID] = ""
for _, col := range ret.Columns[1:] {
attrs["av"+col.ID] = "" // 将列作为属性添加到块中
row.Cells = append(row.Cells, &av.Cell{ID: ast.NewNodeID(), Value: ""})
}
if err = setNodeAttrsWithTx(tx, node, tree, attrs); nil != err {
@ -194,7 +208,7 @@ func addAttributeViewBlock(blockID, avID string, tree *parse.Tree, tx *Transacti
}
}
attrView.Rows = append(attrView.Rows, row)
err = av.SaveAttributeView(attrView)
ret.Rows = append(ret.Rows, row)
err = av.SaveAttributeView(ret)
return
}