From 6c3ecdac63eda8b80833ea11e622bfaf49a59901 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 27 Sep 2024 15:05:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=96=B0=E5=A2=9EclassNameSimple=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=B8=A6=E6=A8=A1=E5=9D=97=E5=90=8D=E7=9A=84?=
 =?UTF-8?q?=E7=B1=BB=E5=90=8D=E3=80=82=E5=AD=90=E8=A1=A8List=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8D=E4=B8=8D=E5=B8=A6=E6=A8=A1=E5=9D=97=E5=90=8D?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/modules/gen/crud/controller.xml |  2 +-
 .../templates/modules/gen/crud/entity.xml     | 10 ++---
 .../templates/modules/gen/crud/service.xml    |  4 +-
 .../templates/modules/gen/crud/vueApi.xml     |  2 +-
 .../templates/modules/gen/crud/vueForm.xml    | 38 +++++++++----------
 .../modules/gen/crud/vueFormRoute.xml         | 38 +++++++++----------
 .../modules/gen/crud_cloud/controller.xml     |  2 +-
 .../modules/gen/crud_cloud/entity.xml         | 10 ++---
 .../modules/gen/crud_cloud/service.xml        |  4 +-
 .../modules/gen/include/formChildTable.html   |  4 +-
 .../gen/include/formChildTableScript.html     | 12 +++---
 .../modules/gen/query/controller.xml          |  2 +-
 .../templates/modules/gen/query/service.xml   |  2 +-
 13 files changed, 65 insertions(+), 65 deletions(-)

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 1f61a435..4aa4d01a 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
@@ -146,7 +146,7 @@ public class ${ClassName}Controller extends BaseController {
 	 * 查询子表数据
 	 */
 	@RequiresPermissions("${permissionPrefix}:view")
-	@RequestMapping(value = "${@StringUtils.uncap(child.className)}ListData")
+	@RequestMapping(value = "${@StringUtils.uncap(child.classNameSimple)}ListData")
 	@ResponseBody
 	public Page<${@StringUtils.cap(child.className)}> subListData(${@StringUtils.cap(child.className)} ${@StringUtils.uncap(child.className)}, HttpServletRequest request, HttpServletResponse response) {
 		${@StringUtils.uncap(child.className)}.setPage(new Page<>(request, response));
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
index ec91b0fa..0d38519a 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
@@ -213,7 +213,7 @@ public class ${ClassName} extends ${toBoolean(table.optionMap['isBpmForm'])?(tab
 	// 生成子表列表字段
 	for(child in table.childList){
 	%>
-	private List<${@StringUtils.cap(child.className)}> ${@StringUtils.uncap(child.className)}List = ListUtils.newArrayList();		// 子表列表
+	private List<${@StringUtils.cap(child.className)}> ${@StringUtils.uncap(child.classNameSimple)}List = ListUtils.newArrayList();		// 子表列表
 	<%
 	}
 	
@@ -366,12 +366,12 @@ public class ${ClassName} extends ${toBoolean(table.optionMap['isBpmForm'])?(tab
 	%>
 	
 	@Valid
-	public List<${@StringUtils.cap(child.className)}> get${@StringUtils.cap(child.className)}List() {
-		return ${@StringUtils.uncap(child.className)}List;
+	public List<${@StringUtils.cap(child.className)}> get${@StringUtils.cap(child.classNameSimple)}List() {
+		return ${@StringUtils.uncap(child.classNameSimple)}List;
 	}
 
-	public void set${@StringUtils.cap(child.className)}List(List<${@StringUtils.cap(child.className)}> ${@StringUtils.uncap(child.className)}List) {
-		this.${@StringUtils.uncap(child.className)}List = ${@StringUtils.uncap(child.className)}List;
+	public void set${@StringUtils.cap(child.classNameSimple)}List(List<${@StringUtils.cap(child.className)}> ${@StringUtils.uncap(child.classNameSimple)}List) {
+		this.${@StringUtils.uncap(child.classNameSimple)}List = ${@StringUtils.uncap(child.classNameSimple)}List;
 	}
 	<% } %>
 	
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml
index 75afabc3..8bd4111f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml
@@ -70,7 +70,7 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Crud'}Serv
 			<% for (child in table.childList){ %>
 			${@StringUtils.cap(child.className)} ${@StringUtils.uncap(child.className)} = new ${@StringUtils.cap(child.className)}(entity);
 			${@StringUtils.uncap(child.className)}.setStatus(${@StringUtils.cap(child.className)}.STATUS_NORMAL);
-			entity.set${@StringUtils.cap(child.className)}List(${@StringUtils.uncap(child.className)}Dao.findList(${@StringUtils.uncap(child.className)}));
+			entity.set${@StringUtils.cap(child.classNameSimple)}List(${@StringUtils.uncap(child.className)}Dao.findList(${@StringUtils.uncap(child.className)}));
 			<% } %>
 		}
 		return entity;
@@ -168,7 +168,7 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Crud'}Serv
 	<% } %>
 	<% for (child in table.childList) { %>
 		// 保存 ${ClassName}子表
-		for (${@StringUtils.cap(child.className)} ${@StringUtils.uncap(child.className)} : ${className}.get${@StringUtils.cap(child.className)}List()){
+		for (${@StringUtils.cap(child.className)} ${@StringUtils.uncap(child.className)} : ${className}.get${@StringUtils.cap(child.classNameSimple)}List()){
 			if (!${@StringUtils.cap(child.className)}.STATUS_DELETE.equals(${@StringUtils.uncap(child.className)}.getStatus())){
 				<%
 				for(c in child.columnList){
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueApi.xml b/modules/core/src/main/resources/templates/modules/gen/crud/vueApi.xml
index 5952854c..a5293e74 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/vueApi.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/vueApi.xml
@@ -72,7 +72,7 @@ for(c in table.columnList){
 %>
 <% // 生成子表列表字段
 for(child in table.childList){ %>
-  ${@StringUtils.uncap(child.className)}List?: any[]; // 子表列表
+  ${@StringUtils.uncap(child.classNameSimple)}List?: any[]; // 子表列表
 <% } %>
 }
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml b/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml
index e16abc67..47845f76 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml
@@ -28,7 +28,7 @@
     <% if (table.childList.~size > 0){ %>
     <BasicForm @register="registerForm">
       <% for (child in table.childList){ %>
-      <template #${@StringUtils.uncap(child.className)}List>
+      <template #${@StringUtils.uncap(child.classNameSimple)}List>
         <BasicTable
           @register="register${child.className}Table"
           @row-click="handle${child.className}RowClick"
@@ -352,10 +352,10 @@ for (c in table.columnList){
   for (child in table.childList){ %>
     {
       label: t('${child.comments}'),
-      field: '${@StringUtils.uncap(child.className)}List',
+      field: '${@StringUtils.uncap(child.classNameSimple)}List',
       component: 'Input',
       colProps: { md: 24, lg: 24 },
-      slot: '${@StringUtils.uncap(child.className)}List',
+      slot: '${@StringUtils.uncap(child.classNameSimple)}List',
     },
 <%
   }
@@ -446,7 +446,7 @@ for (c in table.columnList){
   });
 <% for (child in table.childList){ %>
 
-  const [register${child.className}Table, ${@StringUtils.uncap(child.className)}Table] = useTable({
+  const [register${child.className}Table, ${@StringUtils.uncap(child.classNameSimple)}Table] = useTable({
     actionColumn: {
       width: 60,
       actions: (record: Recordable) => [
@@ -469,7 +469,7 @@ for (c in table.columnList){
   });
 
   async function set${child.className}TableData(_res: Recordable) {
-    ${@StringUtils.uncap(child.className)}Table.setColumns([
+    ${@StringUtils.uncap(child.classNameSimple)}Table.setColumns([
   <%
   for (c in child.columnList){
     if (c.isEdit != '1' || c.isPk == '1'){
@@ -577,7 +577,7 @@ for (c in table.columnList){
   }
   %>
     ]);
-    ${@StringUtils.uncap(child.className)}Table.setTableData(record.value.${@StringUtils.uncap(child.className)}List || []);
+    ${@StringUtils.uncap(child.classNameSimple)}Table.setTableData(record.value.${@StringUtils.uncap(child.classNameSimple)}List || []);
   }
 
   function handle${child.className}RowClick(record: Recordable) {
@@ -585,7 +585,7 @@ for (c in table.columnList){
   }
 
   function handle${child.className}Add() {
-    ${@StringUtils.uncap(child.className)}Table.insertTableDataRecord({
+    ${@StringUtils.uncap(child.classNameSimple)}Table.insertTableDataRecord({
       id: new Date().getTime(),
       isNewRecord: true,
       editable: true,
@@ -593,35 +593,35 @@ for (c in table.columnList){
   }
 
   function handle${child.className}Delete(record: Recordable) {
-    ${@StringUtils.uncap(child.className)}Table.deleteTableDataRecord(record);
+    ${@StringUtils.uncap(child.classNameSimple)}Table.deleteTableDataRecord(record);
   }
 
   async function get${child.className}List() {
-    let ${@StringUtils.uncap(child.className)}ListValid = true;
-    let ${@StringUtils.uncap(child.className)}List: Recordable[] = [];
-    for (const record of ${@StringUtils.uncap(child.className)}Table.getDataSource()) {
+    let ${@StringUtils.uncap(child.classNameSimple)}ListValid = true;
+    let ${@StringUtils.uncap(child.classNameSimple)}List: Recordable[] = [];
+    for (const record of ${@StringUtils.uncap(child.classNameSimple)}Table.getDataSource()) {
       if (!(await record.onEdit?.(false, true))) {
-        ${@StringUtils.uncap(child.className)}ListValid = false;
+        ${@StringUtils.uncap(child.classNameSimple)}ListValid = false;
       }
-      ${@StringUtils.uncap(child.className)}List.push({
+      ${@StringUtils.uncap(child.classNameSimple)}List.push({
         ...record,
         id: !!record.isNewRecord ? '' : record.id,
       });
     }
-    for (const record of ${@StringUtils.uncap(child.className)}Table.getDelDataSource()) {
+    for (const record of ${@StringUtils.uncap(child.classNameSimple)}Table.getDelDataSource()) {
       if (!!record.isNewRecord) continue;
-      ${@StringUtils.uncap(child.className)}List.push({
+      ${@StringUtils.uncap(child.classNameSimple)}List.push({
         ...record,
         status: '1',
       });
     }
-    if (!${@StringUtils.uncap(child.className)}ListValid) {
+    if (!${@StringUtils.uncap(child.classNameSimple)}ListValid) {
       throw {
-        errorFields: [{ name: ['${@StringUtils.uncap(child.className)}List'] }],
+        errorFields: [{ name: ['${@StringUtils.uncap(child.classNameSimple)}List'] }],
         message: t('${child.comments}填写有误，请根据提示修正'),
       };
     }
-    return ${@StringUtils.uncap(child.className)}List;
+    return ${@StringUtils.uncap(child.classNameSimple)}List;
   }
 <% } %>
 
@@ -688,7 +688,7 @@ for (c in table.columnList){
   %>
       };
     <% for (child in table.childList){ %>
-      data.${@StringUtils.uncap(child.className)}List = await get${child.className}List();
+      data.${@StringUtils.uncap(child.classNameSimple)}List = await get${child.className}List();
     <% } %>
     <% if(table.isTreeEntity){ %>
       data.oldParentCode = record.value.parentCode;
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueFormRoute.xml b/modules/core/src/main/resources/templates/modules/gen/crud/vueFormRoute.xml
index 6268379d..f4c133d5 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/vueFormRoute.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/vueFormRoute.xml
@@ -26,7 +26,7 @@
     <% for (child in table.childList){ %>
     <template #${@StringUtils.uncap(child.className)}>
       <BasicForm @register="register${child.className}Form">
-        <template #${@StringUtils.uncap(child.className)}List>
+        <template #${@StringUtils.uncap(child.classNameSimple)}List>
           <BasicTable
             @register="register${child.className}Table"
             @row-click="handle${child.className}RowClick"
@@ -370,10 +370,10 @@ for (c in table.columnList){
 
   const input${child.className}FormSchemas: FormSchema[] = [
     {
-      field: '${@StringUtils.uncap(child.className)}List',
+      field: '${@StringUtils.uncap(child.classNameSimple)}List',
       component: 'Input',
       colProps: { md: 24, lg: 24 },
-      slot: '${@StringUtils.uncap(child.className)}List',
+      slot: '${@StringUtils.uncap(child.classNameSimple)}List',
     },
   ];
 <%
@@ -473,7 +473,7 @@ for (c in table.columnList){
     baseColProps: { md: 24, lg: 24 },
   });
 
-  const [register${child.className}Table, ${@StringUtils.uncap(child.className)}Table] = useTable({
+  const [register${child.className}Table, ${@StringUtils.uncap(child.classNameSimple)}Table] = useTable({
     actionColumn: {
       width: 60,
       actions: (record: Recordable) => [
@@ -496,7 +496,7 @@ for (c in table.columnList){
   });
 
   async function set${child.className}TableData(_res: Recordable) {
-    ${@StringUtils.uncap(child.className)}Table.setColumns([
+    ${@StringUtils.uncap(child.classNameSimple)}Table.setColumns([
   <%
   for (c in child.columnList){
     if (c.isEdit != '1' || c.isPk == '1'){
@@ -604,7 +604,7 @@ for (c in table.columnList){
   }
   %>
     ]);
-    ${@StringUtils.uncap(child.className)}Table.setTableData(record.value.${@StringUtils.uncap(child.className)}List || []);
+    ${@StringUtils.uncap(child.classNameSimple)}Table.setTableData(record.value.${@StringUtils.uncap(child.classNameSimple)}List || []);
   }
 
   function handle${child.className}RowClick(record: Recordable) {
@@ -612,7 +612,7 @@ for (c in table.columnList){
   }
 
   function handle${child.className}Add() {
-    ${@StringUtils.uncap(child.className)}Table.insertTableDataRecord({
+    ${@StringUtils.uncap(child.classNameSimple)}Table.insertTableDataRecord({
       id: new Date().getTime(),
       isNewRecord: true,
       editable: true,
@@ -620,35 +620,35 @@ for (c in table.columnList){
   }
 
   function handle${child.className}Delete(record: Recordable) {
-    ${@StringUtils.uncap(child.className)}Table.deleteTableDataRecord(record);
+    ${@StringUtils.uncap(child.classNameSimple)}Table.deleteTableDataRecord(record);
   }
 
   async function get${child.className}List() {
-    let ${@StringUtils.uncap(child.className)}ListValid = true;
-    let ${@StringUtils.uncap(child.className)}List: Recordable[] = [];
-    for (const record of ${@StringUtils.uncap(child.className)}Table.getDataSource()) {
+    let ${@StringUtils.uncap(child.classNameSimple)}ListValid = true;
+    let ${@StringUtils.uncap(child.classNameSimple)}List: Recordable[] = [];
+    for (const record of ${@StringUtils.uncap(child.classNameSimple)}Table.getDataSource()) {
       if (!(await record.onEdit?.(false, true))) {
-        ${@StringUtils.uncap(child.className)}ListValid = false;
+        ${@StringUtils.uncap(child.classNameSimple)}ListValid = false;
       }
-      ${@StringUtils.uncap(child.className)}List.push({
+      ${@StringUtils.uncap(child.classNameSimple)}List.push({
         ...record,
         id: !!record.isNewRecord ? '' : record.id,
       });
     }
-    for (const record of ${@StringUtils.uncap(child.className)}Table.getDelDataSource()) {
+    for (const record of ${@StringUtils.uncap(child.classNameSimple)}Table.getDelDataSource()) {
       if (!!record.isNewRecord) continue;
-      ${@StringUtils.uncap(child.className)}List.push({
+      ${@StringUtils.uncap(child.classNameSimple)}List.push({
         ...record,
         status: '1',
       });
     }
-    if (!${@StringUtils.uncap(child.className)}ListValid) {
+    if (!${@StringUtils.uncap(child.classNameSimple)}ListValid) {
       throw {
-        errorFields: [{ name: ['${@StringUtils.uncap(child.className)}List'] }],
+        errorFields: [{ name: ['${@StringUtils.uncap(child.classNameSimple)}List'] }],
         message: t('${child.comments}填写有误，请根据提示修正'),
       };
     }
-    return ${@StringUtils.uncap(child.className)}List;
+    return ${@StringUtils.uncap(child.classNameSimple)}List;
   }
 <% } %>
 
@@ -742,7 +742,7 @@ for (c in table.columnList){
   %>
       };
     <% for (child in table.childList){ %>
-      data.${@StringUtils.uncap(child.className)}List = await get${child.className}List();
+      data.${@StringUtils.uncap(child.classNameSimple)}List = await get${child.className}List();
     <% } %>
     <% if(table.isTreeEntity){ %>
       data.oldParentCode = record.value.parentCode;
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 ba0cdca9..eb4c72d4 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
@@ -148,7 +148,7 @@ public class ${ClassName}Controller extends BaseController {
 	 * 查询子表数据
 	 */
 	@RequiresPermissions("${permissionPrefix}:view")
-	@RequestMapping(value = "${@StringUtils.uncap(child.className)}ListData")
+	@RequestMapping(value = "${@StringUtils.uncap(child.classNameSimple)}ListData")
 	@ResponseBody
 	public Page<${@StringUtils.cap(child.className)}> subListData(${@StringUtils.cap(child.className)} ${@StringUtils.uncap(child.className)}, HttpServletRequest request, HttpServletResponse response) {
 		${@StringUtils.uncap(child.className)}.setPage(new Page<>(request, response));
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
index db97879c..3ade33db 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
@@ -213,7 +213,7 @@ public class ${ClassName} extends ${toBoolean(table.optionMap['isBpmForm'])?(tab
 	// 生成子表列表字段
 	for(child in table.childList){
 	%>
-	private List<${@StringUtils.cap(child.className)}> ${@StringUtils.uncap(child.className)}List = ListUtils.newArrayList();		// 子表列表
+	private List<${@StringUtils.cap(child.className)}> ${@StringUtils.uncap(child.classNameSimple)}List = ListUtils.newArrayList();		// 子表列表
 	<%
 	}
 	
@@ -366,12 +366,12 @@ public class ${ClassName} extends ${toBoolean(table.optionMap['isBpmForm'])?(tab
 	%>
 	
 	@Valid
-	public List<${@StringUtils.cap(child.className)}> get${@StringUtils.cap(child.className)}List() {
-		return ${@StringUtils.uncap(child.className)}List;
+	public List<${@StringUtils.cap(child.className)}> get${@StringUtils.cap(child.classNameSimple)}List() {
+		return ${@StringUtils.uncap(child.classNameSimple)}List;
 	}
 
-	public void set${@StringUtils.cap(child.className)}List(List<${@StringUtils.cap(child.className)}> ${@StringUtils.uncap(child.className)}List) {
-		this.${@StringUtils.uncap(child.className)}List = ${@StringUtils.uncap(child.className)}List;
+	public void set${@StringUtils.cap(child.classNameSimple)}List(List<${@StringUtils.cap(child.className)}> ${@StringUtils.uncap(child.classNameSimple)}List) {
+		this.${@StringUtils.uncap(child.classNameSimple)}List = ${@StringUtils.uncap(child.classNameSimple)}List;
 	}
 	<% } %>
 	
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
index c75fb012..c9caeb29 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
@@ -76,7 +76,7 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Crud'}Serv
 			<% for (child in table.childList){ %>
 			${@StringUtils.cap(child.className)} ${@StringUtils.uncap(child.className)} = new ${@StringUtils.cap(child.className)}(entity);
 			${@StringUtils.uncap(child.className)}.setStatus(${@StringUtils.cap(child.className)}.STATUS_NORMAL);
-			entity.set${@StringUtils.cap(child.className)}List(${@StringUtils.uncap(child.className)}Dao.findList(${@StringUtils.uncap(child.className)}));
+			entity.set${@StringUtils.cap(child.classNameSimple)}List(${@StringUtils.uncap(child.className)}Dao.findList(${@StringUtils.uncap(child.className)}));
 			<% } %>
 		}
 		return entity;
@@ -175,7 +175,7 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Crud'}Serv
 	<% } %>
 	<% for (child in table.childList) { %>
 		// 保存 ${ClassName}子表
-		for (${@StringUtils.cap(child.className)} ${@StringUtils.uncap(child.className)} : ${className}.get${@StringUtils.cap(child.className)}List()){
+		for (${@StringUtils.cap(child.className)} ${@StringUtils.uncap(child.className)} : ${className}.get${@StringUtils.cap(child.classNameSimple)}List()){
 			if (!${@StringUtils.cap(child.className)}.STATUS_DELETE.equals(${@StringUtils.uncap(child.className)}.getStatus())){
 				<%
 				for(c in child.columnList){
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/formChildTable.html b/modules/core/src/main/resources/templates/modules/gen/include/formChildTable.html
index b15f3e26..b7248533 100644
--- a/modules/core/src/main/resources/templates/modules/gen/include/formChildTable.html
+++ b/modules/core/src/main/resources/templates/modules/gen/include/formChildTable.html
@@ -4,10 +4,10 @@
 %>
 				<div class="form-unit">\${text('${child.comments}')}</div>
 				<div class="form-unit-wrap table-form">
-					<table id="${@StringUtils.uncap(child.className)}DataGrid"></table>
+					<table id="${@StringUtils.uncap(child.classNameSimple)}DataGrid"></table>
 				<% if(table.tplCategory != 'query'){ %>
 					\<% if (hasPermi('${permissionPrefix}:edit')){ %>
-						<a href="#" id="${@StringUtils.uncap(child.className)}DataGridAddRowBtn" class="btn btn-primary btn-sm mt10 mb10"><i class="fa fa-plus"></i> \${text('增行')}</a>
+						<a href="#" id="${@StringUtils.uncap(child.classNameSimple)}DataGridAddRowBtn" class="btn btn-primary btn-sm mt10 mb10"><i class="fa fa-plus"></i> \${text('增行')}</a>
 					\<% } %>
 				<% } %>
 				</div>
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/formChildTableScript.html b/modules/core/src/main/resources/templates/modules/gen/include/formChildTableScript.html
index d1e860af..2d446ef2 100644
--- a/modules/core/src/main/resources/templates/modules/gen/include/formChildTableScript.html
+++ b/modules/core/src/main/resources/templates/modules/gen/include/formChildTableScript.html
@@ -6,9 +6,9 @@ var treeselectExists = false;
 for(child in table.childList){
 %>
 \//# // 初始化${child.comments}DataGrid对象
-$('#${@StringUtils.uncap(child.className)}DataGrid').dataGrid({
+$('#${@StringUtils.uncap(child.classNameSimple)}DataGrid').dataGrid({
 
-	data: \"#{toJson(${className}.${@StringUtils.uncap(child.className)}List)}",
+	data: \"#{toJson(${className}.${@StringUtils.uncap(child.classNameSimple)}List)}",
 	datatype: 'local', // 设置本地数据
 	autoGridHeight: function(){return 'auto'}, // 设置自动高度
 	
@@ -164,9 +164,9 @@ if (table.tplCategory != 'query'){
 		{header:'\${text("操作")}', name:'actions', width:80, align:'center', formatter: function(val, obj, row, act){
 			var actions = [];
 			if (val == 'new'){
-				actions.push('<a href="#" onclick="js.confirm(\'\${text("你确认要删除这条数据吗？")}\', function(){$(\'#${@StringUtils.uncap(child.className)}DataGrid\').dataGrid(\'delRowData\',\''+obj.rowId+'\')});return false;"><i class="fa fa-trash-o"></i></a>&nbsp;');
+				actions.push('<a href="#" onclick="js.confirm(\'\${text("你确认要删除这条数据吗？")}\', function(){$(\'#${@StringUtils.uncap(child.classNameSimple)}DataGrid\').dataGrid(\'delRowData\',\''+obj.rowId+'\')});return false;"><i class="fa fa-trash-o"></i></a>&nbsp;');
 			}else{
-				actions.push('<a href="#" onclick="js.confirm(\'\${text("你确认要删除这条数据吗？")}\', function(){$(\'#${@StringUtils.uncap(child.className)}DataGrid\').dataGrid(\'setRowData\',\''+obj.rowId+'\',null,{display:\'none\'});$(\'#'+obj.rowId+'_status\').val(\''+Global.STATUS_DELETE+'\');});return false;"><i class="fa fa-trash-o"></i></a>&nbsp;');
+				actions.push('<a href="#" onclick="js.confirm(\'\${text("你确认要删除这条数据吗？")}\', function(){$(\'#${@StringUtils.uncap(child.classNameSimple)}DataGrid\').dataGrid(\'setRowData\',\''+obj.rowId+'\',null,{display:\'none\'});$(\'#'+obj.rowId+'_status\').val(\''+Global.STATUS_DELETE+'\');});return false;"><i class="fa fa-trash-o"></i></a>&nbsp;');
 			}
 			return actions.join('');
 		}, editoptions: {defaultValue: 'new'}}
@@ -178,12 +178,12 @@ if (table.tplCategory != 'query'){
 	\//# // 编辑表格参数
 	editGrid: true,				// 是否是编辑表格
 	editGridInitRowNum: 1,		// 编辑表格的初始化新增行数
-	editGridAddRowBtn: $('#${@StringUtils.uncap(child.className)}DataGridAddRowBtn'),	// 子表增行按钮
+	editGridAddRowBtn: $('#${@StringUtils.uncap(child.classNameSimple)}DataGridAddRowBtn'),	// 子表增行按钮
 	editGridAddRowBtnToHeader: true,	// 子表增行按钮是否显示到表头上
 	editGridAddRowInitData: {<% for(pk in child.pkList){ %>${pk.attrName}<% break; }%>: '', status: Global.STATUS_NORMAL},	// 新增行的时候初始化的数据
 
 	\//# // 编辑表格的提交数据参数
-	editGridInputFormListName: '${@StringUtils.uncap(child.className)}List', // 提交的数据列表名
+	editGridInputFormListName: '${@StringUtils.uncap(child.classNameSimple)}List', // 提交的数据列表名
 	editGridInputFormListAttrs: 'status,<% for(c in child.columnList){if(c.attrName!="status"){%>${c.attrName},<% }} %>', // 提交数据列表的属性字段
 	
 	\//# // 加载成功后执行事件
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 59385d65..4875e27e 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
@@ -132,7 +132,7 @@ public class ${ClassName}Controller extends BaseController {
 	 * 查询子表数据
 	 */
 	@RequiresPermissions("${permissionPrefix}:view")
-	@RequestMapping(value = "${@StringUtils.uncap(child.className)}ListData")
+	@RequestMapping(value = "${@StringUtils.uncap(child.classNameSimple)}ListData")
 	@ResponseBody
 	public Page<${@StringUtils.cap(child.className)}> subListData(${@StringUtils.cap(child.className)} ${@StringUtils.uncap(child.className)}, HttpServletRequest request, HttpServletResponse response) {
 		${@StringUtils.uncap(child.className)}.setPage(new Page<>(request, response));
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/service.xml b/modules/core/src/main/resources/templates/modules/gen/query/service.xml
index 07465f47..3d4c804f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/service.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/service.xml
@@ -49,7 +49,7 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Query'}Ser
 			<% for (child in table.childList){ %>
 			${@StringUtils.cap(child.className)} ${@StringUtils.uncap(child.className)} = new ${@StringUtils.cap(child.className)}(entity);
 			${@StringUtils.uncap(child.className)}.setStatus(${@StringUtils.cap(child.className)}.STATUS_NORMAL);
-			entity.set${@StringUtils.cap(child.className)}List(${@StringUtils.uncap(child.className)}Dao.findList(${@StringUtils.uncap(child.className)}));
+			entity.set${@StringUtils.cap(child.classNameSimple)}List(${@StringUtils.uncap(child.className)}Dao.findList(${@StringUtils.uncap(child.className)}));
 			<% } %>
 		}
 		return entity;