diff --git a/common/src/main/resources/static/jquery-plugins/jquery.layout-latest.js b/common/src/main/resources/static/jquery-plugins/jquery.layout-latest.js index 9e3e7290..790a2116 100644 --- a/common/src/main/resources/static/jquery-plugins/jquery.layout-latest.js +++ b/common/src/main/resources/static/jquery-plugins/jquery.layout-latest.js @@ -2610,7 +2610,13 @@ $.fn.layout = function (opts) { } // ensure no vertical scrollbar on pane - will mess up measurements if ($P.css("overflowX").match(/(scroll|auto)/)) { - $P.css("overflow", "hidden"); + // $P.css("overflow", "hidden"); + // 优化IOS下iframe不支持滚动的问题 ThinkGem + if (navigator.userAgent.match(/iPad|iPhone/i) && $P.find('iframe').length > 0) { + $P.addClass('iframe-ios'); + }else{ + $P.css("overflow", "hidden"); + } } state[pane].content = {}; // init content state if (resize !== false) sizeContent(pane); diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex.html index 750adfe3..e59cf0cd 100644 --- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex.html +++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex.html @@ -13,7 +13,7 @@ var bodyClass = 'fixed noscroll2 sidebar-mini ' + sidebarCollapse; -
+
<% include('sysIndex/topMenu.html'){} %>