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

🎨 Improve av https://github.com/siyuan-note/siyuan/issues/15560

Browse source
This commit is contained in:
Daniel 2025-08-13 16:49:53 +08:00
parent bce519ae99
commit 469d9e24db
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
kernel/model/attribute_view.go
View file

@ -3021,6 +3021,25 @@ func addAttributeViewBlock(now int64, avID, dbBlockID, groupID, previousItemID,
} else {
v.ItemIDs = append([]string{addingItemID}, v.ItemIDs...)
}
// 在所有分组视图中添加，目的是为了在重新分组的过程中保住排序状态 https://github.com/siyuan-note/siyuan/issues/15560
for _, g := range v.Groups {
if "" != previousItemID {
changed := false
for i, id := range g.GroupItemIDs {
if id == previousItemID {
g.GroupItemIDs = append(g.GroupItemIDs[:i+1], append([]string{addingItemID}, g.GroupItemIDs[i+1:]...)...)
changed = true
break
}
}
if !changed {
g.GroupItemIDs = append(g.GroupItemIDs, addingItemID)
}
} else {
g.GroupItemIDs = append([]string{addingItemID}, g.GroupItemIDs...)
}
}
}
regenAttrViewGroups(attrView, "force")
@ -3028,10 +3047,10 @@ func addAttributeViewBlock(now int64, avID, dbBlockID, groupID, previousItemID,
return
}
func fillDefaultValue(attrView *av.AttributeView, view, groupView *av.View, previousBlockID, addingBlockID string) {
defaultValues := getAttrViewAddingBlockDefaultValues(attrView, view, groupView, previousBlockID, addingBlockID)
func fillDefaultValue(attrView *av.AttributeView, view, groupView *av.View, previousItemID, addingItemID string) {
defaultValues := getAttrViewAddingBlockDefaultValues(attrView, view, groupView, previousItemID, addingItemID)
for keyID, newValue := range defaultValues {
newValue.BlockID = addingBlockID
newValue.BlockID = addingItemID
keyValues, getErr := attrView.GetKeyValues(keyID)
if nil != getErr {
continue
@ -3054,7 +3073,7 @@ func fillDefaultValue(attrView *av.AttributeView, view, groupView *av.View, prev
updateTwoWayRelationDestAttrView(attrView, keyValues.Key, newValue, 1, []string{})
}
existingVal := keyValues.GetValue(addingBlockID)
existingVal := keyValues.GetValue(addingItemID)
if nil == existingVal {
keyValues.Values = append(keyValues.Values, newValue)
} else {