From 62288da3d98ac4f9dd4b4bfc586f77f156cb450a Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Tue, 29 Jul 2025 10:43:28 +0800
Subject: [PATCH] :art: Database grouping by field
 https://github.com/siyuan-note/siyuan/issues/10964

---
 kernel/model/attribute_view.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index 2194f5852..5791ecc29 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -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
 	groupItemsMap := map[string][]av.Item{}
 	for _, item := range items {
@@ -1677,8 +1680,6 @@ func genAttrViewViewGroups(view *av.View, attrView *av.AttributeView) {
 				// 过去 30 天之前的按月分组
 				// 过去 30 天、过去 7 天、昨天、今天、明天、未来 7 天、未来 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)) {
 					groupName = "0" + contentTime.Format("2006-01") // 开头的数字用于排序，下同
 				} else if contentTime.Before(todayStart.AddDate(0, 0, -7)) {
@@ -4595,7 +4596,8 @@ func regenAttrViewViewGroups(attrView *av.AttributeView, keyID string) {
 		}
 
 		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
 			}
 		}