Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-09-22 08:30:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve av

Browse source
This commit is contained in:
Daniel 2025-08-05 17:24:16 +08:00
parent 037619368a
commit 8d593833ab
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

@ -1618,9 +1618,17 @@ func renderAttributeView(attrView *av.AttributeView, blockID, viewID, query stri
} }
} }
fixDev := false
// 如果存在分组的话渲染分组视图 // 如果存在分组的话渲染分组视图
if groupKey := view.GetGroupKey(attrView); nil != groupKey { if groupKey := view.GetGroupKey(attrView); nil != groupKey {
for _, groupView := range view.Groups { for _, groupView := range view.Groups {
if "" == groupView.GetGroupValue() && !fixDev {
// TODO 分组上线后删除，预计 2025 年 9 月后可以删除
regenAttrViewViewGroups(attrView, "force")
av.SaveAttributeView(attrView)
fixDev = true
}
switch groupView.GetGroupValue() { switch groupView.GetGroupValue() {
case groupValueDefault: case groupValueDefault:
groupView.Name = fmt.Sprintf(Conf.language(264), groupKey.Name) groupView.Name = fmt.Sprintf(Conf.language(264), groupKey.Name)
@ -1853,11 +1861,11 @@ func genAttrViewViewGroups(view *av.View, attrView *av.AttributeView) {
v.Name = "" // 分组视图的名称在渲染时才填充 v.Name = "" // 分组视图的名称在渲染时才填充
v.GroupVal = &av.Value{Type: av.KeyTypeText, Text: &av.ValueText{Content: groupValue}} v.GroupVal = &av.Value{Type: av.KeyTypeText, Text: &av.ValueText{Content: groupValue}}
if av.KeyTypeSelect == groupKey.Type || av.KeyTypeMSelect == groupKey.Type { if av.KeyTypeSelect == groupKey.Type || av.KeyTypeMSelect == groupKey.Type {
v.GroupVal.Text = nil if opt := groupKey.GetOption(groupVal); nil != opt {
v.GroupVal.Type = av.KeyTypeSelect v.GroupVal.Text = nil
v.GroupVal.Type = av.KeyTypeSelect
opt := groupKey.GetOption(groupVal) v.GroupVal.MSelect = []*av.ValueSelect{{Content: opt.Name, Color: opt.Color}}
v.GroupVal.MSelect = []*av.ValueSelect{{Content: opt.Name, Color: opt.Color}} }
} }
view.Groups = append(view.Groups, v) view.Groups = append(view.Groups, v)
} }