Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 23:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Add Rollup column to database table view https://github.com/siyuan-note/siyuan/issues/9958

Browse source
This commit is contained in:
Daniel 2024-01-01 16:27:01 +08:00
parent 5c8bab48ed
commit b296771340
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 22 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

14
kernel/av/value.go
View file

@ -475,7 +475,7 @@ type ValueRollup struct {
Contents []*Value `json:"contents"`
}
func (r *ValueRollup) RenderContents(calc *RollupCalc) {
func (r *ValueRollup) RenderContents(calc *RollupCalc, destKey *Key) {
if nil == calc {
return
}
@ -535,7 +535,7 @@ func (r *ValueRollup) RenderContents(calc *RollupCalc) {
sum += v.Number.Content
}
}
r.Contents = []*Value{{Type: KeyTypeNumber, Number: NewValueNumber(sum)}}
r.Contents = []*Value{{Type: KeyTypeNumber, Number: NewFormattedValueNumber(sum, destKey.NumberFormat)}}
case CalcOperatorAverage:
sum := 0.0
count := 0
@ -546,7 +546,7 @@ func (r *ValueRollup) RenderContents(calc *RollupCalc) {
}
}
if 0 < count {
r.Contents = []*Value{{Type: KeyTypeNumber, Number: NewValueNumber(sum / float64(count))}}
r.Contents = []*Value{{Type: KeyTypeNumber, Number: NewFormattedValueNumber(sum/float64(count), destKey.NumberFormat)}}
}
case CalcOperatorMedian:
var numbers []float64
@ -557,7 +557,7 @@ func (r *ValueRollup) RenderContents(calc *RollupCalc) {
}
sort.Float64s(numbers)
if 0 < len(numbers) {
r.Contents = []*Value{{Type: KeyTypeNumber, Number: NewValueNumber(numbers[len(numbers)/2])}}
r.Contents = []*Value{{Type: KeyTypeNumber, Number: NewFormattedValueNumber(numbers[len(numbers)/2], destKey.NumberFormat)}}
}
case CalcOperatorMin:
min := math.MaxFloat64
@ -568,7 +568,7 @@ func (r *ValueRollup) RenderContents(calc *RollupCalc) {
}
}
}
r.Contents = []*Value{{Type: KeyTypeNumber, Number: NewValueNumber(min)}}
r.Contents = []*Value{{Type: KeyTypeNumber, Number: NewFormattedValueNumber(min, destKey.NumberFormat)}}
case CalcOperatorMax:
max := -math.MaxFloat64
for _, v := range r.Contents {
@ -578,7 +578,7 @@ func (r *ValueRollup) RenderContents(calc *RollupCalc) {
}
}
}
r.Contents = []*Value{{Type: KeyTypeNumber, Number: NewValueNumber(max)}}
r.Contents = []*Value{{Type: KeyTypeNumber, Number: NewFormattedValueNumber(max, destKey.NumberFormat)}}
case CalcOperatorRange:
min := math.MaxFloat64
max := -math.MaxFloat64
@ -592,7 +592,7 @@ func (r *ValueRollup) RenderContents(calc *RollupCalc) {
}
}
}
r.Contents = []*Value{{Type: KeyTypeNumber, Number: NewValueNumber(max - min)}}
r.Contents = []*Value{{Type: KeyTypeNumber, Number: NewFormattedValueNumber(max-min, destKey.NumberFormat)}}
case CalcOperatorChecked:
countChecked := 0
for _, v := range r.Contents {