update 优化 处理一些代码生成模板的一些写法问题

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

@@ -365,8 +365,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}"
@@ -421,7 +420,3 @@ export default function ${BusinessName}Page() {
     </PageContainer>
   );
 }
-
-
-
-

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

@@ -359,7 +359,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">
@@ -403,7 +402,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/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';
 
@@ -9,7 +11,7 @@ import request from '@/utils/request';
  * @returns {*}
  */
 
-export const list${BusinessName} = (query?: ${BusinessName}Query): AxiosPromise<PageResult<${BusinessName}VO>> => {
+export const list${BusinessName} = (query?: ${BusinessName}Query): AxiosPromise<<#if table.tree>${BusinessName}VO[]<#else>PageResult<${BusinessName}VO></#if>> => {
   return request({
     url: '/${moduleName}/${businessName}/list',
     method: 'get',
@@ -100,4 +102,3 @@ export const del${BusinessName} = (${pkColumn.javaField}: string | number | Arra
 };
 
 
-

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="" />
@@ -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><#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>
@@ -568,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>