fix 修复代码生成模板导出逻辑与多余空行问题

ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/controller.java.ftl

@@ -59,10 +59,10 @@ public class ${ClassName}Controller extends BaseController {
     }
 </#if>
 
+<#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));
     }
 }
-
-

ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/domain.java.ftl

@@ -46,5 +46,3 @@ public class ${ClassName} extends BaseEntity {
 </#list>
 
 }
-
-

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> {
 
 }
-
-
-

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);
+
 }
-
-
-

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;
     }
+
 }
-
-

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 {
 </#list>
 
 }
-
-

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'
   });
 }
-
-
-
-

ruoyi-modules/ruoyi-gen/src/main/resources/fm/react/index-tree.tsx.ftl

@@ -367,8 +367,7 @@ export default function ${BusinessName}Page() {
         <ProFormText name="${pkColumn.javaField}" hidden />
 <#list columns as column>
 <#if (column.insert || column.edit) && !column.pk>
-<#assign field = column.javaField>
+<#if column.javaField == treeParentCode>
-<#if field == treeParentCode>
         <ProFormTreeSelect
           name="${column.javaField}"
           label="${column.columnLabel}"
@@ -423,7 +422,3 @@ export default function ${BusinessName}Page() {
     </PageContainer>
   );
 }
-
-
-
-

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
         <ProFormText name="${pkColumn.javaField}" hidden />
 <#list columns as column>
 <#if (column.insert || column.edit) && !column.pk>
-<#assign field = column.javaField>
 <#if column.htmlType == "input">
         <ProFormText name="${column.javaField}" label="${column.columnLabel}" <#if column.required>rules={[{ required: true, message: '${column.columnLabel}不能为空' }]}</#if> />
 <#elseif column.htmlType == "textarea">
@@ -405,7 +404,3 @@ query = apply${column.capJavaField}DateRange(query, params.${column.javaField}Ra
     </PageContainer>
   );
 }
-
-
-
-

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</#if> {
    */
   params?: Record<string, unknown>;
 }
-
-
-

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, '');
-
+</#if>
-
-

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, '');
-
+</#if>
-
-

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, '');
-
+</#if>
-
-
-

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, '');
-
+</#if>
-
-

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';
+</#if>
 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<<#if table.tree>${BusinessName}VO[]<#else>PageResult<${BusinessName}VO></#if>> => {
-export const list${BusinessName} = (query?: ${BusinessName}Query): AxiosPromise<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'
   });
 };
-
-
-

ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/index-tree.vue.ftl

@@ -45,7 +45,7 @@
 </#if>
               </el-select>
             </el-form-item>
-<#elseif (column.htmlType == "select" || column.htmlType == "radio") && column.dictType?has_content>
+<#elseif (column.htmlType == "select" || column.htmlType == "radio") && !(column.dictType?has_content)>
             <el-form-item label="${column.columnLabel}" prop="${column.javaField}">
               <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${column.columnLabel}" clearable>
                 <el-option label="请选择字典生成" value="" />
@@ -312,7 +312,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-<#elseif column.htmlType == "select" && column.dictType?has_content>
+<#elseif column.htmlType == "select" && !(column.dictType?has_content)>
         <el-form-item label="${column.columnLabel}" prop="${column.javaField}">
           <el-select v-model="form.${column.javaField}" placeholder="请选择${column.columnLabel}">
             <el-option label="请选择字典生成" value="" />
@@ -329,7 +329,7 @@
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-<#elseif column.htmlType == "checkbox" && column.dictType?has_content>
+<#elseif column.htmlType == "checkbox" && !(column.dictType?has_content)>
         <el-form-item label="${column.columnLabel}" prop="${column.javaField}">
           <el-checkbox-group v-model="form.${column.javaField}">
             <el-checkbox>请选择字典生成</el-checkbox>
@@ -349,7 +349,7 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-<#elseif column.htmlType == "radio" && column.dictType?has_content>
+<#elseif column.htmlType == "radio" && !(column.dictType?has_content)>
         <el-form-item label="${column.columnLabel}" prop="${column.javaField}">
           <el-radio-group v-model="form.${column.javaField}">
             <el-radio value="1">请选择字典生成</el-radio>
@@ -689,4 +689,3 @@ onMounted(() => {
   getList();
 });
 </script>
-

ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/index.vue.ftl

@@ -45,7 +45,7 @@
 </#if>
               </el-select>
             </el-form-item>
-<#elseif (column.htmlType == "select" || column.htmlType == "radio") && column.dictType?has_content>
+<#elseif (column.htmlType == "select" || column.htmlType == "radio") && !(column.dictType?has_content)>
             <el-form-item label="${column.columnLabel}" prop="${column.javaField}">
               <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${column.columnLabel}" clearable >
                 <el-option label="请选择字典生成" value="" />
@@ -60,7 +60,7 @@
                 placeholder="请选择${column.columnLabel}"
               />
             </el-form-item>
-<#elseif column.htmlType == "datetime" && column.queryType == "BETWEEN">
+<#elseif column.htmlType == "datetime" && column.queryType == "BETWEEN" && column.query>
             <el-form-item label="${column.columnLabel}" style="width: 308px">
               <el-date-picker
                 v-model="dateRange${column.capJavaField}"
@@ -233,7 +233,8 @@
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="${businessName}FormRef" :model="form" :rules="rules" label-width="80px">
 <#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">
         <el-form-item label="${column.columnLabel}" prop="${column.javaField}">
           <el-input v-model="form.${column.javaField}" placeholder="请输入${column.columnLabel}" />
         </el-form-item>
@@ -268,7 +269,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-<#elseif column.htmlType == "select" && column.dictType?has_content>
+<#elseif column.htmlType == "select" && !(column.dictType?has_content)>
         <el-form-item label="${column.columnLabel}" prop="${column.javaField}">
           <el-select v-model="form.${column.javaField}" placeholder="请选择${column.columnLabel}">
             <el-option label="请选择字典生成" value="" />
@@ -285,7 +286,7 @@
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-<#elseif column.htmlType == "checkbox" && column.dictType?has_content>
+<#elseif column.htmlType == "checkbox" && !(column.dictType?has_content)>
         <el-form-item label="${column.columnLabel}" prop="${column.javaField}">
           <el-checkbox-group v-model="form.${column.javaField}">
             <el-checkbox>请选择字典生成</el-checkbox>
@@ -305,7 +306,7 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-<#elseif column.htmlType == "radio" && column.dictType?has_content>
+<#elseif column.htmlType == "radio" && !(column.dictType?has_content)>
         <el-form-item label="${column.columnLabel}" prop="${column.javaField}">
           <el-radio-group v-model="form.${column.javaField}">
             <el-radio value="1">请选择字典生成</el-radio>
@@ -380,6 +381,9 @@ import { useTableSelection } from '@/hooks/table/useTableSelection';
 <#if needDict>
 import { useDict } from '@/utils/dict';
 </#if>
+<#if needParseTime>
+import { parseTime } from '@/utils/ruoyi';
+</#if>
 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);
 </#if>
 </#list>
@@ -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();
 </#if>
 </#list>
@@ -565,8 +569,8 @@ const handleDelete = async (row?: Partial<${BusinessName}VO>) => {
   await getList();
 };
 
-/** 导出按钮操作 */
 <#if enableExport>
+/** 导出按钮操作 */
 const handleExport = () => {
   requestDownload(
     '${moduleName}/${businessName}/export',

ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/types.ts.ftl

@@ -1,5 +1,3 @@
-import type { BaseEntity<#if !table.tree>, PageQuery</#if> } from '@/api/types';
-
 export interface ${BusinessName}VO {
 <#list columns as column>
 <#if column.list>

ruoyi-modules/ruoyi-gen/src/main/resources/fm/xml/mapper.xml.ftl

@@ -4,6 +4,3 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="${packageName}.mapper.${ClassName}Mapper">
 </mapper>
-
-
-