diff options
| author | Ri Xu <xuri.me@gmail.com> | 2017-06-27 17:53:06 +0800 |
|---|---|---|
| committer | Ri Xu <xuri.me@gmail.com> | 2017-06-27 17:53:06 +0800 |
| commit | 555e2ba9a82d6974077681c7ab34ce0fa93d351d (patch) | |
| tree | 6d1d5ba963d1f2fc1cebebd61833e6b135ae8cc8 /excelize.go | |
| parent | 35841caaf18b20af9e7b942ca8cbb7441f310382 (diff) | |
- Make function `TitleToNumber()` exportable, note that function `ToAlphaString()` return value calculation changes, get more info from go doc. Relate issue #63;
- Readme and go doc updated
Diffstat (limited to 'excelize.go')
| -rw-r--r-- | excelize.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/excelize.go b/excelize.go index 2554565..f8b938c 100644 --- a/excelize.go +++ b/excelize.go @@ -122,7 +122,7 @@ func (f *File) getCellStyle(sheet, axis string) int { col := string(strings.Map(letterOnlyMapF, axis)) row, _ := strconv.Atoi(strings.Map(intOnlyMapF, axis)) xAxis := row - 1 - yAxis := titleToNumber(col) + yAxis := TitleToNumber(col) rows := xAxis + 1 cell := yAxis + 1 @@ -173,7 +173,7 @@ func (f *File) SetCellInt(sheet, axis string, value int) { col := string(strings.Map(letterOnlyMapF, axis)) row, _ := strconv.Atoi(strings.Map(intOnlyMapF, axis)) xAxis := row - 1 - yAxis := titleToNumber(col) + yAxis := TitleToNumber(col) rows := xAxis + 1 cell := yAxis + 1 @@ -211,7 +211,7 @@ func (f *File) SetCellStr(sheet, axis, value string) { col := string(strings.Map(letterOnlyMapF, axis)) row, _ := strconv.Atoi(strings.Map(intOnlyMapF, axis)) xAxis := row - 1 - yAxis := titleToNumber(col) + yAxis := TitleToNumber(col) rows := xAxis + 1 cell := yAxis + 1 @@ -242,7 +242,7 @@ func (f *File) SetCellDefault(sheet, axis, value string) { col := string(strings.Map(letterOnlyMapF, axis)) row, _ := strconv.Atoi(strings.Map(intOnlyMapF, axis)) xAxis := row - 1 - yAxis := titleToNumber(col) + yAxis := TitleToNumber(col) rows := xAxis + 1 cell := yAxis + 1 @@ -269,7 +269,7 @@ func completeCol(xlsx *xlsxWorksheet, row, cell int) { if len(v.C) < cell { start := len(v.C) for iii := start; iii < cell; iii++ { - buffer.WriteString(ToAlphaString(iii + 1)) + buffer.WriteString(ToAlphaString(iii)) buffer.WriteString(strconv.Itoa(k + 1)) xlsx.SheetData.Row[k].C = append(xlsx.SheetData.Row[k].C, xlsxC{ R: buffer.String(), @@ -301,7 +301,7 @@ func completeRow(xlsx *xlsxWorksheet, row, cell int) { start := len(xlsx.SheetData.Row[ii].C) if start == 0 { for iii := start; iii < cell; iii++ { - buffer.WriteString(ToAlphaString(iii + 1)) + buffer.WriteString(ToAlphaString(iii)) buffer.WriteString(strconv.Itoa(ii + 1)) xlsx.SheetData.Row[ii].C = append(xlsx.SheetData.Row[ii].C, xlsxC{ R: buffer.String(), @@ -383,13 +383,13 @@ func checkRow(xlsx *xlsxWorksheet) { } endR := string(strings.Map(letterOnlyMapF, v.C[lenCol-1].R)) endRow, _ := strconv.Atoi(strings.Map(intOnlyMapF, v.C[lenCol-1].R)) - endCol := titleToNumber(endR) + 1 + endCol := TitleToNumber(endR) + 1 if lenCol < endCol { oldRow := xlsx.SheetData.Row[k].C xlsx.SheetData.Row[k].C = xlsx.SheetData.Row[k].C[:0] tmp := []xlsxC{} for i := 0; i <= endCol; i++ { - buffer.WriteString(ToAlphaString(i + 1)) + buffer.WriteString(ToAlphaString(i)) buffer.WriteString(strconv.Itoa(endRow)) tmp = append(tmp, xlsxC{ R: buffer.String(), @@ -398,7 +398,7 @@ func checkRow(xlsx *xlsxWorksheet) { } xlsx.SheetData.Row[k].C = tmp for _, y := range oldRow { - colAxis := titleToNumber(string(strings.Map(letterOnlyMapF, y.R))) + colAxis := TitleToNumber(string(strings.Map(letterOnlyMapF, y.R))) xlsx.SheetData.Row[k].C[colAxis] = y } } |
