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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2025-08-14 16:16:21 +08:00
commit 3dcda6b2e2
1 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

19
kernel/model/attribute_view.go
View file

@ -73,6 +73,12 @@ func GetAttrViewAddingBlockDefaultValues(avID, viewID, groupID, previousBlockID,
}
ret = getAttrViewAddingBlockDefaultValues(attrView, view, groupView, previousBlockID, addingBlockID)
for _, value := range ret {
// 主键都不返回内容，避免闪烁 https://github.com/siyuan-note/siyuan/issues/15561#issuecomment-3184746195
if av.KeyTypeBlock == value.Type {
value.Block.Content = ""
}
}
return
}
@ -4718,6 +4724,12 @@ func updateAttributeViewColumnOptions(operation *Operation) (err error) {
return
}
optionSorts := map[string]int{}
for i, opt := range options {
optionSorts[opt.Name] = i
}
addNew := false
selectKey, _ := attrView.GetKey(operation.ID)
if nil == selectKey {
return
@ -4738,9 +4750,16 @@ func updateAttributeViewColumnOptions(operation *Operation) (err error) {
Color: opt.Color,
Desc: opt.Desc,
})
addNew = true
}
}
if !addNew {
sort.SliceStable(selectKey.Options, func(i, j int) bool {
return optionSorts[selectKey.Options[i].Name] < optionSorts[selectKey.Options[j].Name]
})
}
regenAttrViewGroups(attrView, operation.ID)
err = av.SaveAttributeView(attrView)
return