renun/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-02-28 05:32:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa
2023-07-16 23:10:46 +08:00
parent 635a6b349c 6f57787fcf
commit e4e4879911
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/av/av.go
View File

@@ -24,6 +24,7 @@ import (
"os"
"path/filepath"
"strconv"
"strings"
"github.com/88250/gulu"
"github.com/88250/lute/ast"
@@ -148,7 +149,8 @@ func NewFormattedValueNumber(content float64, format NumberFormat) (ret *ValueNu
case NumberFormatNone:
ret.FormattedContent = strconv.FormatFloat(content, 'f', -1, 64)
case NumberFormatPercent:
ret.FormattedContent = strconv.FormatFloat(content*100, 'f', -1, 64) + "%"
s := fmt.Sprintf("%.2f", content*100)
ret.FormattedContent = strings.TrimRight(strings.TrimRight(s, "0"), ".") + "%"
}
return
}
@@ -158,7 +160,8 @@ func (number *ValueNumber) FormatNumber() {
case NumberFormatNone:
number.FormattedContent = strconv.FormatFloat(number.Content, 'f', -1, 64)
case NumberFormatPercent:
number.FormattedContent = strconv.FormatFloat(number.Content*100, 'f', -1, 64) + "%"
s := fmt.Sprintf("%.2f", number.Content*100)
number.FormattedContent = strings.TrimRight(strings.TrimRight(s, "0"), ".") + "%"
}
}