From 125d94a06c892288fc45ed0923fbe4ce30e9f400 Mon Sep 17 00:00:00 2001
From: jeesite <jeesite@163.com>
Date: Sat, 18 Dec 2021 16:01:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=B7=A6=E6=A0=91=E5=8F=B3?=
 =?UTF-8?q?=E8=A1=A8=E6=B2=A1=E6=9C=89=E5=88=B7=E6=96=B0=E6=A0=91=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/modules/gen/crud/viewForm.xml    | 2 +-
 .../resources/templates/modules/gen/crud_cloud/viewForm.xml   | 2 +-
 .../core/src/main/resources/views/modules/sys/areaForm.html   | 4 ++--
 .../core/src/main/resources/views/modules/sys/areaIndex.html  | 4 ++++
 .../src/main/resources/views/modules/sys/companyForm.html     | 2 +-
 .../src/main/resources/views/modules/sys/companyIndex.html    | 4 ++++
 .../src/main/resources/views/modules/sys/officeIndex.html     | 4 ++++
 7 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml
index e8f4db22..9b51195c 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml
@@ -112,7 +112,7 @@ $("#inputForm").validate({
 			if(data.result == Global.TRUE){
 				js.closeCurrentTabPage(function(contentWindow){
 				<% if(table.isTreeEntity){ %>
-					contentWindow.$('#dataGrid').dataGrid('refreshTreeChildren',
+					(contentWindow.win||contentWindow).$('#dataGrid').dataGrid('refreshTreeChildren',
 							$('#parentCode').val(), '\${${className}.id}');
 				<% }else{ %>
 					contentWindow.page();
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewForm.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewForm.xml
index 0ca3fae1..01b5e562 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewForm.xml
@@ -111,7 +111,7 @@ $("#inputForm").validate({
 			if(data.result == Global.TRUE){
 				js.closeCurrentTabPage(function(contentWindow){
 				<% if(table.isTreeEntity){ %>
-					contentWindow.$('#dataGrid').dataGrid('refreshTreeChildren',
+					(contentWindow.win||contentWindow).$('#dataGrid').dataGrid('refreshTreeChildren',
 							$('#parentCode').val(), '\${${className}.id}');
 				<% }else{ %>
 					contentWindow.page();
diff --git a/modules/core/src/main/resources/views/modules/sys/areaForm.html b/modules/core/src/main/resources/views/modules/sys/areaForm.html
index b03e3e86..9d610ede 100644
--- a/modules/core/src/main/resources/views/modules/sys/areaForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/areaForm.html
@@ -103,8 +103,8 @@ $("#inputForm").validate({
 			js.showMessage(data.message);
 			if(data.result == Global.TRUE){
 				js.closeCurrentTabPage(function(contentWindow){
-					contentWindow.$('#dataGrid').dataGrid('refreshTreeChildren',
-							$('#parentCode').val(), '${area.id}');
+					(contentWindow.win||contentWindow).$('#dataGrid').dataGrid('refreshTreeChildren',
+							$('#parentCode').val(), '${company.id}');
 				});
 			}
 		}, "json");
diff --git a/modules/core/src/main/resources/views/modules/sys/areaIndex.html b/modules/core/src/main/resources/views/modules/sys/areaIndex.html
index 069cf6e5..ec46b6c7 100644
--- a/modules/core/src/main/resources/views/modules/sys/areaIndex.html
+++ b/modules/core/src/main/resources/views/modules/sys/areaIndex.html
@@ -68,4 +68,8 @@ $('#btnCollapse').click(function(){
 $('#btnRefresh').click(function(){
 	loadTree();
 });
+// 调用子页分页函数
+function page(){
+	win.page();
+}
 </script>
diff --git a/modules/core/src/main/resources/views/modules/sys/companyForm.html b/modules/core/src/main/resources/views/modules/sys/companyForm.html
index 453a4132..614ea321 100644
--- a/modules/core/src/main/resources/views/modules/sys/companyForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/companyForm.html
@@ -131,7 +131,7 @@ $("#inputForm").validate({
 			js.showMessage(data.message);
 			if(data.result == Global.TRUE){
 				js.closeCurrentTabPage(function(contentWindow){
-					contentWindow.$('#dataGrid').dataGrid('refreshTreeChildren',
+					(contentWindow.win||contentWindow).$('#dataGrid').dataGrid('refreshTreeChildren',
 							$('#parentCode').val(), '${company.id}');
 				});
 			}
diff --git a/modules/core/src/main/resources/views/modules/sys/companyIndex.html b/modules/core/src/main/resources/views/modules/sys/companyIndex.html
index cc9d5212..accae9e5 100644
--- a/modules/core/src/main/resources/views/modules/sys/companyIndex.html
+++ b/modules/core/src/main/resources/views/modules/sys/companyIndex.html
@@ -69,4 +69,8 @@ $('#btnCollapse').click(function(){
 $('#btnRefresh').click(function(){
 	loadTree();
 });
+// 调用子页分页函数
+function page(){
+	win.page();
+}
 </script>
diff --git a/modules/core/src/main/resources/views/modules/sys/officeIndex.html b/modules/core/src/main/resources/views/modules/sys/officeIndex.html
index 3e4972ac..fabd029c 100644
--- a/modules/core/src/main/resources/views/modules/sys/officeIndex.html
+++ b/modules/core/src/main/resources/views/modules/sys/officeIndex.html
@@ -69,4 +69,8 @@ $('#btnCollapse').click(function(){
 $('#btnRefresh').click(function(){
 	loadTree();
 });
+// 调用子页分页函数
+function page(){
+	win.page();
+}
 </script>