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

src/main/java/com/nis/domain/configuration/BaseCfg.java

@@ -431,7 +431,7 @@ public class BaseCfg<T> extends BaseEntity<T> {
 		this.tableName = tableName;
 	}
 	
-	protected void initDefaultValue(){
+	public void initDefaultValue(){
 		
 	}
 	/**

src/main/java/com/nis/domain/configuration/DnsIpCfg.java

@@ -226,7 +226,7 @@ public class DnsIpCfg extends BaseCfg<DnsIpCfg> {
 	 * @see com.nis.domain.configuration.BaseCfg#initDefaultValue()
 	 */
 	@Override
-	protected void initDefaultValue() {
+	public void initDefaultValue() {
 		// TODO Auto-generated method stub
 		super.initDefaultValue();
 		this.srcIp ="0.0.0.0";

src/main/webapp/WEB-INF/views/cfg/requestList.jsp

@@ -301,4 +301,4 @@
 </script>
 
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/home.jsp

@@ -29,6 +29,22 @@
 		
 		
 	});
+	//面包屑导航
+	$(function(){
+	
+		$("div ul li a").click(function(){
+			if(typeof $(this).attr("id") !='undefined'){
+				$("#menutwo").text($(this).text().trim());
+				$("#menuthree").text("");
+			}else{
+				$("#menuthree").text($(this).text().trim());
+			}
+// 			var urlto=this+"";
+// 			var ur="${ctx}"+urlto.split("nis")[1];
+// 			$("#menutwo").attr("href",ur);
+			})
+})
+
 </script>
 </head>
 
@@ -39,7 +55,6 @@
 
 		<!-- BEGIN HEADER INNER -->
 		<div class="page-header-inner ">
-
 			<!-- BEGIN LOGO -->
 			<div class="page-logo">
 				<a href="index.html"> <img
@@ -212,8 +227,8 @@
 					<ul class="page-breadcrumb">
 						<li><a href="index.html">Home</a> <i class="fa fa-circle"></i>
 						</li>
-						<li><a href="#">Tables</a> <i class="fa fa-circle"></i></li>
+						<li><a href="#" id="menutwo"  target="mainFrame">Tables</a> <i class="fa fa-circle"></i></li>
-						<li><span>Datatables</span></li>
+						<li><span id="menuthree">Datatables</span></li>
 					</ul>
 				</div>
 				

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

@@ -21557,7 +21557,22 @@ Color library demo
  }
  
  
+ .customColumnList {
+ 	padding-left:10px;
+ 	padding-top:10px;
+ }
  
- 
+.customColumnList label {
+	padding-left: 4px;
+	cursor: pointer;
+	vertical-align: middle;
+}
+.customColumnList input {
+	display: inline-block;
+    vertical-align: middle;
+    margin-bottom: 4px;
+	margin-right: 3px;
+}     
+
  
  

src/main/webapp/static/global/plugins/jquery-jbox/2.3/Skins/Bootstrap/jbox.min.css

@@ -1,4 +1,4 @@
-@charset "utf-8";*:focus{outline:0}.jbox-fade{background-color:#ccc}.jbox-drag{border:1px dashed #376ea5}div.jbox{padding:0;border:0;font-size:12px}div.jbox .jbox-border{background:none repeat scroll 0 0 #999;filter:alpha(opacity=20);-moz-opacity:.2;opacity:.2}div.jbox .jbox-container{background-color:#fff;border:1px solid #999}div.jbox .jbox-title-panel{background:#fff;border-bottom:1px solid #ccc;padding:8px 15px}div.jbox .jbox-title{font-weight:bold;color:#333;font-size:18px;line-height:27px;padding-top:0}div.jbox .jbox-title-icon{background:url(images/jbox-title-icon.gif) no-repeat scroll 3px 5px transparent}div.jbox .jbox-close,div.jbox .jbox-close-hover{background:url(images/jbox-close.gif) no-repeat scroll 0 0 transparent;margin:7px}div.jbox .jbox-close-hover{background-position:-16px 0}div.jbox .jbox-content{min-height:24px;line-height:18px;color:#444}div.jbox .jbox-content-loading{background-color:#e6e6e6}div.jbox .jbox-content-loading-image{background:url(images/jbox-content-loading.gif) no-repeat bottom center}div.jbox .jbox-button-panel{border-top:1px solid #ccc;background-color:#eee}div.jbox .jbox-bottom-text{text-indent:10px;color:#444}div.jbox .jbox-button{background:url(images/jbox-button1.png) repeat-x transparent;border:#aaa 1px solid;color:#888;border-radius:3px 3px 3px 3px;margin:1px 7px 0 0;height:20px;cursor:default}div.jbox .jbox-button-hover{background-position:0 -20px;color:#666}div.jbox .jbox-button-active{background-position:0 -40px}div.jbox-warning .jbox .jbox-button-panel{background-color:#fff}div.jbox .jbox-tip-color{background-color:#376ea5;border-color:#376ea5;border-radius:3px 3px 3px 3px;color:#fff}div.jbox span.jbox-icon{background:url(images/jbox-icons.png) no-repeat scroll 0 0 transparent;_background:url(images/jbox-icons-ie6.gif) no-repeat scroll 0 0 transparent}div.jbox span.jbox-icon-info{background-position:0 0}div.jbox span.jbox-icon-question{background-position:-36px 0}div.jbox span.jbox-icon-success{background-position:-72px 0}div.jbox span.jbox-icon-warning{background-position:-108px 0}
+@charset "utf-8";*:focus{outline:0}.jbox-fade{background-color:#ccc}.jbox-drag{border:1px dashed #376ea5}div.jbox{padding:0;border:0;font-size:12px}div.jbox .jbox-border{background:none repeat scroll 0 0 #999;filter:alpha(opacity=20);-moz-opacity:.2;opacity:.2}div.jbox .jbox-container{background-color:#fff;border:1px solid #999}div.jbox .jbox-title-panel{background:#fff;border-bottom:1px solid #ccc;padding:8px 10px}div.jbox .jbox-title{font-weight:bold;color:#333;font-size:16px;line-height:27px;padding-top:0}div.jbox .jbox-title-icon{background:url(images/jbox-title-icon.gif) no-repeat scroll 3px 5px transparent}div.jbox .jbox-close,div.jbox .jbox-close-hover{background:url(images/jbox-close.gif) no-repeat scroll 0 0 transparent;margin:7px}div.jbox .jbox-close-hover{background-position:-16px 0}div.jbox .jbox-content{min-height:24px;line-height:18px;color:#444}div.jbox .jbox-content-loading{background-color:#e6e6e6}div.jbox .jbox-content-loading-image{background:url(images/jbox-content-loading.gif) no-repeat bottom center}div.jbox .jbox-button-panel{border-top:1px solid #ccc;background-color:#eee}div.jbox .jbox-bottom-text{text-indent:10px;color:#444}div.jbox .jbox-button{background:url(images/jbox-button1.png) repeat-x transparent;border:#aaa 1px solid;color:#888;border-radius:3px 3px 3px 3px;margin:1px 7px 0 0;height:20px;cursor:default}div.jbox .jbox-button-hover{background-position:0 -20px;color:#666}div.jbox .jbox-button-active{background-position:0 -40px}div.jbox-warning .jbox .jbox-button-panel{background-color:#fff}div.jbox .jbox-tip-color{background-color:#376ea5;border-color:#376ea5;border-radius:3px 3px 3px 3px;color:#fff}div.jbox span.jbox-icon{background:url(images/jbox-icons.png) no-repeat scroll 0 0 transparent;_background:url(images/jbox-icons-ie6.gif) no-repeat scroll 0 0 transparent}div.jbox span.jbox-icon-info{background-position:0 0}div.jbox span.jbox-icon-question{background-position:-36px 0}div.jbox span.jbox-icon-success{background-position:-72px 0}div.jbox span.jbox-icon-warning{background-position:-108px 0}
 div.jbox span.jbox-icon-error{background-position:-144px 0}div.jbox span.jbox-icon-none{display:none;overflow:hidden}div.jbox span.jbox-icon-loading{background:url(images/jbox-loading1.gif) no-repeat scroll 0 0 transparent}
 
 .jbox-container *{

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

@@ -12,8 +12,17 @@ $(document).ready(function() {
 		$("a").bind("focus",function() {
 			if(this.blur) {this.blur()};
 		});
-		//所有下拉框使用select2   - 排除class为noSelect2的<select>元素
+		
-		//$("select:not(.noSelect2)").select2();
+		//界面中存在<a class="setfields">自定义列按钮，初始化自定义列功能 
+		if($("a").hasClass("setfields")) {
+			customColumnInit();
+			
+			//绑定自定义按钮事件
+			$(".setfields").click(function(){
+				customColumnClick();
+			});
+		}
+
 		
 	}catch(e){
 		// blank
@@ -327,4 +336,103 @@ function fiterPanleHide() {
 }
 
 
+//location.pathname 属性返回url的路径名，如果存在 //替换为/
+function getLocationPathName() {
+	return window.location.pathname.replace("\//","\/");
+}
+
+//自定义列设置事件
+function customColumnClick(){
+
+	
+	var submit = function(v,h,f) {
+		var abVisCols = [true];
+		$(".customColumnList input[type='checkbox']").each(function(){
+			abVisCols[$(this).val()] = $(this).prop("checked");
+		});
+
+		var key = getLocationPathName()+"_visCols";
+		Cookies.set(key,JSON.stringify(abVisCols),{expires:7});
+		customColumnInit();
+		
+		return true;	
+	}
+	
+	
+	var html = "<div class='customColumnList'>";
+	$(".table tr th").each(function(colIndex,obj){	
+		
+		if(colIndex==0) { //第一列th含 checkbox ,结束本次循环, 下标从1开始反之0开始
+			var ckVal = $(this).find("input[type='checkbox']").val();
+			if(typeof(ckVal) != "undefined") {
+				return true;	
+			}
+		}
+		
+		var checked  = ($(this).is(":visible") ? "checked='checked'":"");
+		var ckbox_html = "<input type='checkbox' "+checked+" value='"+colIndex+"'/>";
+		html+="<div class='col-md-6'><label>"+ckbox_html+" "+$(this).html()+"</label></div>";
+		
+	})
+	html +="</div>";
+	
+	$.jBox(html,{title:"Custom Columns",submit:submit});
+	
+}
+
+//自定义列初始化，先取cookie 后取table tr th
+function customColumnInit() {
+	
+	var key = getLocationPathName()+"_visCols";
+	var abVisCols = Cookies.get(key);
+	if(abVisCols != null && abVisCols.length > 0) {
+	
+		abVisCols = $.parseJSON(abVisCols);
+		
+		$(abVisCols).each(function(indexCol,col){
+			if(col) {
+ 	    		//选中则显示
+ 	            showColumn(indexCol);
+ 	    	}else {
+ 	            hideColumn(indexCol);
+ 	    	}
+		})	
+	}else {
+		
+		$(".table tr th").each(function(){
+ 	    	
+ 	    	var indexCol = $(this).index();
+ 	    	if($(this).attr("isVisible")=="false") {
+ 	            hideColumn(indexCol);
+ 	    	}else {
+ 	    		//选中则显示
+ 	            showColumn(indexCol);
+ 	    	}
+ 	    	
+ 	    });
+	}
+	
+}
+
+
+
+//隐藏索引列
+function hideColumn(index) {
+    $(".table tr").each(function() {
+        $(this).find("th:eq(" + index + ")").hide();
+        $(this).find("td:eq(" + index + ")").hide();
+    })
+
+}
+//显示索引列
+function showColumn(index) {
+
+    $(".table tr").each(function() {
+        $(this).find("th:eq(" + index + ")").show();
+        $(this).find("td:eq(" + index + ")").show();
+    })
+
+}
+
+