修复隐藏列BUG

ureport2-core/src/main/java/com/bstek/ureport/build/HideRowColumnBuilder.java

@@ -16,9 +16,10 @@ import com.bstek.ureport.model.Row;
 public class HideRowColumnBuilder {
 	public void doHideProcessColumn(Report report, Column col) {
 		int colWidth=col.getWidth();
-		if(colWidth>0){
+		if(colWidth>0 || col.isHide()){
 			return;
 		}
+		col.setHide(true);
 		List<Column> columns=report.getColumns();
 		int colNumber=col.getColumnNumber();
 		Map<Row, Map<Column, Cell>> cellMap=report.getRowColCellMap();
@@ -58,9 +59,10 @@ public class HideRowColumnBuilder {
 	
 	public void doHideProcessRow(Report report, Row row) {
 		int rowHeight=row.getRealHeight();
-		if(rowHeight>0){
+		if(rowHeight>0 || row.isHide()){
 			return;
 		}
+		row.setHide(true);
 		Map<Row, Map<Column, Cell>> cellMap=report.getRowColCellMap();
 		Map<Column,Cell> map=cellMap.get(row);
 		if(map==null){

ureport2-core/src/main/java/com/bstek/ureport/definition/ColumnDefinition.java

@@ -30,7 +30,6 @@ public class ColumnDefinition implements Comparable<ColumnDefinition>{
 	
 	protected Column newColumn(List<Column> columns){
 		Column col=new Column(columns);
-		col.setHide(hide);
 		col.setWidth(width);
 		return col;
 	}

ureport2-core/src/main/java/com/bstek/ureport/model/Cell.java

@@ -326,14 +326,14 @@ public class Cell implements ReportCell {
 			int rowHeight=item.getRowHeight();
 			if(rowHeight>-1){
 				row.setRealHeight(rowHeight);
-				if(rowHeight==0){
+				if(rowHeight==0 && !row.isHide()){
 					context.doHideProcessRow(row);
 				}
 			}
 			int colWidth=item.getColWidth();
 			if(colWidth>-1){
 				column.setWidth(colWidth);
-				if(colWidth==0){
+				if(colWidth==0 && !column.isHide()){
 					context.doHideProcessColumn(column);
 				}
 			}

ureport2-core/src/main/java/com/bstek/ureport/model/Column.java

@@ -38,7 +38,6 @@ public class Column extends Line{
 	public Column newColumn(){
 		Column col=new Column(columns);
 		col.setWidth(width);
-		col.setHide(hide);
 		return col;
 	}
 	

ureport2-core/src/main/java/com/bstek/ureport/model/Row.java

@@ -35,6 +35,7 @@ public class Row extends Line{
 	private Band band;
 	private boolean forPaging;
 	private boolean pageBreak;
+	private boolean hide;
 	
 	private List<Row> rows;
 	
@@ -109,4 +110,12 @@ public class Row extends Line{
 	public void setRealHeight(int realHeight) {
 		this.realHeight = realHeight;
 	}
+
+	public boolean isHide() {
+		return hide;
+	}
+
+	public void setHide(boolean hide) {
+		this.hide = hide;
+	}
 }