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

🐛 Fix db tv date sort https://ld246.com/article/1709727211377

Browse source
This commit is contained in:
Daniel 2024-03-07 09:37:49 +08:00
parent 3b7d6b0cf1
commit 8b71a91a0c
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 36 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
kernel/av/av.go
View file

@ -290,6 +290,13 @@ func SaveAttributeView(av *AttributeView) (err error) {
v.KeyID = kv.Key.ID v.KeyID = kv.Key.ID
} }
// 校验日期 IsNotEmpty
if KeyTypeDate == kv.Key.Type {
if 0 != v.Date.Content && !v.Date.IsNotEmpty {
v.Date.IsNotEmpty = true
}
}
for _, view := range av.Views { for _, view := range av.Views {
switch view.LayoutType { switch view.LayoutType {
case LayoutTypeTable: case LayoutTypeTable:
@ -307,12 +314,15 @@ func SaveAttributeView(av *AttributeView) (err error) {
if "" == v.ID { if "" == v.ID {
v.ID = ast.NewNodeID() v.ID = ast.NewNodeID()
} }
createdStr := v.ID[:len("20060102150405")]
created, parseErr := time.ParseInLocation("20060102150405", createdStr, time.Local) if 0 == v.CreatedAt {
if nil == parseErr { createdStr := v.ID[:len("20060102150405")]
v.CreatedAt = created.UnixMilli() created, parseErr := time.ParseInLocation("20060102150405", createdStr, time.Local)
} else { if nil == parseErr {
v.CreatedAt = now v.CreatedAt = created.UnixMilli()
} else {
v.CreatedAt = now
}
} }
if 0 == v.UpdatedAt { if 0 == v.UpdatedAt {

31
kernel/model/attribute_view.go
View file

@ -675,18 +675,27 @@ func renderAttributeView(attrView *av.AttributeView, viewID string, page, pageSi
} }
} }
// 补全值的创建时间和更新时间
for _, v := range kv.Values { for _, v := range kv.Values {
// 校验日期 IsNotEmpty
if av.KeyTypeDate == kv.Key.Type {
if 0 != v.Date.Content && !v.Date.IsNotEmpty {
v.Date.IsNotEmpty = true
}
}
// 补全值的创建时间和更新时间
if "" == v.ID { if "" == v.ID {
v.ID = ast.NewNodeID() v.ID = ast.NewNodeID()
} }
createdStr := v.ID[:len("20060102150405")] if 0 == v.CreatedAt {
created, parseErr := time.ParseInLocation("20060102150405", createdStr, time.Local) createdStr := v.ID[:len("20060102150405")]
if nil == parseErr { created, parseErr := time.ParseInLocation("20060102150405", createdStr, time.Local)
v.CreatedAt = created.UnixMilli() if nil == parseErr {
} else { v.CreatedAt = created.UnixMilli()
v.CreatedAt = currentTimeMillis } else {
v.CreatedAt = currentTimeMillis
}
} }
if 0 == v.UpdatedAt { if 0 == v.UpdatedAt {
@ -1904,11 +1913,11 @@ func addAttributeViewBlock(avID, blockID, previousBlockID, addingBlockID string,
sameKeyFilterSort := false // 是否在同一个字段上同时存在过滤和排序 sameKeyFilterSort := false // 是否在同一个字段上同时存在过滤和排序
if 0 < len(viewable.Sorts) { if 0 < len(viewable.Sorts) {
filterKeys, sortKeys := map[string]bool{}, map[string]bool{} filterKeys, sortKeys := map[string]bool{}, map[string]bool{}
for _, filter := range view.Table.Filters { for _, f := range view.Table.Filters {
filterKeys[filter.Column] = true filterKeys[f.Column] = true
} }
for _, sort := range view.Table.Sorts { for _, s := range view.Table.Sorts {
sortKeys[sort.Column] = true sortKeys[s.Column] = true
} }
for key := range filterKeys { for key := range filterKeys {