0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 Add Relation column to database table view https://github.com/siyuan-note/siyuan/issues/9888

Browse source
This commit is contained in:
Daniel 2023-12-24 23:25:06 +08:00
parent c70b8c382c
commit 8c6d9ae176
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
kernel/model/attribute_view.go
View file

@ -2171,9 +2171,9 @@ func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID, cellID string,
isUpdatingBlockKey := av.KeyTypeBlock == val.Type
oldBoundBlockID := val.BlockID
var oldRelation *av.ValueRelation
var oldRelationBlockIDs []string
if av.KeyTypeRelation == val.Type {
oldRelation = val.Relation
oldRelationBlockIDs = val.Relation.BlockIDs
}
data, err := gulu.JSON.MarshalJSON(valueData)
if nil != err {
@ -2224,19 +2224,17 @@ func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID, cellID string,
if nil != key && av.KeyTypeRelation == key.Type && nil != key.Relation && key.Relation.IsTwoWay {
destAv, _ := av.ParseAttributeView(key.Relation.AvID)
if nil != destAv {
if nil != oldRelation {
// 清空旧的双向关联的目标值
for _, blockID := range oldRelation.BlockIDs {
for _, keyValues := range destAv.KeyValues {
if keyValues.Key.ID != key.Relation.BackKeyID {
continue
}
// 清空旧的双向关联的目标值
for _, blockID := range oldRelationBlockIDs {
for _, keyValues := range destAv.KeyValues {
if keyValues.Key.ID != key.Relation.BackKeyID {
continue
}
for _, value := range keyValues.Values {
if value.BlockID == blockID {
value.Relation.BlockIDs = gulu.Str.RemoveElem(value.Relation.BlockIDs, rowID)
break
}
for _, value := range keyValues.Values {
if value.BlockID == blockID {
value.Relation.BlockIDs = gulu.Str.RemoveElem(value.Relation.BlockIDs, rowID)
break
}
}
}