Merge pull request youseries#303 from lee-hong/master

修复多列表格中行高度设置错误导致的pdf导出数据丢失问题
lynchlee · May 10, 2018 · a037d0d · a037d0d
2 parents bb5ddd4 + cba3fd3
commit a037d0d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/ureport2-core/src/main/java/com/bstek/ureport/model/Cell.java b/ureport2-core/src/main/java/com/bstek/ureport/model/Cell.java
@@ -650,7 +650,10 @@ public void doDataWrapCompute(Context context){
 		int dif=totalLineHeight-totalRowHeight;
 		if(dif>0){
 			int rowHeight=row.getHeight();
-			row.setRealHeight(rowHeight+dif);
+			int newRowHeight = rowHeight+dif;
+			if(row.getRealHeight()< newRowHeight){
+				row.setRealHeight(newRowHeight);
+			}
 		}
 	}