Skip to content

Commit a1810aa

Browse files
committed
This improves the date and time number formats
- Now support applying date and time number format for 812 language tags - Fix panic on getting merged cells with the same start and end axis
1 parent ae17fa8 commit a1810aa

File tree

4 files changed

+4932
-1163
lines changed

4 files changed

+4932
-1163
lines changed

merge.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,5 +289,9 @@ func (m *MergeCell) GetStartAxis() string {
289289
// GetEndAxis returns the bottom right cell reference of merged range, for
290290
// example: "D4".
291291
func (m *MergeCell) GetEndAxis() string {
292-
return strings.Split((*m)[0], ":")[1]
292+
coordinates := strings.Split((*m)[0], ":")
293+
if len(coordinates) == 2 {
294+
return coordinates[1]
295+
}
296+
return coordinates[0]
293297
}

merge_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,13 @@ func TestMergeCell(t *testing.T) {
8080
assert.True(t, ok)
8181
ws.(*xlsxWorksheet).MergeCells = &xlsxMergeCells{Cells: []*xlsxMergeCell{nil, nil}}
8282
assert.NoError(t, f.MergeCell("Sheet1", "A2", "B3"))
83+
// Test getting merged cells with the same start and end axis
84+
ws.(*xlsxWorksheet).MergeCells = &xlsxMergeCells{Cells: []*xlsxMergeCell{{Ref: "A1"}}}
85+
mergedCells, err := f.GetMergeCells("Sheet1")
86+
assert.NoError(t, err)
87+
assert.Equal(t, "A1", mergedCells[0].GetStartAxis())
88+
assert.Equal(t, "A1", mergedCells[0].GetEndAxis())
89+
assert.Empty(t, mergedCells[0].GetCellValue())
8390
}
8491

8592
func TestMergeCellOverlap(t *testing.T) {

0 commit comments

Comments
 (0)