From 635aacbd801eaea839f495ff96931beab74ff3e3 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Mon, 5 Nov 2018 19:04:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9IP=E5=A4=8D=E7=94=A8=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E9=85=8D=E7=BD=AE=E7=94=B1region=E8=A1=A8=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E8=A1=A8=E5=8D=95=E5=B1=9E=E6=80=A7.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sql/20181105/update_region_dict.sql       |   2 +
 .../WEB-INF/views/basics/policyGroupForm.jsp  |   2 +-
 .../ipmulitiplex/dnatPolicyForm.jsp           | 140 ++++++++----------
 .../ipmulitiplex/snatPolicyForm.jsp           |  74 ++++-----
 4 files changed, 93 insertions(+), 125 deletions(-)
 create mode 100644 src/main/resources/sql/20181105/update_region_dict.sql

diff --git a/src/main/resources/sql/20181105/update_region_dict.sql b/src/main/resources/sql/20181105/update_region_dict.sql
new file mode 100644
index 000000000..8bb29fc15
--- /dev/null
+++ b/src/main/resources/sql/20181105/update_region_dict.sql
@@ -0,0 +1,2 @@
+UPDATE function_region_dict SET config_ip_port_show = '1' WHERE function_id = 300 AND dict_id = 68;
+UPDATE function_region_dict SET config_ip_port_show = '3,4' WHERE function_id = 304 AND dict_id = 232;
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
index cc616fc17..9f275e19e 100644
--- a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
@@ -104,7 +104,7 @@ $(function(){
 								        <div class="form-group hidden">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="asn_no"/></label>
 								            <div class="col-md-6">
-								                <input id="asnNo" class="form-control required asnNoUnique number" type="text" name="asnNo" value="${_cfg.asnNo}" autocomplete="off" maxlength="20" ctx="${ctx }">
+								                <input id="asnNo" class="form-control required asnNoUnique number" type="text" name="asnNo" value="${_cfg.asnNo}" autocomplete="off" maxlength="15" ctx="${ctx }">
 								            </div>
 								            <div for="asnNo"></div>
 								        </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm.jsp
index ec1f4c889..586983b93 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm.jsp
@@ -5,8 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	//$("select[name='protocol']").parents(".form-group").addClass("hidden");
-	$("select[name='direction']").parents(".form-group").addClass("hidden");
 	if('${fn:length(serviceList)}'>1){
 		$("#serviceId").val($(".action:checked").attr("serviceId"));
 		$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -135,7 +133,6 @@ $(function(){
 									   </div>
 								   </c:if>
 								</div>
-	               				<%--@include file="/WEB-INF/include/form/complexIpInfo.jsp" --%>
 	               				<div class="row ipInfo">
 									<div class="row">
 									    <div class="col-md-6">
@@ -158,9 +155,38 @@ $(function(){
 									            <div for="ipType"></div>
 									        </div>
 									    </div>
-									    <div class="col-md-6 hidden">
+									    <div class="col-md-6">
+											<div class="form-group ">
+												<label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol" /></label>
+												<div class="col-md-6">
+													<select name="protocol"
+														class="selectpicker show-tick form-control required">
+														<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+															<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
+														</c:forEach>
+													</select>
+												</div>
+												<div for="protocol"></div>
+											</div>
+										</div>
+									</div>
+									<div class="row ip">
+									    <div class="col-md-6">
+									        <div class="form-group">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
+									            <div class="col-md-6">
+									            	 <select name="ipPattern" class="selectpicker show-tick form-control required">
+									                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
+															<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.ipPattern==ipPatternC.itemCode || (_cfg.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
+								              			</c:forEach>
+									                 </select>
+									            </div>
+									            <div for="ipPattern"></div>
+									        </div>
+									    </div>
+									    <div class="col-md-6">
 									        <div class="form-group ">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
 									            <div class="col-md-6">
 									                 <input class="form-control required ipCheck" type="text" name="srcIpAddress" value="${_cfg.srcIpAddress}">
 									            </div>
@@ -175,26 +201,10 @@ $(function(){
 									            </div>
 									            <div for="destIpAddress"></div>
 									        </div>
-									    </div>
+									     </div>
 									</div>
-									<div class="row ip">
-									    <div class="col-md-6 hidden">
-									        <div class="form-group">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
-									            <div class="col-md-6">
-									            	 <select name="ipPattern" class="selectpicker show-tick form-control required">
-									                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
-															<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.ipPattern==ipPatternC.itemCode || (_cfg.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
-								              			</c:forEach>
-									                 </select>
-									            </div>
-									            <div for="ipPattern"></div>
-									        </div>
-									    </div>
-									    
-									</div>
-									<div class="row hidden port">
-									    <div class="col-md-6 hidden">
+									<div class="row port">
+									    <div class="col-md-6">
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
 									            <div class="col-md-6">
@@ -207,8 +217,8 @@ $(function(){
 									            <div for="portPattern"></div>
 									        </div>
 									    </div>
-									    <div class="col-md-6 hidden">
-									        <div class="form-group ">
+									    <div class="col-md-6">
+									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
 									            <div class="col-md-6">
 									                 <input class="form-control required portCheck" type="text" name="srcPort" value="${_cfg.srcPort}">
@@ -216,33 +226,7 @@ $(function(){
 									            <div for="srcPort"></div>
 									        </div>
 									    </div>
-									</div>
-									<div class="row destPort">
-									    <%-- <div class="col-md-6">
-									        <div class="form-group ">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
-									            <div class="col-md-6">
-									                 <input class="form-control required ipCheck" type="text" name="destIpAddress" value="${_cfg.destIpAddress}">
-									            </div>
-									            <div for="destIpAddress"></div>
-									        </div>
-									    </div> --%>
 									    <div class="col-md-6">
-											<div class="form-group ">
-												<label class="control-label col-md-3"><font color="red">*</font>
-													<spring:message code="protocol" /></label>
-												<div class="col-md-6">
-													<select name="protocol"
-														class="selectpicker show-tick form-control required">
-														<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
-															<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
-														</c:forEach>
-													</select>
-												</div>
-												<div for="protocol"></div>
-											</div>
-										</div>
-									     <div class="col-md-6">
 									        <div class="form-group ">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
 									            <div class="col-md-6">
@@ -252,29 +236,32 @@ $(function(){
 									        </div>
 									    </div>
 									</div>
-									<div class="row protocol ">
-										<%-- <div class="col-md-6">
-											<div class="form-group ">
-												<label class="control-label col-md-3"><font color="red">*</font>
-													<spring:message code="protocol" /></label>
-												<div class="col-md-6">
-													<select name="protocol"
-														class="selectpicker show-tick form-control required">
-														<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
-															<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
-														</c:forEach>
-													</select>
-												</div>
-												<div for="protocol"></div>
-											</div>
-										</div> --%>
+									<%-- <div class="row destPort">
+									     <div class="col-md-6">
+									        <div class="form-group ">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
+									            <div class="col-md-6">
+									                 <input class="form-control required ipCheck" type="text" name="destIpAddress" value="${_cfg.destIpAddress}">
+									            </div>
+									            <div for="destIpAddress"></div>
+									        </div>
+									     </div>
+									     <div class="col-md-6">
+									        <div class="form-group ">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
+									            <div class="col-md-6">
+									                 <input class="form-control required portCheck" type="text" name="destPort" value="${_cfg.destPort}">
+									            </div>
+									            <div for="destPort"></div>
+									        </div>
+									    </div>
+									</div> --%>
+									<div class="row protocol">
 										<div class="col-md-6">
-											<div class="form-group">
-												<label class="control-label col-md-3"><font color="red">*</font>
-													<spring:message code="direction" /></label>
+											<div class="form-group hidden">
+												<label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction" /></label>
 												<div class="col-md-6">
-													<select name="direction"
-														class="selectpicker show-tick form-control required">
+													<select name="direction" class="selectpicker show-tick form-control required">
 														<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
 															<option value="${directionC.itemCode}"><spring:message code="${directionC.itemValue}"/></option>
 														</c:forEach>
@@ -284,16 +271,9 @@ $(function(){
 											</div>
 										</div>
 									</div>
-									<%-- <div class="row">
-										<button type="button" class="btn btn-red-hollow center-block"
-											onClick="more(this);" data-click-times="0">
-											<spring:message code="show_more" />
-										</button>
-									</div> --%>
 									<br>
 								</div>
 	           			   		<div class="row ipmulitiplex">
-								    
 								    <div class="col-md-6 hidden">
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ir_type"/></label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm.jsp
index 63d910de8..1dc43d7cf 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm.jsp
@@ -5,8 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("select[name='protocol']").parents(".form-group").addClass("hidden");
-	$("select[name='direction']").parents(".form-group").addClass("hidden");
 	if('${fn:length(serviceList)}'>1){
 		$("#serviceId").val($(".action:checked").attr("serviceId"));
 		$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -140,7 +138,6 @@ $(function(){
 									   </div>
 								   </c:if>
 								</div>
-	               				<%--@include file="/WEB-INF/include/form/complexIpInfo.jsp" --%>
 	               				<div class="row ipInfo">
 									<div class="row">
 									    <div class="col-md-6">
@@ -164,17 +161,6 @@ $(function(){
 									        </div>
 									    </div>
 									    <div class="col-md-6">
-									        <div class="form-group ">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
-									            <div class="col-md-6">
-									                 <input class="form-control required ipCheck" type="text" name="srcIpAddress" value="${_cfg.srcIpAddress}">
-									            </div>
-									            <div for="srcIpAddress"></div>
-									        </div>
-									    </div>
-									</div>
-									<div class="row ip">
-									    <div class="col-md-6 hidden">
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
 									            <div class="col-md-6">
@@ -187,9 +173,33 @@ $(function(){
 									            <div for="ipPattern"></div>
 									        </div>
 									    </div>
-									    
 									</div>
-									<div class="row hidden port">
+									<div class="row ip">
+										<div class="col-md-6">
+									        <div class="form-group ">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
+									            <div class="col-md-6">
+									                 <input class="form-control required ipCheck" type="text" name="srcIpAddress" value="${_cfg.srcIpAddress}">
+									            </div>
+									            <div for="srcIpAddress"></div>
+									        </div>
+									    </div>
+									    <div class="col-md-6">
+								        	<div class="form-group hidden">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="area"/></label>
+									            <div class="col-md-6">
+									            	 <select id="areaEffectiveIds" name="areaEffectiveIds" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search" >
+														<option value="" ><spring:message code="select"/></option>
+														<c:forEach items="${areas}" var="area">
+															<option value="${area.itemCode}" <c:if test="${_cfg.areaEffectiveIds == area.itemCode }">selected</c:if> >${area.itemValue}</option>
+														</c:forEach>
+													</select>
+									            </div>
+									            <div for="areaEffectiveIds"></div>
+									        </div>
+									    </div>
+									</div>
+									<div class="row port">
 									    <div class="col-md-6 hidden">
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
@@ -203,7 +213,7 @@ $(function(){
 									            <div for="portPattern"></div>
 									        </div>
 									    </div>
-									    <div class="col-md-6 hidden">
+									    <div class="col-md-6">
 									        <div class="form-group ">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
 									            <div class="col-md-6">
@@ -213,7 +223,7 @@ $(function(){
 									        </div>
 									    </div>
 									</div>
-									<div class="row hidden destPort">
+									<div class="row destPort">
 									    <div class="col-md-6">
 									        <div class="form-group ">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
@@ -233,9 +243,9 @@ $(function(){
 									        </div>
 									    </div>
 									</div>
-									<div class="row hidden protocol ">
+									<div class="row hidden protocol">
 										<div class="col-md-6">
-											<div class="form-group ">
+											<div class="form-group">
 												<label class="control-label col-md-3"><font color="red">*</font>
 													<spring:message code="protocol" /></label>
 												<div class="col-md-6">
@@ -265,32 +275,9 @@ $(function(){
 											</div>
 										</div>
 									</div>
-									<%-- <div class="row">
-										<button type="button" class="btn btn-red-hollow center-block"
-											onClick="more(this);" data-click-times="0">
-											<spring:message code="show_more" />
-										</button>
-									</div> --%>
-									<div class="row">
-										<div class="col-md-6">
-								        	<div class="form-group hidden">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="area"/></label>
-									            <div class="col-md-6">
-									            	 <select id="areaEffectiveIds" name="areaEffectiveIds" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search" >
-														<option value="" ><spring:message code="select"/></option>
-														<c:forEach items="${areas}" var="area">
-															<option value="${area.itemCode}" <c:if test="${_cfg.areaEffectiveIds == area.itemCode }">selected</c:if> >${area.itemValue}</option>
-														</c:forEach>
-													</select>
-									            </div>
-									            <div for="areaEffectiveIds"></div>
-									        </div>
-									    </div>
-									</div>
 									<br>
 								</div>
 	           			   		<div class="row ipmulitiplex">
-								    
 								    <div class="col-md-6 hidden">
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ir_type"/></label>
@@ -315,7 +302,6 @@ $(function(){
 								            </div>
 								            <div for="ratelimit"></div>
 								        </div>
-								        
 								    </div>
 								</div>
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>