github
/
layui
mirror of https://github.com/layui/layui
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(layer): 改进 maxWidth 和 maxHeight 的处理 (#2270)

pull/2276/head
morning-star 2024-10-11 10:04:05 +08:00 committed by GitHub
parent 18e01433a3
commit 0a532f313a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/layer/detail/options.md
View File

@ -153,7 +153,7 @@ layer.open({
<td>maxWidth</td> <td>maxWidth</td>
<td> <td>
弹层的最大宽度。当 `area` 属性值为默认的 `auto'` 时有效。 弹层的最大宽度。当 `area` 属性设置宽度自适应时有效。
</td> </td>
<td>number</td> <td>number</td>
@ -167,7 +167,7 @@ layer.open({
<td>maxHeight</td> <td>maxHeight</td>
<td> <td>
弹层的最大高度。当 `area` 属设置高度自适应时有效。 弹层的最大高度。当 `area` 属性设置高度自适应时有效。
</td> </td>
<td>number</td> <td>number</td>

4
src/modules/layer.js
View File

@ -558,7 +558,7 @@ Class.pt.resize = function(){
Class.pt.auto = function(index){ Class.pt.auto = function(index){
var that = this, config = that.config, layero = $('#'+ doms[0] + index); var that = this, config = that.config, layero = $('#'+ doms[0] + index);
if(config.area[0] === '' && config.maxWidth > 0){ if((config.area[0] === '' || config.area[0] === 'auto') && config.maxWidth > 0){
// 适配 ie7 // 适配 ie7
if(layer.ie && layer.ie < 8 && config.btn){ if(layer.ie && layer.ie < 8 && config.btn){
layero.width(layero.innerWidth()); layero.width(layero.innerWidth());
@ -579,7 +579,7 @@ Class.pt.auto = function(index){
setHeight('iframe'); setHeight('iframe');
break; break;
default: default:
if(config.area[1] === ''){ if(config.area[1] === '' || config.area[1] === 'auto'){
if(config.maxHeight > 0 && layero.outerHeight() > config.maxHeight){ if(config.maxHeight > 0 && layero.outerHeight() > config.maxHeight){
area[1] = config.maxHeight; area[1] = config.maxHeight;
setHeight('.'+doms[5]); setHeight('.'+doms[5]);