2.2.2
This commit is contained in:
		
							parent
							
								
									f9ade81e38
								
							
						
					
					
						commit
						74d08a6149
					
				
							
								
								
									
										2
									
								
								dist/lay/modules/table.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/lay/modules/table.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										2
									
								
								dist/layui.all.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/layui.all.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							@ -10,7 +10,7 @@
 | 
			
		||||
<link rel="stylesheet" href="../src/css/layui.css">
 | 
			
		||||
 | 
			
		||||
<style>
 | 
			
		||||
body{padding: 20px;}
 | 
			
		||||
body{padding: 20px; /*overflow-y: scroll;*/}
 | 
			
		||||
</style>
 | 
			
		||||
</head>
 | 
			
		||||
<body>
 | 
			
		||||
 | 
			
		||||
@ -817,13 +817,12 @@ layui.define(['laytpl', 'laypage', 'layer', 'form'], function(exports){
 | 
			
		||||
    ,scollWidth = that.layMain.width() - that.layMain.prop('clientWidth') //纵向滚动条宽度
 | 
			
		||||
    ,scollHeight = that.layMain.height() - that.layMain.prop('clientHeight') //横向滚动条高度
 | 
			
		||||
    ,getScrollWidth = that.getScrollWidth(that.layMain[0]) //获取主容器滚动条宽度,如果有的话
 | 
			
		||||
    ,outWidth = layMainTable.width() - that.layMain.width(); //表格内容器的超出宽度
 | 
			
		||||
    ,outWidth = layMainTable.outerWidth() - that.layMain.width(); //表格内容器的超出宽度
 | 
			
		||||
    
 | 
			
		||||
    //如果存在自动列宽,则要保证绝对填充满,并且不能出现滚动条
 | 
			
		||||
    if(that.autoColNums && !that.scrollPatchWStatus){
 | 
			
		||||
      var th = that.layHeader.eq(0).find('thead th:last-child')
 | 
			
		||||
      ,field = th.data('field');
 | 
			
		||||
      
 | 
			
		||||
      that.getCssRule(field, function(item){
 | 
			
		||||
        var width = item.style.width || th.outerWidth();
 | 
			
		||||
        item.style.width = (parseFloat(width) - getScrollWidth - function(){
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user