From eaaa78db2c9145046b0ad88c66ca156490db2270 Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Sat, 15 Feb 2020 23:32:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E6=94=AF=E6=8C=81if?=
 =?UTF-8?q?rame?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/default/index/index.html    | 2 +-
 application/admin/view/default/store/index.html    | 2 +-
 public/static/common/css/common.css                | 2 +-
 public/static/common/js/common.js                  | 2 +-
 public/static/common/lib/ueditor/ueditor.config.js | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/application/admin/view/default/index/index.html b/application/admin/view/default/index/index.html
index ee67f23ec..ad0df3628 100755
--- a/application/admin/view/default/index/index.html
+++ b/application/admin/view/default/index/index.html
@@ -9,7 +9,7 @@
 	{{include file="public/menu" /}}
 
 	<!-- right content  -->
-	<iframe id="ifcontent" src="{{:MyUrl('admin/index/init')}}"></iframe>
+	<iframe id="ifcontent" src="{{:MyUrl('admin/index/init')}}" width="100%" height="100%"></iframe>
 	<!-- right content end  -->
 </div>
 
diff --git a/application/admin/view/default/store/index.html b/application/admin/view/default/store/index.html
index aff09ef9b..cbf2a706e 100644
--- a/application/admin/view/default/store/index.html
+++ b/application/admin/view/default/store/index.html
@@ -1,7 +1,7 @@
 {{include file="public/header" /}}
         
 <!-- right content  -->
-<iframe id="ifcontent" src="{{$store_url}}"></iframe>
+<iframe src="{{$store_url}}" width="100%" height="100%"></iframe>
 <!-- right content end  -->
 
 <!-- footer -->
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 0128e4f7c..892307f74 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -62,7 +62,7 @@ form.am-form .am-form-group-refreshing, .plug-file-upload-view, .content-app-ite
 /**
  * iframe
  */
-iframe { width: 100%; height: 100%; border: 0; }
+iframe { border: 0; }
 
 
 /**
diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js
index b114935c1..0e7aecf1b 100755
--- a/public/static/common/js/common.js
+++ b/public/static/common/js/common.js
@@ -781,7 +781,7 @@ function ModalLoad(url, title, tag, class_tag)
 	    html += '<h4 class="am-popup-title">'+(title || '温馨提示')+'</h4>';
 	    html += '<span data-am-modal-close class="am-close">&times;</span>';
 		html += '</div>';
-	    html += '<iframe src="'+url+'"></iframe>';
+	    html += '<iframe src="'+url+'" width="100%" height="100%"></iframe>';
 		html += '</div>';
 		html += '</div>';
 	$('body').append(html);
diff --git a/public/static/common/lib/ueditor/ueditor.config.js b/public/static/common/lib/ueditor/ueditor.config.js
index faea5f3c6..02eacfc5a 100755
--- a/public/static/common/lib/ueditor/ueditor.config.js
+++ b/public/static/common/lib/ueditor/ueditor.config.js
@@ -367,6 +367,7 @@
 		,outputXssFilter: true
 		// xss过滤白名单 名单来源: https://raw.githubusercontent.com/leizongmin/js-xss/master/lib/default.js
 		,whitList: {
+            iframe: ['src', 'width', 'height', 'border', 'alt', 'style', 'class', 'frameborder', 'align', 'longdesc', 'marginheight', 'marginwidth', 'name', 'sandbox', 'scrolling', 'seamless', 'srcdoc'],
 			a:      ['target', 'href', 'title', 'class', 'style'],
 			abbr:   ['title', 'class', 'style'],
 			address: ['class', 'style'],