From ef651abc34e9c05804241a73ccab85b75964dca5 Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 8 Oct 2018 11:27:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=9A=84visible=E5=8A=9F=E8=83=BD=EF=BC=8CisShow=3D1?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E6=89=8D=E5=B1=95=E7=A4=BA=E8=8F=9C?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/include/left_menu.jsp | 129 +++++++++--------- 1 file changed, 65 insertions(+), 64 deletions(-) diff --git a/src/main/webapp/WEB-INF/include/left_menu.jsp b/src/main/webapp/WEB-INF/include/left_menu.jsp index 0a960debe..70be6710a 100644 --- a/src/main/webapp/WEB-INF/include/left_menu.jsp +++ b/src/main/webapp/WEB-INF/include/left_menu.jsp @@ -12,74 +12,75 @@ - - + From 2b6997aa939fa2c25b1271b4b7a0f13f87a1828f Mon Sep 17 00:00:00 2001 From: zhanghongqing <13664257052@163.com> Date: Mon, 8 Oct 2018 17:18:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E6=8F=8F=E8=BF=B0=E7=9A=84=E6=96=87?= =?UTF-8?q?=E5=AD=97=E9=95=BF=E6=98=BE=E7=A4=BA128=EF=BC=8C=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=88=97=E8=A1=A8=E7=9A=84=E8=BF=87=E9=95=BF=E6=96=87?= =?UTF-8?q?=E5=AD=97=E6=88=AA=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/static/global/scripts/common.js | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 7cd21481c..192d5d99c 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -1,4 +1,25 @@ $(function(){ + //增加描述新增时的文字长度限制 + $("form input[name='cfgDesc']").attr("maxlength","128") + //截取过长的文字 使用id选择器;例如:tab对象->tr->td对象. 排除日志table .logTb + $("#contentTable").not(".logTb").find("td").each(function(i){ + //获取td当前对象的文本,如果长度大于25; + if($(this).text().trim().length>28){ + //给td设置title属性,并且设置td的完整值.给title属性. + var strTitle = $(this).text().trim(); + //解决火狐title不能自动换行 + var count = Math.floor(strTitle.length/64); + for(var i=1;i<=count;i++){ + strTitle=strTitle.substring(0,i*64-1)+"\n"+strTitle.substring(i*64-1); + } + $(this).attr("title",strTitle); + //获取td的值,进行截取。赋值给text变量保存. + var text=$(this).text().substring(0,25)+"..."; + //重新为td赋值; + $(this).text(text); + } + }); + $("input[name$='isCaseSenstive']").on("change",function(){ setIsHexBin(this); }); From e70e7007fc667a1b58ff47ecf30b8a83bd470199 Mon Sep 17 00:00:00 2001 From: zhanghongqing <13664257052@163.com> Date: Tue, 9 Oct 2018 09:44:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3app=E7=89=B9=E5=BE=81?= =?UTF-8?q?=E4=B8=AD=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9=E6=97=B6=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=85=8D=E7=BD=AE=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/configuration/AppMultiFeatureCfgService.java | 4 ++++ .../webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java index 6a93aa6f0..a7a3fbac9 100644 --- a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java @@ -121,14 +121,18 @@ public class AppMultiFeatureCfgService extends BaseService { } if(entity.getStrList()!=null){ for(AppStringFeatureCfg cfg:entity.getStrList()){ + if(StringUtils.isNotBlank(cfg.getCfgKeywords())){ BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); appMultiFeatureCfgDao.insertAppStringFeatureCfg(cfg); + } } } if(entity.getComplexList()!=null){ for(AppComplexFeatureCfg cfg:entity.getComplexList()){ + if(StringUtils.isNotBlank(cfg.getCfgKeywords())){ BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); appMultiFeatureCfgDao.insertAppComplexFeatureCfg(cfg); + } } } } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp index c612de0b6..8175767d2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp @@ -271,8 +271,10 @@ var delContent = function(contentClassName, addBtnClassName) { -