diff --git a/app/src/main/java/com/bin/david/smarttable/bean/MergeInfo.java b/app/src/main/java/com/bin/david/smarttable/bean/MergeInfo.java index eb5d708..c1b36e0 100644 --- a/app/src/main/java/com/bin/david/smarttable/bean/MergeInfo.java +++ b/app/src/main/java/com/bin/david/smarttable/bean/MergeInfo.java @@ -13,7 +13,7 @@ public class MergeInfo { @SmartColumn(id =1,name = "姓名",autoCount = true,autoMerge = true) private String name; - @SmartColumn(id=2,name="年龄",autoCount = true,autoMerge = true,maxMergeCount = 3) + @SmartColumn(id=2,name="年龄",autoCount = true,autoMerge = true) private int age; @SmartColumn(id =3,name="更新时间") private long time; diff --git a/form/src/main/java/com/bin/david/form/data/column/Column.java b/form/src/main/java/com/bin/david/form/data/column/Column.java index bf6bf8b..c55cd7b 100644 --- a/form/src/main/java/com/bin/david/form/data/column/Column.java +++ b/form/src/main/java/com/bin/david/form/data/column/Column.java @@ -381,6 +381,13 @@ public List parseRanges(){ rangeStartPosition = i-1; } rangeCount++; + //修复最后一列没有合并 + if(i == size-1){ + int[] range = {rangeStartPosition, i}; + ranges.add(range); + rangeStartPosition =-1; + rangeCount =1; + } }else{ if(rangeStartPosition !=-1){ int[] range = {rangeStartPosition, i-1};