From 75d39ced6f93170bc21e21eff8fc7414e3523b19 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sun, 16 Jul 2023 23:12:02 +0800
Subject: [PATCH] :art: Attribute View columns calculate
 https://github.com/siyuan-note/siyuan/issues/8699

---
 kernel/av/table.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/kernel/av/table.go b/kernel/av/table.go
index dd2ec5022..e99d438b8 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: &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)}
 		}
 	}
 }