!5 代码生成页面的编辑页列数允许多列

Merge pull request !5 from 晨曦/0416

ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

@@ -156,6 +156,9 @@ public class GenTable implements Serializable
     /** 备注   */
     private String remark;
 
+    /** 编辑页列数  */
+    private Integer editColumns;
+
     /**
      * 请求参数
      */

ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

@@ -70,6 +70,8 @@ public class VelocityUtils {
         velocityContext.put("columns", genTable.getColumns());
         velocityContext.put("table", genTable);
         velocityContext.put("dicts", getDicts(genTable));
+        /* 编辑页列数*/
+        velocityContext.put("editColumns", genTable.getEditColumns());
         setMenuVelocityContext(velocityContext, genTable);
         if (GenConstants.TPL_TREE.equals(tplCategory)) {
             setTreeVelocityContext(velocityContext, genTable);

ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/element.ts.index.vue.vm

@@ -3,21 +3,21 @@
         <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
             <div class="search" v-show="showSearch">
                 <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input" || $column.htmlType == "textarea")
+                    #foreach($column in $columns)
+                        #if($column.query)
+                            #set($dictType=$column.dictType)
+                            #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                            #if($parentheseIndex != -1)
+                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                            #else
+                                #set($comment=$column.columnComment)
+                            #end
+                            #if($column.htmlType == "input" || $column.htmlType == "textarea")
                                 <el-form-item label="${comment}" prop="${column.javaField}">
                                     <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable style="width: 240px" @keyup.enter="handleQuery" />
                                 </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                            #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
                                 <el-form-item label="${comment}" prop="${column.javaField}">
                                     <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable style="width: 240px">
                                         <el-option
@@ -28,13 +28,13 @@
                                         />
                                     </el-select>
                                 </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                            #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
                                 <el-form-item label="${comment}" prop="${column.javaField}">
                                     <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable style="width: 240px">
                                         <el-option label="请选择字典生成" value="" />
                                     </el-select>
                                 </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                            #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
                                 <el-form-item label="${comment}" prop="${column.javaField}">
                                     <el-date-picker clearable
                                                     v-model="queryParams.${column.javaField}"
@@ -43,7 +43,7 @@
                                                     placeholder="请选择${comment}"
                                     />
                                 </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                            #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
                                 <el-form-item label="${comment}" style="width: 308px">
                                     <el-date-picker
                                         v-model="dateRange${AttrName}"
@@ -55,9 +55,9 @@
                                         :default-time="[new Date(2024, 1, 1, 0, 0, 0), new Date(2024, 1, 1, 23, 59, 59)]"
                                     />
                                 </el-form-item>
-#end
-#end
-#end
+                            #end
+                        #end
+                    #end
                     <el-form-item>
                         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
                         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -90,42 +90,42 @@
 
             <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55" align="center" />
-#foreach($column in $columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk)
+                #foreach($column in $columns)
+                    #set($javaField=$column.javaField)
+                    #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                    #if($parentheseIndex != -1)
+                        #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                    #else
+                        #set($comment=$column.columnComment)
+                    #end
+                    #if($column.pk)
                         <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="${column.list}" />
-#elseif($column.list && $column.htmlType == "datetime")
+                    #elseif($column.list && $column.htmlType == "datetime")
                         <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
                             <template #default="scope">
                                 <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
                             </template>
                         </el-table-column>
-#elseif($column.list && $column.htmlType == "imageUpload")
+                    #elseif($column.list && $column.htmlType == "imageUpload")
                         <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
                             <template #default="scope">
                                 <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
                             </template>
                         </el-table-column>
-#elseif($column.list && $column.dictType && "" != $column.dictType)
+                    #elseif($column.list && $column.dictType && "" != $column.dictType)
                         <el-table-column label="${comment}" align="center" prop="${javaField}">
                             <template #default="scope">
-#if($column.htmlType == "checkbox")
+                                #if($column.htmlType == "checkbox")
                                     <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-#else
+                                #else
                                     <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
-#end
+                                #end
                             </template>
                         </el-table-column>
-#elseif($column.list && "" != $javaField)
+                    #elseif($column.list && "" != $javaField)
                         <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#end
-#end
+                    #end
+                #end
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                     <template #default="scope">
                         <el-tooltip content="修改" placement="top">
@@ -147,19 +147,32 @@
             />
         </el-card>
         <!-- 添加或修改${functionName}对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="780px" append-to-body>
-      <el-form ref="${businessName}FormRef" :model="form" :rules="rules" label-width="80px">
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if(($column.insert || $column.edit) && !$column.pk)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if($column.htmlType == "input")
+        <el-dialog :title="dialog.title" v-model="dialog.visible" width="1000px" append-to-body>
+            <el-form ref="${businessName}FormRef" :model="form" :rules="rules" label-width="100px">
+                <el-row>
+                    #foreach($column in $columns)
+                        #set($field=$column.javaField)
+                        #if(($column.insert || $column.edit) && !$column.pk)
+                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                            #if($parentheseIndex != -1)
+                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                            #else
+                                #set($comment=$column.columnComment)
+                            #end
+                            #set($dictType=$column.dictType)
+                            #if(${editColumns}==1)
+                        <el-col :span="24">
+                            #end
+                            #if(${editColumns}==2)
+                        <el-col :span="12">
+                            #end
+                            #if(${editColumns}==3)
+                        <el-col :span="8">
+                            #end
+                            #if(${editColumns}==4)
+                        <el-col :span="6">
+                            #end
+                            #if($column.htmlType == "input")
                                 #if(${field} == "version")
                                     <el-form-item label="${comment}" prop="${field}" v-show="false">
                                         <el-input v-model="form.${field}" placeholder="请输入${comment}" />
@@ -169,40 +182,40 @@
                                         <el-input v-model="form.${field}" placeholder="请输入${comment}" />
                                     </el-form-item>
                                 #end
-#elseif($column.htmlType == "imageUpload")
+                            #elseif($column.htmlType == "imageUpload")
                                 <el-form-item label="${comment}" prop="${field}">
                                     <image-upload v-model="form.${field}"/>
                                 </el-form-item>
-#elseif($column.htmlType == "fileUpload")
+                            #elseif($column.htmlType == "fileUpload")
                                 <el-form-item label="${comment}" prop="${field}">
                                     <file-upload v-model="form.${field}"/>
                                 </el-form-item>
-#elseif($column.htmlType == "editor")
+                            #elseif($column.htmlType == "editor")
                                 <el-form-item label="${comment}">
                                     <editor v-model="form.${field}" :min-height="192"/>
                                 </el-form-item>
-#elseif($column.htmlType == "select" && "" != $dictType)
+                            #elseif($column.htmlType == "select" && "" != $dictType)
                                 <el-form-item label="${comment}" prop="${field}">
                                     <el-select v-model="form.${field}" placeholder="请选择${comment}">
                                         <el-option
                                             v-for="dict in ${dictType}"
                                             :key="dict.value"
                                             :label="dict.label"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
+                                            #if($column.javaType == "Integer" || $column.javaType == "Long")
                                             :value="parseInt(dict.value)"
-#else
+                                            #else
                                             :value="dict.value"
-#end
+                                            #end
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
-#elseif($column.htmlType == "select" && $dictType)
+                            #elseif($column.htmlType == "select" && $dictType)
                                 <el-form-item label="${comment}" prop="${field}">
                                     <el-select v-model="form.${field}" placeholder="请选择${comment}">
                                         <el-option label="请选择字典生成" value="" />
                                     </el-select>
                                 </el-form-item>
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
+                            #elseif($column.htmlType == "checkbox" && "" != $dictType)
                                 <el-form-item label="${comment}" prop="${field}">
                                     <el-checkbox-group v-model="form.${field}">
                                         <el-checkbox
@@ -213,33 +226,33 @@
                                         </el-checkbox>
                                     </el-checkbox-group>
                                 </el-form-item>
-#elseif($column.htmlType == "checkbox" && $dictType)
+                            #elseif($column.htmlType == "checkbox" && $dictType)
                                 <el-form-item label="${comment}" prop="${field}">
                                     <el-checkbox-group v-model="form.${field}">
                                         <el-checkbox>请选择字典生成</el-checkbox>
                                     </el-checkbox-group>
                                 </el-form-item>
-#elseif($column.htmlType == "radio" && "" != $dictType)
+                            #elseif($column.htmlType == "radio" && "" != $dictType)
                                 <el-form-item label="${comment}" prop="${field}">
                                     <el-radio-group v-model="form.${field}">
                                         <el-radio
                                             v-for="dict in ${dictType}"
                                             :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
+                                            #if($column.javaType == "Integer" || $column.javaType == "Long")
                                             :label="parseInt(dict.value)"
-#else
+                                            #else
                                             :label="dict.value"
-#end
+                                            #end
                                         >{{dict.label}}</el-radio>
                                     </el-radio-group>
                                 </el-form-item>
-#elseif($column.htmlType == "radio" && $dictType)
+                            #elseif($column.htmlType == "radio" && $dictType)
                                 <el-form-item label="${comment}" prop="${field}">
                                     <el-radio-group v-model="form.${field}">
                                         <el-radio label="1">请选择字典生成</el-radio>
                                     </el-radio-group>
                                 </el-form-item>
-#elseif($column.htmlType == "datetime")
+                            #elseif($column.htmlType == "datetime")
                                 <el-form-item label="${comment}" prop="${field}">
                                     <el-date-picker clearable
                                                     v-model="form.${field}"
@@ -248,13 +261,15 @@
                                                     placeholder="请选择${comment}">
                                     </el-date-picker>
                                 </el-form-item>
-#elseif($column.htmlType == "textarea")
+                            #elseif($column.htmlType == "textarea")
                                 <el-form-item label="${comment}" prop="${field}">
                                     <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
                                 </el-form-item>
-#end
-#end
-#end
+                            #end
+                        </el-col>
+                        #end
+                    #end
+                </el-row>
                 #if($table.sub)
                     <el-divider content-position="center">${subTable.functionName}信息</el-divider>
                     <el-row :gutter="10" class="mb8">
@@ -376,54 +391,54 @@
 </template>
 
 <script setup lang="ts">
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from '@/api/${moduleName}/${businessName}';
-#if($table.sub)
-import { ${BusinessName}VO, ${subClassName}VO, ${BusinessName}Query, ${BusinessName}Form } from '@/api/${moduleName}/${businessName}/types';
-#else
-import { ${BusinessName}VO, ${BusinessName}Query, ${BusinessName}Form } from '@/api/${moduleName}/${businessName}/types';
-#end
-import { globalHeaders } from '@/utils/request';
+    import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from '@/api/${moduleName}/${businessName}';
+        #if($table.sub)
+        import { ${BusinessName}VO, ${subClassName}VO, ${BusinessName}Query, ${BusinessName}Form } from '@/api/${moduleName}/${businessName}/types';
+        #else
+        import { ${BusinessName}VO, ${BusinessName}Query, ${BusinessName}Form } from '@/api/${moduleName}/${businessName}/types';
+        #end
+    import { globalHeaders } from '@/utils/request';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-#if(${dicts} != '')
-#set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = toRefs<any>(proxy?.useDict(${dicts}));
-#end
+    const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+        #if(${dicts} != '')
+            #set($dictsNoSymbol=$dicts.replace("'", ""))
+        const { ${dictsNoSymbol} } = toRefs<any>(proxy?.useDict(${dicts}));
+        #end
 
-// 表格数据
-const ${businessName}List = ref<${BusinessName}VO[]>([]);
-#if($table.sub)
-// 子表格数据
-const ${subclassName}List = ref<${subClassName}VO[]>([]);
-#end
-const buttonLoading = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-// 选中数组
-const ids = ref<Array<string | number>>([]);
-#if($table.sub)
-// 子表选中数据
-const checked${subClassName} = ref<${subClassName}VO[]>([]);
-#end
-// 非单个禁用
-const single = ref(true);
-// 非多个禁用
-const multiple = ref(true);
-// 总条数
-const total = ref(0);
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-const dateRange${AttrName} = ref<[DateModelType, DateModelType]>(['', '']);
-#end
-#end
+    // 表格数据
+    const ${businessName}List = ref<${BusinessName}VO[]>([]);
+        #if($table.sub)
+        // 子表格数据
+        const ${subclassName}List = ref<${subClassName}VO[]>([]);
+        #end
+    const buttonLoading = ref(false);
+    const loading = ref(true);
+    const showSearch = ref(true);
+    // 选中数组
+    const ids = ref<Array<string | number>>([]);
+        #if($table.sub)
+        // 子表选中数据
+        const checked${subClassName} = ref<${subClassName}VO[]>([]);
+        #end
+    // 非单个禁用
+    const single = ref(true);
+    // 非多个禁用
+    const multiple = ref(true);
+    // 总条数
+    const total = ref(0);
+        #foreach ($column in $columns)
+            #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+            const dateRange${AttrName} = ref<[DateModelType, DateModelType]>(['', '']);
+            #end
+        #end
 
-const queryFormRef = ref<ElFormInstance>();
-const ${businessName}FormRef = ref<ElFormInstance>();
-const uploadRef = ref<ElUploadInstance>();
+    const queryFormRef = ref<ElFormInstance>();
+    const ${businessName}FormRef = ref<ElFormInstance>();
+    const uploadRef = ref<ElUploadInstance>();
 
-/*** 导入参数 */
-const upload = reactive<ImportOption>({
+    /*** 导入参数 */
+    const upload = reactive<ImportOption>({
         // 是否显示弹出层（导入）
         open: false,
         // 弹出层标题（导入）
@@ -436,159 +451,159 @@ const upload = reactive<ImportOption>({
         headers: globalHeaders(),
         // 上传的地址
         url: import.meta.env.VITE_APP_BASE_API + '/${moduleName}/${businessName}/importData'
-});
+    });
 
-const dialog = reactive<DialogOption>({
+    const dialog = reactive<DialogOption>({
         visible: false,
         title: ''
-});
+    });
 
-const initFormData: ${BusinessName}Form = {
-#foreach ($column in $columns)
-#if($column.insert || $column.edit)
-#if($column.htmlType == "checkbox")
+    const initFormData: ${BusinessName}Form = {
+        #foreach ($column in $columns)
+            #if($column.insert || $column.edit)
+                #if($column.htmlType == "checkbox")
                         $column.javaField: []#if($foreach.count != $columns.size()),#end
-#else
+                #else
                     #if(${column.javaField} == "version")
                             $column.javaField: 0#if($foreach.count != $columns.size()),#end
                     #else
                             $column.javaField: undefined#if($foreach.count != $columns.size()),#end
                     #end
-#end
-#end
-#end
-};
-const data = reactive<PageData<${BusinessName}Form, ${BusinessName}Query>>({
+                #end
+            #end
+        #end
+    };
+    const data = reactive<PageData<${BusinessName}Form, ${BusinessName}Query>>({
         form: {...initFormData},
         queryParams: {
             pageNum: 1,
             pageSize: 10,
-#foreach ($column in $columns)
-#if($column.query)
-#if($column.htmlType != "datetime" || $column.queryType != "BETWEEN")
+            #foreach ($column in $columns)
+                #if($column.query)
+                    #if($column.htmlType != "datetime" || $column.queryType != "BETWEEN")
                             $column.javaField: undefined,
-#end
-#end
-#end
+                    #end
+                #end
+            #end
             params: {
-#foreach ($column in $columns)
-#if($column.query)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                #foreach ($column in $columns)
+                    #if($column.query)
+                        #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
                                 $column.javaField: undefined#if($foreach.count != $columns.size()),#end
-#end
-#end
-#end
+                        #end
+                    #end
+                #end
             }
         },
         rules: {
-#foreach ($column in $columns)
-#if($column.insert || $column.edit)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
+            #foreach ($column in $columns)
+                #if($column.insert || $column.edit)
+                    #if($column.required)
+                        #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                        #if($parentheseIndex != -1)
+                            #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                        #else
+                            #set($comment=$column.columnComment)
+                        #end
                             $column.javaField: [
                             { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
                         ]#if($foreach.count != $columns.size()),#end
-#end
-#end
-#end
+                    #end
+                #end
+            #end
         }
-});
+    });
 
-const { queryParams, form, rules } = toRefs(data);
+    const { queryParams, form, rules } = toRefs(data);
 
-/** 查询${functionName}列表 */
-const getList = async () => {
+    /** 查询${functionName}列表 */
+    const getList = async () => {
         loading.value = true;
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+        #foreach ($column in $columns)
+            #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
                 queryParams.value.params = {};
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                #break
+            #end
+        #end
+        #foreach ($column in $columns)
+            #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
                 proxy?.addDateRange(queryParams.value, dateRange${AttrName}.value, '${AttrName}');
-#end
-#end
+            #end
+        #end
         const res = await list${BusinessName}(queryParams.value);
             ${businessName}List.value = res.rows;
         total.value = res.total;
         loading.value = false;
-};
+    };
 
-/** 取消按钮 */
-const cancel = () => {
+    /** 取消按钮 */
+    const cancel = () => {
         reset();
         dialog.visible = false;
-};
+    };
 
-/** 表单重置 */
-const reset = () => {
+    /** 表单重置 */
+    const reset = () => {
         form.value = {...initFormData};
-#if($table.sub)
+        #if($table.sub)
                 ${subclassName}List.value = [];
-#end
+        #end
             ${businessName}FormRef.value?.resetFields();
-};
+    };
 
-/** 搜索按钮操作 */
-const handleQuery = () => {
+    /** 搜索按钮操作 */
+    const handleQuery = () => {
         queryParams.value.pageNum = 1;
         getList();
-};
+    };
 
-/** 重置按钮操作 */
-const resetQuery = () => {
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+    /** 重置按钮操作 */
+    const resetQuery = () => {
+        #foreach ($column in $columns)
+            #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
                 dateRange${AttrName}.value = ['', ''];
-#end
-#end
+            #end
+        #end
         queryFormRef.value?.resetFields();
         handleQuery();
-};
+    };
 
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: ${BusinessName}VO[]) => {
+    /** 多选框选中数据 */
+    const handleSelectionChange = (selection: ${BusinessName}VO[]) => {
         ids.value = selection.map(item => item.${pkColumn.javaField});
         single.value = selection.length != 1;
         multiple.value = !selection.length;
-};
+    };
 
-/** 新增按钮操作 */
-const handleAdd = () => {
+    /** 新增按钮操作 */
+    const handleAdd = () => {
         reset();
         dialog.visible = true;
         dialog.title = '添加${functionName}';
-};
+    };
 
-/** 修改按钮操作 */
-const handleUpdate = async (row?: ${BusinessName}VO) => {
+    /** 修改按钮操作 */
+    const handleUpdate = async (row?: ${BusinessName}VO) => {
         reset();
         const _${pkColumn.javaField} = row?.${pkColumn.javaField} || ids.value[0];
         const res = await get${BusinessName}(_${pkColumn.javaField});
         Object.assign(form.value, res.data);
-#foreach ($column in $columns)
+        #foreach ($column in $columns)
             #if($column.htmlType == "checkbox")
                 form.value.$column.javaField = form.value.${column.javaField}.split(",");
             #end
-#end
-#if($table.sub)
+        #end
+        #if($table.sub)
                 ${subclassName}List.value = res.data.${subclassName}List;
-#end
+        #end
         dialog.visible = true;
         dialog.title = '修改${functionName}';
-};
+    };
 
-/** 提交按钮 */
-const submitForm = () => {
+    /** 提交按钮 */
+    const submitForm = () => {
             ${businessName}FormRef.value?.validate(async (valid: boolean) => {
             if (valid) {
                 buttonLoading.value = true;
@@ -610,27 +625,27 @@ const submitForm = () => {
                 await getList();
             }
         });
-};
+    };
 
-/** 删除按钮操作 */
-const handleDelete = async (row?: ${BusinessName}VO) => {
+    /** 删除按钮操作 */
+    const handleDelete = async (row?: ${BusinessName}VO) => {
         const _${pkColumn.javaField}s = row?.${pkColumn.javaField} || ids.value;
         await proxy?.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + _${pkColumn.javaField}s + '"的数据项？').finally(() => loading.value = false);
         await del${BusinessName}(_${pkColumn.javaField}s);
         proxy?.#[[$modal]]#.msgSuccess("删除成功");
         await getList();
-};
+    };
 
-#if($table.sub)
-/** ${subTable.functionName}序号 */
-const row${subClassName}Index = ({row,rowIndex}: {row: ${subClassName}VO,rowIndex: number}) => {
+    #if($table.sub)
+    /** ${subTable.functionName}序号 */
+    const row${subClassName}Index = ({row,rowIndex}: {row: ${subClassName}VO,rowIndex: number}) => {
         row.index = rowIndex + 1;
-}
+    }
 
-/** ${subTable.functionName}添加按钮操作 */
-const handleAdd${subClassName} = () => {
+    /** ${subTable.functionName}添加按钮操作 */
+    const handleAdd${subClassName} = () => {
         let obj = {};
-#foreach($column in $subTable.columns)
+        #foreach($column in $subTable.columns)
         #if($column.pk || $column.javaField == ${subTableFkclassName})
         #elseif($column.list && "" != $javaField)
         #if(${column.javaField} == "version")
@@ -639,12 +654,12 @@ const handleAdd${subClassName} = () => {
         obj.$column.javaField = "";
         #end
         #end
-#end
+        #end
         ${subclassName}List.value.push(obj);
-}
+    }
 
-/** ${subTable.functionName}删除按钮操作 */
-const handleDelete${subClassName} = () => {
+    /** ${subTable.functionName}删除按钮操作 */
+    const handleDelete${subClassName} = () => {
         if (checked${subClassName}.value.length == 0) {
             proxy.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
         } else {
@@ -654,38 +669,38 @@ const handleDelete${subClassName} = () => {
                 return checked${subClassName}s.indexOf(item.index) == -1
             });
         }
-}
+    }
 
-/** 复选框选中数据 */
-const handle${subClassName}SelectionChange = (selection: ${subClassName}VO[]) => {
+    /** 复选框选中数据 */
+    const handle${subClassName}SelectionChange = (selection: ${subClassName}VO[]) => {
         checked${subClassName}.value = selection.map(item => item.index)
-}
-#end
+    }
+    #end
 
-/** 导出按钮操作 */
-const handleExport = () => {
+    /** 导出按钮操作 */
+    const handleExport = () => {
         proxy?.download('${moduleName}/${businessName}/export', {
             ...queryParams.value
         }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
-};
+    };
 
-/** 导入按钮操作 */
-const handleImport = () => {
+    /** 导入按钮操作 */
+    const handleImport = () => {
         upload.title = '${functionName}导入';
         upload.open = true;
-};
+    };
 
-/** 下载模板操作 */
-const importTemplate = () => {
+    /** 下载模板操作 */
+    const importTemplate = () => {
         proxy?.download('${moduleName}/${businessName}/importTemplate', {}, `${businessName}_template.xlsx`);
-};
+    };
 
-/**文件上传中处理 */
-const handleFileUploadProgress = () => {
+    /**文件上传中处理 */
+    const handleFileUploadProgress = () => {
         upload.isUploading = true;
-};
-/** 文件上传成功处理 */
-const handleFileSuccess = (response: any, file: UploadFile) => {
+    };
+    /** 文件上传成功处理 */
+    const handleFileSuccess = (response: any, file: UploadFile) => {
         upload.open = false;
         upload.isUploading = false;
         uploadRef.value?.handleRemove(file);
@@ -693,14 +708,14 @@ const handleFileSuccess = (response: any, file: UploadFile) => {
             dangerouslyUseHTMLString: true
         });
         getList();
-};
+    };
 
-/** 提交上传文件 */
-function submitFileForm() {
+    /** 提交上传文件 */
+    function submitFileForm() {
         uploadRef.value?.submit();
-}
+    }
 
-onMounted(() => {
+    onMounted(() => {
         getList();
-});
+    });
 </script>

script/sql/mysql/update.sql

@@ -72,3 +72,6 @@ insert into sys_menu values('130',  'EasyRetry控制台',  '2',   '6',  'easyret
 -- 增加ancestors字段
 ALTER TABLE `mf_product` ADD COLUMN `ancestors` VARCHAR(760) NULL DEFAULT '' COMMENT '祖级列表' AFTER `parent_id`;
 ALTER TABLE `demo_product` ADD COLUMN `ancestors` VARCHAR(760) NULL DEFAULT '' COMMENT '祖级列表' AFTER `parent_id`;
+
+--增加edit_columns字段
+ALTER TABLE `gen_table` ADD COLUMN `edit_columns` TINYINT NULL DEFAULT 1 AFTER `remark`;

script/sql/postgresql/update.sql

@@ -133,3 +133,6 @@ insert into sys_menu values('130',  'EasyRetry控制台',  '2',   '6',  'easyret
 -- 增加ancestors字段
 ALTER TABLE "mf_product" ADD "ancestors" VARCHAR(760) NULL;
 COMMENT ON COLUMN "mf_product"."ancestors" IS '祖级列表';
+
+--增加edit_columns字段
+ALTER TABLE `gen_table` ADD COLUMN `edit_columns` TINYINT NULL DEFAULT 1 AFTER `remark`;