Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 07:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 https://github.com/siyuan-note/siyuan/issues/15659

Browse source
This commit is contained in:
Daniel 2025-08-22 19:10:34 +08:00
parent 8a6922b56f
commit b14f057a76
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 35 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kernel/av/relation.go
View file

@ -16,7 +16,7 @@ var (
attributeViewRelationsLock = sync.Mutex{} attributeViewRelationsLock = sync.Mutex{}
) )
func GetSrcAvIDs(destAvID string) []string { func GetSrcAvIDs(destAvID string, excludeSelfAv bool) []string {
attributeViewRelationsLock.Lock() attributeViewRelationsLock.Lock()
defer attributeViewRelationsLock.Unlock() defer attributeViewRelationsLock.Unlock()
@ -42,8 +42,9 @@ func GetSrcAvIDs(destAvID string) []string {
return nil return nil
} }
// 排除自己 if excludeSelfAv {
srcAvIDs = gulu.Str.RemoveElem(srcAvIDs, destAvID) srcAvIDs = gulu.Str.RemoveElem(srcAvIDs, destAvID)
}
return srcAvIDs return srcAvIDs
} }

38
kernel/model/attribute_view.go
View file

@ -1695,11 +1695,6 @@ func genAttrViewGroups(view *av.View, attrView *av.AttributeView) {
return return
} }
var relationDestAv *av.AttributeView
if av.KeyTypeRelation == groupKey.Type && nil != groupKey.Relation {
relationDestAv, _ = av.ParseAttributeView(groupKey.Relation.AvID)
}
var rangeStart, rangeEnd float64 var rangeStart, rangeEnd float64
switch group.Method { switch group.Method {
case av.GroupMethodValue: case av.GroupMethodValue:
@ -1736,6 +1731,15 @@ func genAttrViewGroups(view *av.View, attrView *av.AttributeView) {
todayStart := time.Now() todayStart := time.Now()
todayStart = time.Date(todayStart.Year(), todayStart.Month(), todayStart.Day(), 0, 0, 0, 0, time.Local) todayStart = time.Date(todayStart.Year(), todayStart.Month(), todayStart.Day(), 0, 0, 0, 0, time.Local)
var relationDestAv *av.AttributeView
if av.KeyTypeRelation == groupKey.Type && nil != groupKey.Relation {
if attrView.ID == groupKey.Relation.AvID {
relationDestAv = attrView
} else {
relationDestAv, _ = av.ParseAttributeView(groupKey.Relation.AvID)
}
}
groupItemsMap := map[string][]av.Item{} groupItemsMap := map[string][]av.Item{}
for _, item := range items { for _, item := range items {
value := item.GetValue(group.Field) value := item.GetValue(group.Field)
@ -3254,7 +3258,7 @@ func removeAttributeViewBlock(srcIDs []string, avID string, tx *Transaction) (er
regenAttrViewGroups(attrView, "force") regenAttrViewGroups(attrView, "force")
relatedAvIDs := av.GetSrcAvIDs(avID) relatedAvIDs := av.GetSrcAvIDs(avID, true)
for _, relatedAvID := range relatedAvIDs { for _, relatedAvID := range relatedAvIDs {
ReloadAttrView(relatedAvID) ReloadAttrView(relatedAvID)
} }
@ -4328,7 +4332,7 @@ func BatchUpdateAttributeViewCells(tx *Transaction, avID string, values []interf
return return
} }
relatedAvIDs := av.GetSrcAvIDs(avID) relatedAvIDs := av.GetSrcAvIDs(avID, true)
for _, relatedAvID := range relatedAvIDs { for _, relatedAvID := range relatedAvIDs {
ReloadAttrView(relatedAvID) ReloadAttrView(relatedAvID)
} }
@ -4350,7 +4354,7 @@ func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID string, valueDa
return return
} }
relatedAvIDs := av.GetSrcAvIDs(avID) relatedAvIDs := av.GetSrcAvIDs(avID, true)
for _, relatedAvID := range relatedAvIDs { for _, relatedAvID := range relatedAvIDs {
ReloadAttrView(relatedAvID) ReloadAttrView(relatedAvID)
} }
@ -4541,7 +4545,23 @@ func updateAttributeViewValue(tx *Transaction, attrView *av.AttributeView, keyID
updateTwoWayRelationDestAttrView(attrView, key, val, relationChangeMode, oldRelationBlockIDs) updateTwoWayRelationDestAttrView(attrView, key, val, relationChangeMode, oldRelationBlockIDs)
} }
if isUpdatingBlockKey {
relatedAvIDs := av.GetSrcAvIDs(avID, false)
if gulu.Str.Contains(avID, relatedAvIDs) {
regenAttrViewGroups(attrView, "force")
}
relatedAvIDs = gulu.Str.RemoveElem(relatedAvIDs, avID)
for _, relatedAvID := range relatedAvIDs {
destAv, _ := av.ParseAttributeView(relatedAvID)
if nil == destAv {
continue
}
regenAttrViewGroups(destAv, "force")
}
} else {
regenAttrViewGroups(attrView, keyID) regenAttrViewGroups(attrView, keyID)
}
return return
} }
@ -5084,7 +5104,7 @@ func getAttrViewName(attrView *av.AttributeView) string {
func replaceRelationAvValues(avID, previousID, nextID string) (changedSrcAvID []string) { func replaceRelationAvValues(avID, previousID, nextID string) (changedSrcAvID []string) {
// The database relation fields follow the change after the primary key field is changed https://github.com/siyuan-note/siyuan/issues/11117 // The database relation fields follow the change after the primary key field is changed https://github.com/siyuan-note/siyuan/issues/11117
srcAvIDs := av.GetSrcAvIDs(avID) srcAvIDs := av.GetSrcAvIDs(avID, true)
for _, srcAvID := range srcAvIDs { for _, srcAvID := range srcAvIDs {
srcAv, parseErr := av.ParseAttributeView(srcAvID) srcAv, parseErr := av.ParseAttributeView(srcAvID)
changed := false changed := false

2
kernel/model/transaction.go
View file

@ -1562,7 +1562,7 @@ func upsertAvBlockRel(node *ast.Node) {
affectedAvIDs = gulu.Str.RemoveDuplicatedElem(affectedAvIDs) affectedAvIDs = gulu.Str.RemoveDuplicatedElem(affectedAvIDs)
var relatedAvIDs []string var relatedAvIDs []string
for _, avID := range affectedAvIDs { for _, avID := range affectedAvIDs {
relatedAvIDs = append(relatedAvIDs, av.GetSrcAvIDs(avID)...) relatedAvIDs = append(relatedAvIDs, av.GetSrcAvIDs(avID, true)...)
} }
affectedAvIDs = append(affectedAvIDs, relatedAvIDs...) affectedAvIDs = append(affectedAvIDs, relatedAvIDs...)
affectedAvIDs = gulu.Str.RemoveDuplicatedElem(affectedAvIDs) affectedAvIDs = gulu.Str.RemoveDuplicatedElem(affectedAvIDs)