github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-20 19:10:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa 2023-07-13 00:53:02 +08:00
commit cb70ae9213
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
kernel/model/attribute_view.go
View File

@ -286,15 +286,8 @@ func addAttributeViewBlock(blockID string, operation *Operation, tree *parse.Tre
}
}
for _, keyValues := range attrView.KeyValues {
value := &av.Value{KeyID: keyValues.Key.ID, BlockID: blockID}
blockValues.Values = append(blockValues.Values, value)
if av.KeyTypeBlock == keyValues.Key.Type {
value.Block = &av.ValueBlock{ID: blockID, Content: getNodeRefText(node)}
break
}
}
value := &av.Value{KeyID: blockValues.Key.ID, BlockID: blockID, Block: &av.ValueBlock{ID: blockID, Content: getNodeRefText(node)}}
blockValues.Values = append(blockValues.Values, value)
attrs := parse.IAL2Map(node.KramdownIAL)
attrs[NodeAttrNamePrefixAvKey+operation.AvID+"-"+blockValues.Key.ID] = "" // 将列作为属性添加到块中
@ -670,19 +663,22 @@ func updateAttributeViewCell(operation *Operation, tx *Transaction) (err error)
var val *av.Value
for _, keyValues := range attrView.KeyValues {
if operation.KeyID == keyValues.Key.ID {
for _, value := range keyValues.Values {
if operation.ID == value.ID {
val = value
break
}
}
break
if operation.KeyID != keyValues.Key.ID {
continue
}
}
if nil == val {
return
for _, value := range keyValues.Values {
if operation.ID == value.ID {
val = value
break
}
}
if nil == val {
val = &av.Value{ID: operation.ID, KeyID: keyValues.Key.ID, BlockID: operation.RowID}
keyValues.Values = append(keyValues.Values, val)
}
break
}
tree, err := tx.loadTree(val.BlockID)

1
kernel/model/transaction.go
View File

@ -1055,6 +1055,7 @@ type Operation struct {
Name string `json:"name"` // 属性视图列名
Typ string `json:"type"` // 属性视图列类型
KeyID string `json:"keyID"` // 属性视列 ID
RowID string `json:"rowID"` // 属性视图行 ID
discard bool // 用于标识是否在事务合并中丢弃
}