diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/controller.java.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/controller.java.ftl
index 9b39684b8..4409a237e 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/controller.java.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/controller.java.ftl
@@ -59,10 +59,10 @@ public class ${ClassName}Controller extends BaseController {
}
+<#if enableExport>
/**
* 导出${functionName}列表
*/
-<#if enableExport>
@SaCheckPermission("${permissionPrefix}:export")
@Log(title = "${functionName}", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@@ -153,5 +153,3 @@ public class ${ClassName}Controller extends BaseController {
return toAjax(${className}Service.deleteWithValidByIds(List.of(${pkColumn.javaField}s), true));
}
}
-
-
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/domain.java.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/domain.java.ftl
index c1fda8a5c..de2a61419 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/domain.java.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/domain.java.ftl
@@ -46,5 +46,3 @@ public class ${ClassName} extends BaseEntity {
}
-
-
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/mapper.java.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/mapper.java.ftl
index acf164c78..0922401ec 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/mapper.java.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/mapper.java.ftl
@@ -13,6 +13,3 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
public interface ${ClassName}Mapper extends BaseMapperPlus<${ClassName}, ${ClassName}Vo> {
}
-
-
-
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/service.java.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/service.java.ftl
index 60688565b..be04d6f89 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/service.java.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/service.java.ftl
@@ -101,7 +101,5 @@ public interface I${ClassName}Service {
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
+
}
-
-
-
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/serviceImpl.java.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/serviceImpl.java.ftl
index 8a9b14644..c6cc3187d 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/serviceImpl.java.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/serviceImpl.java.ftl
@@ -43,7 +43,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
private final ${ClassName}Mapper ${className}Mapper;
-/**
+ /**
* 查询${functionName}
*
* @param ${pkColumn.javaField} 主键
@@ -342,6 +342,5 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
}
return ${className}Mapper.deleteByIds(ids) > 0;
}
+
}
-
-
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/vo.java.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/vo.java.ftl
index 0acd4df15..5abade8fc 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/vo.java.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/vo.java.ftl
@@ -17,8 +17,6 @@ import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
-
-
/**
* ${functionName}视图对象 ${tableName}
*
@@ -61,5 +59,3 @@ public class ${ClassName}Vo implements Serializable {
}
-
-
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/react/api.ts.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/react/api.ts.ftl
index a02ce3855..9ad172583 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/react/api.ts.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/react/api.ts.ftl
@@ -92,7 +92,3 @@ export function del${BusinessName}(${pkColumn.javaField}: string | number | Arra
method: 'delete'
});
}
-
-
-
-
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/react/index-tree.tsx.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/react/index-tree.tsx.ftl
index 0bbaeb847..6c8eb4110 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/react/index-tree.tsx.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/react/index-tree.tsx.ftl
@@ -367,8 +367,7 @@ export default function ${BusinessName}Page() {
<#list columns as column>
<#if (column.insert || column.edit) && !column.pk>
-<#assign field = column.javaField>
-<#if field == treeParentCode>
+<#if column.javaField == treeParentCode>
);
}
-
-
-
-
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/react/index.tsx.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/react/index.tsx.ftl
index df3691cea..b6444d222 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/react/index.tsx.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/react/index.tsx.ftl
@@ -361,7 +361,6 @@ query = apply${column.capJavaField}DateRange(query, params.${column.javaField}Ra
<#list columns as column>
<#if (column.insert || column.edit) && !column.pk>
-<#assign field = column.javaField>
<#if column.htmlType == "input">
rules={[{ required: true, message: '${column.columnLabel}不能为空' }]} />
<#elseif column.htmlType == "textarea">
@@ -405,7 +404,3 @@ query = apply${column.capJavaField}DateRange(query, params.${column.javaField}Ra
);
}
-
-
-
-
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/react/types.ts.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/react/types.ts.ftl
index 1d3d8dc79..368751fcc 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/react/types.ts.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/react/types.ts.ftl
@@ -52,6 +52,3 @@ export interface ${BusinessName}Query<#if !table.tree> extends PageQuery {
*/
params?: Record;
}
-
-
-
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/mysql.sql.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/mysql.sql.ftl
index 88e7a492a..41cca8179 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/mysql.sql.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/mysql.sql.ftl
@@ -14,9 +14,7 @@ values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, 3, '#
insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, 4, '#', '', 'N', 'Y', 'F', '0', '0', '${permissionPrefix}:remove', '#', 1761000000000000103, 1761100000000000001, sysdate(), null, null, '');
-
+<#if enableExport>
insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, 5, '#', '', 'N', 'Y', 'F', '0', '0', '${permissionPrefix}:export', '#', 1761000000000000103, 1761100000000000001, sysdate(), null, null, '');
-
-
-
+
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/oracle.sql.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/oracle.sql.ftl
index 5a736472c..b348a4446 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/oracle.sql.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/oracle.sql.ftl
@@ -14,9 +14,7 @@ values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, 3, '#
insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, 4, '#', '', 'N', 'Y', 'F', '0', '0', '${permissionPrefix}:remove', '#', 1761000000000000103, 1761100000000000001, sysdate, null, null, '');
-
+<#if enableExport>
insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, 5, '#', '', 'N', 'Y', 'F', '0', '0', '${permissionPrefix}:export', '#', 1761000000000000103, 1761100000000000001, sysdate, null, null, '');
-
-
-
+
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/postgres.sql.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/postgres.sql.ftl
index 9de54bfff..be0e18832 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/postgres.sql.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/postgres.sql.ftl
@@ -14,10 +14,7 @@ values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, 3, '#
insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, 4, '#', '', 'N', 'Y', 'F', '0', '0', '${permissionPrefix}:remove', '#', 1761000000000000103, 1761100000000000001, now(), null, null, '');
-
+<#if enableExport>
insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, 5, '#', '', 'N', 'Y', 'F', '0', '0', '${permissionPrefix}:export', '#', 1761000000000000103, 1761100000000000001, now(), null, null, '');
-
-
-
-
+
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/sqlserver.sql.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/sqlserver.sql.ftl
index 7568f5e05..8dbca931b 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/sqlserver.sql.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/sqlserver.sql.ftl
@@ -14,9 +14,7 @@ values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, 3, '#
insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, 4, '#', '', 'N', 'Y', 'F', '0', '0', '${permissionPrefix}:remove', '#', 1761000000000000103, 1761100000000000001, getdate(), null, null, '');
-
+<#if enableExport>
insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, 5, '#', '', 'N', 'Y', 'F', '0', '0', '${permissionPrefix}:export', '#', 1761000000000000103, 1761100000000000001, getdate(), null, null, '');
-
-
-
+
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/api.ts.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/api.ts.ftl
index 62c1ae2c5..61a111b4f 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/api.ts.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/api.ts.ftl
@@ -1,5 +1,7 @@
import type { ${BusinessName}Form, ${BusinessName}Query, ${BusinessName}VO } from '@/api/${moduleName}/${businessName}/types';
+<#if !table.tree>
import type { PageResult } from '@/api/types';
+
import type { AxiosPromise } from '@/utils/api-types';
import request from '@/utils/request';
@@ -8,8 +10,7 @@ import request from '@/utils/request';
* @param query
* @returns {*}
*/
-
-export const list${BusinessName} = (query?: ${BusinessName}Query): AxiosPromise> => {
+export const list${BusinessName} = (query?: ${BusinessName}Query): AxiosPromise<<#if table.tree>${BusinessName}VO[]<#else>PageResult<${BusinessName}VO>> => {
return request({
url: '/${moduleName}/${businessName}/list',
method: 'get',
@@ -98,6 +99,3 @@ export const del${BusinessName} = (${pkColumn.javaField}: string | number | Arra
method: 'delete'
});
};
-
-
-
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/index-tree.vue.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/index-tree.vue.ftl
index cbceb9cbf..3f7e09554 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/index-tree.vue.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/index-tree.vue.ftl
@@ -45,7 +45,7 @@
-<#elseif (column.htmlType == "select" || column.htmlType == "radio") && column.dictType?has_content>
+<#elseif (column.htmlType == "select" || column.htmlType == "radio") && !(column.dictType?has_content)>
@@ -312,7 +312,7 @@
>
-<#elseif column.htmlType == "select" && column.dictType?has_content>
+<#elseif column.htmlType == "select" && !(column.dictType?has_content)>
@@ -329,7 +329,7 @@
-<#elseif column.htmlType == "checkbox" && column.dictType?has_content>
+<#elseif column.htmlType == "checkbox" && !(column.dictType?has_content)>
请选择字典生成
@@ -349,7 +349,7 @@
>{{dict.label}}
-<#elseif column.htmlType == "radio" && column.dictType?has_content>
+<#elseif column.htmlType == "radio" && !(column.dictType?has_content)>
请选择字典生成
@@ -689,4 +689,3 @@ onMounted(() => {
getList();
});
-
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/index.vue.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/index.vue.ftl
index 9bacf6fde..59df6cc5c 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/index.vue.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/index.vue.ftl
@@ -45,7 +45,7 @@
-<#elseif (column.htmlType == "select" || column.htmlType == "radio") && column.dictType?has_content>
+<#elseif (column.htmlType == "select" || column.htmlType == "radio") && !(column.dictType?has_content)>
@@ -60,7 +60,7 @@
placeholder="请选择${column.columnLabel}"
/>
-<#elseif column.htmlType == "datetime" && column.queryType == "BETWEEN">
+<#elseif column.htmlType == "datetime" && column.queryType == "BETWEEN" && column.query>
<#list columns as column>
-<#if (column.insert || column.edit) && !column.pk>`n<#if column.htmlType == "input">
+<#if (column.insert || column.edit) && !column.pk>
+<#if column.htmlType == "input">
@@ -268,7 +269,7 @@
>
-<#elseif column.htmlType == "select" && column.dictType?has_content>
+<#elseif column.htmlType == "select" && !(column.dictType?has_content)>
@@ -285,7 +286,7 @@
-<#elseif column.htmlType == "checkbox" && column.dictType?has_content>
+<#elseif column.htmlType == "checkbox" && !(column.dictType?has_content)>
请选择字典生成
@@ -305,7 +306,7 @@
>{{dict.label}}
-<#elseif column.htmlType == "radio" && column.dictType?has_content>
+<#elseif column.htmlType == "radio" && !(column.dictType?has_content)>
请选择字典生成
@@ -380,6 +381,9 @@ import { useTableSelection } from '@/hooks/table/useTableSelection';
<#if needDict>
import { useDict } from '@/utils/dict';
+<#if needParseTime>
+import { parseTime } from '@/utils/ruoyi';
+
import modal from '@/plugins/modal';
<#if enableExport>
import { download as requestDownload } from '@/utils/request';
@@ -400,7 +404,7 @@ const { loading, withLoading } = useLoading(true);
const { showSearch } = useSearchToggle();
const total = ref(0);
<#list columns as column>
-<#if column.htmlType == "datetime" && column.queryType == "BETWEEN">
+<#if column.htmlType == "datetime" && column.queryType == "BETWEEN" && column.query>
const {
dateRange: dateRange${column.capJavaField},
applyDateRange: apply${column.capJavaField}DateRange,
@@ -472,7 +476,7 @@ const getList = async () => {
<#if needAddDateRange>
let params = queryParams.value;
<#list columns as column>
-<#if column.htmlType == "datetime" && column.queryType == "BETWEEN">
+<#if column.htmlType == "datetime" && column.queryType == "BETWEEN" && column.query>
params = apply${column.capJavaField}DateRange(params);
@@ -505,7 +509,7 @@ const { resetQuery } = useSearchReset({
initialPageSize: 10,
resetExtras: () => {
<#list columns as column>
-<#if column.htmlType == "datetime" && column.queryType == "BETWEEN">
+<#if column.htmlType == "datetime" && column.queryType == "BETWEEN" && column.query>
reset${column.capJavaField}DateRange();
@@ -565,8 +569,8 @@ const handleDelete = async (row?: Partial<${BusinessName}VO>) => {
await getList();
};
-/** 导出按钮操作 */
<#if enableExport>
+/** 导出按钮操作 */
const handleExport = () => {
requestDownload(
'${moduleName}/${businessName}/export',
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/types.ts.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/types.ts.ftl
index bd2d5cfa5..de4d9c9af 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/types.ts.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/types.ts.ftl
@@ -1,5 +1,3 @@
-import type { BaseEntity<#if !table.tree>, PageQuery } from '@/api/types';
-
export interface ${BusinessName}VO {
<#list columns as column>
<#if column.list>
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/xml/mapper.xml.ftl b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/xml/mapper.xml.ftl
index d99206849..1c76ad8de 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/fm/xml/mapper.xml.ftl
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/fm/xml/mapper.xml.ftl
@@ -4,6 +4,3 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-
-