diff --git a/modules/core/src/main/resources/templates/modules/gen/config.xml b/modules/core/src/main/resources/templates/modules/gen/config.xml
index feedc252..ec3270ff 100644
--- a/modules/core/src/main/resources/templates/modules/gen/config.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/config.xml
@@ -28,7 +28,7 @@
 				<template>category-ref:dao</template>
 			</childTable>
 		</category>
-		<category value="crud_vue_only" label="单表/主子表 （增删改查）仅Vue">
+		<category value="crud_only_vue" label="单表/主子表 （增删改查）仅Vue">
 			<template>crud/vueApi.xml</template>
 			<template>crud/vueList.xml</template>
 			<template>crud/vueIndex.xml</template>
@@ -58,18 +58,46 @@
 				<template>crud_cloud/dao.xml</template>
 			</childTable>
 		</category>
+		<category value="crud_cloud_vue" label="单表/主子表 （增删改查 Cloud，生成 Api/Client）Vue">
+			<template>crud_cloud/entity.xml</template>
+			<template>crud_cloud/mapper.xml</template>
+			<template>crud_cloud/dao.xml</template>
+			<template>crud_cloud/api.xml</template>
+			<template>crud_cloud/client.xml</template>
+			<template>crud_cloud/service.xml</template>
+			<template>crud_cloud/controller.xml</template>
+			<template>crud/vueApi.xml</template>
+			<template>crud/vueList.xml</template>
+			<template>crud/vueIndex.xml</template>
+			<template>crud/vueForm.xml</template>
+			<childTable>
+				<template>crud_cloud/mapper.xml</template>
+				<template>crud_cloud/entity.xml</template>
+				<template>crud_cloud/dao.xml</template>
+			</childTable>
+		</category>
+		<category value="crud_cloud_select" label="单表/主子表 （增删改查 Cloud，含 listselect 选择页面）">
+			<template>category-ref:crud_cloud</template>
+			<template>crud_cloud/viewSelect.xml</template>
+			<childTable>
+				<template>category-ref:dao</template>
+			</childTable>
+		</category>
 		<category value="treeGrid" label="树表/树结构表（增删改查）">
 			<template>category-ref:crud</template>
 		</category>
 		<category value="treeGrid_vue" label="树表/树结构表（增删改查）Vue">
 			<template>category-ref:crud_vue</template>
 		</category>
-		<category value="treeGrid_vue_only" label="树表/树结构表（增删改查）仅Vue">
-			<template>category-ref:crud_vue_only</template>
+		<category value="treeGrid_only_vue" label="树表/树结构表（增删改查）仅Vue">
+			<template>category-ref:crud_only_vue</template>
 		</category>
 		<category value="treeGrid_cloud" label="树表/树结构表（增删改查  Cloud，生成 Api/Client）">
 			<template>category-ref:crud_cloud</template>
 		</category>
+		<category value="treeGrid_cloud_vue" label="树表/树结构表（增删改查  Cloud，生成 Api/Client）Vue">
+			<template>category-ref:crud_cloud_vue</template>
+		</category>
 		<category value="service" label="业务层和持久层（dao/service，不含控制器和视图）">
 			<template>category-ref:dao</template>
 			<template>crud/service.xml</template>
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 b4accf22..5123aff3 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
@@ -6,135 +6,6 @@
 	<filePath>${frontDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
 	<fileName>${className}Form.html</fileName>
 	<content><![CDATA[
-<%
-	var extLibs = '';
-	if(toBoolean(table.optionMap['isImageUpload']) || toBoolean(table.optionMap['isFileUpload'])){
-		extLibs = extLibs + ',\'fileupload\'';
-	}
-	if(table.childList.~size > 0){
-		extLibs = extLibs + ',\'dataGrid\'';
-	}
-%>
-\<% layout('/layouts/default.html', {title: '${functionNameSimple}管理', libs: ['validate'${extLibs}]}){ %>
-<div class="main-content">
-	<div class="box box-main">
-		<div class="box-header with-border">
-			<div class="box-title">
-				<i class="fa icon-note"></i> \${text(${className}.isNewRecord ? '新增${functionNameSimple}' : '编辑${functionNameSimple}')}
-			</div>
-			<div class="box-tools pull-right">
-				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-			</div>
-		</div>
-		<${'#'}form:form id="inputForm" model="\${${className}}" action="\${ctx}/${urlPrefix}/save" method="post" class="form-horizontal">
-			<div class="box-body">
-				<div class="form-unit">\${text('基本信息')}</div>
-			<% if(table.isTreeEntity){ %>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4">\${text('上级${functionNameSimple}')}：</label>
-							<div class="col-sm-8">
-								<${'#'}form:treeselect id="parent" title="\${text('上级${functionNameSimple}')}"
-									path="parent.id" labelPath="parent.${table.treeViewNameAttrName}"
-									url="\${ctx}/${urlPrefix}/treeData?excludeCode=\${${className}.id}"
-									class="" allowClear="true" canSelectRoot="true" canSelectParent="true"/>
-							</div>
-						</div>
-					</div>
-				</div>
-			<% } %>
-				<% include('/templates/modules/gen/include/formControl.html'){} %>
-				<% include('/templates/modules/gen/include/formChildTable.html'){} %>
-			<% if(toBoolean(table.optionMap['isBpmForm'])){ %>
-				\<% if(isNotBlank(${className}.bpm.taskId)){ %>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-xs-2">${text('审批意见')}：</label>
-							<div class="col-xs-10">
-								<${'#'}bpm:comment bpmEntity="\${${className}}" />
-							</div>
-						</div>
-					</div>
-				</div>
-				\<% } %>
-				<${'#'}bpm:nextTaskInfo bpmEntity="\${${className}}" />
-			<% } %>
-			</div>
-			<div class="box-footer">
-				<div class="row">
-					<div class="col-sm-offset-2 col-sm-10">
-					<% if(toBoolean(table.optionMap['isBpmForm'])){ %>
-						\<% if (hasPermi('${permissionPrefix}:edit')){ %>
-							<${'#'}form:hidden path="status"/>
-							\<% if (${className}.isNewRecord || ${className}.status == '9'){ %>
-								<button type="submit" class="btn btn-sm btn-info" id="btnDraft"><i class="fa fa-save"></i> ${text('暂 存')}</button>&nbsp;
-							\<% } %>
-							<${'#'}bpm:button bpmEntity="\${${className}}" formKey="${table.optionMap['bpmFormKey']}" completeText="${text('提 交')}"/>
-						\<% } %>
-					<% }else{ %>
-						\<% if (hasPermi('${permissionPrefix}:edit')){ %>
-							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> \${text('保 存')}</button>&nbsp;
-						\<% } %>
-					<% } %>
-						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> \${text('关 闭')}</button>
-					</div>
-				</div>
-			</div>
-		</${'#'}form:form>
-	</div>
-</div>
-\<% } %>
-<% include('/templates/modules/gen/include/formChildTableScript.html'){} %>
-<script>
-<% if(toBoolean(table.optionMap['isBpmForm'])){ %>
-// 业务实现草稿按钮
-$('#btnDraft').click(function(){
-	$('#status').val(Global.STATUS_DRAFT);
-});
-// 流程按钮操作事件
-BpmButton = window.BpmButton || {};
-BpmButton.init = function(task){
-	if (task && task.priority){
-		$('#bpm_priority').val(task.priority).trigger('change'); // 设置下一个任务的优先级
-	}
-}
-BpmButton.complete = function($this, task){
-	$('#status').val(Global.STATUS_AUDIT);
-};
-// 表单验证提交事件
-<% } %>
-$("#inputForm").validate({
-	submitHandler: function(form){
-		js.ajaxSubmitForm($(form), function(data){
-			js.showMessage(data.message);
-			if(data.result == Global.TRUE){
-				js.closeCurrentTabPage(function(contentWindow){
-				<% if(table.isTreeEntity){ %>
-					(contentWindow.win||contentWindow).$('#dataGrid').dataGrid('refreshTreeChildren',
-							$('#parentCode').val(), '\${${className}.id}');
-				<% }else{ %>
-					contentWindow.page();
-				<% } %>
-				});
-			}
-		}, "json");
-    }
-});
-<% if(table.isTreeEntity){ %>
-
-// 选择上级节点回调方法
-function treeselectCallback(id, act, index, layero){
-	if (id == 'parent' && (act == 'ok' || act == 'clear')){
-		// 创建并初始化下一个节点信息，如：排序号、默认值
-		$.get('\${ctx}/${urlPrefix}/createNextNode?parentCode='
-				+$('#parentCode').val(), function(data){
-			$('#treeSort').val(data.treeSort);
-		});
-	}
-}
-<% } %>
-</script>]]>
+<% include('/templates/modules/gen/include/viewForm.html'){} %>]]>
 	</content>
 </template>
\ No newline at end of file
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
index e429360d..60082fc9 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml
@@ -6,85 +6,6 @@
 	<filePath>${frontDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
 	<fileName>${className}Index.html</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}},
-	async:{enable:true,autoParam:["id=parentCode"],url:"\${ctx}/${urlPrefix}/treeData"},
-	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(setting.async.url+"?___t="+new Date().getTime(), {
-			parentCode:'\${parameter.parentCode!}'}, function(data){
-		tree = $.fn.zTree.init($("#tree"), setting, data);
-		var level = -1, nodes;
-		while (++level <= 1) {
-			nodes = tree.getNodesByParam("level", level);
-			if (nodes.length > 10) { break; }
-			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>
-<% } %>
-]]>
+<% include('/templates/modules/gen/include/viewIndex.html'){} %>]]>
 	</content>
 </template>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml
index df71b6bc..cf51b818 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml
@@ -6,36 +6,6 @@
 	<filePath>${frontDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
 	<fileName>${className}List.html</fileName>
 	<content><![CDATA[
-\<% layout('/layouts/default.html', {title: '${functionNameSimple}管理', libs: ['dataGrid']}){ %>
-<div class="main-content">
-	<div class="box box-main">
-		<div class="box-header">
-			<div class="box-title">
-				<i class="fa icon-notebook"></i> \${text('${functionNameSimple}管理')}
-			</div>
-			<div class="box-tools pull-right">
-				<a href="#" class="btn btn-default" id="btnSearch" title="\${text('查询')}"><i class="fa fa-filter"></i> \${text('查询')}</a>
-				<% if(table.isTreeEntity){ %>
-				<a href="#" class="btn btn-default" id="btnRefreshTree" title="\${text('刷新')}"><i class="fa fa-refresh"></i> \${text('刷新')}</a>
-				<a href="#" class="btn btn-default" id="btnExpandTreeNode" title="\${text('展开一级')}"><i class="fa fa-angle-double-down"></i> \${text('展开')}</a>
-				<a href="#" class="btn btn-default" id="btnCollapseTreeNode" title="\${text('折叠全部')}"><i class="fa fa-angle-double-up"></i> \${text('折叠')}</a>
-				<% } %>
-				\<% if(hasPermi('${permissionPrefix}:edit')){ %>
-					<a href="\${ctx}/${urlPrefix}/form" class="btn btn-default btnTool" title="\${text('新增${functionNameSimple}')}"><i class="fa fa-plus"></i> \${text('新增')}</a>
-				\<% } %>
-				<a href="#" class="btn btn-default" id="btnSetting" title="\${text('设置')}"><i class="fa fa-navicon"></i></a>
-			</div>
-		</div>
-		<div class="box-body">
-			<% include('/templates/modules/gen/include/searchForm.html'){} %>
-			<table id="dataGrid"></table>
-			<% if(!table.isTreeEntity){ %>
-			<div id="dataGridPage"></div>
-			<% } %>
-		</div>
-	</div>
-</div>
-\<% } %>
-<% include('/templates/modules/gen/include/dataGridScript.html'){} %>]]>
+<% include('/templates/modules/gen/include/viewList.html'){} %>]]>
 	</content>
 </template>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewSelect.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewSelect.xml
index 2738aaf4..b2ff8f71 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/viewSelect.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewSelect.xml
@@ -6,26 +6,6 @@
 	<filePath>${frontDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
 	<fileName>${className}Select.html</fileName>
 	<content><![CDATA[
-\<% layout('/layouts/default.html', {title: '${functionNameSimple}管理', libs: ['dataGrid']}){ %>
-<div class="main-content">
-	<div class="box box-main">
-		<div class="box-body">
-			<% include('/templates/modules/gen/include/searchForm.html'){} %>
-			<div class="row">
-				<div class="col-xs-10 pr10">
-					<table id="dataGrid"></table>
-					<% if(!table.isTreeEntity){ %>
-					<div id="dataGridPage"></div>
-					<% } %>
-				</div>
-				<div class="col-xs-2 pl0">
-					<div id="selectData" class="tags-input"></div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-\<% } %>
-<% include('/templates/modules/gen/include/dataGridSelectScript.html'){} %>]]>
+<% include('/templates/modules/gen/include/viewSelect.html'){} %>]]>
 	</content>
 </template>
\ No newline at end of file
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 65dd49e1..3b61f8cb 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
@@ -6,135 +6,6 @@
 	<filePath>${frontDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
 	<fileName>${className}Form.html</fileName>
 	<content><![CDATA[
-<%
-	var extLibs = '';
-	if(toBoolean(table.optionMap['isImageUpload']) || toBoolean(table.optionMap['isFileUpload'])){
-		extLibs = extLibs + ',\'fileupload\'';
-	}
-	if(table.childList.~size > 0){
-		extLibs = extLibs + ',\'dataGrid\'';
-	}
-%>
-\<% layout('/layouts/default.html', {title: '${functionNameSimple}管理', libs: ['validate'${extLibs}]}){ %>
-<div class="main-content">
-	<div class="box box-main">
-		<div class="box-header with-border">
-			<div class="box-title">
-				<i class="fa icon-note"></i> \${text(${className}.isNewRecord ? '新增${functionNameSimple}' : '编辑${functionNameSimple}')}
-			</div>
-			<div class="box-tools pull-right">
-				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-			</div>
-		</div>
-		<${'#'}form:form id="inputForm" model="\${${className}}" action="\${ctx}/${urlPrefix}/save" method="post" class="form-horizontal">
-			<div class="box-body">
-				<div class="form-unit">\${text('基本信息')}</div>
-			<% if(table.isTreeEntity){ %>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4">\${text('上级${functionNameSimple}')}：</label>
-							<div class="col-sm-8">
-								<${'#'}form:treeselect id="parent" title="\${text('上级${functionNameSimple}')}"
-									path="parent.id" labelPath="parent.${table.treeViewNameAttrName}"
-									url="\${ctx}/${urlPrefix}/treeData?excludeCode=\${${className}.id}"
-									class="" allowClear="true" canSelectRoot="true" canSelectParent="true"/>
-							</div>
-						</div>
-					</div>
-				</div>
-			<% } %>
-				<% include('/templates/modules/gen/include/formControl.html'){} %>
-				<% include('/templates/modules/gen/include/formChildTable.html'){} %>
-			<% if(toBoolean(table.optionMap['isBpmForm'])){ %>
-				\<% if(isNotBlank(${className}.bpm.taskId)){ %>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-xs-2">${text('审批意见')}：</label>
-							<div class="col-xs-10">
-								<${'#'}bpm:comment bpmEntity="\${${className}}" />
-							</div>
-						</div>
-					</div>
-				</div>
-				\<% } %>
-				<${'#'}bpm:nextTaskInfo bpmEntity="\${${className}}" />
-			<% } %>
-			</div>
-			<div class="box-footer">
-				<div class="row">
-					<div class="col-sm-offset-2 col-sm-10">
-					<% if(toBoolean(table.optionMap['isBpmForm'])){ %>
-						\<% if (hasPermi('${permissionPrefix}:edit')){ %>
-							<${'#'}form:hidden path="status"/>
-							\<% if (${className}.isNewRecord || ${className}.status == '9'){ %>
-								<button type="submit" class="btn btn-sm btn-info" id="btnDraft"><i class="fa fa-save"></i> ${text('暂 存')}</button>&nbsp;
-							\<% } %>
-							<${'#'}bpm:button bpmEntity="\${${className}}" formKey="${table.optionMap['bpmFormKey']}" completeText="${text('提 交')}"/>
-						\<% } %>
-					<% }else{ %>
-						\<% if (hasPermi('${permissionPrefix}:edit')){ %>
-							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> \${text('保 存')}</button>&nbsp;
-						\<% } %>
-					<% } %>
-						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> \${text('关 闭')}</button>
-					</div>
-				</div>
-			</div>
-		</${'#'}form:form>
-	</div>
-</div>
-\<% } %>
-<% include('/templates/modules/gen/include/formChildTableScript.html'){} %>
-<script>
-<% if(toBoolean(table.optionMap['isBpmForm'])){ %>
-// 业务实现草稿按钮
-$('#btnDraft').click(function(){
-	$('#status').val(Global.STATUS_DRAFT);
-});
-// 流程按钮操作事件
-BpmButton = window.BpmButton || {};
-BpmButton.init = function(task){
-	if (task && task.priority){
-		$('#bpm_priority').val(task.priority).trigger('change'); // 设置下一个任务的优先级
-	}
-}
-BpmButton.complete = function($this, task){
-	$('#status').val(Global.STATUS_AUDIT);
-};
-// 表单验证提交事件
-<% } %>
-$("#inputForm").validate({
-	submitHandler: function(form){
-		js.ajaxSubmitForm($(form), function(data){
-			js.showMessage(data.message);
-			if(data.result == Global.TRUE){
-				js.closeCurrentTabPage(function(contentWindow){
-				<% if(table.isTreeEntity){ %>
-					(contentWindow.win||contentWindow).$('#dataGrid').dataGrid('refreshTreeChildren',
-							$('#parentCode').val(), '\${${className}.id}');
-				<% }else{ %>
-					contentWindow.page();
-				<% } %>
-				});
-			}
-		}, "json");
-    }
-});
-<% if(table.isTreeEntity){ %>
-
-// 选择上级节点回调方法
-function treeselectCallback(id, act, index, layero){
-	if (id == 'parent' && (act == 'ok' || act == 'clear')){
-		// 创建并初始化下一个节点信息，如：排序号、默认值
-		$.get('\${ctx}/${urlPrefix}/createNextNode?parentCode='
-				+$('#parentCode').val(), function(data){
-			$('#treeSort').val(data.treeSort);
-		});
-	}
-}
-<% } %>
-</script>]]>
+<% include('/templates/modules/gen/include/viewForm.html'){} %>]]>
 	</content>
 </template>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewIndex.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewIndex.xml
index 99c77c60..05f0f51f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewIndex.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewIndex.xml
@@ -6,85 +6,6 @@
 	<filePath>${frontDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
 	<fileName>${className}Index.html</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}},
-	async:{enable:true,autoParam:["id=parentCode"],url:"\${ctx}/${urlPrefix}/treeData"},
-	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(setting.async.url+"?___t="+new Date().getTime(), {
-			parentCode:'\${parameter.parentCode!}'}, function(data){
-		tree = $.fn.zTree.init($("#tree"), setting, data);
-		var level = -1, nodes;
-		while (++level <= 1) {
-			nodes = tree.getNodesByParam("level", level);
-			if (nodes.length > 10) { break; }
-			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>
-<% } %>
-]]>
+<% include('/templates/modules/gen/include/viewIndex.html'){} %>]]>
 	</content>
 </template>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewList.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewList.xml
index 38176bb0..542c9fd6 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewList.xml
@@ -6,36 +6,6 @@
 	<filePath>${frontDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
 	<fileName>${className}List.html</fileName>
 	<content><![CDATA[
-\<% layout('/layouts/default.html', {title: '${functionNameSimple}管理', libs: ['dataGrid']}){ %>
-<div class="main-content">
-	<div class="box box-main">
-		<div class="box-header">
-			<div class="box-title">
-				<i class="fa icon-notebook"></i> \${text('${functionNameSimple}管理')}
-			</div>
-			<div class="box-tools pull-right">
-				<a href="#" class="btn btn-default" id="btnSearch" title="\${text('查询')}"><i class="fa fa-filter"></i> \${text('查询')}</a>
-				<% if(table.isTreeEntity){ %>
-				<a href="#" class="btn btn-default" id="btnRefreshTree" title="\${text('刷新')}"><i class="fa fa-refresh"></i> \${text('刷新')}</a>
-				<a href="#" class="btn btn-default" id="btnExpandTreeNode" title="\${text('展开一级')}"><i class="fa fa-angle-double-down"></i> \${text('展开')}</a>
-				<a href="#" class="btn btn-default" id="btnCollapseTreeNode" title="\${text('折叠全部')}"><i class="fa fa-angle-double-up"></i> \${text('折叠')}</a>
-				<% } %>
-				\<% if(hasPermi('${permissionPrefix}:edit')){ %>
-					<a href="\${ctx}/${urlPrefix}/form" class="btn btn-default btnTool" title="\${text('新增${functionNameSimple}')}"><i class="fa fa-plus"></i> \${text('新增')}</a>
-				\<% } %>
-				<a href="#" class="btn btn-default" id="btnSetting" title="\${text('设置')}"><i class="fa fa-navicon"></i></a>
-			</div>
-		</div>
-		<div class="box-body">
-			<% include('/templates/modules/gen/include/searchForm.html'){} %>
-			<table id="dataGrid"></table>
-			<% if(!table.isTreeEntity){ %>
-			<div id="dataGridPage"></div>
-			<% } %>
-		</div>
-	</div>
-</div>
-\<% } %>
-<% include('/templates/modules/gen/include/dataGridScript.html'){} %>]]>
+<% include('/templates/modules/gen/include/viewList.html'){} %>]]>
 	</content>
 </template>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewSelect.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewSelect.xml
new file mode 100644
index 00000000..840affe8
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewSelect.xml
@@ -0,0 +1,11 @@
+<?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>viewSelect</name>
+	<filePath>${frontDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<fileName>${className}Select.html</fileName>
+	<content><![CDATA[
+<% include('/templates/modules/gen/include/viewSelect.html'){} %>]]>
+	</content>
+</template>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/viewForm.html b/modules/core/src/main/resources/templates/modules/gen/include/viewForm.html
new file mode 100644
index 00000000..7b0e08bd
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/include/viewForm.html
@@ -0,0 +1,131 @@
+<%/* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+   * No deletion without permission, or be held responsible to law. */%>
+<%
+	var extLibs = '';
+	if(toBoolean(table.optionMap['isImageUpload']) || toBoolean(table.optionMap['isFileUpload'])){
+		extLibs = extLibs + ',\'fileupload\'';
+	}
+	if(table.childList.~size > 0){
+		extLibs = extLibs + ',\'dataGrid\'';
+	}
+%>
+\<% layout('/layouts/default.html', {title: '${functionNameSimple}管理', libs: ['validate'${extLibs}]}){ %>
+<div class="main-content">
+	<div class="box box-main">
+		<div class="box-header with-border">
+			<div class="box-title">
+				<i class="fa icon-note"></i> \${text(${className}.isNewRecord ? '新增${functionNameSimple}' : '编辑${functionNameSimple}')}
+			</div>
+			<div class="box-tools pull-right">
+				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+			</div>
+		</div>
+		<${'#'}form:form id="inputForm" model="\${${className}}" action="\${ctx}/${urlPrefix}/save" method="post" class="form-horizontal">
+			<div class="box-body">
+				<div class="form-unit">\${text('基本信息')}</div>
+			<% if(table.isTreeEntity){ %>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4">\${text('上级${functionNameSimple}')}：</label>
+							<div class="col-sm-8">
+								<${'#'}form:treeselect id="parent" title="\${text('上级${functionNameSimple}')}"
+									path="parent.id" labelPath="parent.${table.treeViewNameAttrName}"
+									url="\${ctx}/${urlPrefix}/treeData?excludeCode=\${${className}.id}"
+									class="" allowClear="true" canSelectRoot="true" canSelectParent="true"/>
+							</div>
+						</div>
+					</div>
+				</div>
+			<% } %>
+				<% include('/templates/modules/gen/include/formControl.html'){} %>
+				<% include('/templates/modules/gen/include/formChildTable.html'){} %>
+			<% if(toBoolean(table.optionMap['isBpmForm'])){ %>
+				\<% if(isNotBlank(${className}.bpm.taskId)){ %>
+				<div class="row">
+					<div class="col-xs-12">
+						<div class="form-group">
+							<label class="control-label col-xs-2">${text('审批意见')}：</label>
+							<div class="col-xs-10">
+								<${'#'}bpm:comment bpmEntity="\${${className}}" />
+							</div>
+						</div>
+					</div>
+				</div>
+				\<% } %>
+				<${'#'}bpm:nextTaskInfo bpmEntity="\${${className}}" />
+			<% } %>
+			</div>
+			<div class="box-footer">
+				<div class="row">
+					<div class="col-sm-offset-2 col-sm-10">
+					<% if(toBoolean(table.optionMap['isBpmForm'])){ %>
+						\<% if (hasPermi('${permissionPrefix}:edit')){ %>
+							<${'#'}form:hidden path="status"/>
+							\<% if (${className}.isNewRecord || ${className}.status == '9'){ %>
+								<button type="submit" class="btn btn-sm btn-info" id="btnDraft"><i class="fa fa-save"></i> ${text('暂 存')}</button>&nbsp;
+							\<% } %>
+							<${'#'}bpm:button bpmEntity="\${${className}}" formKey="${table.optionMap['bpmFormKey']}" completeText="${text('提 交')}"/>
+						\<% } %>
+					<% }else{ %>
+						\<% if (hasPermi('${permissionPrefix}:edit')){ %>
+							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> \${text('保 存')}</button>&nbsp;
+						\<% } %>
+					<% } %>
+						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> \${text('关 闭')}</button>
+					</div>
+				</div>
+			</div>
+		</${'#'}form:form>
+	</div>
+</div>
+\<% } %>
+<% include('/templates/modules/gen/include/formChildTableScript.html'){} %>
+<script>
+<% if(toBoolean(table.optionMap['isBpmForm'])){ %>
+// 业务实现草稿按钮
+$('#btnDraft').click(function(){
+	$('#status').val(Global.STATUS_DRAFT);
+});
+// 流程按钮操作事件
+BpmButton = window.BpmButton || {};
+BpmButton.init = function(task){
+	if (task && task.priority){
+		$('#bpm_priority').val(task.priority).trigger('change'); // 设置下一个任务的优先级
+	}
+}
+BpmButton.complete = function($this, task){
+	$('#status').val(Global.STATUS_AUDIT);
+};
+// 表单验证提交事件
+<% } %>
+$("#inputForm").validate({
+	submitHandler: function(form){
+		js.ajaxSubmitForm($(form), function(data){
+			js.showMessage(data.message);
+			if(data.result == Global.TRUE){
+				js.closeCurrentTabPage(function(contentWindow){
+				<% if(table.isTreeEntity){ %>
+					(contentWindow.win||contentWindow).$('#dataGrid').dataGrid('refreshTreeChildren',
+							$('#parentCode').val(), '\${${className}.id}');
+				<% }else{ %>
+					contentWindow.page();
+				<% } %>
+				});
+			}
+		}, "json");
+    }
+});
+<% if(table.isTreeEntity){ %>
+
+// 选择上级节点回调方法
+function treeselectCallback(id, act, index, layero){
+	if (id == 'parent' && (act == 'ok' || act == 'clear')){
+		// 创建并初始化下一个节点信息，如：排序号、默认值
+		$.get('\${ctx}/${urlPrefix}/createNextNode?parentCode='
+				+$('#parentCode').val(), function(data){
+			$('#treeSort').val(data.treeSort);
+		});
+	}
+}
+<% } %>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/viewIndex.html b/modules/core/src/main/resources/templates/modules/gen/include/viewIndex.html
new file mode 100644
index 00000000..e326f3df
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/include/viewIndex.html
@@ -0,0 +1,81 @@
+<%/* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+   * No deletion without permission, or be held responsible to law. */%>
+<% 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}},
+	async:{enable:true,autoParam:["id=parentCode"],url:"\${ctx}/${urlPrefix}/treeData"},
+	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(setting.async.url+"?___t="+new Date().getTime(), {
+			parentCode:'\${parameter.parentCode!}'}, function(data){
+		tree = $.fn.zTree.init($("#tree"), setting, data);
+		var level = -1, nodes;
+		while (++level <= 1) {
+			nodes = tree.getNodesByParam("level", level);
+			if (nodes.length > 10) { break; }
+			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>
+<% } %>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/viewList.html b/modules/core/src/main/resources/templates/modules/gen/include/viewList.html
new file mode 100644
index 00000000..c85ac116
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/include/viewList.html
@@ -0,0 +1,33 @@
+<%/* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+   * No deletion without permission, or be held responsible to law. */%>
+\<% layout('/layouts/default.html', {title: '${functionNameSimple}管理', libs: ['dataGrid']}){ %>
+<div class="main-content">
+	<div class="box box-main">
+		<div class="box-header">
+			<div class="box-title">
+				<i class="fa icon-notebook"></i> \${text('${functionNameSimple}管理')}
+			</div>
+			<div class="box-tools pull-right">
+				<a href="#" class="btn btn-default" id="btnSearch" title="\${text('查询')}"><i class="fa fa-filter"></i> \${text('查询')}</a>
+				<% if(table.isTreeEntity){ %>
+				<a href="#" class="btn btn-default" id="btnRefreshTree" title="\${text('刷新')}"><i class="fa fa-refresh"></i> \${text('刷新')}</a>
+				<a href="#" class="btn btn-default" id="btnExpandTreeNode" title="\${text('展开一级')}"><i class="fa fa-angle-double-down"></i> \${text('展开')}</a>
+				<a href="#" class="btn btn-default" id="btnCollapseTreeNode" title="\${text('折叠全部')}"><i class="fa fa-angle-double-up"></i> \${text('折叠')}</a>
+				<% } %>
+				\<% if(hasPermi('${permissionPrefix}:edit')){ %>
+					<a href="\${ctx}/${urlPrefix}/form" class="btn btn-default btnTool" title="\${text('新增${functionNameSimple}')}"><i class="fa fa-plus"></i> \${text('新增')}</a>
+				\<% } %>
+				<a href="#" class="btn btn-default" id="btnSetting" title="\${text('设置')}"><i class="fa fa-navicon"></i></a>
+			</div>
+		</div>
+		<div class="box-body">
+			<% include('/templates/modules/gen/include/searchForm.html'){} %>
+			<table id="dataGrid"></table>
+			<% if(!table.isTreeEntity){ %>
+			<div id="dataGridPage"></div>
+			<% } %>
+		</div>
+	</div>
+</div>
+\<% } %>
+<% include('/templates/modules/gen/include/dataGridScript.html'){} %>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/viewSelect.html b/modules/core/src/main/resources/templates/modules/gen/include/viewSelect.html
new file mode 100644
index 00000000..b49a3224
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/include/viewSelect.html
@@ -0,0 +1,21 @@
+\<% layout('/layouts/default.html', {title: '${functionNameSimple}管理', libs: ['dataGrid']}){ %>
+<div class="main-content">
+	<div class="box box-main">
+		<div class="box-body">
+			<% include('/templates/modules/gen/include/searchForm.html'){} %>
+			<div class="row">
+				<div class="col-xs-10 pr10">
+					<table id="dataGrid"></table>
+					<% if(!table.isTreeEntity){ %>
+					<div id="dataGridPage"></div>
+					<% } %>
+				</div>
+				<div class="col-xs-2 pl0">
+					<div id="selectData" class="tags-input"></div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+\<% } %>
+<% include('/templates/modules/gen/include/dataGridSelectScript.html'){} %>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml
index 58c2f9b1..9a4c7300 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml
@@ -5,7 +5,8 @@
 	<name>start-class</name>
 	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/java/com/jeesite/modules</filePath>
 	<fileName>${@StringUtils.cap(module.moduleCode)}Application.java</fileName>
-	<content><![CDATA[/**
+	<content><![CDATA[
+/**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
  * No deletion without permission, or be held responsible to law.
  */