BlackForestBytes/xls
20
0
Fork 0
Code

fixed

Browse Source
This commit is contained in:
Liu Ming 2017-06-12 10:31:26 +08:00
parent 79987c0cd7
commit 3daf1f6acf
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -2,11 +2,11 @@
[![GoDoc](https://godoc.org/github.com/extrame/xls?status.svg)](https://godoc.org/github.com/extrame/xls) [![GoDoc](https://godoc.org/github.com/extrame/xls?status.svg)](https://godoc.org/github.com/extrame/xls)
Pure Golang xls library writen by [MinkTech(chinese)](http://www.mink-tech.com). Pure Golang xls library writen by [Rongshu Tech(chinese)](http://www.rongshu.tech).
Thanks for contributions from Tamás Gulácsi. Thanks for contributions from Tamás Gulácsi, sergeilem.
**English User please mailto** [Liu Ming](mailto:liuming@mink-tech.com) **English User please mailto** [Liu Ming](mailto:liuming@rongshu.tech)
This is a xls library writen in pure Golang. Almostly it is translated from the libxls library in c. This is a xls library writen in pure Golang. Almostly it is translated from the libxls library in c.

17
col.go
View File

@ -4,7 +4,8 @@ import (
"fmt" "fmt"
"math" "math"
"strconv" "strconv"
"time"
"github.com/extrame/goyymmdd"
) )
//content type //content type
@ -49,14 +50,14 @@ func (xf *XfRk) String(wb *WorkBook) string {
if len(wb.Xfs) > idx { if len(wb.Xfs) > idx {
fNo := wb.Xfs[idx].formatNo() fNo := wb.Xfs[idx].formatNo()
if fNo >= 164 { // user defined format if fNo >= 164 { // user defined format
if fmt := wb.Formats[fNo]; fmt != nil { if formatter := wb.Formats[fNo]; formatter != nil {
i, f, isFloat := xf.Rk.number() i, f, isFloat := xf.Rk.number()
if !isFloat { if !isFloat {
f = float64(i) f = float64(i)
} }
fmt.Println(formatter.str, "======")
t := timeFromExcelTime(f, wb.dateMode == 1) t := timeFromExcelTime(f, wb.dateMode == 1)
return yymmdd.Format(t, formatter.str)
return t.Format(time.RFC3339) //TODO it should be international and format as the describled style
} }
// see http://www.openoffice.org/sc/excelfileformat.pdf // see http://www.openoffice.org/sc/excelfileformat.pdf
} else if 14 <= fNo && fNo <= 17 || fNo == 22 || 27 <= fNo && fNo <= 36 || 50 <= fNo && fNo <= 58 { // jp. date format } else if 14 <= fNo && fNo <= 17 || fNo == 22 || 27 <= fNo && fNo <= 36 || 50 <= fNo && fNo <= 58 { // jp. date format
@ -64,6 +65,7 @@ func (xf *XfRk) String(wb *WorkBook) string {
if !isFloat { if !isFloat {
f = float64(i) f = float64(i)
} }
fmt.Println(fNo)
t := timeFromExcelTime(f, wb.dateMode == 1) t := timeFromExcelTime(f, wb.dateMode == 1)
return t.Format("2006.01") //TODO it should be international return t.Format("2006.01") //TODO it should be international
} }
@ -85,6 +87,13 @@ func (rk RK) number() (intNum int64, floatNum float64, isFloat bool) {
} }
return return
} }
//+++ add lines from here
if multiplied != 0 {
isFloat = true
floatNum = float64(val) / 100
return
}
//+++end
return int64(val), 0, false return int64(val), 0, false
} }