Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-24 09:16:09 +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 2023-07-16 23:20:14 +08:00
commit 62b990bf05
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
kernel/av/table.go
View file

@ -674,7 +674,7 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
sum += row.Cells[colIndex].Value.Number.Content
}
}
col.Calc.Result = &Value{Number: &ValueNumber{Content: sum, IsNotEmpty: true}}
col.Calc.Result = &Value{Number: NewFormattedValueNumber(float64(sum), NumberFormatNone)}
case CalcOperatorAverage:
sum := 0.0
count := 0
@ -685,7 +685,7 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
}
}
if 0 != count {
col.Calc.Result = &Value{Number: &ValueNumber{Content: sum / float64(count), IsNotEmpty: true}}
col.Calc.Result = &Value{Number: NewFormattedValueNumber(sum/float64(count), NumberFormatNone)}
}
case CalcOperatorMedian:
values := []float64{}
@ -697,9 +697,9 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
sort.Float64s(values)
if len(values) > 0 {
if len(values)%2 == 0 {
col.Calc.Result = &Value{Number: &ValueNumber{Content: (values[len(values)/2-1] + values[len(values)/2]) / 2, IsNotEmpty: true}}
col.Calc.Result = &Value{Number: NewFormattedValueNumber((values[len(values)/2-1]+values[len(values)/2])/2, NumberFormatNone)}
} else {
col.Calc.Result = &Value{Number: &ValueNumber{Content: values[len(values)/2], IsNotEmpty: true}}
col.Calc.Result = &Value{Number: NewFormattedValueNumber(values[len(values)/2], NumberFormatNone)}
}
}
case CalcOperatorMin:
@ -712,7 +712,7 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
}
}
if math.MaxFloat64 != min {
col.Calc.Result = &Value{Number: &ValueNumber{Content: min, IsNotEmpty: true}}
col.Calc.Result = &Value{Number: NewFormattedValueNumber(min, NumberFormatNone)}
}
case CalcOperatorMax:
max := -math.MaxFloat64
@ -724,7 +724,7 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
}
}
if -math.MaxFloat64 != max {
col.Calc.Result = &Value{Number: &ValueNumber{Content: max, IsNotEmpty: true}}
col.Calc.Result = &Value{Number: NewFormattedValueNumber(max, NumberFormatNone)}
}
case CalcOperatorRange:
min := math.MaxFloat64
@ -740,7 +740,7 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
}
}
if math.MaxFloat64 != min && -math.MaxFloat64 != max {
col.Calc.Result = &Value{Number: &ValueNumber{Content: max - min, IsNotEmpty: true}}
col.Calc.Result = &Value{Number: NewFormattedValueNumber(max-min, NumberFormatNone)}
}
}
}