调整代码生成模板目录

modules/core/src/main/resources/templates/modules/gen/config.xml

@@ -16,40 +16,40 @@
 		</category>
 		<category value="crud_vue" label="单表/主子表 （增删改查） vue">
 			<template>category-ref:crud_java</template>
-			<template>crud/vueApi.xml</template>
-			<template>crud/vueList.xml</template>
-			<template>crud/vueForm.xml</template>
-			<template>crud/vueIndex.xml</template>
-			<template>crud/vueImport.xml</template>
+			<template>vue/vueApi.xml</template>
+			<template>vue/vueList.xml</template>
+			<template>vue/vueForm.xml</template>
+			<template>vue/vueIndex.xml</template>
+			<template>vue/vueImport.xml</template>
 			<childTable>
 				<template>category-ref:dao</template>
-				<template>crud/vueFormChildList.xml</template>
+				<template>vue/vueFormChildList.xml</template>
 			</childTable>
 		</category>
 		<category value="crud_only_vue" label="单表/主子表 （增删改查） 仅vue">
-			<template>crud/vueApi.xml</template>
-			<template>crud/vueList.xml</template>
-			<template>crud/vueForm.xml</template>
-			<template>crud/vueIndex.xml</template>
-			<template>crud/vueImport.xml</template>
+			<template>vue/vueApi.xml</template>
+			<template>vue/vueList.xml</template>
+			<template>vue/vueForm.xml</template>
+			<template>vue/vueIndex.xml</template>
+			<template>vue/vueImport.xml</template>
 			<childTable>
-				<template>crud/vueFormChildList.xml</template>
+				<template>vue/vueFormChildList.xml</template>
 			</childTable>
 		</category>
 		<category value="crud_only_vue_modal" label="单表/主子表 （增删改查，弹窗表单） 仅vue ">
 			<template>category-ref:crud_only_vue</template>
 			<childTable>
-				<template>crud/vueFormChildList.xml</template>
+				<template>vue/vueFormChildList.xml</template>
 			</childTable>
 		</category>
 		<category value="crud_only_vue_modal_route" label="单表/主子表 （增删改查，路由表单） 仅vue ">
-			<template>crud/vueApi.xml</template>
-			<template>crud/vueList.xml</template>
-			<template>crud/vueFormRoute.xml</template>
-			<template>crud/vueIndex.xml</template>
-			<template>crud/vueImport.xml</template>
+			<template>vue/vueApi.xml</template>
+			<template>vue/vueList.xml</template>
+			<template>vue/vueFormRoute.xml</template>
+			<template>vue/vueIndex.xml</template>
+			<template>vue/vueImport.xml</template>
 			<childTable>
-				<template>crud/vueFormChildList.xml</template>
+				<template>vue/vueFormChildList.xml</template>
 			</childTable>
 		</category>
 		<category value="crud_select" label="单表/主子表 （增删改查，含 listselect 选择页面） beetl">
@@ -61,10 +61,10 @@
 		</category>
 		<category value="crud_select_vue" label="单表/主子表 （增删改查，含 listselect 选择页面） vue">
 			<template>category-ref:crud_vue</template>
-			<template>crud/vueSelect.xml</template>
+			<template>vue/vueSelect.xml</template>
 			<childTable>
 				<template>category-ref:dao</template>
-				<template>crud/vueFormChildList.xml</template>
+				<template>vue/vueFormChildList.xml</template>
 			</childTable>
 		</category>
 		<category value="crud_java" label="单表/主子表 （增删改查，只生成 java/mapper） 仅后端 ">
@@ -86,14 +86,14 @@
 		</category>
 		<category value="crud_cloud_vue" label="单表/主子表 （增删改查 Cloud，生成 api/client） Vue">
 			<template>category-ref:crud_cloud_java</template>
-			<template>crud/vueApi.xml</template>
-			<template>crud/vueList.xml</template>
-			<template>crud/vueIndex.xml</template>
-			<template>crud/vueForm.xml</template>
-			<template>crud/vueImport.xml</template>
+			<template>vue/vueApi.xml</template>
+			<template>vue/vueList.xml</template>
+			<template>vue/vueIndex.xml</template>
+			<template>vue/vueForm.xml</template>
+			<template>vue/vueImport.xml</template>
 			<childTable>
 				<template>category-ref:dao_cloud</template>
-				<template>crud/vueFormChildList.xml</template>
+				<template>vue/vueFormChildList.xml</template>
 			</childTable>
 		</category>
 		<category value="crud_cloud_select" label="单表/主子表 （增删改查 Cloud，含 listselect 选择页面） beetl">
@@ -105,10 +105,10 @@
 		</category>
 		<category value="crud_cloud_select_vue" label="单表/主子表 （增删改查 Cloud，含 listselect 选择页面） vue">
 			<template>category-ref:crud_cloud_vue</template>
-			<template>crud/vueSelect.xml</template>
+			<template>vue/vueSelect.xml</template>
 			<childTable>
 				<template>category-ref:dao_cloud</template>
-				<template>crud/vueFormChildList.xml</template>
+				<template>vue/vueFormChildList.xml</template>
 			</childTable>
 		</category>
 		<category value="crud_cloud_java" label="单表/主子表 （增删改查 Cloud，只生成 java/mapper） 仅后端">

modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml

@@ -6,6 +6,6 @@
 	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
 	<fileName>${className}Form.html</fileName>
 	<content><![CDATA[
-<% include('/templates/modules/gen/include/viewForm.html'){} %>]]>
+<% include('/templates/modules/gen/view/viewForm.html'){} %>]]>
 	</content>
 </template>

modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml

@@ -6,6 +6,6 @@
 	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
 	<fileName>${className}Index.html</fileName>
 	<content><![CDATA[
-<% include('/templates/modules/gen/include/viewIndex.html'){} %>]]>
+<% include('/templates/modules/gen/view/viewIndex.html'){} %>]]>
 	</content>
 </template>

modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml

@@ -6,6 +6,6 @@
 	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
 	<fileName>${className}List.html</fileName>
 	<content><![CDATA[
-<% include('/templates/modules/gen/include/viewList.html'){} %>]]>
+<% include('/templates/modules/gen/view/viewList.html'){} %>]]>
 	</content>
 </template>

modules/core/src/main/resources/templates/modules/gen/crud/viewSelect.xml

@@ -6,6 +6,6 @@
 	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
 	<fileName>${className}Select.html</fileName>
 	<content><![CDATA[
-<% include('/templates/modules/gen/include/viewSelect.html'){} %>]]>
+<% include('/templates/modules/gen/view/viewSelect.html'){} %>]]>
 	</content>
 </template>

modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewForm.xml

@@ -6,6 +6,6 @@
 	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
 	<fileName>${className}Form.html</fileName>
 	<content><![CDATA[
-<% include('/templates/modules/gen/include/viewForm.html'){} %>]]>
+<% include('/templates/modules/gen/view/viewForm.html'){} %>]]>
 	</content>
 </template>

modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewIndex.xml

@@ -6,6 +6,6 @@
 	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
 	<fileName>${className}Index.html</fileName>
 	<content><![CDATA[
-<% include('/templates/modules/gen/include/viewIndex.html'){} %>]]>
+<% include('/templates/modules/gen/view/viewIndex.html'){} %>]]>
 	</content>
 </template>

modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewList.xml

@@ -6,6 +6,6 @@
 	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
 	<fileName>${className}List.html</fileName>
 	<content><![CDATA[
-<% include('/templates/modules/gen/include/viewList.html'){} %>]]>
+<% include('/templates/modules/gen/view/viewList.html'){} %>]]>
 	</content>
 </template>

modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewSelect.xml

@@ -6,6 +6,6 @@
 	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
 	<fileName>${className}Select.html</fileName>
 	<content><![CDATA[
-<% include('/templates/modules/gen/include/viewSelect.html'){} %>]]>
+<% include('/templates/modules/gen/view/viewSelect.html'){} %>]]>
 	</content>
 </template>

modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml

@@ -44,8 +44,8 @@
 					</div>
 				</div>
 			<% } %>
-				<% include('/templates/modules/gen/include/formControl.html'){} %>
-				<% include('/templates/modules/gen/include/formChildTable.html'){} %>
+				<% include('/templates/modules/gen/view/formControl.html'){} %>
+				<% include('/templates/modules/gen/view/formChildTable.html'){} %>
 			</div>
 			<div class="box-footer">
 				<div class="row">
@@ -58,6 +58,6 @@
 	</div>
 </div>
 \<% } %>
-<% include('/templates/modules/gen/include/formChildTableScript.html'){} %>]]>
+<% include('/templates/modules/gen/view/formChildTableScript.html'){} %>]]>
 	</content>
 </template>

modules/core/src/main/resources/templates/modules/gen/query/viewList.xml

@@ -24,7 +24,7 @@
 			</div>
 		</div>
 		<div class="box-body">
-			<% include('/templates/modules/gen/include/searchForm.html'){} %>
+			<% include('/templates/modules/gen/view/searchForm.html'){} %>
 			<table id="dataGrid"></table>
 			<% if(!table.isTreeEntity){ %>
 			<div id="dataGridPage"></div>
@@ -33,6 +33,6 @@
 	</div>
 </div>
 \<% } %>
-<% include('/templates/modules/gen/include/dataGridScript.html'){} %>]]>
+<% include('/templates/modules/gen/view/dataGridScript.html'){} %>]]>
 	</content>
 </template>

modules/core/src/main/resources/templates/modules/gen/view/viewForm.html

@@ -38,8 +38,8 @@
 					</div>
 				</div>
 			<% } %>
-				<% include('/templates/modules/gen/include/formControl.html'){} %>
-				<% include('/templates/modules/gen/include/formChildTable.html'){} %>
+				<% include('/templates/modules/gen/view/formControl.html'){} %>
+				<% include('/templates/modules/gen/view/formChildTable.html'){} %>
 			<% if(toBoolean(table.optionMap['isBpmForm'])){ %>
 				<div class="row taskComment hide">
 					<div class="col-xs-12">
@@ -78,7 +78,7 @@
 	</div>
 </div>
 \<% } %>
-<% include('/templates/modules/gen/include/formChildTableScript.html'){} %>
+<% include('/templates/modules/gen/view/formChildTableScript.html'){} %>
 <script>
 <% if(toBoolean(table.optionMap['isBpmForm'])){ %>
 // 业务实现草稿按钮

modules/core/src/main/resources/templates/modules/gen/view/viewList.html

@@ -27,7 +27,7 @@
 			</div>
 		</div>
 		<div class="box-body">
-			<% include('/templates/modules/gen/include/searchForm.html'){} %>
+			<% include('/templates/modules/gen/view/searchForm.html'){} %>
 			<table id="dataGrid"></table>
 			<% if(!table.isTreeEntity){ %>
 			<div id="dataGridPage"></div>
@@ -36,7 +36,7 @@
 	</div>
 </div>
 \<% } %>
-<% include('/templates/modules/gen/include/dataGridScript.html'){} %>
+<% include('/templates/modules/gen/view/dataGridScript.html'){} %>
 <% if(toBoolean(table.optionMap['isImportExport'])){ %>
 <script>
 $('#btnExport').click(function(){

modules/core/src/main/resources/templates/modules/gen/view/viewSelect.html

@@ -2,7 +2,7 @@
 <div class="main-content">
 	<div class="box box-main">
 		<div class="box-body">
-			<% include('/templates/modules/gen/include/searchForm.html'){} %>
+			<% include('/templates/modules/gen/view/searchForm.html'){} %>
 			<div class="row">
 				<div class="col-xs-10 pr10">
 					<table id="dataGrid"></table>
@@ -18,4 +18,4 @@
 	</div>
 </div>
 \<% } %>
-<% include('/templates/modules/gen/include/dataGridSelectScript.html'){} %>
+<% include('/templates/modules/gen/view/dataGridSelectScript.html'){} %>