0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 Improve database date filed sorting https://github.com/siyuan-note/siyuan/issues/12127

Browse source
This commit is contained in:
Daniel 2024-07-29 21:15:35 +08:00
parent 9a8802bf39
commit e5078e8af5
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
kernel/av/sort.go
View file

@ -19,6 +19,7 @@ package av
import (
"bytes"
"strings"
"time"
"github.com/siyuan-note/siyuan/kernel/util"
)
@ -84,10 +85,23 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int {
if !other.Date.IsNotEmpty {
return -1
}
if value.Date.Content > other.Date.Content {
valueContent := value.Date.Content
otherContent := other.Date.Content
if value.Date.IsNotTime {
v := time.UnixMilli(valueContent)
valueContent = time.Date(v.Year(), v.Month(), v.Day(), 0, 0, 0, 0, time.Local).UnixMilli()
}
if other.Date.IsNotTime {
o := time.UnixMilli(otherContent)
otherContent = time.Date(o.Year(), o.Month(), o.Day(), 0, 0, 0, 0, time.Local).UnixMilli()
}
if valueContent > otherContent {
return 1
}
if value.Date.Content < other.Date.Content {
if valueContent < otherContent {
return -1
}
return 0