diff --git a/ureport2-console/src/main/resources/ureport-html/html-preview.html b/ureport2-console/src/main/resources/ureport-html/html-preview.html index 152d530..e9faa2a 100644 --- a/ureport2-console/src/main/resources/ureport-html/html-preview.html +++ b/ureport2-console/src/main/resources/ureport-html/html-preview.html @@ -127,6 +127,7 @@ ${downSearchFormHtml} diff --git a/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/ResetButtonComponent.java b/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/ResetButtonComponent.java index be9a1d3..705140d 100644 --- a/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/ResetButtonComponent.java +++ b/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 ""; } @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(); } } diff --git a/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/SearchForm.java b/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/SearchForm.java index e3ba2e3..fe305cc 100644 --- a/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/SearchForm.java +++ b/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("
"); + sb.append(""); for(Component component:components){ sb.append(component.toHtml(context)); } diff --git a/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/SelectInputComponent.java b/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/SelectInputComponent.java index e58dcdf..fddae5e 100644 --- a/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/SelectInputComponent.java +++ b/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(""); } - /*if(pvalue.equals("")){ - sb.append(""); - }*/ } - + /*if(pvalue.equals("")){ + sb.append(""); + }*/ sb.append(""); return sb.toString(); } diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/ResetButtonComponent.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/ResetButtonComponent.class index c39d0b0..18d8bb4 100644 Binary files a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/ResetButtonComponent.class and b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/ResetButtonComponent.class differ diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SearchForm.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SearchForm.class index f2678ba..6bc3b3f 100644 Binary files a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SearchForm.class and b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SearchForm.class differ diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SelectInputComponent.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SelectInputComponent.class index 47e9ccd..655d1ea 100644 Binary files a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SelectInputComponent.class and b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SelectInputComponent.class differ diff --git a/ureport2-core/target/maven-archiver/pom.properties b/ureport2-core/target/maven-archiver/pom.properties index f64699c..537895a 100644 --- a/ureport2-core/target/maven-archiver/pom.properties +++ b/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 diff --git a/ureport2-core/target/ureport2-core-2.2.9-sources.jar b/ureport2-core/target/ureport2-core-2.2.9-sources.jar index 0963d70..30b02c4 100644 Binary files a/ureport2-core/target/ureport2-core-2.2.9-sources.jar and b/ureport2-core/target/ureport2-core-2.2.9-sources.jar differ diff --git a/ureport2-core/target/ureport2-core-2.2.9.jar b/ureport2-core/target/ureport2-core-2.2.9.jar index f4d5faa..20a9734 100644 Binary files a/ureport2-core/target/ureport2-core-2.2.9.jar and b/ureport2-core/target/ureport2-core-2.2.9.jar differ