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

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

Browse source
This commit is contained in:
Vanessa 2023-07-17 10:12:43 +08:00
commit be0b52a916
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
kernel/av/av.go
View file

@ -147,7 +147,8 @@ func NewFormattedValueNumber(content float64, format NumberFormat) (ret *ValueNu
}
switch format {
case NumberFormatNone:
ret.FormattedContent = strconv.FormatFloat(content, 'f', -1, 64)
s := fmt.Sprintf("%.5f", content)
ret.FormattedContent = strings.TrimRight(strings.TrimRight(s, "0"), ".")
case NumberFormatPercent:
s := fmt.Sprintf("%.2f", content*100)
ret.FormattedContent = strings.TrimRight(strings.TrimRight(s, "0"), ".") + "%"

2
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: NewFormattedValueNumber(float64(sum), NumberFormatNone)}
col.Calc.Result = &Value{Number: NewFormattedValueNumber(sum, NumberFormatNone)}
case CalcOperatorAverage:
sum := 0.0
count := 0