From 286d9330cb8b8aff1a57114e5183c31297a24711 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 16 Jul 2023 23:22:51 +0800 Subject: [PATCH] :art: Attribute View columns calculate https://github.com/siyuan-note/siyuan/issues/8699 --- kernel/av/av.go | 3 ++- kernel/av/table.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/av/av.go b/kernel/av/av.go index 1eb6877ce..d1fc53042 100644 --- a/kernel/av/av.go +++ b/kernel/av/av.go @@ -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"), ".") + "%" diff --git a/kernel/av/table.go b/kernel/av/table.go index e99d438b8..5e3947f31 100644 --- a/kernel/av/table.go +++ b/kernel/av/table.go @@ -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