修改重置按钮函数

ureport2-console/src/main/resources/ureport-html/html-preview.html

@@ -127,6 +127,7 @@ ${downSearchFormHtml}
 <script type="text/javascript">
 window._server="${contextPath}/ureport";
 window.formElements=[];
+
 $(document).ready(function(){
 	
 	buildPaging(${pageIndex},${totalPageWithCol});
@@ -139,6 +140,11 @@ $(document).ready(function(){
 	function doSearch(){
 		submitSearchForm("${file}","${customParameters}");
 	}
+	function resetForm() {
+		$("#ureport_search_form input").val("");
+		$("#ureport_search_form select").val("").trigger("change");
+	}
+
 });
 </script>
 </body>

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

@@ -22,12 +22,16 @@ package com.bstek.ureport.definition.searchform;
 public class ResetButtonComponent extends ButtonComponent{
 	@Override
 	public String toHtml(RenderContext context) {
-		return "<button type=\"reset\" id=\""+context.buildComponentId(this)+"\"" +
+		return "<button type='button' id=\""+context.buildComponentId(this)+"\"" +
 				"style=\"padding: 6px 12px;float:left;margin-left:16px\" " +
 				" class=\"btn "+getStyle()+" btn-sm\">"+getLabel()+"</button>";
 	}
 	@Override
 	public String initJs(RenderContext context) {
-		return "";
+		StringBuilder sb=new StringBuilder();
+		sb.append("$('#"+context.buildComponentId(this)+"').click(function(){");
+		sb.append("resetForm();");
+		sb.append("});");
+		return sb.toString();
 	}
 }

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

@@ -26,7 +26,7 @@ public class SearchForm {
 	private FormPosition formPosition;
 	public String toHtml(RenderContext context){
 		StringBuilder sb=new StringBuilder();
-		sb.append("<form  style='margin-top:10px'>");
+		sb.append("<form id='ureport_search_form' style='margin-top:10px'>");
 		for(Component component:components){
 			sb.append(component.toHtml(context));
 		}

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

@@ -80,11 +80,10 @@ public class SelectInputComponent extends InputComponent {
 				String selected=value.equals(pvalue) ? "selected" : "";
 				sb.append("<option value='"+value+"' "+selected+">"+option.getLabel()+"</option>");
 			}
-			/*if(pvalue.equals("")){
-				sb.append("<option value='' selected></option>");
-			}*/
 		}
-
+		/*if(pvalue.equals("")){
+			sb.append("<option value='' selected></option>");
+		}*/
 		sb.append("</select>");
 		return sb.toString();
 	}

ureport2-core/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Jul 10 10:25:49 CST 2020
+#Fri Jul 10 13:55:07 CST 2020
 version=2.2.9
 groupId=com.spcp.ureport
 artifactId=ureport2-core