Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/java/com/nis/util/DictUtils.java

@@ -202,6 +202,28 @@ public class DictUtils {
 		}
 		return dictList;		
 	}
+	/**
+	 * 功能业务字典，业务信息
+	 * @param dictId
+	 * @return
+	 */
+	public static FunctionServiceDict getFunctionServiceDict(Integer dictId){
+		FunctionServiceDict serviceDict=null;
+		List<FunctionServiceDict> allDictList = (List<FunctionServiceDict>)CacheUtils.get(Constants.CACHE_FUNCTION_SERVICE_DICT);
+		List<FunctionServiceDict> dictList = new ArrayList();
+		if(StringUtil.isEmpty(allDictList)){
+			FunctionServiceDict entity = new FunctionServiceDict();
+			allDictList = functionServiceDictDao.getList(entity);
+			CacheUtils.put(Constants.CACHE_FUNCTION_SERVICE_DICT, allDictList);
+		}
+		for(FunctionServiceDict entity:allDictList){
+			if(entity.getDictId().equals(dictId)){
+				serviceDict=entity;
+				break;
+			}
+		}
+		return serviceDict;
+	}
 	/**
 	 * 功能业务字典，获取相应功能菜单对应的业务信息
 	 * @param functionId
@@ -238,6 +260,28 @@ public class DictUtils {
 		}
 		return dictList;		
 	}
+	/**
+	 * 功能配置域字典，获取配置域信息
+	 * @param dictId
+	 * @return
+	 */
+	public static FunctionRegionDict getFunctionRegionDict(Integer dictId){
+		FunctionRegionDict regionDict=null;
+		List<FunctionRegionDict> allDictList = (List<FunctionRegionDict>)CacheUtils.get(Constants.CACHE_FUNCTION_REGION_DICT);
+		List<FunctionRegionDict> dictList = new ArrayList();
+		if(StringUtil.isEmpty(allDictList)){
+			FunctionRegionDict entity = new FunctionRegionDict();
+			allDictList = functionRegionDictDao.getList(entity);
+			CacheUtils.put(Constants.CACHE_FUNCTION_REGION_DICT, allDictList);
+		}
+		for(FunctionRegionDict entity:allDictList){
+			if(entity.getDictId().equals(dictId)){
+				regionDict=entity;
+				break;
+			}
+		}
+		return regionDict;		
+	}
 	/**
 	 * 功能配置域字典，获取相应功能菜单对应的配置域信息
 	 * @param functionId

src/main/java/com/nis/util/excel/ExportExcel.java

@@ -486,7 +486,7 @@ public class ExportExcel {
 			if (ss.length==2){
 				cell.setCellValue(ss[0]);
 				Comment comment = this.sheet.createDrawingPatriarch().createCellComment(
-						new XSSFClientAnchor(0, 0, 0, 0, (short) 3, 3, (short) 5, 6));
+						new XSSFClientAnchor(0, 0, 0, 0, (short) i, 0, (short) i+4, 3));
 				comment.setString(new XSSFRichTextString(ss[1]));
 				cell.setCellComment(comment);
 			}else{

src/main/webapp/static/global/css/components.css

@@ -5846,7 +5846,7 @@ Custom color buttons
 /* Form uneditable input */
 .uneditable-input {
   padding: 6px 12px;
-  min-width: 206px;
+  width: 206px;
   font-size: 14px;
   font-weight: normal;
   height: 34px;
@@ -5856,6 +5856,14 @@ Custom color buttons
   -webkit-box-shadow: none;
   box-shadow: none;
   -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+  overflow: hidden; 
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+	-icab-text-overflow: ellipsis;
+	-khtml-text-overflow: ellipsis;
+	-moz-text-overflow: ellipsis;
+	-webkit-text-overflow: ellipsis;
   transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; }
 
 .form-control-static {

src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css

@@ -5174,7 +5174,8 @@ button.close {
 
 .modal-body {
   position: relative;
-  padding: 15px; }
+  /* padding: 15px; */ 
+  }
 
 .modal-footer {
   padding: 15px;

src/main/webapp/static/global/scripts/common.js

@@ -9,16 +9,16 @@ $(function(){
 		protocol:[],
 		direction:[]
 	});
+	$("input[name$='isCaseSenstive']").on("change",function(){
+		setIsHexBin(this);
+	});
+	setHexCaseSenstive();
 	$("select[name$='isHexbin']").each(function(){
 		setIsHexBin(this);
 	});
 	$("input[name$='isHex']").on("change",function(){
 		setIsHexBin(this);
 	});
-	$("input[name$='isCaseSenstive']").on("change",function(){
-		setIsHexBin(this);
-	});
-	setHexCaseSenstive();
 	$("a[name=viewLogInfo]>i").on("click",function(){
 		var html = "<div class='logInfo'>";
 		$(this).parents("tr").find("td").each(function(index,element){