From 805759db01fbc6a95352c9906b3bbc5ca5bae3a0 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 1 Nov 2024 10:44:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=A8=A1=E6=9D=BF=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/modules/gen/config.xml          | 58 +++++++++----------
 .../templates/modules/gen/crud/viewForm.xml   |  2 +-
 .../templates/modules/gen/crud/viewIndex.xml  |  2 +-
 .../templates/modules/gen/crud/viewList.xml   |  2 +-
 .../templates/modules/gen/crud/viewSelect.xml |  2 +-
 .../modules/gen/crud_cloud/viewForm.xml       |  2 +-
 .../modules/gen/crud_cloud/viewIndex.xml      |  2 +-
 .../modules/gen/crud_cloud/viewList.xml       |  2 +-
 .../modules/gen/crud_cloud/viewSelect.xml     |  2 +-
 .../templates/modules/gen/query/viewForm.xml  |  6 +-
 .../templates/modules/gen/query/viewList.xml  |  4 +-
 .../gen/{include => view}/dataGridScript.html |  0
 .../dataGridSelectScript.html                 |  0
 .../gen/{include => view}/formChildTable.html |  0
 .../formChildTableScript.html                 |  0
 .../gen/{include => view}/formControl.html    |  0
 .../gen/{include => view}/searchForm.html     |  0
 .../gen/{include => view}/viewForm.html       |  6 +-
 .../gen/{include => view}/viewIndex.html      |  0
 .../gen/{include => view}/viewList.html       |  4 +-
 .../gen/{include => view}/viewSelect.html     |  4 +-
 .../modules/gen/{crud => vue}/vueApi.xml      |  0
 .../modules/gen/{crud => vue}/vueForm.xml     |  0
 .../gen/{crud => vue}/vueFormChildList.xml    |  0
 .../gen/{crud => vue}/vueFormRoute.xml        |  0
 .../modules/gen/{crud => vue}/vueImport.xml   |  0
 .../modules/gen/{crud => vue}/vueIndex.xml    |  0
 .../modules/gen/{crud => vue}/vueList.xml     |  0
 .../modules/gen/{crud => vue}/vueSelect.xml   |  0
 29 files changed, 49 insertions(+), 49 deletions(-)
 rename modules/core/src/main/resources/templates/modules/gen/{include => view}/dataGridScript.html (100%)
 rename modules/core/src/main/resources/templates/modules/gen/{include => view}/dataGridSelectScript.html (100%)
 rename modules/core/src/main/resources/templates/modules/gen/{include => view}/formChildTable.html (100%)
 rename modules/core/src/main/resources/templates/modules/gen/{include => view}/formChildTableScript.html (100%)
 rename modules/core/src/main/resources/templates/modules/gen/{include => view}/formControl.html (100%)
 rename modules/core/src/main/resources/templates/modules/gen/{include => view}/searchForm.html (100%)
 rename modules/core/src/main/resources/templates/modules/gen/{include => view}/viewForm.html (93%)
 rename modules/core/src/main/resources/templates/modules/gen/{include => view}/viewIndex.html (100%)
 rename modules/core/src/main/resources/templates/modules/gen/{include => view}/viewList.html (94%)
 rename modules/core/src/main/resources/templates/modules/gen/{include => view}/viewSelect.html (75%)
 rename modules/core/src/main/resources/templates/modules/gen/{crud => vue}/vueApi.xml (100%)
 rename modules/core/src/main/resources/templates/modules/gen/{crud => vue}/vueForm.xml (100%)
 rename modules/core/src/main/resources/templates/modules/gen/{crud => vue}/vueFormChildList.xml (100%)
 rename modules/core/src/main/resources/templates/modules/gen/{crud => vue}/vueFormRoute.xml (100%)
 rename modules/core/src/main/resources/templates/modules/gen/{crud => vue}/vueImport.xml (100%)
 rename modules/core/src/main/resources/templates/modules/gen/{crud => vue}/vueIndex.xml (100%)
 rename modules/core/src/main/resources/templates/modules/gen/{crud => vue}/vueList.xml (100%)
 rename modules/core/src/main/resources/templates/modules/gen/{crud => vue}/vueSelect.xml (100%)

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 a7814d56..51439f4a 100644
--- a/modules/core/src/main/resources/templates/modules/gen/config.xml
+++ b/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） 仅后端">
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 c34676a1..0d1ea75d 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,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>
\ 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 c6f1e907..9aacd215 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,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>
\ 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 1d19b762..34bcc2b2 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,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>
\ 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 f90a8985..a22bcc85 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,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>
\ 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 5d5e8fc6..9712c399 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,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>
\ 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 8b73df3f..a0481252 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,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>
\ 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 a1a88158..dd7f9b47 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,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>
\ 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
index 48f0f332..0de4bfae 100644
--- 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
@@ -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>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml b/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml
index dcf5ae05..5e256af6 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml
+++ b/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>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml b/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml
index 8ebd7239..ff1abef6 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml
+++ b/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>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html b/modules/core/src/main/resources/templates/modules/gen/view/dataGridScript.html
similarity index 100%
rename from modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html
rename to modules/core/src/main/resources/templates/modules/gen/view/dataGridScript.html
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/dataGridSelectScript.html b/modules/core/src/main/resources/templates/modules/gen/view/dataGridSelectScript.html
similarity index 100%
rename from modules/core/src/main/resources/templates/modules/gen/include/dataGridSelectScript.html
rename to modules/core/src/main/resources/templates/modules/gen/view/dataGridSelectScript.html
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/formChildTable.html b/modules/core/src/main/resources/templates/modules/gen/view/formChildTable.html
similarity index 100%
rename from modules/core/src/main/resources/templates/modules/gen/include/formChildTable.html
rename to modules/core/src/main/resources/templates/modules/gen/view/formChildTable.html
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/formChildTableScript.html b/modules/core/src/main/resources/templates/modules/gen/view/formChildTableScript.html
similarity index 100%
rename from modules/core/src/main/resources/templates/modules/gen/include/formChildTableScript.html
rename to modules/core/src/main/resources/templates/modules/gen/view/formChildTableScript.html
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/formControl.html b/modules/core/src/main/resources/templates/modules/gen/view/formControl.html
similarity index 100%
rename from modules/core/src/main/resources/templates/modules/gen/include/formControl.html
rename to modules/core/src/main/resources/templates/modules/gen/view/formControl.html
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/searchForm.html b/modules/core/src/main/resources/templates/modules/gen/view/searchForm.html
similarity index 100%
rename from modules/core/src/main/resources/templates/modules/gen/include/searchForm.html
rename to modules/core/src/main/resources/templates/modules/gen/view/searchForm.html
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/viewForm.html b/modules/core/src/main/resources/templates/modules/gen/view/viewForm.html
similarity index 93%
rename from modules/core/src/main/resources/templates/modules/gen/include/viewForm.html
rename to modules/core/src/main/resources/templates/modules/gen/view/viewForm.html
index 19460e53..dc93d941 100644
--- a/modules/core/src/main/resources/templates/modules/gen/include/viewForm.html
+++ b/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'])){ %>
 // 业务实现草稿按钮
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/viewIndex.html b/modules/core/src/main/resources/templates/modules/gen/view/viewIndex.html
similarity index 100%
rename from modules/core/src/main/resources/templates/modules/gen/include/viewIndex.html
rename to modules/core/src/main/resources/templates/modules/gen/view/viewIndex.html
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/viewList.html b/modules/core/src/main/resources/templates/modules/gen/view/viewList.html
similarity index 94%
rename from modules/core/src/main/resources/templates/modules/gen/include/viewList.html
rename to modules/core/src/main/resources/templates/modules/gen/view/viewList.html
index d7462f94..6d75caa8 100644
--- a/modules/core/src/main/resources/templates/modules/gen/include/viewList.html
+++ b/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(){
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/viewSelect.html b/modules/core/src/main/resources/templates/modules/gen/view/viewSelect.html
similarity index 75%
rename from modules/core/src/main/resources/templates/modules/gen/include/viewSelect.html
rename to modules/core/src/main/resources/templates/modules/gen/view/viewSelect.html
index b49a3224..71f7e4c8 100644
--- a/modules/core/src/main/resources/templates/modules/gen/include/viewSelect.html
+++ b/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'){} %>
\ No newline at end of file
+<% include('/templates/modules/gen/view/dataGridSelectScript.html'){} %>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueApi.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
similarity index 100%
rename from modules/core/src/main/resources/templates/modules/gen/crud/vueApi.xml
rename to modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
similarity index 100%
rename from modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml
rename to modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueFormChildList.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml
similarity index 100%
rename from modules/core/src/main/resources/templates/modules/gen/crud/vueFormChildList.xml
rename to modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueFormRoute.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
similarity index 100%
rename from modules/core/src/main/resources/templates/modules/gen/crud/vueFormRoute.xml
rename to modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueImport.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml
similarity index 100%
rename from modules/core/src/main/resources/templates/modules/gen/crud/vueImport.xml
rename to modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueIndex.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml
similarity index 100%
rename from modules/core/src/main/resources/templates/modules/gen/crud/vueIndex.xml
rename to modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
similarity index 100%
rename from modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml
rename to modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueSelect.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml
similarity index 100%
rename from modules/core/src/main/resources/templates/modules/gen/crud/vueSelect.xml
rename to modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml