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 https://github.com/siyuan-note/siyuan/issues/15555

Browse source
This commit is contained in:
Daniel 2025-08-13 11:00:23 +08:00
parent e6a88e2ad2
commit dc39e18fc1
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 40 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

28
kernel/model/attribute_view.go
View file

@ -1648,6 +1648,11 @@ func genAttrViewGroups(view *av.View, attrView *av.AttributeView) {
return
}
var relationDestAv *av.AttributeView
if av.KeyTypeRelation == groupKey.Type && nil != groupKey.Relation {
relationDestAv, _ = av.ParseAttributeView(groupKey.Relation.AvID)
}
var rangeStart, rangeEnd float64
switch group.Method {
case av.GroupMethodValue:
@ -1695,11 +1700,20 @@ func genAttrViewGroups(view *av.View, attrView *av.AttributeView) {
var groupVal string
switch group.Method {
case av.GroupMethodValue:
if av.KeyTypeMSelect == groupKey.Type {
if av.KeyTypeSelect == groupKey.Type || av.KeyTypeMSelect == groupKey.Type {
for _, s := range value.MSelect {
groupItemsMap[s.Content] = append(groupItemsMap[s.Content], item)
}
continue
} else if av.KeyTypeRelation == groupKey.Type {
if nil == relationDestAv {
continue
}
for _, bID := range value.Relation.BlockIDs {
groupItemsMap[bID] = append(groupItemsMap[bID], item)
}
continue
}
groupVal = value.String(false)
@ -1801,6 +1815,16 @@ func genAttrViewGroups(view *av.View, attrView *av.AttributeView) {
v.GroupVal.Type = av.KeyTypeSelect
v.GroupVal.MSelect = []*av.ValueSelect{{Content: opt.Name, Color: opt.Color}}
}
} else if av.KeyTypeRelation == groupKey.Type {
if relationDestAv != nil && groupValueDefault != groupValue {
v.GroupVal.Text = nil
v.GroupVal.Type = av.KeyTypeRelation
v.GroupVal.Relation = &av.ValueRelation{BlockIDs: []string{groupValue}}
if destBlock := relationDestAv.GetBlockValue(groupValue); nil != destBlock {
v.GroupVal.Relation.Contents = []*av.Value{destBlock}
}
}
}
v.GroupSort = -1
view.Groups = append(view.Groups, v)
@ -3556,7 +3580,7 @@ func sortAttributeViewRow(operation *Operation) (err error) {
}
targetGroupView.GroupItemIDs = util.InsertElem(targetGroupView.GroupItemIDs, previousIndex, itemID)
if av.KeyTypeMSelect == groupKey.Type {
if av.KeyTypeMSelect == groupKey.Type || av.KeyTypeRelation == groupKey.Type {
// 跨多选分组时一个项目可能会同时存在于多个分组中，需要重新生成分组
regenAttrViewGroups(attrView, "force")
}