- Support to read inlineStr type cell value, relate issue #208, PR #209;

- go test and godoc has been updated
formula
Ri Xu 7 years ago
parent 564ebe48dd
commit 2b97c3bb46
No known key found for this signature in database
GPG Key ID: BA5E5BB1C948EDF7

@ -174,6 +174,8 @@ func (xlsx *xlsxC) getValueFrom(f *File, d *xlsxSST) (string, error) {
return f.formattedValue(xlsx.S, d.SI[xlsxSI].T), nil return f.formattedValue(xlsx.S, d.SI[xlsxSI].T), nil
case "str": case "str":
return f.formattedValue(xlsx.S, xlsx.V), nil return f.formattedValue(xlsx.S, xlsx.V), nil
case "inlineStr":
return f.formattedValue(xlsx.S, xlsx.IS.T), nil
default: default:
return f.formattedValue(xlsx.S, xlsx.V), nil return f.formattedValue(xlsx.S, xlsx.V), nil
} }

Binary file not shown.

@ -304,6 +304,19 @@ type xlsxDataValidations struct {
// xlsxC directly maps the c element in the namespace // xlsxC directly maps the c element in the namespace
// http://schemas.openxmlformats.org/spreadsheetml/2006/main - currently I have // http://schemas.openxmlformats.org/spreadsheetml/2006/main - currently I have
// not checked it for completeness - it does as much as I need. // not checked it for completeness - it does as much as I need.
//
// This simple type is restricted to the values listed in the following table:
//
// Enumeration Value | Description
// ---------------------------+---------------------------------
// b (Boolean) | Cell containing a boolean.
// d (Date) | Cell contains a date in the ISO 8601 format.
// e (Error) | Cell containing an error.
// inlineStr (Inline String) | 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).
// n (Number) | Cell containing a number.
// s (Shared String) | Cell containing a shared string.
// str (String) | Cell containing a formula string.
//
type xlsxC struct { type xlsxC struct {
R string `xml:"r,attr"` // Cell ID, e.g. A1 R string `xml:"r,attr"` // Cell ID, e.g. A1
S int `xml:"s,attr,omitempty"` // Style reference. S int `xml:"s,attr,omitempty"` // Style reference.
@ -311,9 +324,18 @@ type xlsxC struct {
T string `xml:"t,attr,omitempty"` // Type. T string `xml:"t,attr,omitempty"` // Type.
F *xlsxF `xml:"f,omitempty"` // Formula F *xlsxF `xml:"f,omitempty"` // Formula
V string `xml:"v,omitempty"` // Value V string `xml:"v,omitempty"` // Value
IS *xlsxIS `xml:"is"`
XMLSpace xml.Attr `xml:"space,attr,omitempty"` 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 // xlsxF directly maps the f element in the namespace
// http://schemas.openxmlformats.org/spreadsheetml/2006/main - currently I have // http://schemas.openxmlformats.org/spreadsheetml/2006/main - currently I have
// not checked it for completeness - it does as much as I need. // not checked it for completeness - it does as much as I need.

Loading…
Cancel
Save