Pārlūkot izejas kodu

Merge pull request #291 from peiqi111/master

resolve #289, #290
xuri 7 gadi atpakaļ
vecāks
revīzija
507fc5307d
1 mainītis faili ar 4 papildinājumiem un 3 dzēšanām
  1. 4 3
      cell.go

+ 4 - 3
cell.go

@@ -244,12 +244,13 @@ func (f *File) GetCellFormula(sheet, axis string) string {
 		if xlsx.SheetData.Row[k].R == row {
 			for i := range xlsx.SheetData.Row[k].C {
 				if axis == xlsx.SheetData.Row[k].C[i].R {
+					if xlsx.SheetData.Row[k].C[i].F == nil {
+						continue
+					}
 					if xlsx.SheetData.Row[k].C[i].F.T == STCellFormulaTypeShared {
 						return getSharedForumula(xlsx, xlsx.SheetData.Row[k].C[i].F.Si)
 					}
-					if xlsx.SheetData.Row[k].C[i].F != nil {
-						return xlsx.SheetData.Row[k].C[i].F.Content
-					}
+					return xlsx.SheetData.Row[k].C[i].F.Content
 				}
 			}
 		}