From 90de804cf3e49e926772c3649fc5b505dc7cf797 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 26 Nov 2021 11:46:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=91=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E5=B7=A6=E6=A0=91=E5=8F=B3=E8=A1=A8=E7=94=9F=E6=88=90=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/views/modules/cms/tplIndex.html | 10 +--
 .../templates/modules/gen/crud/controller.xml | 12 +++
 .../templates/modules/gen/crud/viewForm.xml   |  2 +-
 .../templates/modules/gen/crud/viewIndex.xml  | 90 +++++++++++++++++++
 .../modules/gen/crud_cloud/controller.xml     | 12 +++
 .../modules/gen/crud_cloud/viewForm.xml       |  2 +-
 .../modules/gen/include/searchForm.html       |  4 +-
 .../modules/gen/query/controller.xml          | 12 +++
 .../resources/views/modules/sys/areaForm.html |  2 +-
 .../views/modules/sys/areaIndex.html          |  4 +
 .../views/modules/sys/companyForm.html        |  2 +-
 .../views/modules/sys/companyIndex.html       |  4 +
 .../views/modules/sys/officeIndex.html        |  4 +
 13 files changed, 150 insertions(+), 10 deletions(-)
 create mode 100644 modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml

diff --git a/modules/cms/src/main/resources/views/modules/cms/tplIndex.html b/modules/cms/src/main/resources/views/modules/cms/tplIndex.html
index c779911d..d15b5500 100644
--- a/modules/cms/src/main/resources/views/modules/cms/tplIndex.html
+++ b/modules/cms/src/main/resources/views/modules/cms/tplIndex.html
@@ -61,11 +61,11 @@ var setting = {
 		for (var i = 0; i < nodes.length; i++) {
 			tree.expandNode(nodes[i], true, false, false);
 		}
-		// 展开第二级节点
-		nodes = tree.getNodesByParam("level", 1);
-		for (var i = 0; i < nodes.length; i++) {
-			tree.expandNode(nodes[i], true, false, false);
-		}
+// 		// 展开第二级节点
+// 		nodes = tree.getNodesByParam("level", 1);
+// 		for (var i = 0; i < nodes.length; i++) {
+// 			tree.expandNode(nodes[i], true, false, false);
+// 		}
 	}, null, null, js.text('loading.message'));
 };
 loadTree();
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
index b8b2685a..60a42ff6 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
@@ -75,6 +75,18 @@ public class ${ClassName}Controller extends BaseController {
 		return ${className}Service.getAndValid(${className});
 		<% } %>
 	}
+	<% if(table.isTreeEntity){ %>
+	
+	/**
+	 * 管理主页
+	 */
+	@RequiresPermissions("${permissionPrefix}:view")
+	@RequestMapping(value = "index")
+	public String index(${ClassName} ${className}, Model model) {
+		model.addAttribute("${className}", ${className});
+		return "${lastPackageName}/${viewPrefix}Index";
+	}
+	<% } %>
 	
 	/**
 	 * 查询列表
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/viewIndex.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml
new file mode 100644
index 00000000..d0f79e9a
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+     No deletion without permission, or be held responsible to law. -->
+<template>
+	<name>vueIndex</name>
+	<filePath>vue/src/views/${urlPrefix}</filePath>
+	<fileName>index.vue</fileName>
+	<content><![CDATA[
+<% if(table.isTreeEntity){ %>
+\<% layout('/layouts/default.html', {title: '${functionNameSimple}管理', libs: ['layout','zTree']}){ %>
+<div class="ui-layout-west">
+	<div class="main-content">
+		<div class="box box-main">
+			<div class="box-header">
+				<div class="box-title">
+					<i class="fa icon-grid"></i> \${text('${functionNameSimple}')}
+				</div>
+				<div class="box-tools pull-right">
+					<button type="button" class="btn btn-box-tool" id="btnExpand" title="\${text('展开')}" style="display:none;"><i class="fa fa-chevron-up"></i></button>
+					<button type="button" class="btn btn-box-tool" id="btnCollapse" title="\${text('折叠')}"><i class="fa fa-chevron-down"></i></button>
+					<button type="button" class="btn btn-box-tool" id="btnRefresh" title="\${text('刷新')}"><i class="fa fa-refresh"></i></button>
+				</div>
+			</div>
+			<div class="ui-layout-content">
+				<div id="tree" class="ztree"></div>
+			</div>
+		</div>
+	</div>
+</div>
+<div class="ui-layout-center">
+	<iframe id="mainFrame" name="mainFrame" class="ui-layout-content p0"
+		src="\${ctx}/${urlPrefix}/list"></iframe>
+</div>
+\<% } %>
+<script>
+// 初始化布局
+$('body').layout({
+	west__initClosed: $(window).width() <= 767, // 是否默认关闭
+	west__size: 200
+});
+// 主页框架
+var win = $("#mainFrame")[0].contentWindow;
+// 树结构初始化加载
+var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{enable:true}},
+	callback:{onClick:function(event, treeId, treeNode){
+		tree.expandNode(treeNode);
+		//win.$('button[type=reset]').click();
+		<% for(pk in table.pkList){ %>
+		win.$('#${pk.attrName}').val(treeNode.id);
+		<% } %>
+		win.page();
+	}}
+}, tree, loadTree = function(){
+	js.ajaxSubmit("\${ctx}/${urlPrefix}/treeData?___t=" + new Date().getTime(), function(data){
+		tree = $.fn.zTree.init($("#tree"), setting, data);//.expandAll(true);
+		// 展开第一级节点
+		var nodes = tree.getNodesByParam("level", 0);
+		for(var i=0; i<nodes.length; i++) {
+			tree.expandNode(nodes[i], true, false, false);
+		}
+		// 展开第二级节点
+// 		nodes = tree.getNodesByParam("level", 1);
+// 		for(var i=0; i<nodes.length; i++) {
+// 			tree.expandNode(nodes[i], true, false, false);
+// 		}
+	}, null, null, js.text('loading.message'));
+};loadTree();
+// 工具栏按钮绑定
+$('#btnExpand').click(function(){
+	tree.expandAll(true);
+	$(this).hide();
+	$('#btnCollapse').show();
+});
+$('#btnCollapse').click(function(){
+	tree.expandAll(false);
+	$(this).hide();
+	$('#btnExpand').show();
+});
+$('#btnRefresh').click(function(){
+	loadTree();
+});
+// 调用子页分页函数
+function page(){
+	win.page();
+}
+</script>
+<% } %>
+]]>
+	</content>
+</template>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
index 1d5952a3..ff8a34ee 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
@@ -75,6 +75,18 @@ public class ${ClassName}Controller extends BaseController {
 		return ${className}Service.getAndValid(${className});
 		<% } %>
 	}
+	<% if(table.isTreeEntity){ %>
+	
+	/**
+	 * 管理主页
+	 */
+	@RequiresPermissions("${permissionPrefix}:view")
+	@RequestMapping(value = "index")
+	public String index(${ClassName} ${className}, Model model) {
+		model.addAttribute("${className}", ${className});
+		return "${lastPackageName}/${viewPrefix}Index";
+	}
+	<% } %>
 	
 	/**
 	 * 查询列表
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 b29bf320..a77721d3 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
@@ -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/include/searchForm.html b/modules/core/src/main/resources/templates/modules/gen/include/searchForm.html
index 57e28fcf..2b4477f6 100644
--- a/modules/core/src/main/resources/templates/modules/gen/include/searchForm.html
+++ b/modules/core/src/main/resources/templates/modules/gen/include/searchForm.html
@@ -2,7 +2,9 @@
 			<${'#'}form:form id="searchForm" model="\${${className}}" action="\${ctx}/${urlPrefix}/listData" method="post" class="form-inline hide"
 					data-page-no="\${parameter.pageNo}" data-page-size="\${parameter.pageSize}" data-order-by="\${parameter.orderBy}">
 		<% for(c in table.columnList){ %>
-			<% if(c.isQuery == "1" && !c.isTreeEntityColumn){ %>
+			<% if(table.isTreeEntity && c.isPk == "1"){ %>
+				<${'#'}form:hidden path="${c.attrName}"/>
+			<% }else if(c.isQuery == "1" && !c.isTreeEntityColumn){ %>
 				<div class="form-group">
 					<label class="control-label">\${text('${c.columnLabel}')}：</label>
 				<% if(c.showType == 'input' || c.showType == 'textarea'){ %>
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml
index d524dbcd..a6f1f651 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml
@@ -69,6 +69,18 @@ public class ${ClassName}Controller extends BaseController {
 		return ${className}Service.getAndValid(${className});
 		<% } %>
 	}
+	<% if(table.isTreeEntity){ %>
+	
+	/**
+	 * 管理主页
+	 */
+	@RequiresPermissions("${permissionPrefix}:view")
+	@RequestMapping(value = "index")
+	public String index(${ClassName} ${className}, Model model) {
+		model.addAttribute("${className}", ${className});
+		return "${lastPackageName}/${viewPrefix}Index";
+	}
+	<% } %>
 	
 	/**
 	 * 查询列表
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..3faec4eb 100644
--- a/modules/core/src/main/resources/views/modules/sys/areaForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/areaForm.html
@@ -103,7 +103,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(), '${area.id}');
 				});
 			}
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 67c5b913..6e256ffe 100644
--- a/modules/core/src/main/resources/views/modules/sys/companyForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/companyForm.html
@@ -128,7 +128,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 874893b2..86543692 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 0679ca58..e08a9ba5 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>