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

🎨 Support cancel two-way relation when related to the current database https://github.com/siyuan-note/siyuan/issues/11356

Browse source
This commit is contained in:
Daniel 2024-05-12 11:39:02 +08:00
parent 47599388e2
commit 933a1936c0
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
kernel/model/attribute_view.go
View file

@ -2967,7 +2967,13 @@ func RemoveAttributeViewKey(avID, keyID string) (err error) {
if removedKey.Relation.IsTwoWay { if removedKey.Relation.IsTwoWay {
// 删除双向关联的目标列 // 删除双向关联的目标列
destAv, _ := av.ParseAttributeView(removedKey.Relation.AvID) var destAv *av.AttributeView
if avID == removedKey.Relation.AvID {
destAv = attrView
} else {
destAv, _ = av.ParseAttributeView(removedKey.Relation.AvID)
}
if nil != destAv { if nil != destAv {
destAvRelSrcAv := false destAvRelSrcAv := false
for i, keyValues := range destAv.KeyValues { for i, keyValues := range destAv.KeyValues {
@ -2993,8 +2999,10 @@ func RemoveAttributeViewKey(avID, keyID string) (err error) {
} }
} }
av.SaveAttributeView(destAv) if destAv != attrView {
util.PushReloadAttrView(destAv.ID) av.SaveAttributeView(destAv)
util.PushReloadAttrView(destAv.ID)
}
if !destAvRelSrcAv { if !destAvRelSrcAv {
av.RemoveAvRel(destAv.ID, attrView.ID) av.RemoveAvRel(destAv.ID, attrView.ID)
@ -3224,12 +3232,12 @@ func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID, cellID string,
// 将游离行绑定到新建的块上 // 将游离行绑定到新建的块上
bindBlockAv(tx, avID, rowID) bindBlockAv(tx, avID, rowID)
} }
} else { // 之前绑定了块 } else { // 之前绑定了块
if isUpdatingBlockKey { // 正在更新主键 if isUpdatingBlockKey { // 正在更新主键
if val.IsDetached { // 现在是游离行 if val.IsDetached { // 现在是游离行
// 将绑定的块从属性视图中移除 // 将绑定的块从属性视图中移除
unbindBlockAv(tx, avID, rowID) unbindBlockAv(tx, avID, rowID)
} else { // 现在绑定了块 } else { // 现在绑定了块
if oldBoundBlockID != val.BlockID { // 之前绑定的块和现在绑定的块不一样 if oldBoundBlockID != val.BlockID { // 之前绑定的块和现在绑定的块不一样
// 换绑块 // 换绑块
unbindBlockAv(tx, avID, oldBoundBlockID) unbindBlockAv(tx, avID, oldBoundBlockID)