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 18:20:45 +08:00
parent 085c72add5
commit c3a9b0f77b
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
kernel/api/av.go
View file

@ -53,13 +53,12 @@ func getAttributeViewAddingBlockDefaultValues(c *gin.Context) {
addingBlockID = arg["addingBlockID"].(string)
}
values, ignore := model.GetAttrViewAddingBlockDefaultValues(avID, viewID, groupID, previousID, addingBlockID)
values := model.GetAttrViewAddingBlockDefaultValues(avID, viewID, groupID, previousID, addingBlockID)
if 1 > len(values) {
values = nil
}
ret.Data = map[string]interface{}{
"values": values,
"ignore": ignore,
}
}

8
kernel/model/attribute_view.go
View file

@ -43,7 +43,7 @@ import (
"github.com/xrash/smetrics"
)
func GetAttrViewAddingBlockDefaultValues(avID, viewID, groupID, previousBlockID, addingBlockID string) (ret map[string]*av.Value, ignore bool) {
func GetAttrViewAddingBlockDefaultValues(avID, viewID, groupID, previousBlockID, addingBlockID string) (ret map[string]*av.Value) {
ret = map[string]*av.Value{}
attrView, err := av.ParseAttributeView(avID)
@ -60,7 +60,6 @@ func GetAttrViewAddingBlockDefaultValues(avID, viewID, groupID, previousBlockID,
if 1 > len(view.Filters) && nil == view.Group {
// 没有过滤条件也没有分组条件时忽略
ignore = true
return
}
@ -74,11 +73,6 @@ func GetAttrViewAddingBlockDefaultValues(avID, viewID, groupID, previousBlockID,
}
ret = getAttrViewAddingBlockDefaultValues(attrView, view, groupView, previousBlockID, addingBlockID)
if 1 > len(ret) {
if 2 > len(view.Groups) && 1 > len(groupView.GroupItemIDs) { // 少于两个分组并且没有项目时忽略
ignore = true
}
}
return
}