Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 15:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Database grouping by field https://github.com/siyuan-note/siyuan/issues/10964

Browse source
This commit is contained in:
Daniel 2025-07-29 10:43:28 +08:00
parent fa2ec80cb1
commit 62288da3d9
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kernel/model/attribute_view.go
View file

@ -1626,6 +1626,9 @@ func genAttrViewViewGroups(view *av.View, attrView *av.AttributeView) {
} }
} }
todayStart := time.Now()
todayStart = time.Date(todayStart.Year(), todayStart.Month(), todayStart.Day(), 0, 0, 0, 0, time.Local)
var groupName string var groupName string
groupItemsMap := map[string][]av.Item{} groupItemsMap := map[string][]av.Item{}
for _, item := range items { for _, item := range items {
@ -1677,8 +1680,6 @@ func genAttrViewViewGroups(view *av.View, attrView *av.AttributeView) {
// 过去 30 天之前的按月分组 // 过去 30 天之前的按月分组
// 过去 30 天、过去 7 天、昨天、今天、明天、未来 7 天、未来 30 天 // 过去 30 天、过去 7 天、昨天、今天、明天、未来 7 天、未来 30 天
// 未来 30 天之后的按月分组 // 未来 30 天之后的按月分组
todayStart := time.Now()
todayStart = time.Date(todayStart.Year(), todayStart.Month(), todayStart.Day(), 0, 0, 0, 0, time.Local)
if contentTime.Before(todayStart.AddDate(0, 0, -30)) { if contentTime.Before(todayStart.AddDate(0, 0, -30)) {
groupName = "0" + contentTime.Format("2006-01") // 开头的数字用于排序，下同 groupName = "0" + contentTime.Format("2006-01") // 开头的数字用于排序，下同
} else if contentTime.Before(todayStart.AddDate(0, 0, -7)) { } else if contentTime.Before(todayStart.AddDate(0, 0, -7)) {
@ -4595,7 +4596,8 @@ func regenAttrViewViewGroups(attrView *av.AttributeView, keyID string) {
} }
if "force" != keyID { if "force" != keyID {
if av.KeyTypeTemplate != groupKey.Type && view.Group.Field != keyID { if av.KeyTypeTemplate != groupKey.Type && av.KeyTypeCreated != groupKey.Type && av.KeyTypeUpdated != groupKey.Type &&
view.Group.Field != keyID {
continue continue
} }
} }