Skip to content

Commit 8171bf4

Browse files
committed
修复固定标题多显示标题
1 parent 91a94a6 commit 8171bf4

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

app/src/main/java/com/bin/david/smarttable/bean/MergeInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
public class MergeInfo {
1414
@SmartColumn(id =1,name = "姓名",autoCount = true,autoMerge = true)
1515
private String name;
16-
@SmartColumn(id=2,name="年龄",autoCount = true,autoMerge = true,maxMergeCount = 3)
16+
@SmartColumn(id=2,name="年龄",autoCount = true,autoMerge = true)
1717
private int age;
1818
@SmartColumn(id =3,name="更新时间")
1919
private long time;

form/src/main/java/com/bin/david/form/data/column/Column.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,13 @@ public List<int[]> parseRanges(){
381381
rangeStartPosition = i-1;
382382
}
383383
rangeCount++;
384+
//修复最后一列没有合并
385+
if(i == size-1){
386+
int[] range = {rangeStartPosition, i};
387+
ranges.add(range);
388+
rangeStartPosition =-1;
389+
rangeCount =1;
390+
}
384391
}else{
385392
if(rangeStartPosition !=-1){
386393
int[] range = {rangeStartPosition, i-1};

0 commit comments

Comments
 (0)