p71924506
/
excelize
forked from p30928647/excelize
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improve compatibility for phonetic hint and sheet tab color

This commit is contained in:
xuri 2020-09-03 23:44:43 +08:00
parent 98f1a69903
commit 1111de2fdb
No known key found for this signature in database
GPG Key ID: BA5E5BB1C948EDF7
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xmlComments.go
View File

@ -69,7 +69,7 @@ type xlsxText struct {
type xlsxPhoneticRun struct { type xlsxPhoneticRun struct {
Sb uint32 `xml:"sb,attr"` Sb uint32 `xml:"sb,attr"`
Eb uint32 `xml:"eb,attr"` Eb uint32 `xml:"eb,attr"`
T string `xml:"t,attr"` T string `xml:"t"`
} }
// formatComment directly maps the format settings of the comment. // formatComment directly maps the format settings of the comment.

6
xmlSharedStrings.go
View File

@ -38,8 +38,10 @@ type xlsxSST struct {
// level - then the string item shall consist of multiple rich text runs which // level - then the string item shall consist of multiple rich text runs which
// collectively are used to express the string. // collectively are used to express the string.
type xlsxSI struct { type xlsxSI struct {
T *xlsxT `xml:"t,omitempty"` T *xlsxT `xml:"t,omitempty"`
R []xlsxR `xml:"r"` R []xlsxR `xml:"r"`
RPh []*xlsxPhoneticRun `xml:"rPh"`
PhoneticPr *xlsxPhoneticPr `xml:"phoneticPr"`
} }
// String extracts characters from a string item. // String extracts characters from a string item.

15
xmlWorksheet.go
View File

@ -234,11 +234,11 @@ type xlsxSheetPr struct {
SyncVertical bool `xml:"syncVertical,attr,omitempty"` SyncVertical bool `xml:"syncVertical,attr,omitempty"`
SyncRef string `xml:"syncRef,attr,omitempty"` SyncRef string `xml:"syncRef,attr,omitempty"`
TransitionEvaluation bool `xml:"transitionEvaluation,attr,omitempty"` TransitionEvaluation bool `xml:"transitionEvaluation,attr,omitempty"`
TransitionEntry bool `xml:"transitionEntry,attr,omitempty"`
Published *bool `xml:"published,attr"` Published *bool `xml:"published,attr"`
CodeName string `xml:"codeName,attr,omitempty"` CodeName string `xml:"codeName,attr,omitempty"`
FilterMode bool `xml:"filterMode,attr,omitempty"` FilterMode bool `xml:"filterMode,attr,omitempty"`
EnableFormatConditionsCalculation *bool `xml:"enableFormatConditionsCalculation,attr"` EnableFormatConditionsCalculation *bool `xml:"enableFormatConditionsCalculation,attr"`
TransitionEntry bool `xml:"transitionEntry,attr,omitempty"`
TabColor *xlsxTabColor `xml:"tabColor,omitempty"` TabColor *xlsxTabColor `xml:"tabColor,omitempty"`
OutlinePr *xlsxOutlinePr `xml:"outlinePr,omitempty"` OutlinePr *xlsxOutlinePr `xml:"outlinePr,omitempty"`
PageSetUpPr *xlsxPageSetUpPr `xml:"pageSetUpPr,omitempty"` PageSetUpPr *xlsxPageSetUpPr `xml:"pageSetUpPr,omitempty"`
@ -247,7 +247,10 @@ type xlsxSheetPr struct {
// xlsxOutlinePr maps to the outlinePr element. SummaryBelow allows you to // xlsxOutlinePr maps to the outlinePr element. SummaryBelow allows you to
// adjust the direction of grouper controls. // adjust the direction of grouper controls.
type xlsxOutlinePr struct { type xlsxOutlinePr struct {
SummaryBelow bool `xml:"summaryBelow,attr"` ApplyStyles *bool `xml:"applyStyles,attr"`
SummaryBelow bool `xml:"summaryBelow,attr,omitempty"`
SummaryRight bool `xml:"summaryRight,attr,omitempty"`
ShowOutlineSymbols bool `xml:"showOutlineSymbols,attr,omitempty"`
} }
// xlsxPageSetUpPr expresses page setup properties of the worksheet. // xlsxPageSetUpPr expresses page setup properties of the worksheet.
@ -258,9 +261,11 @@ type xlsxPageSetUpPr struct {
// xlsxTabColor represents background color of the sheet tab. // xlsxTabColor represents background color of the sheet tab.
type xlsxTabColor struct { type xlsxTabColor struct {
RGB string `xml:"rgb,attr,omitempty"` Auto bool `xml:"auto,attr,omitempty"`
Theme int `xml:"theme,attr,omitempty"` Indexed int `xml:"indexed,attr,omitempty"`
Tint float64 `xml:"tint,attr,omitempty"` RGB string `xml:"rgb,attr,omitempty"`
Theme int `xml:"theme,attr,omitempty"`
Tint float64 `xml:"tint,attr,omitempty"`
} }
// xlsxCols defines column width and column formatting for one or more columns // xlsxCols defines column width and column formatting for one or more columns