BlackForestBytes
/
xls
21
0
Fork 0
Code

Merge branch 'master' into master

This commit is contained in:
Lucas Liu 2020-04-26 20:43:28 +08:00 committed by GitHub
parent 0bc58acfcb 60fcb0b22c
commit b72264b294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
col.go
View File

@ -8,7 +8,7 @@ import (
"time"
"github.com/extrame/goyymmdd"
yymmdd "github.com/extrame/goyymmdd"
)
//content type
@ -63,7 +63,6 @@ func (xf *XfRk) String(wb *WorkBook) string {
f = float64(i)
}
t := timeFromExcelTime(f, wb.dateMode == 1)
return yymmdd.Format(t, formatter.str)
}
}
@ -162,6 +161,10 @@ type NumberCol struct {
}
func (c *NumberCol) String(wb *WorkBook) []string {
if fNo := wb.Xfs[c.Index].formatNo(); fNo != 0 {
t := timeFromExcelTime(c.Float, wb.dateMode == 1)
return []string{yymmdd.Format(t, wb.Formats[fNo].str)}
}
return []string{strconv.FormatFloat(c.Float, 'f', -1, 64)}
}