소스 검색

Fix missing show grid lines property and godoc updated.

Ri Xu 9 년 전
부모
커밋
9c14741a6b
2개의 변경된 파일28개의 추가작업 그리고 28개의 파일을 삭제
  1. 26 26
      excelize.go
  2. 2 2
      xmlWorksheet.go

+ 26 - 26
excelize.go

@@ -162,24 +162,24 @@ func replaceWorkSheetsRelationshipsNameSpace(workbookMarshal string) string {
 
 // Check XML tags and fix discontinuous case, for example:
 //
-//  <row r="15" spans="1:22" x14ac:dyDescent="0.2">
-//      <c r="A15" s="2" />
-//      <c r="B15" s="2" />
-//      <c r="F15" s="1" />
-//      <c r="G15" s="1" />
-//  </row>
+//		<row r="15" spans="1:22" x14ac:dyDescent="0.2">
+//			<c r="A15" s="2" />
+//			<c r="B15" s="2" />
+//			<c r="F15" s="1" />
+//			<c r="G15" s="1" />
+//		</row>
 //
 // in this case, we should to change it to
 //
-//  <row r="15" spans="1:22" x14ac:dyDescent="0.2">
-//      <c r="A15" s="2" />
-//      <c r="B15" s="2" />
-//      <c r="C15" s="2" />
-//      <c r="D15" s="2" />
-//      <c r="E15" s="2" />
-//      <c r="F15" s="1" />
-//      <c r="G15" s="1" />
-//  </row>
+//  	<row r="15" spans="1:22" x14ac:dyDescent="0.2">
+//      	<c r="A15" s="2" />
+//      	<c r="B15" s="2" />
+//      	<c r="C15" s="2" />
+//      	<c r="D15" s="2" />
+//      	<c r="E15" s="2" />
+//      	<c r="F15" s="1" />
+//      	<c r="G15" s="1" />
+//  	</row>
 //
 // Noteice: this method could be very slow for large spreadsheets (more than 3000 rows one sheet).
 func checkRow(xlsx xlsxWorksheet) xlsxWorksheet {
@@ -223,20 +223,20 @@ func checkRow(xlsx xlsxWorksheet) xlsxWorksheet {
 //
 // For example:
 //
-// <row r="19" spans="2:2">
-//     <c r="B19">
-//         <f>SUM(Sheet2!D2,Sheet2!D11)</f>
-//         <v>100</v>
-//     </c>
-// </row>
+//		<row r="19" spans="2:2">
+//     		<c r="B19">
+//         		<f>SUM(Sheet2!D2,Sheet2!D11)</f>
+//         		<v>100</v>
+//    		 </c>
+// 		</row>
 //
 // to
 //
-// <row r="19" spans="2:2">
-//     <c r="B19">
-//         <f>SUM(Sheet2!D2,Sheet2!D11)</f>
-//     </c>
-// </row>
+// 		<row r="19" spans="2:2">
+//     		<c r="B19">
+//         		<f>SUM(Sheet2!D2,Sheet2!D11)</f>
+//     		</c>
+// 		</row>
 func (f *File) UpdateLinkedValue() {
 	for i := 1; i <= f.SheetCount; i++ {
 		var xlsx xlsxWorksheet

+ 2 - 2
xmlWorksheet.go

@@ -131,7 +131,7 @@ type xlsxSheetViews struct {
 type xlsxSheetView struct {
 	// WindowProtection        bool            `xml:"windowProtection,attr"`
 	// ShowFormulas            bool            `xml:"showFormulas,attr"`
-	// ShowGridLines           bool            `xml:"showGridLines,attr"`
+	ShowGridLines string `xml:"showGridLines,attr,omitempty"`
 	// ShowRowColHeaders       bool            `xml:"showRowColHeaders,attr"`
 	// ShowZeros               bool            `xml:"showZeros,attr"`
 	// RightToLeft             bool            `xml:"rightToLeft,attr"`
@@ -155,7 +155,7 @@ type xlsxSheetView struct {
 // as I need.
 type xlsxSelection struct {
 	Pane         string `xml:"pane,attr,omitempty"`
-	ActiveCell   string `xml:"activeCell,attr"`
+	ActiveCell   string `xml:"activeCell,attr,omitempty"`
 	ActiveCellID int    `xml:"activeCellId,attr"`
 	SQRef        string `xml:"sqref,attr"`
 }