From e47acf9ff2f7a21c5fbec2bac731d3fc7ab43943 Mon Sep 17 00:00:00 2001
From: yubaolee <yubaolee@163.com>
Date: Mon, 2 Apr 2018 14:01:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Diframe=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.Mvc/userJs/categories.js       | 1 -
 OpenAuth.Mvc/userJs/flowInstanceEdit.js | 6 +++---
 OpenAuth.Mvc/userJs/flowInstanceOp.js   | 6 +++---
 OpenAuth.Mvc/userJs/flowInstances.js    | 3 ++-
 OpenAuth.Mvc/userJs/flowSchemeDesign.js | 7 ++++---
 OpenAuth.Mvc/userJs/flowSchemes.js      | 3 ++-
 OpenAuth.Mvc/userJs/formEdit.js         | 5 +++--
 OpenAuth.Mvc/userJs/forms.js            | 4 +++-
 OpenAuth.Mvc/userJs/modules.js          | 1 -
 OpenAuth.Mvc/userJs/nodeInfo.js         | 4 ++--
 OpenAuth.Mvc/userJs/orgs.js             | 1 -
 OpenAuth.Mvc/userJs/roles.js            | 1 -
 OpenAuth.Mvc/userJs/users.js            | 1 -
 13 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/OpenAuth.Mvc/userJs/categories.js b/OpenAuth.Mvc/userJs/categories.js
index 987b65c0..e190910c 100644
--- a/OpenAuth.Mvc/userJs/categories.js
+++ b/OpenAuth.Mvc/userJs/categories.js
@@ -2,7 +2,6 @@ layui.config({
     base: "/js/"
 }).use(['form','vue', 'ztree', 'layer', 'jquery', 'table','droptree','openauth'], function () {
     var form = layui.form,
-		//layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer,
         layer = layui.layer,
         $ = layui.jquery;
     var table = layui.table;
diff --git a/OpenAuth.Mvc/userJs/flowInstanceEdit.js b/OpenAuth.Mvc/userJs/flowInstanceEdit.js
index 9f605942..cac353c2 100644
--- a/OpenAuth.Mvc/userJs/flowInstanceEdit.js
+++ b/OpenAuth.Mvc/userJs/flowInstanceEdit.js
@@ -6,7 +6,7 @@
         $ = layui.jquery;
     var table = layui.table;
     var openauth = layui.openauth;
-    var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
+    var index = layer.getFrameIndex(window.name); //获取窗口索引
      var id = $.getUrlParam("id");   //ID
     var update = (id !=null && id != '');
     //提交的URL
@@ -18,7 +18,7 @@
 
     //标签切换
     element.on('tab(tab)', function (data) {
-        parent.layer.iframeAuto(index);
+        layer.iframeAuto(index);
     });
 
     /*=========流程设计（begin）======================*/
@@ -183,5 +183,5 @@
     }
 
     //让层自适应iframe
-    parent.layer.iframeAuto(index);
+    layer.iframeAuto(index);
 })
\ No newline at end of file
diff --git a/OpenAuth.Mvc/userJs/flowInstanceOp.js b/OpenAuth.Mvc/userJs/flowInstanceOp.js
index 1799dbd4..038536f2 100644
--- a/OpenAuth.Mvc/userJs/flowInstanceOp.js
+++ b/OpenAuth.Mvc/userJs/flowInstanceOp.js
@@ -5,14 +5,14 @@
 		layer = (top == undefined || top.layer === undefined )? layui.layer : top.layer,
         $ = layui.jquery;
     var openauth = layui.openauth;
-    var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
+    var index = layer.getFrameIndex(window.name); //获取窗口索引
 
    var id = $.getUrlParam("id");   //ID
     $("#FlowInstanceId").val(id);
 
     //标签切换
     element.on('tab(tab)', function (data) {
-        parent.layer.iframeAuto(index);
+        layer.iframeAuto(index);
     });
 
     $.getJSON('/FlowInstances/get?id=' + id,
@@ -56,5 +56,5 @@
     }
 
     //让层自适应iframe
-    parent.layer.iframeAuto(index);
+    layer.iframeAuto(index);
 })
\ No newline at end of file
diff --git a/OpenAuth.Mvc/userJs/flowInstances.js b/OpenAuth.Mvc/userJs/flowInstances.js
index 251d795c..be5ef3a5 100644
--- a/OpenAuth.Mvc/userJs/flowInstances.js
+++ b/OpenAuth.Mvc/userJs/flowInstances.js
@@ -6,6 +6,7 @@
         $ = layui.jquery;
     var table = layui.table;
     var openauth = layui.openauth;
+    var thiswin = (top == undefined) ? window : top.window;
     layui.droptree("/UserSession/GetOrgs", "#Organizations", "#OrganizationIds");
    
     //主列表加载，可反复调用进行刷新
@@ -75,7 +76,7 @@
                 content: '/flowInstances/edit?id=' + data.Id,
                 btn: ['保存', '关闭'],
                 yes: function (index, layero) {
-                    var iframeWin = window[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var iframeWin = thiswin[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
                     iframeWin.submit();
                 },
                 btn2: function (index) {
diff --git a/OpenAuth.Mvc/userJs/flowSchemeDesign.js b/OpenAuth.Mvc/userJs/flowSchemeDesign.js
index f488b984..47e41077 100644
--- a/OpenAuth.Mvc/userJs/flowSchemeDesign.js
+++ b/OpenAuth.Mvc/userJs/flowSchemeDesign.js
@@ -5,10 +5,11 @@ layui.config({
     var form = layui.form, element = layui.element,
 		layer = (top == undefined || top.layer === undefined )? layui.layer : top.layer,
         $ = layui.jquery;
+    var thiswin = (top == undefined) ? window : top.window;
     var table = layui.table;
     var openauth = layui.openauth;
 
-    var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
+    var index = layer.getFrameIndex(window.name); //获取窗口索引
     var id = $.getUrlParam("id");   //ID
     var update = (id != null && id != '');
     //提交的URL
@@ -107,7 +108,7 @@ layui.config({
                 btn: ['确定', '取消'],
                 yes: function (index, layero) {
                     var body = layer.getChildFrame('body', index);
-                    var iframeWin = window[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var iframeWin = thiswin[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
                     var nodedata = iframeWin.getVal();
                     flowDesignPanel.SetNodeEx(object.id, nodedata);
                     layer.close(index);
@@ -179,5 +180,5 @@ layui.config({
     }
 
     //让层自适应iframe
-    parent.layer.iframeAuto(index);
+    layer.iframeAuto(index);
 })
\ No newline at end of file
diff --git a/OpenAuth.Mvc/userJs/flowSchemes.js b/OpenAuth.Mvc/userJs/flowSchemes.js
index f0f3d7c2..5d562d68 100644
--- a/OpenAuth.Mvc/userJs/flowSchemes.js
+++ b/OpenAuth.Mvc/userJs/flowSchemes.js
@@ -6,6 +6,7 @@
         $ = layui.jquery;
     var table = layui.table;
     var openauth = layui.openauth;
+    var thiswin = (top == undefined) ? window : top.window;
 
     layui.droptree("/UserSession/GetOrgs", "#Organizations", "#OrganizationIds");
 
@@ -76,7 +77,7 @@
                 content: '/flowschemes/design?id='+data.Id,
                 btn: ['保存', '关闭'],
                 yes: function (index, layero) {
-                    var iframeWin = window[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var iframeWin = thiswin[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
                     iframeWin.submit();
                 },
                 btn2: function (index) {
diff --git a/OpenAuth.Mvc/userJs/formEdit.js b/OpenAuth.Mvc/userJs/formEdit.js
index 0e342ab8..8ca9b626 100644
--- a/OpenAuth.Mvc/userJs/formEdit.js
+++ b/OpenAuth.Mvc/userJs/formEdit.js
@@ -5,10 +5,11 @@
         element = layui.element,
 		layer = (top == undefined || top.layer === undefined )? layui.layer : top.layer,
         $ = layui.jquery;
+    var thiswin = (top == undefined) ? window : top.window;
     var table = layui.table;
     var openauth = layui.openauth;
 
-    var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
+    var index = layer.getFrameIndex(window.name); //获取窗口索引
     var id = $.getUrlParam("id");   //ID
     var update = (id != null && id != '');
     //提交的URL
@@ -314,6 +315,6 @@
     }
 
     //让层自适应iframe
-    //parent.layer.iframeAuto(index);
+    //layer.iframeAuto(index);
 
 })
\ No newline at end of file
diff --git a/OpenAuth.Mvc/userJs/forms.js b/OpenAuth.Mvc/userJs/forms.js
index fa7c4c3b..577becbc 100644
--- a/OpenAuth.Mvc/userJs/forms.js
+++ b/OpenAuth.Mvc/userJs/forms.js
@@ -8,6 +8,8 @@
     var table = layui.table;
     var openauth = layui.openauth;
 
+    var thiswin = (top == undefined) ? window : top.window;
+
 
     layui.droptree("/UserSession/GetOrgs", "#Organizations", "#OrganizationIds");
    
@@ -77,7 +79,7 @@
                 content: '/forms/edit?id=' + data.Id,
                 btn: ['保存', '关闭'],
                 yes: function (index, layero) {
-                    var iframeWin = window[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var iframeWin = thiswin[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
                     iframeWin.submit();
                 },
                 btn2: function (index) {
diff --git a/OpenAuth.Mvc/userJs/modules.js b/OpenAuth.Mvc/userJs/modules.js
index e64461af..360d68d5 100644
--- a/OpenAuth.Mvc/userJs/modules.js
+++ b/OpenAuth.Mvc/userJs/modules.js
@@ -2,7 +2,6 @@ layui.config({
     base: "/js/"
 }).use(['form','vue', 'ztree', 'layer', 'jquery', 'table','droptree','openauth'], function () {
     var form = layui.form,
-		//layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer,
         layer = layui.layer,
         $ = layui.jquery;
     var table = layui.table;
diff --git a/OpenAuth.Mvc/userJs/nodeInfo.js b/OpenAuth.Mvc/userJs/nodeInfo.js
index 60ea88c6..34b17c7d 100644
--- a/OpenAuth.Mvc/userJs/nodeInfo.js
+++ b/OpenAuth.Mvc/userJs/nodeInfo.js
@@ -6,7 +6,7 @@ layui.config({
     var form = layui.form;
     var users = [];   //节点的执行人
 
-    var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
+    var index = layer.getFrameIndex(window.name); //获取窗口索引
     //从flowschemes.js进入的节点信息
     var node = parent.FlowDesignObject;
     console.log(JSON.stringify(node));
@@ -151,5 +151,5 @@ layui.config({
     }
 
     //让层自适应iframe
-    parent.layer.iframeAuto(index);
+    layer.iframeAuto(index);
 })
\ No newline at end of file
diff --git a/OpenAuth.Mvc/userJs/orgs.js b/OpenAuth.Mvc/userJs/orgs.js
index bc5b9671..99928a90 100644
--- a/OpenAuth.Mvc/userJs/orgs.js
+++ b/OpenAuth.Mvc/userJs/orgs.js
@@ -2,7 +2,6 @@ layui.config({
     base: "/js/"
 }).use(['form','vue', 'ztree', 'layer', 'jquery', 'table','droptree','openauth'], function () {
     var form = layui.form,
-		//layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer,
         layer = layui.layer,
         $ = layui.jquery;
     var table = layui.table;
diff --git a/OpenAuth.Mvc/userJs/roles.js b/OpenAuth.Mvc/userJs/roles.js
index 8d9353f5..ccf72c79 100644
--- a/OpenAuth.Mvc/userJs/roles.js
+++ b/OpenAuth.Mvc/userJs/roles.js
@@ -2,7 +2,6 @@ layui.config({
     base: "/js/"
 }).use(['form','vue', 'ztree', 'layer', 'jquery', 'table','droptree','openauth'], function () {
     var form = layui.form,
-		//layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer,
         layer = layui.layer,
         $ = layui.jquery;
     var table = layui.table;
diff --git a/OpenAuth.Mvc/userJs/users.js b/OpenAuth.Mvc/userJs/users.js
index 3ba0cead..39a49339 100644
--- a/OpenAuth.Mvc/userJs/users.js
+++ b/OpenAuth.Mvc/userJs/users.js
@@ -2,7 +2,6 @@ layui.config({
     base: "/js/"
 }).use(['form','vue', 'ztree', 'layer', 'jquery', 'table','droptree','openauth'], function () {
     var form = layui.form,
-		//layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer,
         layer = layui.layer,
         $ = layui.jquery;
     var table = layui.table;