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

🎨 Improve database relation field binding/unbinding blocks https://github.com/siyuan-note/siyuan/issues/12372

Browse source
This commit is contained in:
Daniel 2024-09-02 17:53:34 +08:00
parent c955aa82a5
commit edb6af67d9
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 41 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

45
kernel/model/attribute_view.go
View file

@ -990,8 +990,20 @@ func unbindAttributeViewBlock(operation *Operation, tx *Transaction) (err error)
return return
} }
var changedAvIDs []string
for _, keyValues := range attrView.KeyValues { for _, keyValues := range attrView.KeyValues {
for _, value := range keyValues.Values { for _, value := range keyValues.Values {
if av.KeyTypeRelation == value.Type {
if nil != value.Relation {
for i, relBlockID := range value.Relation.BlockIDs {
if relBlockID == operation.ID {
value.Relation.BlockIDs[i] = operation.NextID
changedAvIDs = append(changedAvIDs, attrView.ID)
}
}
}
}
if value.BlockID != operation.ID { if value.BlockID != operation.ID {
continue continue
} }
@ -1005,7 +1017,8 @@ func unbindAttributeViewBlock(operation *Operation, tx *Transaction) (err error)
value.Block.ID = operation.NextID value.Block.ID = operation.NextID
} }
replaceRelationAvValues(operation.AvID, operation.ID, operation.NextID) avIDs := replaceRelationAvValues(operation.AvID, operation.ID, operation.NextID)
changedAvIDs = append(changedAvIDs, avIDs...)
} }
} }
@ -1028,6 +1041,11 @@ func unbindAttributeViewBlock(operation *Operation, tx *Transaction) (err error)
} }
err = av.SaveAttributeView(attrView) err = av.SaveAttributeView(attrView)
changedAvIDs = gulu.Str.RemoveDuplicatedElem(changedAvIDs)
for _, avID := range changedAvIDs {
util.PushReloadAttrView(avID)
}
return return
} }
@ -2855,8 +2873,20 @@ func replaceAttributeViewBlock(operation *Operation, tx *Transaction) (err error
} }
} }
var changedAvIDs []string
for _, keyValues := range attrView.KeyValues { for _, keyValues := range attrView.KeyValues {
for _, value := range keyValues.Values { for _, value := range keyValues.Values {
if av.KeyTypeRelation == value.Type {
if nil != value.Relation {
for i, relBlockID := range value.Relation.BlockIDs {
if relBlockID == operation.PreviousID {
value.Relation.BlockIDs[i] = operation.NextID
changedAvIDs = append(changedAvIDs, attrView.ID)
}
}
}
}
if value.BlockID != operation.PreviousID { if value.BlockID != operation.PreviousID {
continue continue
} }
@ -2878,7 +2908,8 @@ func replaceAttributeViewBlock(operation *Operation, tx *Transaction) (err error
if av.KeyTypeBlock == value.Type && !operation.IsDetached { if av.KeyTypeBlock == value.Type && !operation.IsDetached {
bindBlockAv(tx, operation.AvID, operation.NextID) bindBlockAv(tx, operation.AvID, operation.NextID)
replaceRelationAvValues(operation.AvID, operation.PreviousID, operation.NextID) avIDs := replaceRelationAvValues(operation.AvID, operation.PreviousID, operation.NextID)
changedAvIDs = append(changedAvIDs, avIDs...)
} }
} }
} }
@ -2902,6 +2933,11 @@ func replaceAttributeViewBlock(operation *Operation, tx *Transaction) (err error
} }
err = av.SaveAttributeView(attrView) err = av.SaveAttributeView(attrView)
changedAvIDs = gulu.Str.RemoveDuplicatedElem(changedAvIDs)
for _, avID := range changedAvIDs {
util.PushReloadAttrView(avID)
}
return return
} }
@ -3429,7 +3465,7 @@ func getAttrViewName(attrView *av.AttributeView) string {
return ret return ret
} }
func replaceRelationAvValues(avID, previousID, nextID 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)
@ -3464,9 +3500,10 @@ func replaceRelationAvValues(avID, previousID, nextID string) {
if changed { if changed {
av.SaveAttributeView(srcAv) av.SaveAttributeView(srcAv)
util.PushReloadAttrView(srcAvID) changedSrcAvID = append(changedSrcAvID, srcAvID)
} }
} }
return
} }
func updateBoundBlockAvsAttribute(avIDs []string) { func updateBoundBlockAvsAttribute(avIDs []string) {