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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2024-04-01 17:33:29 +08:00
commit 6c157e6871
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
kernel/av/value.go
View file

@ -716,7 +716,7 @@ func (r *ValueRollup) RenderContents(calc *RollupCalc, destKey *Key) {
case CalcOperatorSum:
sum := 0.0
for _, v := range r.Contents {
if nil != v.Number {
if KeyTypeNumber == v.Type && nil != v.Number && v.Number.IsNotEmpty {
sum += v.Number.Content
}
}
@ -725,7 +725,7 @@ func (r *ValueRollup) RenderContents(calc *RollupCalc, destKey *Key) {
sum := 0.0
count := 0
for _, v := range r.Contents {
if nil != v.Number {
if KeyTypeNumber == v.Type && nil != v.Number && v.Number.IsNotEmpty {
sum += v.Number.Content
count++
}
@ -736,7 +736,7 @@ func (r *ValueRollup) RenderContents(calc *RollupCalc, destKey *Key) {
case CalcOperatorMedian:
var numbers []float64
for _, v := range r.Contents {
if nil != v.Number {
if KeyTypeNumber == v.Type && nil != v.Number && v.Number.IsNotEmpty {
numbers = append(numbers, v.Number.Content)
}
}
@ -747,7 +747,7 @@ func (r *ValueRollup) RenderContents(calc *RollupCalc, destKey *Key) {
case CalcOperatorMin:
minVal := math.MaxFloat64
for _, v := range r.Contents {
if nil != v.Number {
if KeyTypeNumber == v.Type && nil != v.Number && v.Number.IsNotEmpty {
if v.Number.Content < minVal {
minVal = v.Number.Content
}
@ -757,7 +757,7 @@ func (r *ValueRollup) RenderContents(calc *RollupCalc, destKey *Key) {
case CalcOperatorMax:
maxVal := -math.MaxFloat64
for _, v := range r.Contents {
if nil != v.Number {
if KeyTypeNumber == v.Type && nil != v.Number && v.Number.IsNotEmpty {
if v.Number.Content > maxVal {
maxVal = v.Number.Content
}
@ -768,7 +768,7 @@ func (r *ValueRollup) RenderContents(calc *RollupCalc, destKey *Key) {
minVal := math.MaxFloat64
maxVal := -math.MaxFloat64
for _, v := range r.Contents {
if nil != v.Number {
if KeyTypeNumber == v.Type && nil != v.Number && v.Number.IsNotEmpty {
if v.Number.Content < minVal {
minVal = v.Number.Content
}