p30928647
/
excelize
1
0
Fork 1
Code Issues Pull Requests Projects Releases 23 Wiki Activity

This fix scientific notation and page setup fields parsing issue

This commit is contained in:
xuri 2022-03-18 00:52:10 +08:00
parent 1da129a3df
commit 14b461420f
No known key found for this signature in database
GPG Key ID: BA5E5BB1C948EDF7
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
calc_test.go
View File

@ -66,7 +66,7 @@ func TestCalcCellValue(t *testing.T) {
// Engineering Functions // Engineering Functions
// BESSELI // BESSELI
"=BESSELI(4.5,1)": "15.389222753735925", "=BESSELI(4.5,1)": "15.389222753735925",
"=BESSELI(32,1)": "5.502845511211247e+12", "=BESSELI(32,1)": "5502845511211.25",
// BESSELJ // BESSELJ
"=BESSELJ(1.9,2)": "0.329925727692387", "=BESSELJ(1.9,2)": "0.329925727692387",
// BESSELK // BESSELK
@ -457,7 +457,7 @@ func TestCalcCellValue(t *testing.T) {
"=EVEN(-4)": "-4", "=EVEN(-4)": "-4",
"=EVEN((0))": "0", "=EVEN((0))": "0",
// EXP // EXP
"=EXP(100)": "2.6881171418161356E+43", "=EXP(100)": "2.68811714181614E+43",
"=EXP(0.1)": "1.10517091807565", "=EXP(0.1)": "1.10517091807565",
"=EXP(0)": "1", "=EXP(0)": "1",
"=EXP(-5)": "0.00673794699908547", "=EXP(-5)": "0.00673794699908547",
@ -465,7 +465,7 @@ func TestCalcCellValue(t *testing.T) {
// FACT // FACT
"=FACT(3)": "6", "=FACT(3)": "6",
"=FACT(6)": "720", "=FACT(6)": "720",
"=FACT(10)": "3.6288e+06", "=FACT(10)": "3628800",
"=FACT(FACT(3))": "720", "=FACT(FACT(3))": "720",
// FACTDOUBLE // FACTDOUBLE
"=FACTDOUBLE(5)": "15", "=FACTDOUBLE(5)": "15",
@ -915,9 +915,9 @@ func TestCalcCellValue(t *testing.T) {
"=LOGNORM.INV(0.3,2,0.2)": "6.6533460753367", "=LOGNORM.INV(0.3,2,0.2)": "6.6533460753367",
// LOGNORM.DIST // LOGNORM.DIST
"=LOGNORM.DIST(0.5,10,5,FALSE)": "0.0162104821842127", "=LOGNORM.DIST(0.5,10,5,FALSE)": "0.0162104821842127",
"=LOGNORM.DIST(12,10,5,TRUE)": "0.0664171147992077", "=LOGNORM.DIST(12,10,5,TRUE)": "0.0664171147992078",
// LOGNORMDIST // LOGNORMDIST
"=LOGNORMDIST(12,10,5)": "0.0664171147992077", "=LOGNORMDIST(12,10,5)": "0.0664171147992078",
// NORM.DIST // NORM.DIST
"=NORM.DIST(0.8,1,0.3,TRUE)": "0.252492537546923", "=NORM.DIST(0.8,1,0.3,TRUE)": "0.252492537546923",
"=NORM.DIST(50,40,20,FALSE)": "0.017603266338215", "=NORM.DIST(50,40,20,FALSE)": "0.017603266338215",
@ -1304,12 +1304,12 @@ func TestCalcCellValue(t *testing.T) {
"=TIME(\"5\",\"44\",\"32\")": "0.239259259259259", "=TIME(\"5\",\"44\",\"32\")": "0.239259259259259",
"=TIME(0,0,73)": "0.000844907407407407", "=TIME(0,0,73)": "0.000844907407407407",
// TIMEVALUE // TIMEVALUE
"=TIMEVALUE(\"2:23\")": "0.0993055555555556", "=TIMEVALUE(\"2:23\")": "0.0993055555555555",
"=TIMEVALUE(\"2:23 am\")": "0.0993055555555556", "=TIMEVALUE(\"2:23 am\")": "0.0993055555555555",
"=TIMEVALUE(\"2:23 PM\")": "0.599305555555555", "=TIMEVALUE(\"2:23 PM\")": "0.599305555555556",
"=TIMEVALUE(\"14:23:00\")": "0.599305555555555", "=TIMEVALUE(\"14:23:00\")": "0.599305555555556",
"=TIMEVALUE(\"00:02:23\")": "0.00165509259259259", "=TIMEVALUE(\"00:02:23\")": "0.00165509259259259",
"=TIMEVALUE(\"01/01/2011 02:23\")": "0.0993055555555556", "=TIMEVALUE(\"01/01/2011 02:23\")": "0.0993055555555555",
// WEEKDAY // WEEKDAY
"=WEEKDAY(0)": "7", "=WEEKDAY(0)": "7",
"=WEEKDAY(47119)": "2", "=WEEKDAY(47119)": "2",
@ -4137,8 +4137,7 @@ func TestCalcXIRR(t *testing.T) {
f := prepareCalcData(cellData) f := prepareCalcData(cellData)
formulaList := map[string]string{ formulaList := map[string]string{
"=XIRR(A1:A4,B1:B4)": "-0.196743861298328", "=XIRR(A1:A4,B1:B4)": "-0.196743861298328",
"=XIRR(A1:A6,B1:B6)": "0.09443907444452", "=XIRR(A1:A6,B1:B6,0.5)": "0.0944390744445204",
"=XIRR(A1:A6,B1:B6,0.1)": "0.0944390744445201",
} }
for formula, expected := range formulaList { for formula, expected := range formulaList {
assert.NoError(t, f.SetCellFormula("Sheet1", "C1", formula)) assert.NoError(t, f.SetCellFormula("Sheet1", "C1", formula))

3
lib.go
View File

@ -688,7 +688,8 @@ func isNumeric(s string) (bool, int) {
if i == 0 && v == '-' { if i == 0 && v == '-' {
continue continue
} }
if e && v == '-' { if e && (v == '+' || v == '-') {
p = 15
continue continue
} }
return false, 0 return false, 0

2
rows.go
View File

@ -471,7 +471,7 @@ func roundPrecision(text string, prec int) string {
if _, ok := decimal.SetString(text); ok { if _, ok := decimal.SetString(text); ok {
flt, _ := decimal.Float64() flt, _ := decimal.Float64()
if prec == -1 { if prec == -1 {
return decimal.Text('G', 15) return strconv.FormatFloat(flt, 'G', 15, 64)
} }
return strconv.FormatFloat(flt, 'f', -1, 64) return strconv.FormatFloat(flt, 'f', -1, 64)
} }

4
xmlWorksheet.go
View File

@ -116,7 +116,7 @@ type xlsxPageSetUp struct {
FirstPageNumber string `xml:"firstPageNumber,attr,omitempty"` FirstPageNumber string `xml:"firstPageNumber,attr,omitempty"`
FitToHeight *int `xml:"fitToHeight,attr"` FitToHeight *int `xml:"fitToHeight,attr"`
FitToWidth *int `xml:"fitToWidth,attr"` FitToWidth *int `xml:"fitToWidth,attr"`
HorizontalDPI int `xml:"horizontalDpi,attr,omitempty"` HorizontalDPI float64 `xml:"horizontalDpi,attr,omitempty"`
RID string `xml:"http://schemas.openxmlformats.org/officeDocument/2006/relationships id,attr,omitempty"` RID string `xml:"http://schemas.openxmlformats.org/officeDocument/2006/relationships id,attr,omitempty"`
Orientation string `xml:"orientation,attr,omitempty"` Orientation string `xml:"orientation,attr,omitempty"`
PageOrder string `xml:"pageOrder,attr,omitempty"` PageOrder string `xml:"pageOrder,attr,omitempty"`
@ -126,7 +126,7 @@ type xlsxPageSetUp struct {
Scale int `xml:"scale,attr,omitempty"` Scale int `xml:"scale,attr,omitempty"`
UseFirstPageNumber bool `xml:"useFirstPageNumber,attr,omitempty"` UseFirstPageNumber bool `xml:"useFirstPageNumber,attr,omitempty"`
UsePrinterDefaults bool `xml:"usePrinterDefaults,attr,omitempty"` UsePrinterDefaults bool `xml:"usePrinterDefaults,attr,omitempty"`
VerticalDPI int `xml:"verticalDpi,attr,omitempty"` VerticalDPI float64 `xml:"verticalDpi,attr,omitempty"`
} }
// xlsxPrintOptions directly maps the printOptions element in the namespace // xlsxPrintOptions directly maps the printOptions element in the namespace