完善在线查询表单设计器

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

@@ -33,7 +33,7 @@ public class SimpleValueCompute implements ValueCompute {
 	@Override
 	public List<BindData> compute(Cell cell, Context context) {
 		List<BindData> list=new ArrayList<BindData>();
-		list.add(new BindData(cell.getValue().getValue(),null));
+		list.add(new BindData(cell.getValue().getValue(),null,null));
 		return list;
 	}
 

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

@@ -23,6 +23,7 @@ package com.bstek.ureport.definition.searchform;
 public abstract class ButtonComponent implements Component{
 	private String label;
 	private String style;
+	private String type;
 	@Override
 	public String toHtml(RenderContext context) {
 		return "<button type=\"button\" id=\""+context.buildComponentId(this)+"\" class=\""+style+"\">"+label+"</button>";
@@ -39,4 +40,11 @@ public abstract class ButtonComponent implements Component{
 	public void setStyle(String style) {
 		this.style = style;
 	}
+	@Override
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
 }

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

@@ -48,4 +48,8 @@ public class ColComponent extends ContainerComponent{
 	public void setSize(int size) {
 		this.size = size;
 	}
+	@Override
+	public String getType() {
+		return null;
+	}
 }

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

@@ -23,4 +23,5 @@ package com.bstek.ureport.definition.searchform;
 public interface Component {
 	String toHtml(RenderContext context);
 	String initJs(RenderContext context);
+	String getType();
 }

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

@@ -26,6 +26,7 @@ public class GridComponent implements Component{
 	private boolean showBorder;
 	private int borderWidth;
 	private String borderColor;
+	private String type;
 	private List<ColComponent> cols;
 	public static final String KEY="grid_component";
 	@Override
@@ -66,4 +67,11 @@ public class GridComponent implements Component{
 	public void setCols(List<ColComponent> cols) {
 		this.cols = cols;
 	}
+	@Override
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
 }

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

@@ -24,6 +24,7 @@ package com.bstek.ureport.definition.searchform;
 public abstract class InputComponent implements Component{
 	private String label;
 	private String bindParameter;
+	private String type;
 	protected LabelPosition labelPosition=LabelPosition.top;
 	
 	abstract String inputHtml(RenderContext context);
@@ -64,4 +65,11 @@ public abstract class InputComponent implements Component{
 	public void setBindParameter(String bindParameter) {
 		this.bindParameter = bindParameter;
 	}
+	@Override
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
 }

ureport2-core/src/main/java/com/bstek/ureport/export/word/low/WordProducer.java

@@ -16,59 +16,6 @@
  ******************************************************************************/
 package com.bstek.ureport.export.word.low;
 
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.imageio.ImageIO;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.usermodel.Range;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.Units;
-import org.apache.poi.xwpf.usermodel.BreakType;
-import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
-import org.apache.poi.xwpf.usermodel.UnderlinePatterns;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTColumns;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPageMar;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPageSz;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSectPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTShd;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTcBorders;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTcPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTVerticalJc;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STBorder;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STMerge;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STPageOrientation;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STVerticalJc;
-
-import com.bstek.ureport.build.paging.Page;
-import com.bstek.ureport.chart.ChartData;
-import com.bstek.ureport.definition.Alignment;
-import com.bstek.ureport.definition.Border;
-import com.bstek.ureport.definition.BorderStyle;
-import com.bstek.ureport.definition.CellStyle;
-import com.bstek.ureport.definition.Orientation;
-import com.bstek.ureport.definition.Paper;
-import com.bstek.ureport.exception.ReportComputeException;
-import com.bstek.ureport.export.Producer;
-import com.bstek.ureport.export.word.DxaUtils;
-import com.bstek.ureport.model.Cell;
-import com.bstek.ureport.model.Column;
-import com.bstek.ureport.model.Image;
-import com.bstek.ureport.model.Report;
-import com.bstek.ureport.model.Row;
-import com.bstek.ureport.utils.ImageUtils;
-import com.microsoft.schemas.office.word.CTBorder;
 
 
 /**

ureport2-core/src/main/java/com/bstek/ureport/parser/impl/searchform/CheckboxParser.java

@@ -36,6 +36,7 @@ public class CheckboxParser implements FormParser<CheckboxInputComponent> {
 		checkbox.setBindParameter(element.attributeValue("bind-parameter"));
 		checkbox.setOptionsInline(Boolean.valueOf(element.attributeValue("options-inline")));
 		checkbox.setLabel(element.attributeValue("label"));
+		checkbox.setType(element.attributeValue("type"));
 		checkbox.setLabelPosition(LabelPosition.valueOf(element.attributeValue("label-position")));
 		List<Option> options=new ArrayList<Option>();
 		for(Object obj:element.elements()){

ureport2-core/src/main/java/com/bstek/ureport/parser/impl/searchform/DatetimeInputParser.java

@@ -31,6 +31,7 @@ public class DatetimeInputParser implements FormParser<DateInputComponent> {
 		DateInputComponent component=new DateInputComponent();
 		component.setBindParameter(element.attributeValue("bind-parameter"));
 		component.setLabel(element.attributeValue("label"));
+		component.setType(element.attributeValue("type"));
 		component.setLabelPosition(LabelPosition.valueOf(element.attributeValue("label-position")));
 		component.setFormat(element.attributeValue("format"));
 		return component;

ureport2-core/src/main/java/com/bstek/ureport/parser/impl/searchform/GridParser.java

@@ -33,6 +33,7 @@ public class GridParser implements FormParser<GridComponent> {
 	@Override
 	public GridComponent parse(Element element) {
 		GridComponent grid=new GridComponent();
+		grid.setType(element.attributeValue("type"));
 		grid.setShowBorder(Boolean.valueOf(element.attributeValue("show-border")));
 		if(grid.isShowBorder()){
 			grid.setBorderColor(element.attributeValue("border-color"));

ureport2-core/src/main/java/com/bstek/ureport/parser/impl/searchform/RadioInputParser.java

@@ -36,6 +36,7 @@ public class RadioInputParser implements FormParser<RadioInputComponent> {
 		radio.setBindParameter(element.attributeValue("bind-parameter"));
 		radio.setOptionsInline(Boolean.valueOf(element.attributeValue("options-inline")));
 		radio.setLabel(element.attributeValue("label"));
+		radio.setType(element.attributeValue("type"));
 		radio.setLabelPosition(LabelPosition.valueOf(element.attributeValue("label-position")));
 		List<Option> options=new ArrayList<Option>();
 		for(Object obj:element.elements()){

ureport2-core/src/main/java/com/bstek/ureport/parser/impl/searchform/ResetButtonParser.java

@@ -30,6 +30,7 @@ public class ResetButtonParser implements FormParser<ResetButtonComponent>{
 		ResetButtonComponent btn=new ResetButtonComponent();
 		btn.setLabel(element.attributeValue("label"));
 		btn.setStyle(element.attributeValue("style"));
+		btn.setType(element.attributeValue("type"));
 		return btn;
 	}
 	@Override

ureport2-core/src/main/java/com/bstek/ureport/parser/impl/searchform/SubmitButtonParser.java

@@ -30,6 +30,7 @@ public class SubmitButtonParser implements FormParser<SubmitButtonComponent> {
 		SubmitButtonComponent btn=new SubmitButtonComponent();
 		btn.setLabel(element.attributeValue("label"));
 		btn.setStyle(element.attributeValue("style"));
+		btn.setType(element.attributeValue("type"));
 		return btn;
 	}
 	@Override

ureport2-core/src/main/java/com/bstek/ureport/parser/impl/searchform/TextInputParser.java

@@ -31,6 +31,7 @@ public class TextInputParser implements FormParser<TextInputComponent> {
 		TextInputComponent component=new TextInputComponent();
 		component.setBindParameter(element.attributeValue("bind-parameter"));
 		component.setLabel(element.attributeValue("label"));
+		component.setType(element.attributeValue("type"));
 		component.setLabelPosition(LabelPosition.valueOf(element.attributeValue("label-position")));
 		return component;
 	}