This closes #1539, fix adjust table issue when after removing rows

xuri · xuri · commit 76cd0992b038 · 2023-05-23T00:18:55.000+08:00
diff --git a/adjust.go b/adjust.go
@@ -242,7 +242,7 @@ func (f *File) adjustTable(ws *xlsxWorksheet, sheet string, dir adjustDirection,
 		}
 		coordinates = f.adjustAutoFilterHelper(dir, coordinates, num, offset)
 		x1, y1, x2, y2 := coordinates[0], coordinates[1], coordinates[2], coordinates[3]
-		if y2-y1 < 2 || x2-x1 < 1 {
+		if y2-y1 < 1 || x2-x1 < 0 {
 			ws.TableParts.TableParts = append(ws.TableParts.TableParts[:idx], ws.TableParts.TableParts[idx+1:]...)
 			ws.TableParts.Count = len(ws.TableParts.TableParts)
 			idx--
diff --git a/adjust_test.go b/adjust_test.go
@@ -320,6 +320,7 @@ func TestAdjustTable(t *testing.T) {
 	}
 	assert.NoError(t, f.RemoveRow(sheetName, 2))
 	assert.NoError(t, f.RemoveRow(sheetName, 3))
+	assert.NoError(t, f.RemoveRow(sheetName, 3))
 	assert.NoError(t, f.RemoveCol(sheetName, "H"))
 	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestAdjustTable.xlsx")))
 

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ func (f File) adjustTable(ws xlsxWorksheet, sheet string, dir adjustDirection,`
`242`	`242`	`}`
`243`	`243`	`coordinates = f.adjustAutoFilterHelper(dir, coordinates, num, offset)`
`244`	`244`	`x1, y1, x2, y2 := coordinates[0], coordinates[1], coordinates[2], coordinates[3]`
`245`		`- if y2-y1 < 2 \|\| x2-x1 < 1 {`
	`245`	`+ if y2-y1 < 1 \|\| x2-x1 < 0 {`
`246`	`246`	`ws.TableParts.TableParts = append(ws.TableParts.TableParts[:idx], ws.TableParts.TableParts[idx+1:]...)`
`247`	`247`	`ws.TableParts.Count = len(ws.TableParts.TableParts)`
`248`	`248`	`idx--`
Original file line number	Diff line number	Diff line change
`@@ -320,6 +320,7 @@ func TestAdjustTable(t *testing.T) {`
`320`	`320`	`}`
`321`	`321`	`assert.NoError(t, f.RemoveRow(sheetName, 2))`
`322`	`322`	`assert.NoError(t, f.RemoveRow(sheetName, 3))`
	`323`	`+ assert.NoError(t, f.RemoveRow(sheetName, 3))`
`323`	`324`	`assert.NoError(t, f.RemoveCol(sheetName, "H"))`
`324`	`325`	`assert.NoError(t, f.SaveAs(filepath.Join("test", "TestAdjustTable.xlsx")))`
`325`	`326`