From 817579782663eae9f98286237ff96bd9d76f1075 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Tue, 18 Sep 2018 15:50:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=20=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=88=97=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/static/global/scripts/jeesite.js   | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/static/global/scripts/jeesite.js b/src/main/webapp/static/global/scripts/jeesite.js
index 79016f42d..f0fc66f24 100644
--- a/src/main/webapp/static/global/scripts/jeesite.js
+++ b/src/main/webapp/static/global/scripts/jeesite.js
@@ -320,28 +320,34 @@ function filterActionInit() {
 			$("#isFilterAction").val("true");
 			fiterPanleShow();
 		}
-		//调整滚动条div的高度   
-		var he=document.getElementsByClassName("filter-action-select-panle")[0].offsetHeight;
-		var height=document.documentElement.clientHeight;
-		 if(he>0){
-			 he+=5;
-		 }
-		if($('.table-responsive')){
-			$('.table-responsive').css({'height':height-105-he+'px'});
-		}
 	});
 }
 
+function tzheight(){
+	var hei=document.documentElement.clientHeight;
+	hei=hei-71;
+	var rowheigth=0;
+	if($('.row')){
+		 rowheigth=$('.row').height();
+		 hei=hei-rowheigth;
+	}
+	if($('.table-responsive')){
+		$('.table-responsive').css({'height':hei+'px'});
+	}
+}
+
 function fiterPanleShow() {
 	$("#filter-btn").find("i").removeClass("fa-angle-double-down").addClass("fa-angle-double-up");
 	//$(".btn-search").addClass("hide");
 	$(".filter-action-select-panle").removeClass("hide");
+	tzheight();
 }
 
 function fiterPanleHide() {
 	$("#filter-btn").find("i").removeClass("fa-angle-double-up").addClass("fa-angle-double-down");
 	//$(".btn-search").removeClass("hide");
 	$(".filter-action-select-panle").addClass("hide");
+	tzheight();
 }
 
 
@@ -377,9 +383,9 @@ function customColumnClick(){
 				return true;	
 			}
 		}
-		if($(this).hasClass("cfgDesc")){
+		/*if($(this).hasClass("cfgDesc")){
 			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>";
@@ -404,9 +410,7 @@ function customColumnInit() {
  	    		//选中则显示
  	            showColumn(indexCol);
  	    	}else {
- 	    		if($(".table tr th[class='cfgDesc']").index()!=indexCol){
-	 	            hideColumn(indexCol);
- 	            }
+ 	    		 hideColumn(indexCol);
  	    	}
 		})	
 	}else {