gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'demostration_08' into 'develop'

Browse Source 
Demostration 08

See merge request !28
This commit is contained in:
wangxin
2018-08-16 11:28:21 -04:00
parent 10ebfca48d c2d024a352
commit 92d8e2f54c
9 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/webapp/WEB-INF/tags/sys/treeselect.tag
View File

@@ -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}"

1
src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
View File

@@ -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}"

1
src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
View File

@@ -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">

1
src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
View File

@@ -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}"

1
src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
View File

@@ -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}"

1
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
View File

@@ -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}"

1
src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
View File

@@ -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}"

1
src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
View File

@@ -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}"

26
src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
View File

@@ -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">