Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java

@@ -121,18 +121,22 @@ 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);
 					}
 				}
 			}
 		}
+	}
 	public void auditAppFeatureCfg(AppFeatureIndex entity, Integer isAudit) {
 		ToMaatBean maatBean = new ToMaatBean();
 		MaatCfg maatCfg = new MaatCfg();

src/main/webapp/WEB-INF/include/left_menu.jsp

@@ -12,7 +12,7 @@
      			
      			<c:if test="${not empty menu.children }">
      				<c:forEach  items="${menu.children}" var="secondMenu" varStatus="secondStatus">
-     					
+     					<c:if test="${secondMenu.isShow==1}">
 		     				<li class="nav-item" id="menu_${secondMenu.id }" menu-id="${secondMenu.id }" menu-name="<spring:message code="${secondMenu.code}"></spring:message>" >
 			     				
 			     				<a class="nav-link nav-toggle"		     					
@@ -37,7 +37,7 @@
 									
 										<c:forEach  items="${secondMenu.children}" var="thirdMenu" varStatus="thirdStatus">
 											
-										
+											<c:if test="${thirdMenu.isShow==1}">
 												<li class="nav-item" id="menu_${thirdMenu.id }" menu-id="${thirdMenu.id }" menu-name="<spring:message code="${thirdMenu.code}"></spring:message>">
 									
 								     				<a class="nav-link nav-toggle"		     					
@@ -59,6 +59,7 @@
 													<c:if test="${thiredClid}">
 														<ul class="sub-menu">
 															<c:forEach  items="${thirdMenu.children}" var="fourthMenu">
+																<c:if test="${fourthMenu.isShow==1}">
 																	<li class="nav-item" id="menu_${fourthMenu.id }" menu-id="${fourthMenu.id }" menu-name="<spring:message code="${fourthMenu.code}"></spring:message>"  >
 																		<a href="javascript:;" 
 																		onclick="page_turn('${fourthMenu.id }','${fourthMenu.functionId }','3','','${ctx}${fourthMenu.href }',this)" target="mainFrame" 
@@ -67,19 +68,19 @@
 																			<!-- <span class="badge badge-danger">1</span> -->
 																		</a>
 																	</li>
-										
+																</c:if>
 															</c:forEach> 
 														</ul>
 													 </c:if>
 												  </li>
-									
+											</c:if>
 										</c:forEach> 
 									 </ul>
 								</c:if>
 								
 								
 							</li>
-     					
+     					</c:if>
      				</c:forEach>
      				
      			</c:if>

src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp

@@ -271,8 +271,10 @@ var delContent = function(contentClassName, addBtnClassName) {
 													</c:choose>
 												</c:forEach>
 												<c:if test="${!isBreak}">
-													<div
-														class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+														<input type="hidden" name="cfgRegionValue" value="${region.configRegionValue }">
+														<input type="hidden" name="cfgRegionType" value="${region.regionType }">
+														<input type="hidden" name="cfgRegionCode1" value="${region.configRegionCode }">
 														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
 													<c:set var="complexCfgIndex" value="${complexCfgIndex+1 }"></c:set>

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);
 	});