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

🎨 Improve the handling of empty values in database multi-field sorting https://github.com/siyuan-note/siyuan/issues/10758

Browse source
This commit is contained in:
Daniel 2024-03-28 09:23:29 +08:00
parent 5c6dec485f
commit 58f79964ff
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 40 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
kernel/av/sort.go
View file

@ -48,13 +48,21 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int {
}
case KeyTypeText:
if nil != value.Text && nil != other.Text {
if "" == value.Text.Content {
if "" == other.Text.Content {
return 0
}
return 1
} else if "" == other.Text.Content {
return -1
}
return strings.Compare(value.Text.Content, other.Text.Content)
}
case KeyTypeNumber:
if nil != value.Number && nil != other.Number {
if value.Number.IsNotEmpty {
if !other.Number.IsNotEmpty {
return 1
return -1
}
if value.Number.Content > other.Number.Content {
@ -65,17 +73,17 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int {
}
return 0
} else {
if other.Number.IsNotEmpty {
return -1
if !other.Number.IsNotEmpty {
return 0
}
return 0
return 1
}
}
case KeyTypeDate:
if nil != value.Date && nil != other.Date {
if value.Date.IsNotEmpty {
if !other.Date.IsNotEmpty {
return 1
return -1
}
if value.Date.Content > other.Date.Content {
return 1
@ -85,10 +93,10 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int {
}
return 0
} else {
if other.Date.IsNotEmpty {
return -1
if !other.Date.IsNotEmpty {
return 0
}
return 0
return 1
}
}
case KeyTypeCreated:
@ -140,14 +148,38 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int {
}
case KeyTypeURL:
if nil != value.URL && nil != other.URL {
if "" == value.URL.Content {
if "" == other.URL.Content {
return 0
}
return 1
} else if "" == other.URL.Content {
return -1
}
return strings.Compare(value.URL.Content, other.URL.Content)
}
case KeyTypeEmail:
if nil != value.Email && nil != other.Email {
if "" == value.Email.Content {
if "" == other.Email.Content {
return 0
}
return 1
} else if "" == other.Email.Content {
return -1
}
return strings.Compare(value.Email.Content, other.Email.Content)
}
case KeyTypePhone:
if nil != value.Phone && nil != other.Phone {
if "" == value.Phone.Content {
if "" == other.Phone.Content {
return 0
}
return 1
} else if "" == other.Phone.Content {
return -1
}
return strings.Compare(value.Phone.Content, other.Phone.Content)
}
case KeyTypeMAsset: