From 4b64b26c52932a51ca97a2bb6bf372a07020e52b Mon Sep 17 00:00:00 2001 From: xuri Date: Sun, 13 Feb 2022 00:06:30 +0800 Subject: Ref: #660, #764, #1093, #1112, #1133 This improve number format support - Introduced NFP (number format parser) dependencies module - Initialize custom dates and times number format support - Dependencies module upgraded --- cell.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'cell.go') diff --git a/cell.go b/cell.go index 9af93f6..b5b6ed4 100644 --- a/cell.go +++ b/cell.go @@ -1116,21 +1116,12 @@ func (f *File) formattedValue(s int, v string, raw bool) string { } for _, xlsxFmt := range styleSheet.NumFmts.NumFmt { if xlsxFmt.NumFmtID == numFmtID { - format := strings.ToLower(xlsxFmt.FormatCode) - if isTimeNumFmt(format) { - return parseTime(v, format) - } - return precise + return format(v, xlsxFmt.FormatCode) } } return precise } -// isTimeNumFmt determine if the given number format expression is a time number format. -func isTimeNumFmt(format string) bool { - return strings.Contains(format, "y") || strings.Contains(format, "m") || strings.Contains(strings.Replace(format, "red", "", -1), "d") || strings.Contains(format, "h") -} - // prepareCellStyle provides a function to prepare style index of cell in // worksheet by given column index and style index. func (f *File) prepareCellStyle(ws *xlsxWorksheet, col, row, style int) int { -- cgit v1.2.1