hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

修复在移动端弹出层按钮被挡住的BUG

pull/279748/MERGE
Karson 2017-04-27 17:11:13 +08:00
parent 89e0b2e30b
commit 54f5a344d4
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/admin/view/layout/default.html
View File

@ -4,8 +4,7 @@
{include file="common/meta" /} {include file="common/meta" /}
</head> </head>
<body class="inside-header inside-aside {:defined(IS_DIALOG) && IS_DIALOG ? 'is-dialog' : ''}"> <body class="inside-header inside-aside {:defined('IS_DIALOG') && IS_DIALOG ? 'is-dialog' : ''}">
<div id="main" role="main"> <div id="main" role="main">
<div class="tab-content tab-addtabs"> <div class="tab-content tab-addtabs">
<div id="content"> <div id="content">

10
public/assets/js/backend.js
View File

@ -173,12 +173,16 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang', 'config'], function ($
var btnHeight = layero.find('.layui-layer-btn').outerHeight() || 0; var btnHeight = layero.find('.layui-layer-btn').outerHeight() || 0;
var oldheg = heg + titHeight + btnHeight; var oldheg = heg + titHeight + btnHeight;
var maxheg = 600;
if (frame.outerWidth() < 768) {
maxheg = $(window).height() - 28;
}
// 如果有.layer-footer或窗口小于600则重新排 // 如果有.layer-footer或窗口小于600则重新排
if (layerfooter.size() > 0 || oldheg < 600) { if (layerfooter.size() > 0 || oldheg < maxheg) {
var footerHeight = layero.find('.layui-layer-footer').outerHeight() || 0; var footerHeight = layero.find('.layui-layer-footer').outerHeight() || 0;
footerHeight = 0; footerHeight = 0;
if (oldheg >= 600) { if (oldheg >= maxheg) {
heg = Math.min(600, oldheg) - titHeight - btnHeight - footerHeight; heg = Math.min(maxheg, oldheg) - titHeight - btnHeight - footerHeight;
} }
layero.css({height: heg + titHeight + btnHeight + footerHeight}); layero.css({height: heg + titHeight + btnHeight + footerHeight});
layero.find("iframe").css({height: heg}); layero.find("iframe").css({height: heg});