From acd76425c2ee55c45a51cf7f71c8a6187a09f507 Mon Sep 17 00:00:00 2001 From: Harris Date: Wed, 7 Aug 2019 16:26:13 -0500 Subject: [PATCH] Handle multi row inline strings The inline string struct is actually the same as the shared strings struct, reuse it. Note that Go version 1.10 is required. Fixes #462 --- README.md | 2 +- excelize_test.go | 5 +++++ rows.go | 11 ++--------- test/SharedStrings.xlsx | Bin 6462 -> 9419 bytes xmlSharedStrings.go | 16 +++++++++++++++- xmlWorksheet.go | 14 ++++---------- 6 files changed, 27 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 91155e3545..4bb7d6682c 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ ## Introduction Excelize is a library written in pure Go providing a set of functions that allow you to write to and read from XLSX files. Supports reading and writing XLSX file generated by Microsoft Excel™ 2007 and later. -Supports saving a file without losing original charts of XLSX. This library needs Go version 1.8 or later. The full API docs can be seen using go's built-in documentation tool, or online at [godoc.org](https://godoc.org/github.com/360EntSecGroup-Skylar/excelize) and [docs reference](https://xuri.me/excelize/). +Supports saving a file without losing original charts of XLSX. This library needs Go version 1.10 or later. The full API docs can be seen using go's built-in documentation tool, or online at [godoc.org](https://godoc.org/github.com/360EntSecGroup-Skylar/excelize) and [docs reference](https://xuri.me/excelize/). ## Basic Usage diff --git a/excelize_test.go b/excelize_test.go index 4169983299..d61dd7bf40 100644 --- a/excelize_test.go +++ b/excelize_test.go @@ -1008,6 +1008,11 @@ func TestSharedStrings(t *testing.T) { t.FailNow() } assert.Equal(t, "A", rows[0][0]) + rows, err = f.GetRows("Sheet2") + if !assert.NoError(t, err) { + t.FailNow() + } + assert.Equal(t, "Test Weight (Kgs)", rows[0][0]) } func TestSetSheetRow(t *testing.T) { diff --git a/rows.go b/rows.go index 220c233800..c17179faac 100644 --- a/rows.go +++ b/rows.go @@ -206,18 +206,11 @@ func (xlsx *xlsxC) getValueFrom(f *File, d *xlsxSST) (string, error) { case "s": xlsxSI := 0 xlsxSI, _ = strconv.Atoi(xlsx.V) - if len(d.SI[xlsxSI].R) > 0 { - value := "" - for _, v := range d.SI[xlsxSI].R { - value += v.T - } - return value, nil - } - return f.formattedValue(xlsx.S, d.SI[xlsxSI].T), nil + return f.formattedValue(xlsx.S, d.SI[xlsxSI].String()), nil case "str": return f.formattedValue(xlsx.S, xlsx.V), nil case "inlineStr": - return f.formattedValue(xlsx.S, xlsx.IS.T), nil + return f.formattedValue(xlsx.S, xlsx.IS.String()), nil default: return f.formattedValue(xlsx.S, xlsx.V), nil } diff --git a/test/SharedStrings.xlsx b/test/SharedStrings.xlsx index 7b722d9ee4733d24d5b9956ec0b517570c501560..d6004c0cd2b60c0324378fde7017b55d21a79dbb 100644 GIT binary patch literal 9419 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 O0Qw*Wz!BxocmD@YLNdYt literal 6462 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 LcPz(0j{yDyMS%Gc diff --git a/xmlSharedStrings.go b/xmlSharedStrings.go index 3fcf3d5bb7..48d4464ff9 100644 --- a/xmlSharedStrings.go +++ b/xmlSharedStrings.go @@ -9,7 +9,10 @@ package excelize -import "encoding/xml" +import ( + "encoding/xml" + "strings" +) // xlsxSST directly maps the sst element from the namespace // http://schemas.openxmlformats.org/spreadsheetml/2006/main. String values may @@ -33,6 +36,17 @@ type xlsxSI struct { R []xlsxR `xml:"r"` } +func (x xlsxSI) String() string { + if len(x.R) > 0 { + var rows strings.Builder + for _, s := range x.R { + rows.WriteString(s.T) + } + return rows.String() + } + return x.T +} + // xlsxR directly maps the r element from the namespace // http://schemas.openxmlformats.org/spreadsheetml/2006/main - currently I have // not checked this for completeness - it does as much as I need. diff --git a/xmlWorksheet.go b/xmlWorksheet.go index 9727866311..a5db776bbb 100644 --- a/xmlWorksheet.go +++ b/xmlWorksheet.go @@ -9,7 +9,9 @@ package excelize -import "encoding/xml" +import ( + "encoding/xml" +) // xlsxWorksheet directly maps the worksheet element in the namespace // http://schemas.openxmlformats.org/spreadsheetml/2006/main - currently I have @@ -424,18 +426,10 @@ type xlsxC struct { T string `xml:"t,attr,omitempty"` // Type. F *xlsxF `xml:"f,omitempty"` // Formula V string `xml:"v,omitempty"` // Value - IS *xlsxIS `xml:"is"` + IS *xlsxSI `xml:"is"` XMLSpace xml.Attr `xml:"space,attr,omitempty"` } -// xlsxIS directly maps the t element. Cell containing an (inline) rich -// string, i.e., one not in the shared string table. If this cell type is -// used, then the cell value is in the is element rather than the v element in -// the cell (c element). -type xlsxIS struct { - T string `xml:"t"` -} - // xlsxF directly maps the f element in the namespace // http://schemas.openxmlformats.org/spreadsheetml/2006/main - currently I have // not checked it for completeness - it does as much as I need.