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

🎨 Improve av grouping https://github.com/siyuan-note/siyuan/issues/15443

Browse source
This commit is contained in:
Daniel 2025-08-05 17:42:53 +08:00
parent e2114dffd8
commit 7ac5b0010d
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/av/av.go
View file

@ -193,7 +193,7 @@ type View struct {
ItemIDs []string `json:"itemIds,omitempty"` // 项目 ID 列表，用于维护所有项目
Group *ViewGroup `json:"group,omitempty"` // 分组规则
GroupUpdated int64 `json:"groupUpdated"` // 分组规则更新时间戳
GroupCreated int64 `json:"groupCreated"` // 分组生成时间戳
Groups []*View `json:"groups,omitempty"` // 分组视图列表
GroupItemIDs []string `json:"groupItemIds"` // 分组项目 ID 列表，用于维护分组中的所有项目
GroupCalc *GroupCalc `json:"groupCalc,omitempty"` // 分组计算规则

8
kernel/model/attribute_view.go
View file

@ -217,7 +217,7 @@ func removeAttributeViewGroup(avID, blockID string) (err error) {
}
func removeAttributeViewGroup0(view *av.View) {
view.Group, view.Groups, view.GroupUpdated = nil, nil, 0
view.Group, view.Groups, view.GroupCreated = nil, nil, 0
}
func (tx *Transaction) doSyncAttrViewTableColWidth(operation *Operation) (ret *TxErr) {
@ -1613,8 +1613,8 @@ func renderAttributeView(attrView *av.AttributeView, blockID, viewID, query stri
// 当前日期可能会变，所以如果是按日期分组则需要重新生成分组
if isGroupByDate(view) {
updatedDate := time.UnixMilli(view.GroupUpdated).Format("2006-01-02")
if time.Now().Format("2006-01-02") != updatedDate {
createdDate := time.UnixMilli(view.GroupCreated).Format("2006-01-02")
if time.Now().Format("2006-01-02") != createdDate {
regenAttrViewViewGroups(attrView, "force")
av.SaveAttributeView(attrView)
}
@ -1871,7 +1871,7 @@ func genAttrViewViewGroups(view *av.View, attrView *av.AttributeView) {
view.Groups = append(view.Groups, v)
}
view.GroupUpdated = time.Now().UnixMilli()
view.GroupCreated = time.Now().UnixMilli()
setAttrViewGroupStates(view, groupStates)