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-07-28 15:20:53 +08:00
commit 9ee922794e
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kernel/model/attribute_view.go
View file

@ -372,13 +372,13 @@ func addAttributeViewBlock(blockID string, operation *Operation, tree *parse.Tre
attrs := parse.IAL2Map(node.KramdownIAL)
attrs[NodeAttrNamePrefixAvKey+operation.AvID+"-"+blockValues.Key.ID] = "" // 将列作为属性添加到块中
if "" == attrs[NodeAttrNameAVs] {
attrs[NodeAttrNameAVs] = operation.AvID
if "" == attrs[NodeAttrNameAvs] {
attrs[NodeAttrNameAvs] = operation.AvID
} else {
avIDs := strings.Split(attrs[NodeAttrNameAVs], ",")
avIDs := strings.Split(attrs[NodeAttrNameAvs], ",")
avIDs = append(avIDs, operation.AvID)
avIDs = gulu.Str.RemoveDuplicatedElem(avIDs)
attrs[NodeAttrNameAVs] = strings.Join(avIDs, ",")
attrs[NodeAttrNameAvs] = strings.Join(avIDs, ",")
}
if err = setNodeAttrsWithTx(tx, node, tree, attrs); nil != err {
@ -946,6 +946,6 @@ func updateAttributeViewColumnOption(operation *Operation) (err error) {
}
const (
NodeAttrNameAVs = "custom-avs"
NodeAttrNamePrefixAvKey = "custom-av-key-"
NodeAttrNameAvs = "custom-avs" // 用于标记块所属的属性视图，逗号分隔 av id
NodeAttrNamePrefixAvKey = "custom-av-key-" // 用于标记列
)

4
kernel/model/transaction.go
View file

@ -728,7 +728,7 @@ func (tx *Transaction) doDelete(operation *Operation) (ret *TxErr) {
}
func syncDelete2AttributeView(node *ast.Node) {
avs := node.IALAttr(NodeAttrNameAVs)
avs := node.IALAttr(NodeAttrNameAvs)
if "" == avs {
return
}
@ -1240,7 +1240,7 @@ func refreshDynamicRefTexts(updatedDefNodes map[string]*ast.Node, updatedTrees m
// 2. 更新属性视图主键内容
for _, updatedDefNode := range updatedDefNodes {
avs := updatedDefNode.IALAttr(NodeAttrNameAVs)
avs := updatedDefNode.IALAttr(NodeAttrNameAvs)
if "" == avs {
continue
}