Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-03 15:28:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🐛 Fix rollup column sort https://ld246.com/article/1706960677814

Browse source
This commit is contained in:
Daniel 2024-02-04 09:54:43 +08:00
parent a655a02ce4
commit 2b37ea5d06
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
kernel/av/table.go
View file

@ -17,6 +17,7 @@
package av
import (
"bytes"
"math"
"sort"
"strconv"
@ -210,8 +211,19 @@ func (value *Value) Compare(other *Value) int {
}
case KeyTypeRollup:
if nil != value.Rollup && nil != other.Rollup {
vContent := strings.TrimSpace(strings.Join(value.Relation.Contents, " "))
oContent := strings.TrimSpace(strings.Join(other.Relation.Contents, " "))
vContentBuf := bytes.Buffer{}
for _, c := range value.Rollup.Contents {
vContentBuf.WriteString(c.String())
vContentBuf.WriteByte(' ')
}
vContent := strings.TrimSpace(vContentBuf.String())
oContentBuf := bytes.Buffer{}
for _, c := range other.Rollup.Contents {
oContentBuf.WriteString(c.String())
oContentBuf.WriteByte(' ')
}
oContent := strings.TrimSpace(oContentBuf.String())
if util.IsNumeric(vContent) && util.IsNumeric(oContent) {
v1, _ := strconv.ParseFloat(vContent, 64)
v2, _ := strconv.ParseFloat(oContent, 64)