From c2d024a352fba95c66daf3444fc3429f06aae5a0 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Thu, 16 Aug 2018 11:20:43 +0800
Subject: [PATCH] =?UTF-8?q?(1)app=E7=89=B9=E5=BE=81=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E5=9F=BA=E7=A1=80=E5=8D=8F=E8=AE=AE=EF=BC=8C=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=86=E9=9A=A7=E9=81=93=E8=A1=8C=E4=B8=BAtree=E6=A0=B9?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=B7=BB=E5=8A=A0tittle=20(2)=E7=89=B9?=
 =?UTF-8?q?=E5=AE=9A=E6=9C=8D=E5=8A=A1=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/tags/sys/treeselect.tag    |  1 -
 .../WEB-INF/views/cfg/app/appByteCfgForm.jsp  |  1 +
 .../views/cfg/app/appDomainCfgForm.jsp        |  1 +
 .../WEB-INF/views/cfg/app/appHttpCfgForm.jsp  |  1 +
 .../WEB-INF/views/cfg/app/appIpCfgForm.jsp    |  1 +
 .../views/cfg/app/appPolicyCfgForm.jsp        |  1 +
 .../WEB-INF/views/cfg/basicprotocol/form.jsp  |  1 +
 .../views/cfg/encryptedtunnelbehav/form.jsp   |  1 +
 .../views/specific/specificServiceCfgForm.jsp | 26 +++++++------------
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
index e2520f1d6..2fc704fb5 100644
--- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
@@ -26,7 +26,6 @@
 <%@ attribute name="showParentName" type="java.lang.String" required="false" description="显示父类名称"%>
 <%@ attribute name="checkedPS" type="java.lang.String" required="false" description="复选框选中时是否关联父子节点，ps关联父子，p关联父，s关联子,都不关联为空"%>
 <%@ attribute name="unCheckedPS" type="java.lang.String" required="false" description="复选框取消选中时是否关联父子节点，ps关联父子，p关联父，s关联子,都不关联为空"%>
-<%@ attribute name="rootNodeName" type="java.lang.String" required="false" description="根节点显示的名称"%>
 <div class="input-group">
 	<input id="${id}Id" name="${name}" class="${cssClass} singleClass" type="hidden" value="${value}" />
 	<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'} type="text" value="<spring:message code='${labelValue}'/>" data-msg-required="${dataMsgRequired}" placeholder="${value}"
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
index f6e35aded..a295d9d9a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
@@ -88,6 +88,7 @@ $(function(){
                               <div class="row">
                               		<div class="col-md-6">
 								        <div class="form-group">
+								        	 <c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
 								            <div class="col-md-6">
 										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
index 59d8db5fe..2bc1a5535 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
@@ -86,6 +86,7 @@ $(function(){
                           <!-- desc and action -->
                               <div class="row">
                               		<div class="col-md-6">
+                              			 <c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
 								            <div class="col-md-6">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
index 8e82f408c..5c229ec28 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
@@ -101,6 +101,7 @@ $(function(){
                               <div class="row">
                               		<div class="col-md-6">
 								        <div class="form-group">
+								        	 <c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
 								            <div class="col-md-6">
 										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
index a1ee5cfe3..51a3797dc 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
@@ -67,6 +67,7 @@ $(function(){
                               <div class="row">
                               		<div class="col-md-6">
 								        <div class="form-group">
+								        	 <c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
 								            <div class="col-md-6">
 										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
index 6368c86b2..5e1d0bb12 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
@@ -195,6 +195,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 									 <div class="row">
 		                              		<div class="col-md-6">
 										        <div class="form-group">
+										        	 <c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
 										            <div class="col-md-6">
 												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
index 026727348..217a99c66 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
@@ -147,6 +147,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 									 <div class="row">
 		                              		<div class="col-md-6">
 										        <div class="form-group">
+										        	<c:set var="spec_service_id"><spring:message code="basic_protocol"/></c:set>
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="basic_protocol"/></label>
 										            <div class="col-md-6">
 												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
index 92f90a405..d68a9267a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
@@ -196,6 +196,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 									 <div class="row">
 		                              		<div class="col-md-6">
 										        <div class="form-group">
+										            <c:set var="spec_service_id"><spring:message code="encrypted_tunnel_behavior"/></c:set>
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="encrypted_tunnel_behavior"/></label>
 										            <div class="col-md-6">
 												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
index 2ba5b7ab6..0e729150d 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
@@ -66,12 +66,7 @@
 				},
 				errorContainer: "#messageBox",
 				errorPlacement: function(error, element) {
-					$("#messageBox").text("<spring:message code='enter_error'/>");
-					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
-						error.appendTo(element.parent().parent());
-					} else {
-						error.insertAfter(element);
-					}
+					$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
 				}
 			});
 			//if("${specificServiceCfg.parentType}"){
@@ -87,10 +82,6 @@
 						$(this).find("[name='parent.specServiceId']").removeAttr("name");
 						$(this).find("[name='parent.specServiceName']").removeAttr("name");
 					}
-					if($(this).attr("cfgType")==3){
-						$(this).find("input").unbind("click");
-						$(this).find("a").unbind("click");
-					}
 				});
 				$(".protocol_code").html('<font color="red">*</font><spring:message code="app_code"/>:');
 				$(".protocol_name").html('<font color="red">*</font><spring:message code="app_name"/>:');
@@ -102,9 +93,6 @@
 						$(this).find("[name='parent.specServiceId']").removeAttr("name");
 						$(this).find("[name='parent.specServiceName']").removeAttr("name");
 					}
-					if($(this).attr("cfgType")==3){
-						$(this).find("input").unbind("click");
-					}
 				});
 				if($("[name='cfgType']").val()==1){
 					$(".protocol_code").html('<font color="red">*</font><spring:message code="app_code"/>:');
@@ -127,8 +115,9 @@
 					if($(this).attr("cfgType")==cfgType){
 						$(this).removeClass("hidden");
 						$("#specificServiceCfg"+cfgType+"Id").attr("name","parent.specServiceId");
+						$("#specificServiceCfg"+cfgType+"Name").attr("name","parent.specServiceName");
 					}else{
-						$(this).addClass("hidden").addClass("disable");
+						$(this).addClass("hidden");
 						$(this).find("[name='parent.specServiceId']").removeAttr("name");
 						$(this).find("[name='parent.specServiceName']").removeAttr("name");
 					}
@@ -199,13 +188,14 @@
 															<div class="col-md-4">
 																<c:if test="${empty specificServiceCfg.specServiceId}">
 															    <sys:treeselect id="${'specificServiceCfg'.concat(dict.itemCode)}" name="parent.specServiceId" value="${specificServiceCfg.parent.specServiceId}" labelName="parent.specServiceName" labelValue="${fatherName}" title="${dict.itemValue}"
-															     url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${dict.itemCode}" extId="${specificServiceCfg.specServiceId}" cssClass="required form-control"/>	
+															    url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${dict.itemCode}" extId="${specificServiceCfg.specServiceId}" cssClass="required form-control"/>	
 																</c:if>
 																<c:if test="${not empty specificServiceCfg.specServiceId}">
 																 <sys:treeselect id="${'specificServiceCfg'.concat(dict.itemCode)}" name="parent.specServiceId" value="${specificServiceCfg.cfgType eq dict.itemCode?specificServiceCfg.parent.specServiceId:0}" labelName="parent.specServiceName" labelValue="${(specificServiceCfg.cfgType eq dict.itemCode and specificServiceCfg.parent.specServiceId ne '0')?fns:getBySpecServiceId(specificServiceCfg.parent.specServiceId).specServiceName:fatherName}"
-																	title="${dict.itemValue}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${dict.itemCode}" extId="${specificServiceCfg.specServiceId}" cssClass="required form-control"/>	
+																title="${dict.itemValue}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${dict.itemCode}" extId="${specificServiceCfg.specServiceId}" cssClass="required form-control"/>	
 																</c:if>
 															</div>
+															<div for="parent.specServiceName"></div>
 														</div>
 													</c:forEach>
 												    <div class="form-group">
@@ -213,18 +203,21 @@
 														<div class="col-md-4">
 															<input id="specServiceCode" name="specServiceCode" maxlength="50" range="[0,2147483647]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/>
 														</div>
+														<div for="specServiceCode"></div>
 													</div>  
 													<div class="form-group">
 														<label class="col-md-3 control-label protocol_name"><font color="red">*</font><spring:message code="protocol_name"/>:</label>
 														<div class="col-md-4">
 															<form:input path="specServiceName" htmlEscape="false" maxlength="64" class="form-control required noBlankSpace"/>
 														</div>
+														<div for="specServiceName"></div>
 													</div> 
 												 	<div class="form-group">
 														<label class="col-md-3 control-label hidden"><spring:message code="group_id"/>:</label>
 														<div class="col-md-4">
 															<form:input path="groupId" htmlEscape="false" maxlength="50" range="[0,2147483647]" class="form-control digits hidden" placeholder="0"/>
 														</div>
+														<div for="groupId"></div>
 													</div> 
 													<%-- <div class="form-group">
 														<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
@@ -249,6 +242,7 @@
 														<div class="col-md-4">
 															<form:textarea path="specServiceDesc" htmlEscape="false" maxlength="64" class="form-control"/>
 														</div>
+														<div for="specServiceDesc"></div>
 													</div>
 													<div class="form-actions">
 														<div class="row">