diff --git a/src/main/java/com/nis/domain/configuration/HttpsContentReplaceCfg.java b/src/main/java/com/nis/domain/configuration/HttpsContentReplaceCfg.java new file mode 100644 index 000000000..ae7d81028 --- /dev/null +++ b/src/main/java/com/nis/domain/configuration/HttpsContentReplaceCfg.java @@ -0,0 +1,93 @@ +/** + *@Title: HttpsContentReplaceConfig.java + *@Package com.nis.domain.restful + *@Description TODO + *@author dell + *@date 2018年2月6日 上午10:30:46 + *@version 版本号 + */ +package com.nis.domain.configuration; + +/** + * @ClassName: HttpsContentReplaceConfig.java + * @Description: TODO + * @author (dell) + * @date 2018年2月6日 上午10:30:46 + * @version V1.0 + */ +public class HttpsContentReplaceCfg extends BaseStringCfg { + + /** + * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） + * + * @since 1.0.0 + */ + + private static final long serialVersionUID = -116828220692786004L; + /** + * 网站名称 + */ + private String webName; + /** + * 源内容 + */ + private String srcContent; + /** + * 替换内容 + */ + private String destContent; + /** + * webName + * @return webName + */ + + public String getWebName() { + return webName; + } + /** + * @param webName the webName to set + */ + public void setWebName(String webName) { + this.webName = webName; + } + /** + * srcContent + * @return srcContent + */ + + public String getSrcContent() { + return srcContent; + } + /** + * @param srcContent the srcContent to set + */ + public void setSrcContent(String srcContent) { + this.srcContent = srcContent; + } + /** + * destContent + * @return destContent + */ + + public String getDestContent() { + return destContent; + } + /** + * @param destContent the destContent to set + */ + public void setDestContent(String destContent) { + this.destContent = destContent; + } + + /* (non-Javadoc) + * @see com.nis.domain.configuration.BaseStringCfg#initDefaultValue() + */ + @Override + public void initDefaultValue() { + // TODO Auto-generated method stub + super.initDefaultValue(); + this.exprType=0; + this.matchMethod=3; + } + +} diff --git a/src/main/java/com/nis/domain/configuration/MultipleCfg.java b/src/main/java/com/nis/domain/configuration/MultipleCfg.java index 12875394a..bc97318fe 100644 --- a/src/main/java/com/nis/domain/configuration/MultipleCfg.java +++ b/src/main/java/com/nis/domain/configuration/MultipleCfg.java @@ -19,19 +19,20 @@ import java.util.Map; * @version V1.0 */ public class MultipleCfg extends BaseCfg { - /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * * @since 1.0.0 */ - private static final long serialVersionUID = -8369567908781421920L; + /** + * 配置关系表，一个compileId 中有哪些表存了数据 + */ + private MultipleCfgRelation relation; private String mainTable; private String mainTableType; private String mainTableDesc; private List otherTables;//key 表名，value 类型 -// private BaseCfg mainCfg; //ip配置 private Map ipCfg; //字符串配置 @@ -168,4 +169,18 @@ public class MultipleCfg extends BaseCfg { public void setMainTableDesc(String mainTableDesc) { this.mainTableDesc = mainTableDesc; } + /** + * relation + * @return relation + */ + + public MultipleCfgRelation getRelation() { + return relation; + } + /** + * @param relation the relation to set + */ + public void setRelation(MultipleCfgRelation relation) { + this.relation = relation; + } } diff --git a/src/main/java/com/nis/domain/configuration/MultipleCfgRelation.java b/src/main/java/com/nis/domain/configuration/MultipleCfgRelation.java new file mode 100644 index 000000000..ece553838 --- /dev/null +++ b/src/main/java/com/nis/domain/configuration/MultipleCfgRelation.java @@ -0,0 +1,74 @@ +/** + *@Title: MultipleCfgRelation.java + *@Package com.nis.domain.configuration + *@Description TODO + *@author dell + *@date 2018年4月10日 上午11:11:53 + *@version 版本号 + */ +package com.nis.domain.configuration; + +import java.io.Serializable; + +/** + * @ClassName: MultipleCfgRelation.java + * @Description: TODO + * @author (dell) + * @date 2018年4月10日 上午11:11:53 + * @version V1.0 + */ +public class MultipleCfgRelation implements Serializable{ + + /** + * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） + * + * @since 1.0.0 + */ + + private static final long serialVersionUID = -615924510840736781L; + private int compileId; + private String tableName; + private int isValid; + /** + * compileId + * @return compileId + */ + + public int getCompileId() { + return compileId; + } + /** + * @param compileId the compileId to set + */ + public void setCompileId(int compileId) { + this.compileId = compileId; + } + /** + * tableName + * @return tableName + */ + + public String getTableName() { + return tableName; + } + /** + * @param tableName the tableName to set + */ + public void setTableName(String tableName) { + this.tableName = tableName; + } + /** + * isValid + * @return isValid + */ + + public int getIsValid() { + return isValid; + } + /** + * @param isValid the isValid to set + */ + public void setIsValid(int isValid) { + this.isValid = isValid; + } +} diff --git a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java index d2aaf34ba..ca06814f5 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -1,5 +1,6 @@ package com.nis.web.controller.configuration; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -7,6 +8,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -31,12 +33,9 @@ import com.nis.web.controller.BaseController; public class IpCfgController extends BaseController{ /** * - * ipCfgList(配置列表与审核列表，需要根据参数判断是哪个列表，以便显示隐藏对应的界面菜单，按钮) + * cfgList(配置列表) * (这里描述这个方法适用条件 – 可选) * @param model - * @param audit - * @param pageNo - * @param pageSize * @param cfgName * @param ipCfg * @param request @@ -46,7 +45,32 @@ public class IpCfgController extends BaseController{ * @exception * @since 1.0.0 */ +// @RequestMapping(value = {"cfgList"}) +// @RequiresPermissions("cfg:ip:edit") +// public String cfgList(Model model,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response){ +// return ipCfgList(model,Constants.CFG_PAGE,cfgName,ipCfg,request,response); +// } + /** + * + * auditList(审核列表) + * (这里描述这个方法适用条件 – 可选) + * @param model + * @param cfgName + * @param ipCfg + * @param request + * @param response + * @return + *String + * @exception + * @since 1.0.0 + */ +// @RequestMapping(value = {"auditList"}) +// @RequiresPermissions("cfg:ip:audit") +// public String auditList(Model model,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response){ +// return ipCfgList(model,Constants.AUDIT_PAGE,cfgName,ipCfg,request,response); +// } @RequestMapping(value = {"list"}) + @RequiresPermissions(value={"cfg:ip:add","cfg:ip:edit","cfg:ip:delete","cfg:ip:audit"},logical=Logical.OR) public String ipCfgList(Model model,Integer audit,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) { model.addAttribute("cfgName", cfgName); model.addAttribute("audit", audit); @@ -61,7 +85,21 @@ public class IpCfgController extends BaseController{ if(!StringUtils.isBlank(tableName)){ logger.info("table name is "+tableName); ipCfg.setTableName(tableName); - Page page = ipCfgService.findPage(new Page(request,response,"r"), ipCfg); + Page searchPage=new Page(request,response,"r"); + String addWhrere=null; + if(audit==Constants.CFG_PAGE){// + addWhrere="r.is_audit in ("+Constants.AUDIT_NOT_YET+","+Constants.AUDIT_NO+")"; + }else if(audit==Constants.AUDIT_PAGE){ + addWhrere="r.is_audit in ("+Constants.AUDIT_NOT_YET+","+Constants.AUDIT_YES+")"; + } + if(addWhrere!=null){ + if(StringUtils.isNotBlank(searchPage.getWhere())){ + searchPage.setWhere(searchPage.getWhere()+" AND "+addWhrere); + }else{ + searchPage.setWhere(addWhrere); + } + } + Page page = ipCfgService.findPage(searchPage, ipCfg); model.addAttribute("page", page); model.addAttribute("action", ipCfg.getAction()); model.addAttribute("tableName", tableName); @@ -72,7 +110,6 @@ public class IpCfgController extends BaseController{ } } } - return "/cfg/ipCfgList"; } @@ -92,6 +129,7 @@ public class IpCfgController extends BaseController{ * @since 1.0.0 */ @RequestMapping(value = {"form"}) + @RequiresPermissions("cfg:ip:add") public String ipCfgForm(int action,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { model.addAttribute("cfgName", cfgName); model.addAttribute("serviceId", serviceId); @@ -152,9 +190,9 @@ public class IpCfgController extends BaseController{ * @exception * @since 1.0.0 */ - @RequiresPermissions("sys:cfg:edit") + @RequiresPermissions("cfg:ip:edit") @RequestMapping(value = {"updateForm"}) - public String updateIpCfgForm(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model) { + public String updateIpCfgForm(String tableName,int action,int compileId,String cfgName,Integer serviceId,Model model) { model.addAttribute("cfgName", cfgName); model.addAttribute("serviceId", serviceId); model.addAttribute("action", action); @@ -169,9 +207,9 @@ public class IpCfgController extends BaseController{ if(!StringUtils.isBlank(tableName)){ logger.info("table name is "+tableName); BaseIpCfg searchBean=new BaseIpCfg(); - searchBean.setCfgId(cfgId); + searchBean.setCompileId(compileId); searchBean.setTableName(tableName); - BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean); + BaseIpCfg ipCfg=ipCfgService.get(searchBean); model.addAttribute("_cfg", ipCfg); model.addAttribute("tableName", tableName); initUpdateFormCondition(model,ipCfg); @@ -194,6 +232,7 @@ public class IpCfgController extends BaseController{ * @since 1.0.0 */ @RequestMapping(value = {"saveOrUpdateCfg"}) + @RequiresPermissions(value={"cfg:ip:add","cfg:ip:edit"},logical=Logical.OR) public String saveOrUpdateIpCfg(String cfgName,Model model, BaseIpCfg ipCfg,String areaCfgIds) { model.addAttribute("cfgName",cfgName); model.addAttribute("cfgType", "ip"); @@ -220,50 +259,65 @@ public class IpCfgController extends BaseController{ * @exception * @since 1.0.0 */ - @RequestMapping(value = {"auditCfg"}) - public String auditIpCfg(String cfgName,BaseIpCfg ipCfg,Model model) { + @RequestMapping(value = {"audit"}) + @RequiresPermissions("cfg:ip:audit") + public String auditIpCfg(String cfgName,int serviceId,int isAudit,int action,String tableName,String ids,Model model) { model.addAttribute("cfgName", cfgName); model.addAttribute("cfgType", "ip"); model.addAttribute("audit", Constants.AUDIT_PAGE); - model.addAttribute("serviceId", ipCfg.getServiceId()); - model.addAttribute("action", ipCfg.getAction()); + model.addAttribute("serviceId", serviceId); + model.addAttribute("action", action); try{ - String tableName=ipCfg.getTableName(); String maatTable=null; - ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(ipCfg.getServiceId()); + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); if(serviceConfigInfo!=null){ if(StringUtils.isBlank(tableName)){ tableName=serviceConfigInfo.getTableName(); - ipCfg.setTableName(tableName); } maatTable=serviceConfigInfo.getMaatTable(); } - BaseIpCfg bean=ipCfgService.getIpCfgById(ipCfg); - bean.setTableName(tableName); - int audit=bean.getIsAudit().intValue(); - if(audit==Constants.AUDIT_YES&&ipCfg.getIsAudit()!=Constants.AUDIT_NOT_YES){ - logger.error("审核通过的配置只能取消审核通过！"); - }else{ - ipCfg.setAuditorId(ipCfg.getCurrentUser().getId()); - ipCfg.setAuditTime(new Date()); - bean.setIsAudit(ipCfg.getIsAudit()); - if(ipCfg.getIsAudit()==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0 - ipCfg.setIsValid(Constants.VALID_NO); - bean.setIsValid(Constants.VALID_NO); - bean.setMaatTable(maatTable); - }else if(ipCfg.getIsAudit()==Constants.AUDIT_YES){//审核通过，设置有效标志为1 - ipCfg.setIsValid(Constants.VALID_YES); - bean.setIsValid(Constants.VALID_YES); - bean.setMaatTable(maatTable); + if(StringUtils.isNotBlank(ids)){ + List beans=ipCfgService.getList(tableName,ids); + List auditBeans=new ArrayList<>(); + List auditAreaBeans=new ArrayList<>(); + Date date=new Date(); + for(BaseIpCfg bean:beans){ + BaseIpCfg auditBean=new BaseIpCfg(); + auditBean.setTableName(tableName); + auditBean.setCfgId(bean.getCfgId()); + bean.setTableName(tableName); + int audit=bean.getIsAudit().intValue(); + if(audit==Constants.AUDIT_YES&&isAudit!=Constants.AUDIT_NOT_YES){ + logger.error("审核通过的配置只能取消审核通过！"); + addMessage(model, "audit_failed"); + return "/cfg/resultPage"; + }else{ + auditBean.setAuditorId(bean.getCurrentUser().getId()); + auditBean.setAuditTime(date); + auditBean.setIsAudit(isAudit); + bean.setAuditorId(bean.getCurrentUser().getId()); + bean.setAuditTime(date); + bean.setIsAudit(isAudit); + if(isAudit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0 + auditBean.setIsValid(Constants.VALID_NO); + auditBean.setMaatTable(maatTable); + bean.setIsValid(Constants.VALID_NO); + bean.setMaatTable(maatTable); + }else if(isAudit==Constants.AUDIT_YES){//审核通过，设置有效标志为1 + auditBean.setIsValid(Constants.VALID_YES); + auditBean.setMaatTable(maatTable); + bean.setIsValid(Constants.VALID_YES); + bean.setMaatTable(maatTable); + } + List areaCfg=ipCfgService.getAreaCfgByCompileId(bean.getCompileId()); + bean.setAreaCfg(areaCfg); + auditAreaBeans.addAll(areaCfg); + } + auditBeans.add(auditBean); } - int result=ipCfgService.auditIpCfg(bean,ipCfg); - if(result!=0){ - addMessage(model,"audit_success"); - }else{ - addMessage(model, "audit_failed"); - } - + ipCfgService.auditIpCfg(isAudit,auditBeans,auditAreaBeans,beans); } + addMessage(model,"audit_success"); }catch(Exception e){ logger.error("审核失败", e); addMessage(model, "audit_failed"); @@ -272,16 +326,16 @@ public class IpCfgController extends BaseController{ } /** * - * auditIpCfg(删除IP配置，逻辑删除) + * deleteIpCfg(删除IP配置，逻辑删除) * (这里描述这个方法适用条件 – 可选) * @return *String * @exception * @since 1.0.0 */ - @RequiresPermissions("sys:cfg:edit") - @RequestMapping(value = {"deleteCfg"}) - public String deleteIpCfg(String tableName,int action,long cfgId,int compileId,String cfgName,Integer serviceId,Model model) { + @RequiresPermissions("cfg:ip:edit") + @RequestMapping(value = {"delete"}) + public String deleteIpCfg(String tableName,int action,String ids,String cfgName,Integer serviceId,Model model) { model.addAttribute("cfgName", cfgName); model.addAttribute("serviceId", serviceId); model.addAttribute("action", action); @@ -296,31 +350,58 @@ public class IpCfgController extends BaseController{ } } model.addAttribute("tableName", tableName); - int audit=ipCfgService.getIsAudit(tableName,cfgId); - List areaCfg=ipCfgService.getAreaCfgByCompileId(compileId); - if(areaCfg!=null&&areaCfg.size()>0){ - for(AreaIpCfg c:areaCfg){ - c.setTableName(AreaIpCfg.getTablename()); + List ipCfgs=new ArrayList(); + List areaCfgs=new ArrayList(); + Date date =new Date(); + if(StringUtils.isNotBlank(ids)){ + for(String compileIdStr:ids.split(",")){ + if(StringUtils.isNotBlank(compileIdStr)){ + List areaCfg=ipCfgService.getAreaCfgByCompileId(Integer.parseInt(compileIdStr)); + if(areaCfg!=null&&areaCfg.size()>0){ + for(AreaIpCfg c:areaCfg){ + c.setTableName(AreaIpCfg.getTablename()); + c.setEditorId(c.getCurrentUser().getId()); + c.setEditTime(date); + } + } + areaCfgs.addAll(areaCfg); + BaseIpCfg ipCfg=new BaseIpCfg(); + ipCfg.setCompileId(Integer.parseInt(compileIdStr)); + ipCfg.setTableName(tableName); + ipCfg.setEditorId(ipCfg.getCurrentUser().getId()); + ipCfg.setEditTime(date); + ipCfg.setIsValid(Constants.VALID_DEL); + ipCfgs.add(ipCfg); + } } +// int audit=ipCfgService.getIsAudit(tableName,cfgId); +// List areaCfg=ipCfgService.getAreaCfgByCompileId(compileId); +// if(areaCfg!=null&&areaCfg.size()>0){ +// for(AreaIpCfg c:areaCfg){ +// c.setTableName(AreaIpCfg.getTablename()); +// } +// } + //未审核时可删除 +// if(audit!=Constants.AUDIT_YES&&audit!=Constants.AUDIT_NOT_YES){ +// BaseIpCfg ipCfg=new BaseIpCfg(); +// ipCfg.setCfgId(cfgId); +// ipCfg.setTableName(tableName); +// ipCfg.setEditorId(ipCfg.getCurrentUser().getId()); +// ipCfg.setEditTime(new Date()); +// ipCfg.setIsValid(Constants.VALID_DEL); +// int result=ipCfgService.deleteIpCfg(ipCfg,areaCfg); +// if(result==0){ +// addMessage(model,"delete_failed"); +// }else{ +// addMessage(model,"delete_success"); +// } +// }else{ +// logger.error("通过审核/取消审核通过的配置不能删除！"); +// addMessage(model,"delete_failed"); +// } } - //未审核时可删除 - if(audit!=Constants.AUDIT_YES&&audit!=Constants.AUDIT_NOT_YES){ - BaseIpCfg ipCfg=new BaseIpCfg(); - ipCfg.setCfgId(cfgId); - ipCfg.setTableName(tableName); - ipCfg.setEditorId(ipCfg.getCurrentUser().getId()); - ipCfg.setEditTime(new Date()); - ipCfg.setIsValid(Constants.VALID_DEL); - int result=ipCfgService.deleteIpCfg(ipCfg,areaCfg); - if(result==0){ - addMessage(model,"delete_failed"); - }else{ - addMessage(model,"delete_success"); - } - }else{ - logger.error("通过审核/取消审核通过的配置不能删除！"); - addMessage(model,"delete_failed"); - } + ipCfgService.deleteIpCfg(ipCfgs,areaCfgs); + addMessage(model,"delete_success"); }catch(Exception e){ logger.error("删除失败", e); addMessage(model,"delete_failed"); diff --git a/src/main/java/com/nis/web/dao/CrudDao.java b/src/main/java/com/nis/web/dao/CrudDao.java index 5235048df..a1dc137e0 100644 --- a/src/main/java/com/nis/web/dao/CrudDao.java +++ b/src/main/java/com/nis/web/dao/CrudDao.java @@ -61,5 +61,15 @@ public interface CrudDao { * @return */ public int delete(T entity); + + /** + * audit(审核数据) + * (这里描述这个方法适用条件 – 可选) + * @param t + *void + * @exception + * @since 1.0.0 + */ + public int audit(T entity); } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java index 9fb764cb2..48b2c22c0 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java @@ -18,6 +18,7 @@ public interface IpCfgDao extends CrudDao{ public BaseIpCfg getById(@Param("tableName")String tableName,@Param("cfgId")Long id) ; public BaseIpCfg get(BaseIpCfg entity) ; public List findList(BaseIpCfg entity) ; + public List getList(@Param("tableName")String tableName,@Param("ids")String ids) ; public int insert(BaseIpCfg entity) ; public int updateByPrimaryKeySelective(BaseIpCfg entity) ; public int updateValid(BaseIpCfg entity) ; diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml index 4bff5a945..bc09e7a84 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -161,6 +161,11 @@ AND IS_VALID!=-1 + - - - - - - - - - --%> -
- +
+ + + + + + + + + + + + +
+ +
    +
    • +
    • +
    • +
+
+ + href="javascript:;"> @@ -303,6 +286,7 @@ + <%-- --%> @@ -340,12 +324,13 @@ - + <%-- --%> + <%-- --%> @@ -440,7 +425,7 @@ - + --%> diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js index caacb7f65..ce77b7402 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js @@ -169,7 +169,7 @@ jQuery.validator.addMethod("notStartZero",function(value, element) { //ip地址校验 jQuery.validator.addMethod("ipCheck",function(value, element) { if(value.length==0||value.trim().length==0){return true;} - var typeInt=$("select[name$='ipType']").val(); + var typeInt=$(element).parents(".row").siblings().find("select[name$='ipType']").val(); if(typeInt==4){ return this.optional(element)||(/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/.test(value) && (RegExp.$1 <256 && RegExp.$2<256 && RegExp.$3<256 && RegExp.$4<256)); }else if(typeInt==6){ @@ -179,7 +179,7 @@ jQuery.validator.addMethod("ipCheck",function(value, element) { jQuery.validator.addMethod("ipMask",function(value, element) { if(value.length==0||value.trim().length==0){return true;} obj=value; - var typeInt=$("select[name$='ipType']").val(); + var typeInt=$(element).parents(".row").siblings().find("select[name$='ipType']").val(); if(typeInt==4){ if(obj=="255.255.255.255"){ return true; diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index cc9810580..4c2da19ad 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -1,3 +1,13 @@ +$(function(){ + //全选及取消 + $("#checkAll").change(function(){ + if($("#checkAll").prop("checked")){ + $("input.i-checks").prop("checked",true); + }else{ + $("input.i-checks").prop("checked",false); + } + }); +}); var switchIpType=function(obj){ var type=$(obj).val(); var row=$(obj).parents('.row'); @@ -64,6 +74,18 @@ var switchIpType=function(obj){ }else if($(dstIp).val()=="0.0.0.0"){ $(dstIp).val("::"); } + if(!$(srcPort).val()){ + $(srcPort).val("0"); + } + if(!$(dstPort).val()){ + $(dstPort).val("0"); + } + if(!$(srcPortMask).val()){ + $(srcPortMask).val("65535"); + } + if(!$(dstPortMask).val()){ + $(dstPortMask).val("65535"); + } } } var areaControlInit=function(){
ip
${status.index+1 }${ipCfg.cfgDesc } V${ipCfg.ipType } ${ipCfg.auditorName } + <%--
    @@ -451,24 +436,24 @@
    • -
    • +
    • -
    • +
    • -
    • -
    • +
    • +
-