Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-09-22 00:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Database grouping by field https://github.com/siyuan-note/siyuan/issues/10964

Browse source
This commit is contained in:
Daniel 2025-07-25 22:25:33 +08:00
parent 9cf009d9d9
commit 59d8db4f24
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
kernel/model/attribute_view.go
View file

@ -2129,6 +2129,7 @@ func updateAttributeViewColRelation(operation *Operation) (err error) {
} }
destVal.Relation.BlockIDs = append(destVal.Relation.BlockIDs, srcVal.BlockID) destVal.Relation.BlockIDs = append(destVal.Relation.BlockIDs, srcVal.BlockID)
destVal.Relation.BlockIDs = gulu.Str.RemoveDuplicatedElem(destVal.Relation.BlockIDs) destVal.Relation.BlockIDs = gulu.Str.RemoveDuplicatedElem(destVal.Relation.BlockIDs)
regenAttrViewViewGroups(srcAv, destVal.KeyID)
destKeyValues.Values = append(destKeyValues.Values, destVal) destKeyValues.Values = append(destKeyValues.Values, destVal)
} }
} }
@ -3958,6 +3959,7 @@ func replaceAttributeViewBlock0(attrView *av.AttributeView, oldBlockID, newBlock
content = util.UnescapeHTML(content) content = util.UnescapeHTML(content)
value.Block.Icon, value.Block.Content = icon, content value.Block.Icon, value.Block.Content = icon, content
value.UpdatedAt = now value.UpdatedAt = now
regenAttrViewViewGroups(attrView, value.KeyID)
err = av.SaveAttributeView(attrView) err = av.SaveAttributeView(attrView)
} }
return return
@ -4290,9 +4292,7 @@ func updateAttributeViewValue(tx *Transaction, attrView *av.AttributeView, keyID
} }
val.SetUpdatedAt(now) val.SetUpdatedAt(now)
if err = regenAttrViewViewGroups(attrView, keyID); nil != err { regenAttrViewViewGroups(attrView, keyID)
return
}
if nil != key && av.KeyTypeRelation == key.Type && nil != key.Relation && key.Relation.IsTwoWay { if nil != key && av.KeyTypeRelation == key.Type && nil != key.Relation && key.Relation.IsTwoWay {
// 双向关联需要同时更新目标字段的值 // 双向关联需要同时更新目标字段的值
@ -4330,6 +4330,7 @@ func updateAttributeViewValue(tx *Transaction, attrView *av.AttributeView, keyID
destVal.Relation.BlockIDs = append(destVal.Relation.BlockIDs, rowID) destVal.Relation.BlockIDs = append(destVal.Relation.BlockIDs, rowID)
destVal.Relation.BlockIDs = gulu.Str.RemoveDuplicatedElem(destVal.Relation.BlockIDs) destVal.Relation.BlockIDs = gulu.Str.RemoveDuplicatedElem(destVal.Relation.BlockIDs)
regenAttrViewViewGroups(destAv, key.Relation.BackKeyID)
break break
} }
} }
@ -4349,9 +4350,7 @@ func updateAttributeViewValue(tx *Transaction, attrView *av.AttributeView, keyID
if value.BlockID == blockID { if value.BlockID == blockID {
value.Relation.BlockIDs = gulu.Str.RemoveElem(value.Relation.BlockIDs, rowID) value.Relation.BlockIDs = gulu.Str.RemoveElem(value.Relation.BlockIDs, rowID)
value.SetUpdatedAt(now) value.SetUpdatedAt(now)
if err = regenAttrViewViewGroups(destAv, key.Relation.BackKeyID); nil != err { regenAttrViewViewGroups(destAv, key.Relation.BackKeyID)
return
}
break break
} }
} }
@ -4367,7 +4366,7 @@ func updateAttributeViewValue(tx *Transaction, attrView *av.AttributeView, keyID
return return
} }
func regenAttrViewViewGroups(attrView *av.AttributeView, keyID string) (err error) { func regenAttrViewViewGroups(attrView *av.AttributeView, keyID string) {
for _, view := range attrView.Views { for _, view := range attrView.Views {
if nil != view.Group && view.Group.Field == keyID { if nil != view.Group && view.Group.Field == keyID {
groupKey, _ := attrView.GetKey(view.Group.Field) groupKey, _ := attrView.GetKey(view.Group.Field)
@ -4390,7 +4389,6 @@ func regenAttrViewViewGroups(attrView *av.AttributeView, keyID string) (err erro
} }
} }
} }
return
} }
func unbindBlockAv(tx *Transaction, avID, blockID string) { func unbindBlockAv(tx *Transaction, avID, blockID string) {
@ -4787,6 +4785,7 @@ func replaceRelationAvValues(avID, previousID, nextID string) (changedSrcAvID []
srcAvChanged := false srcAvChanged := false
srcValue.Relation.BlockIDs, srcAvChanged = util.ReplaceStr(srcValue.Relation.BlockIDs, previousID, nextID) srcValue.Relation.BlockIDs, srcAvChanged = util.ReplaceStr(srcValue.Relation.BlockIDs, previousID, nextID)
if srcAvChanged { if srcAvChanged {
regenAttrViewViewGroups(srcAv, srcValue.KeyID)
changed = true changed = true
} }
} }