From 6197dbce654e7461a57baacd56b28fe612c65521 Mon Sep 17 00:00:00 2001
From: Huan Gan <Huan Gan>
Date: Thu, 29 Jun 2017 18:57:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BF=85=E5=A1=AB=E9=A1=B9bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.MD                                           |  1 +
 WebContent/WEB-INF/design/variables.rptdesign       |  5 +++--
 .../pages/parameter/TextBoxParameterFragment.jsp    | 13 ++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

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 @@
             <text-property name="helpText">主键范围</text-property>
             <text-property name="promptText">主键范围</text-property>
             <property name="valueType">static</property>
-            <property name="isRequired">false</property>
+            <property name="isRequired">true</property>
             <property name="dataType">string</property>
             <property name="distinct">true</property>
             <simple-property-list name="defaultValue">
-                <value type="javascript"></value>
+                <value type="javascript">String('')</value>
             </simple-property-list>
             <list-property name="selectionList"/>
             <property name="paramType">simple</property>
@@ -68,6 +68,7 @@
     </data-sources>
     <data-sets>
         <oda-data-set extensionID="org.eclipse.birt.report.data.oda.jdbc.JdbcSelectDataSet" name="hosts-ds" id="7">
+            <property name="nullsOrdering">nulls lowest</property>
             <list-property name="columnHints">
                 <structure>
                     <property name="columnName">hostName</property>
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 @@
 <jsp:useBean id="attributeBean" type="org.eclipse.birt.report.context.BaseAttributeBean" scope="request" />
 <%@ 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());
 %>
 <div class="form-group">
    	<label for="${encodedParameterName}" class="col-sm-4 control-label">
    		<%=parameterBean.getDisplayName() != null ? parameterBean.getDisplayName() : parameterBean.getToolTip() %>
    		
-   		<c:if test="${parameterBean.isRequired()}">
+   		<% if(parameterBean.isRequired()) {%>
    			<FONT COLOR="red">*</FONT>
-   		</c:if>
+   		<% }%>	
    	</label>
     <div class="col-sm-8">
     	<input type="hidden" id="control_type" value="text"/>
@@ -49,13 +49,12 @@
 			VALUE="<%= ParameterAccessor.htmlEncode((parameterBean.getDisplayText() == null )? "" : parameterBean.getDisplayText( ) ) %>"
 			>
 			
-		<c:if test="${!parameterBean.isRequired()}">
+		<% if(!parameterBean.isRequired()) {%>
 			<label class="radio-inline" for="<%= encodedParameterName + "_radio_null" %>">
 				<input name="<%=encodedParameterName + "_radio"%>" type="radio" id="<%= encodedParameterName + "_radio_null" %>" value="<%=encodedParameterName%>" ${empty parameterBean.getValue()?"checked" : ""}/>
 				设置为空
 			</label>
-		</c:if>
+		<% }%>
 		<input type="hidden" id="isRequired" value="<%=parameterBean.isRequired()? "true": "false"%>"/>
-		
     </div>
 </div>