diff --git a/README.MD b/README.MD index 0135554..ea0bc61 100644 --- a/README.MD +++ b/README.MD @@ -41,4 +41,5 @@ birt报表网页预览版 1. 将报表设计文件存放地址为WEB-INF/design 2. 将资源文件存放地址为WEB-INF/i18n 3. 添加TOC居中功能 +4. 修复参数必填项BUG(缺选择全部,如何留空) diff --git a/WebContent/WEB-INF/design/variables.rptdesign b/WebContent/WEB-INF/design/variables.rptdesign index b839d60..f2b75c1 100644 --- a/WebContent/WEB-INF/design/variables.rptdesign +++ b/WebContent/WEB-INF/design/variables.rptdesign @@ -27,11 +27,11 @@ 主键范围 主键范围 static - false + true string true - + String('') simple @@ -68,6 +68,7 @@ + nulls lowest hostName diff --git a/WebContent/birt/pages/parameter/TextBoxParameterFragment.jsp b/WebContent/birt/pages/parameter/TextBoxParameterFragment.jsp index ed6f1e9..741b83e 100644 --- a/WebContent/birt/pages/parameter/TextBoxParameterFragment.jsp +++ b/WebContent/birt/pages/parameter/TextBoxParameterFragment.jsp @@ -6,16 +6,16 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <% - ScalarParameterBean parameterBean = (ScalarParameterBean) attributeBean.getParameterBean( ); - String encodedParameterName = ParameterAccessor.htmlEncode( parameterBean.getName( ) ); + ScalarParameterBean parameterBean = (ScalarParameterBean) attributeBean.getParameterBean(); + String encodedParameterName = ParameterAccessor.htmlEncode( parameterBean.getName()); %>
@@ -49,13 +49,12 @@ VALUE="<%= ParameterAccessor.htmlEncode((parameterBean.getDisplayText() == null )? "" : parameterBean.getDisplayText( ) ) %>" > - + <% if(!parameterBean.isRequired()) {%> - + <% }%> "/> -