From 2d7f66b1e0f70fde10e8c84635a1d584dcb53665 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 17 Dec 2018 22:46:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=B9=E6=9E=9C=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BAIOS=E4=B8=8B=E4=B8=8D=E8=83=BD=E5=B7=A6=E5=8F=B3?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8F=A6=E5=A4=96?=
 =?UTF-8?q?=E9=9C=80=E6=8C=89=E5=A6=82=E4=B8=8B=E6=AD=A5=E9=AA=A4=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=89=8B=E6=9C=BA=EF=BC=9A=E8=AE=BE=E7=BD=AE=20->=20S?=
 =?UTF-8?q?afari=E6=B5=8F=E8=A7=88=E5=99=A8=20->=09=20=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=20->=20Experimental=20Features=20->=20=E5=85=B3=E9=97=AD=20Asy?=
 =?UTF-8?q?nc=20Frame=20Scrolling=20=E9=80=89=E9=A1=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/jquery-plugins/jquery.layout-latest.js         | 8 +++++++-
 .../views/themes/default/modules/sys/sysIndex.html        | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

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;
 <link rel="stylesheet" href="${ctxStatic}/jquery-toastr/2.0/toastr.min.css?${_version}">
 <link rel="stylesheet" href="${ctxStatic}/adminlte/css/skins/${skinName}.css?${_version}">
 <link rel="stylesheet" href="${ctxStatic}/modules/sys/sysIndex.css?${_version}">
-<header class="main-header">    
+<header class="main-header">
 	<% include('sysIndex/topMenu.html'){} %>
 </header>
 <aside class="main-sidebar">