wsy182/RuoYi-Cloud
1
1
Fork 0
mirror of https://gitee.com/y_project/RuoYi-Cloud.git synced 2026-04-26 01:07:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

代码生成支持表单布局选项

Browse Source
This commit is contained in:
RuoYi
2026-04-02 11:08:38 +08:00
parent b52c250cd4
commit 86cb7555eb
12 changed files with 722 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/copy.sh
View File

@@ -9,7 +9,7 @@ usage() {
# copy sql # copy sql
echo "begin copy sql " echo "begin copy sql "
cp ../sql/ry_20260321.sql ./mysql/db cp ../sql/ry_20260402.sql ./mysql/db
cp ../sql/ry_config_20260311.sql ./mysql/db cp ../sql/ry_config_20260311.sql ./mysql/db
# copy html # copy html

13
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
View File

@@ -64,6 +64,9 @@ public class GenTable extends BaseEntity
@NotBlank(message = "作者不能为空") @NotBlank(message = "作者不能为空")
private String functionAuthor; private String functionAuthor;
/** 表单布局（单列 双列 三列） */
private Integer formColNum;
/** 生成代码方式（0zip压缩包 1自定义路径） */ /** 生成代码方式（0zip压缩包 1自定义路径） */
private String genType; private String genType;
@@ -228,6 +231,16 @@ public class GenTable extends BaseEntity
this.functionAuthor = functionAuthor; this.functionAuthor = functionAuthor;
} }
public Integer getFormColNum()
{
return formColNum;
}
public void setFormColNum(Integer formColNum)
{
this.formColNum = formColNum;
}
public String getGenType() public String getGenType()
{ {
return genType; return genType;

20
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
View File

@@ -60,6 +60,7 @@ public class VelocityUtils
velocityContext.put("basePackage", getPackagePrefix(packageName)); velocityContext.put("basePackage", getPackagePrefix(packageName));
velocityContext.put("packageName", packageName); velocityContext.put("packageName", packageName);
velocityContext.put("author", genTable.getFunctionAuthor()); velocityContext.put("author", genTable.getFunctionAuthor());
velocityContext.put("colSpan", getColSpan(genTable.getFormColNum()));
velocityContext.put("datetime", DateUtils.getDate()); velocityContext.put("datetime", DateUtils.getDate());
velocityContext.put("pkColumn", genTable.getPkColumn()); velocityContext.put("pkColumn", genTable.getPkColumn());
velocityContext.put("importList", getImportList(genTable)); velocityContext.put("importList", getImportList(genTable));
@@ -434,4 +435,23 @@ public class VelocityUtils
} }
return num; return num;
} }
/**
* 获取表单 el-col span
*
* @param formColNum 表单布局方式（1单列 2双列 3三列）
* @return span 数值字符串
*/
public static String getColSpan(int formColNum)
{
if (formColNum == 2)
{
return "12";
}
else if (formColNum == 3)
{
return "8";
}
return "24";
}
} }

12
ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml
View File

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="businessName" column="business_name" /> <result property="businessName" column="business_name" />
<result property="functionName" column="function_name" /> <result property="functionName" column="function_name" />
<result property="functionAuthor" column="function_author" /> <result property="functionAuthor" column="function_author" />
<result property="formColNum" column="form_col_num" />
<result property="genType" column="gen_type" /> <result property="genType" column="gen_type" />
<result property="genPath" column="gen_path" /> <result property="genPath" column="gen_path" />
<result property="options" column="options" /> <result property="options" column="options" />
@@ -55,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectGenTableVo"> <sql id="selectGenTableVo">
select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, tpl_web_type, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, tpl_web_type, package_name, module_name, business_name, function_name, function_author, form_col_num, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
</sql> </sql>
<select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult"> <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
@@ -112,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult"> <select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark, SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.form_col_num, t.gen_type, t.gen_path, t.options, t.remark,
c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
FROM gen_table t FROM gen_table t
LEFT JOIN gen_table_column c ON t.table_id = c.table_id LEFT JOIN gen_table_column c ON t.table_id = c.table_id
@@ -120,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult"> <select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark, SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.form_col_num, t.gen_type, t.gen_path, t.options, t.remark,
c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
FROM gen_table t FROM gen_table t
LEFT JOIN gen_table_column c ON t.table_id = c.table_id LEFT JOIN gen_table_column c ON t.table_id = c.table_id
@@ -128,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult"> <select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark, SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.form_col_num, t.options, t.remark,
c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
FROM gen_table t FROM gen_table t
LEFT JOIN gen_table_column c ON t.table_id = c.table_id LEFT JOIN gen_table_column c ON t.table_id = c.table_id
@@ -147,6 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="businessName != null and businessName != ''">business_name,</if> <if test="businessName != null and businessName != ''">business_name,</if>
<if test="functionName != null and functionName != ''">function_name,</if> <if test="functionName != null and functionName != ''">function_name,</if>
<if test="functionAuthor != null and functionAuthor != ''">function_author,</if> <if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
<if test="formColNum != null">form_col_num,</if>
<if test="genType != null and genType != ''">gen_type,</if> <if test="genType != null and genType != ''">gen_type,</if>
<if test="genPath != null and genPath != ''">gen_path,</if> <if test="genPath != null and genPath != ''">gen_path,</if>
<if test="remark != null and remark != ''">remark,</if> <if test="remark != null and remark != ''">remark,</if>
@@ -163,6 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="businessName != null and businessName != ''">#{businessName},</if> <if test="businessName != null and businessName != ''">#{businessName},</if>
<if test="functionName != null and functionName != ''">#{functionName},</if> <if test="functionName != null and functionName != ''">#{functionName},</if>
<if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if> <if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
<if test="formColNum != null">#{formColNum},</if>
<if test="genType != null and genType != ''">#{genType},</if> <if test="genType != null and genType != ''">#{genType},</if>
<if test="genPath != null and genPath != ''">#{genPath},</if> <if test="genPath != null and genPath != ''">#{genPath},</if>
<if test="remark != null and remark != ''">#{remark},</if> <if test="remark != null and remark != ''">#{remark},</if>
@@ -180,6 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="subTableFkName != null">sub_table_fk_name = #{subTableFkName},</if> <if test="subTableFkName != null">sub_table_fk_name = #{subTableFkName},</if>
<if test="className != null and className != ''">class_name = #{className},</if> <if test="className != null and className != ''">class_name = #{className},</if>
<if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if> <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
<if test="formColNum != null">form_col_num = #{formColNum},</if>
<if test="genType != null and genType != ''">gen_type = #{genType},</if> <if test="genType != null and genType != ''">gen_type = #{genType},</if>
<if test="genPath != null and genPath != ''">gen_path = #{genPath},</if> <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
<if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if> <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>

183
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
View File

@@ -165,8 +165,16 @@
</el-table> </el-table>
<!-- 添加或修改${functionName}对话框 --> <!-- 添加或修改${functionName}对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> #if($table.formColNum == 2)
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> #set($dialogWidth = "800px")
#elseif($table.formColNum == 3)
#set($dialogWidth = "1100px")
#else
#set($dialogWidth = "500px")
#end
<el-dialog :title="title" :visible.sync="open" width="${dialogWidth}" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
#foreach($column in $columns) #foreach($column in $columns)
#set($field=$column.javaField) #set($field=$column.javaField)
#if($column.insert && !$column.pk) #if($column.insert && !$column.pk)
@@ -179,100 +187,127 @@
#end #end
#set($dictType=$column.dictType) #set($dictType=$column.dictType)
#if("" != $treeParentCode && $column.javaField == $treeParentCode) #if("" != $treeParentCode && $column.javaField == $treeParentCode)
<el-form-item label="${comment}" prop="${treeParentCode}"> <el-col :span="${colSpan}">
<treeselect v-model="form.${treeParentCode}" :options="${businessName}Options" :normalizer="normalizer" placeholder="请选择${comment}" /> <el-form-item label="${comment}" prop="${treeParentCode}">
</el-form-item> <treeselect v-model="form.${treeParentCode}" :options="${businessName}Options" :normalizer="normalizer" placeholder="请选择${comment}" />
</el-form-item>
</el-col>
#elseif($column.htmlType == "input") #elseif($column.htmlType == "input")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-input v-model="form.${field}" placeholder="请输入${comment}" /> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <el-input v-model="form.${field}" placeholder="请输入${comment}" />
</el-form-item>
</el-col>
#elseif($column.htmlType == "imageUpload") #elseif($column.htmlType == "imageUpload")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<image-upload v-model="form.${field}"/> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <image-upload v-model="form.${field}"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "fileUpload") #elseif($column.htmlType == "fileUpload")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<file-upload v-model="form.${field}"/> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <file-upload v-model="form.${field}"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "editor") #elseif($column.htmlType == "editor")
<el-form-item label="${comment}"> <el-col :span="24">
<editor v-model="form.${field}" :min-height="192"/> <el-form-item label="${comment}">
</el-form-item> <editor v-model="form.${field}" :min-height="192"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "select" && "" != $dictType) #elseif($column.htmlType == "select" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-select v-model="form.${field}" placeholder="请选择${comment}"> <el-form-item label="${comment}" prop="${field}">
<el-option <el-select v-model="form.${field}" placeholder="请选择${comment}">
v-for="dict in dict.type.${dictType}" <el-option
:key="dict.value" v-for="dict in dict.type.${dictType}"
:label="dict.label" :key="dict.value"
:label="dict.label"
#if($column.javaType == "Integer" || $column.javaType == "Long") #if($column.javaType == "Integer" || $column.javaType == "Long")
:value="parseInt(dict.value)" :value="parseInt(dict.value)"
#else #else
:value="dict.value" :value="dict.value"
#end #end
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
#elseif($column.htmlType == "select" && $dictType) #elseif($column.htmlType == "select" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-select v-model="form.${field}" placeholder="请选择${comment}"> <el-form-item label="${comment}" prop="${field}">
<el-option label="请选择字典生成" value="" /> <el-select v-model="form.${field}" placeholder="请选择${comment}">
</el-select> <el-option label="请选择字典生成" value="" />
</el-form-item> </el-select>
</el-form-item>
</el-col>
#elseif($column.htmlType == "checkbox" && "" != $dictType) #elseif($column.htmlType == "checkbox" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-checkbox-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-checkbox <el-checkbox-group v-model="form.${field}">
v-for="dict in dict.type.${dictType}" <el-checkbox
:key="dict.value" v-for="dict in dict.type.${dictType}"
:label="dict.value"> :key="dict.value"
{{dict.label}} :label="dict.value">
</el-checkbox> {{dict.label}}
</el-checkbox-group> </el-checkbox>
</el-form-item> </el-checkbox-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "checkbox" && $dictType) #elseif($column.htmlType == "checkbox" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-checkbox-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-checkbox>请选择字典生成</el-checkbox> <el-checkbox-group v-model="form.${field}">
</el-checkbox-group> <el-checkbox>请选择字典生成</el-checkbox>
</el-form-item> </el-checkbox-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "radio" && "" != $dictType) #elseif($column.htmlType == "radio" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-radio-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-radio <el-radio-group v-model="form.${field}">
v-for="dict in dict.type.${dictType}" <el-radio
:key="dict.value" v-for="dict in dict.type.${dictType}"
:key="dict.value"
#if($column.javaType == "Integer" || $column.javaType == "Long") #if($column.javaType == "Integer" || $column.javaType == "Long")
:label="parseInt(dict.value)" :label="parseInt(dict.value)"
#else #else
:label="dict.value" :label="dict.value"
#end #end
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col>
#elseif($column.htmlType == "radio" && $dictType) #elseif($column.htmlType == "radio" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-radio-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-radio label="1">请选择字典生成</el-radio> <el-radio-group v-model="form.${field}">
</el-radio-group> <el-radio label="1">请选择字典生成</el-radio>
</el-form-item> </el-radio-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "datetime") #elseif($column.htmlType == "datetime")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-date-picker clearable <el-form-item label="${comment}" prop="${field}">
v-model="form.${field}" <el-date-picker clearable
type="date" v-model="form.${field}"
value-format="yyyy-MM-dd" type="date"
placeholder="选择${comment}"> value-format="yyyy-MM-dd"
</el-date-picker> placeholder="选择${comment}">
</el-form-item> </el-date-picker>
</el-form-item>
</el-col>
#elseif($column.htmlType == "textarea") #elseif($column.htmlType == "textarea")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="24">
<el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" /> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
#end #end
#end #end
#end #end
#end #end
</el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>

175
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
View File

@@ -180,8 +180,16 @@
/> />
<!-- 添加或修改${functionName}对话框 --> <!-- 添加或修改${functionName}对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> #if($table.formColNum == 2)
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> #set($dialogWidth = "800px")
#elseif($table.formColNum == 3)
#set($dialogWidth = "1100px")
#else
#set($dialogWidth = "500px")
#end
<el-dialog :title="title" :visible.sync="open" width="${dialogWidth}" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
#foreach($column in $columns) #foreach($column in $columns)
#set($field=$column.javaField) #set($field=$column.javaField)
#if($column.insert && !$column.pk) #if($column.insert && !$column.pk)
@@ -194,96 +202,121 @@
#end #end
#set($dictType=$column.dictType) #set($dictType=$column.dictType)
#if($column.htmlType == "input") #if($column.htmlType == "input")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-input v-model="form.${field}" placeholder="请输入${comment}" /> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <el-input v-model="form.${field}" placeholder="请输入${comment}" />
</el-form-item>
</el-col>
#elseif($column.htmlType == "imageUpload") #elseif($column.htmlType == "imageUpload")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<image-upload v-model="form.${field}"/> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <image-upload v-model="form.${field}"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "fileUpload") #elseif($column.htmlType == "fileUpload")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<file-upload v-model="form.${field}"/> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <file-upload v-model="form.${field}"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "editor") #elseif($column.htmlType == "editor")
<el-form-item label="${comment}"> <el-col :span="24">
<editor v-model="form.${field}" :min-height="192"/> <el-form-item label="${comment}">
</el-form-item> <editor v-model="form.${field}" :min-height="192"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "select" && "" != $dictType) #elseif($column.htmlType == "select" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-select v-model="form.${field}" placeholder="请选择${comment}"> <el-form-item label="${comment}" prop="${field}">
<el-option <el-select v-model="form.${field}" placeholder="请选择${comment}">
v-for="dict in dict.type.${dictType}" <el-option
:key="dict.value" v-for="dict in dict.type.${dictType}"
:label="dict.label" :key="dict.value"
:label="dict.label"
#if($column.javaType == "Integer" || $column.javaType == "Long") #if($column.javaType == "Integer" || $column.javaType == "Long")
:value="parseInt(dict.value)" :value="parseInt(dict.value)"
#else #else
:value="dict.value" :value="dict.value"
#end #end
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
#elseif($column.htmlType == "select" && $dictType) #elseif($column.htmlType == "select" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-select v-model="form.${field}" placeholder="请选择${comment}"> <el-form-item label="${comment}" prop="${field}">
<el-option label="请选择字典生成" value="" /> <el-select v-model="form.${field}" placeholder="请选择${comment}">
</el-select> <el-option label="请选择字典生成" value="" />
</el-form-item> </el-select>
</el-form-item>
</el-col>
#elseif($column.htmlType == "checkbox" && "" != $dictType) #elseif($column.htmlType == "checkbox" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-checkbox-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-checkbox <el-checkbox-group v-model="form.${field}">
v-for="dict in dict.type.${dictType}" <el-checkbox
:key="dict.value" v-for="dict in dict.type.${dictType}"
:label="dict.value"> :key="dict.value"
{{dict.label}} :label="dict.value">
</el-checkbox> {{dict.label}}
</el-checkbox-group> </el-checkbox>
</el-form-item> </el-checkbox-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "checkbox" && $dictType) #elseif($column.htmlType == "checkbox" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-checkbox-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-checkbox>请选择字典生成</el-checkbox> <el-checkbox-group v-model="form.${field}">
</el-checkbox-group> <el-checkbox>请选择字典生成</el-checkbox>
</el-form-item> </el-checkbox-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "radio" && "" != $dictType) #elseif($column.htmlType == "radio" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-radio-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-radio <el-radio-group v-model="form.${field}">
v-for="dict in dict.type.${dictType}" <el-radio
:key="dict.value" v-for="dict in dict.type.${dictType}"
:key="dict.value"
#if($column.javaType == "Integer" || $column.javaType == "Long") #if($column.javaType == "Integer" || $column.javaType == "Long")
:label="parseInt(dict.value)" :label="parseInt(dict.value)"
#else #else
:label="dict.value" :label="dict.value"
#end #end
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col>
#elseif($column.htmlType == "radio" && $dictType) #elseif($column.htmlType == "radio" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-radio-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-radio label="1">请选择字典生成</el-radio> <el-radio-group v-model="form.${field}">
</el-radio-group> <el-radio label="1">请选择字典生成</el-radio>
</el-form-item> </el-radio-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "datetime") #elseif($column.htmlType == "datetime")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-date-picker clearable <el-form-item label="${comment}" prop="${field}">
v-model="form.${field}" <el-date-picker clearable
type="date" v-model="form.${field}"
value-format="yyyy-MM-dd" type="date"
placeholder="请选择${comment}"> value-format="yyyy-MM-dd"
</el-date-picker> placeholder="请选择${comment}">
</el-form-item> </el-date-picker>
</el-form-item>
</el-col>
#elseif($column.htmlType == "textarea") #elseif($column.htmlType == "textarea")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="24">
<el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" /> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
#end #end
#end #end
#end #end
#end #end
</el-row>
#if($table.sub) #if($table.sub)
<el-divider content-position="center">${subTable.functionName}信息</el-divider> <el-divider content-position="center">${subTable.functionName}信息</el-divider>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">

201
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm
View File

@@ -144,8 +144,16 @@
</el-table> </el-table>
<!-- 添加或修改${functionName}对话框 --> <!-- 添加或修改${functionName}对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body> #if($table.formColNum == 2)
<el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px"> #set($dialogWidth = "800px")
#elseif($table.formColNum == 3)
#set($dialogWidth = "1100px")
#else
#set($dialogWidth = "500px")
#end
<el-dialog :title="title" v-model="open" width="${dialogWidth}" append-to-body>
<el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="100px">
<el-row>
#foreach($column in $columns) #foreach($column in $columns)
#set($field=$column.javaField) #set($field=$column.javaField)
#if($column.insert && !$column.pk) #if($column.insert && !$column.pk)
@@ -158,107 +166,134 @@
#end #end
#set($dictType=$column.dictType) #set($dictType=$column.dictType)
#if("" != $treeParentCode && $column.javaField == $treeParentCode) #if("" != $treeParentCode && $column.javaField == $treeParentCode)
<el-form-item label="${comment}" prop="${treeParentCode}"> <el-col :span="${colSpan}">
<el-tree-select <el-form-item label="${comment}" prop="${treeParentCode}">
v-model="form.${treeParentCode}" <el-tree-select
:data="${businessName}Options" v-model="form.${treeParentCode}"
:props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }" :data="${businessName}Options"
value-key="${treeCode}" :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
placeholder="请选择${comment}" value-key="${treeCode}"
check-strictly placeholder="请选择${comment}"
/> check-strictly
</el-form-item> />
</el-form-item>
</el-col>
#elseif($column.htmlType == "input") #elseif($column.htmlType == "input")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-input v-model="form.${field}" placeholder="请输入${comment}" /> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <el-input v-model="form.${field}" placeholder="请输入${comment}" />
</el-form-item>
</el-col>
#elseif($column.htmlType == "imageUpload") #elseif($column.htmlType == "imageUpload")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<image-upload v-model="form.${field}"/> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <image-upload v-model="form.${field}"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "fileUpload") #elseif($column.htmlType == "fileUpload")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<file-upload v-model="form.${field}"/> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <file-upload v-model="form.${field}"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "editor") #elseif($column.htmlType == "editor")
<el-form-item label="${comment}"> <el-col :span="24">
<editor v-model="form.${field}" :min-height="192"/> <el-form-item label="${comment}">
</el-form-item> <editor v-model="form.${field}" :min-height="192"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "select" && "" != $dictType) #elseif($column.htmlType == "select" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-select v-model="form.${field}" placeholder="请选择${comment}"> <el-form-item label="${comment}" prop="${field}">
<el-option <el-select v-model="form.${field}" placeholder="请选择${comment}">
v-for="dict in ${dictType}" <el-option
:key="dict.value" v-for="dict in ${dictType}"
:label="dict.label" :key="dict.value"
:label="dict.label"
#if($column.javaType == "Integer" || $column.javaType == "Long") #if($column.javaType == "Integer" || $column.javaType == "Long")
:value="parseInt(dict.value)" :value="parseInt(dict.value)"
#else #else
:value="dict.value" :value="dict.value"
#end #end
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
#elseif($column.htmlType == "select" && $dictType) #elseif($column.htmlType == "select" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-select v-model="form.${field}" placeholder="请选择${comment}"> <el-form-item label="${comment}" prop="${field}">
<el-option label="请选择字典生成" value="" /> <el-select v-model="form.${field}" placeholder="请选择${comment}">
</el-select> <el-option label="请选择字典生成" value="" />
</el-form-item> </el-select>
</el-form-item>
</el-col>
#elseif($column.htmlType == "checkbox" && "" != $dictType) #elseif($column.htmlType == "checkbox" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-checkbox-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-checkbox <el-checkbox-group v-model="form.${field}">
v-for="dict in ${dictType}" <el-checkbox
:key="dict.value" v-for="dict in ${dictType}"
:label="dict.value"> :key="dict.value"
{{dict.label}} :label="dict.value">
</el-checkbox> {{dict.label}}
</el-checkbox-group> </el-checkbox>
</el-form-item> </el-checkbox-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "checkbox" && $dictType) #elseif($column.htmlType == "checkbox" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-checkbox-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-checkbox>请选择字典生成</el-checkbox> <el-checkbox-group v-model="form.${field}">
</el-checkbox-group> <el-checkbox>请选择字典生成</el-checkbox>
</el-form-item> </el-checkbox-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "radio" && "" != $dictType) #elseif($column.htmlType == "radio" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-radio-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-radio <el-radio-group v-model="form.${field}">
v-for="dict in ${dictType}" <el-radio
:key="dict.value" 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)" :label="parseInt(dict.value)"
#else #else
:label="dict.value" :label="dict.value"
#end #end
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col>
#elseif($column.htmlType == "radio" && $dictType) #elseif($column.htmlType == "radio" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-radio-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-radio label="1">请选择字典生成</el-radio> <el-radio-group v-model="form.${field}">
</el-radio-group> <el-radio label="1">请选择字典生成</el-radio>
</el-form-item> </el-radio-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "datetime") #elseif($column.htmlType == "datetime")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-date-picker clearable <el-form-item label="${comment}" prop="${field}">
v-model="form.${field}" <el-date-picker clearable
type="date" v-model="form.${field}"
value-format="YYYY-MM-DD" type="date"
placeholder="选择${comment}"> value-format="YYYY-MM-DD"
</el-date-picker> placeholder="选择${comment}">
</el-form-item> </el-date-picker>
</el-form-item>
</el-col>
#elseif($column.htmlType == "textarea") #elseif($column.htmlType == "textarea")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="24">
<el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" /> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
#end #end
#end #end
#end #end
#end #end
</el-row>
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
@@ -444,13 +479,13 @@ function submitForm() {
#end #end
#end #end
if (form.value.${pkColumn.javaField} != null) { if (form.value.${pkColumn.javaField} != null) {
update${BusinessName}(form.value).then(response => { update${BusinessName}(form.value).then(() => {
proxy.#[[$modal]]#.msgSuccess("修改成功") proxy.#[[$modal]]#.msgSuccess("修改成功")
open.value = false open.value = false
getList() getList()
}) })
} else { } else {
add${BusinessName}(form.value).then(response => { add${BusinessName}(form.value).then(() => {
proxy.#[[$modal]]#.msgSuccess("新增成功") proxy.#[[$modal]]#.msgSuccess("新增成功")
open.value = false open.value = false
getList() getList()

192
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
View File

@@ -163,8 +163,16 @@
/> />
<!-- 添加或修改${functionName}对话框 --> <!-- 添加或修改${functionName}对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body> #if($table.formColNum == 2)
<el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px"> #set($dialogWidth = "800px")
#elseif($table.formColNum == 3)
#set($dialogWidth = "1100px")
#else
#set($dialogWidth = "500px")
#end
<el-dialog :title="title" v-model="open" width="${dialogWidth}" append-to-body>
<el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="100px">
<el-row>
#foreach($column in $columns) #foreach($column in $columns)
#set($field=$column.javaField) #set($field=$column.javaField)
#if($column.insert && !$column.pk) #if($column.insert && !$column.pk)
@@ -177,96 +185,121 @@
#end #end
#set($dictType=$column.dictType) #set($dictType=$column.dictType)
#if($column.htmlType == "input") #if($column.htmlType == "input")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-input v-model="form.${field}" placeholder="请输入${comment}" /> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <el-input v-model="form.${field}" placeholder="请输入${comment}" />
</el-form-item>
</el-col>
#elseif($column.htmlType == "imageUpload") #elseif($column.htmlType == "imageUpload")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<image-upload v-model="form.${field}"/> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <image-upload v-model="form.${field}"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "fileUpload") #elseif($column.htmlType == "fileUpload")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<file-upload v-model="form.${field}"/> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <file-upload v-model="form.${field}"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "editor") #elseif($column.htmlType == "editor")
<el-form-item label="${comment}"> <el-col :span="24">
<editor v-model="form.${field}" :min-height="192"/> <el-form-item label="${comment}">
</el-form-item> <editor v-model="form.${field}" :min-height="192"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "select" && "" != $dictType) #elseif($column.htmlType == "select" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-select v-model="form.${field}" placeholder="请选择${comment}"> <el-form-item label="${comment}" prop="${field}">
<el-option <el-select v-model="form.${field}" placeholder="请选择${comment}">
v-for="dict in ${dictType}" <el-option
:key="dict.value" v-for="dict in ${dictType}"
:label="dict.label" :key="dict.value"
:label="dict.label"
#if($column.javaType == "Integer" || $column.javaType == "Long") #if($column.javaType == "Integer" || $column.javaType == "Long")
:value="parseInt(dict.value)" :value="parseInt(dict.value)"
#else #else
:value="dict.value" :value="dict.value"
#end #end
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
#elseif($column.htmlType == "select" && $dictType) #elseif($column.htmlType == "select" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-select v-model="form.${field}" placeholder="请选择${comment}"> <el-form-item label="${comment}" prop="${field}">
<el-option label="请选择字典生成" value="" /> <el-select v-model="form.${field}" placeholder="请选择${comment}">
</el-select> <el-option label="请选择字典生成" value="" />
</el-form-item> </el-select>
</el-form-item>
</el-col>
#elseif($column.htmlType == "checkbox" && "" != $dictType) #elseif($column.htmlType == "checkbox" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-checkbox-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-checkbox <el-checkbox-group v-model="form.${field}">
v-for="dict in ${dictType}" <el-checkbox
:key="dict.value" v-for="dict in ${dictType}"
:label="dict.value"> :key="dict.value"
{{dict.label}} :label="dict.value">
</el-checkbox> {{dict.label}}
</el-checkbox-group> </el-checkbox>
</el-form-item> </el-checkbox-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "checkbox" && $dictType) #elseif($column.htmlType == "checkbox" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-checkbox-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-checkbox>请选择字典生成</el-checkbox> <el-checkbox-group v-model="form.${field}">
</el-checkbox-group> <el-checkbox>请选择字典生成</el-checkbox>
</el-form-item> </el-checkbox-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "radio" && "" != $dictType) #elseif($column.htmlType == "radio" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-radio-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-radio <el-radio-group v-model="form.${field}">
v-for="dict in ${dictType}" <el-radio
:key="dict.value" 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)" :label="parseInt(dict.value)"
#else #else
:label="dict.value" :label="dict.value"
#end #end
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col>
#elseif($column.htmlType == "radio" && $dictType) #elseif($column.htmlType == "radio" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-radio-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-radio label="1">请选择字典生成</el-radio> <el-radio-group v-model="form.${field}">
</el-radio-group> <el-radio label="1">请选择字典生成</el-radio>
</el-form-item> </el-radio-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "datetime") #elseif($column.htmlType == "datetime")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-date-picker clearable <el-form-item label="${comment}" prop="${field}">
v-model="form.${field}" <el-date-picker clearable
type="date" v-model="form.${field}"
value-format="YYYY-MM-DD" type="date"
placeholder="请选择${comment}"> value-format="YYYY-MM-DD"
</el-date-picker> placeholder="请选择${comment}">
</el-form-item> </el-date-picker>
</el-form-item>
</el-col>
#elseif($column.htmlType == "textarea") #elseif($column.htmlType == "textarea")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="24">
<el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" /> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
#end #end
#end #end
#end #end
#end #end
</el-row>
#if($table.sub) #if($table.sub)
<el-divider content-position="center">${subTable.functionName}信息</el-divider> <el-divider content-position="center">${subTable.functionName}信息</el-divider>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
@@ -277,9 +310,13 @@
<el-button type="danger" icon="Delete" @click="handleDelete${subClassName}">删除</el-button> <el-button type="danger" icon="Delete" @click="handleDelete${subClassName}">删除</el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}"> <el-table :data="${subclassName}List" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="序号" align="center" prop="index" width="50"/> <el-table-column label="序号" width="60">
<template #default="{ $index }">
{{ $index + 1 }}
</template>
</el-table-column>
#foreach($column in $subTable.columns) #foreach($column in $subTable.columns)
#set($javaField=$column.javaField) #set($javaField=$column.javaField)
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
@@ -515,13 +552,13 @@ function submitForm() {
form.value.${subclassName}List = ${subclassName}List.value form.value.${subclassName}List = ${subclassName}List.value
#end #end
if (form.value.${pkColumn.javaField} != null) { if (form.value.${pkColumn.javaField} != null) {
update${BusinessName}(form.value).then(response => { update${BusinessName}(form.value).then(() => {
proxy.#[[$modal]]#.msgSuccess("修改成功") proxy.#[[$modal]]#.msgSuccess("修改成功")
open.value = false open.value = false
getList() getList()
}) })
} else { } else {
add${BusinessName}(form.value).then(response => { add${BusinessName}(form.value).then(() => {
proxy.#[[$modal]]#.msgSuccess("新增成功") proxy.#[[$modal]]#.msgSuccess("新增成功")
open.value = false open.value = false
getList() getList()
@@ -543,11 +580,6 @@ function handleDelete(row) {
} }
#if($table.sub) #if($table.sub)
/** ${subTable.functionName}序号 */
function row${subClassName}Index({ row, rowIndex }) {
row.index = rowIndex + 1
}
/** ${subTable.functionName}添加按钮操作 */ /** ${subTable.functionName}添加按钮操作 */
function handleAdd${subClassName}() { function handleAdd${subClassName}() {
let obj = {} let obj = {}

197
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3ts/index-tree.vue.vm
View File

@@ -144,8 +144,16 @@
</el-table> </el-table>
<!-- 添加或修改${functionName}对话框 --> <!-- 添加或修改${functionName}对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body> #if($table.formColNum == 2)
<el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px"> #set($dialogWidth = "800px")
#elseif($table.formColNum == 3)
#set($dialogWidth = "1100px")
#else
#set($dialogWidth = "500px")
#end
<el-dialog :title="title" v-model="open" width="${dialogWidth}" append-to-body>
<el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="100px">
<el-row>
#foreach($column in $columns) #foreach($column in $columns)
#set($field=$column.javaField) #set($field=$column.javaField)
#if($column.insert && !$column.pk) #if($column.insert && !$column.pk)
@@ -158,107 +166,134 @@
#end #end
#set($dictType=$column.dictType) #set($dictType=$column.dictType)
#if("" != $treeParentCode && $column.javaField == $treeParentCode) #if("" != $treeParentCode && $column.javaField == $treeParentCode)
<el-form-item label="${comment}" prop="${treeParentCode}"> <el-col :span="${colSpan}">
<el-tree-select <el-form-item label="${comment}" prop="${treeParentCode}">
v-model="form.${treeParentCode}" <el-tree-select
:data="${businessName}Options" v-model="form.${treeParentCode}"
:props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }" :data="${businessName}Options"
value-key="${treeCode}" :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
placeholder="请选择${comment}" value-key="${treeCode}"
check-strictly placeholder="请选择${comment}"
/> check-strictly
</el-form-item> />
</el-form-item>
</el-col>
#elseif($column.htmlType == "input") #elseif($column.htmlType == "input")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-input v-model="form.${field}" placeholder="请输入${comment}" /> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <el-input v-model="form.${field}" placeholder="请输入${comment}" />
</el-form-item>
</el-col>
#elseif($column.htmlType == "imageUpload") #elseif($column.htmlType == "imageUpload")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<image-upload v-model="form.${field}"/> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <image-upload v-model="form.${field}"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "fileUpload") #elseif($column.htmlType == "fileUpload")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<file-upload v-model="form.${field}"/> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <file-upload v-model="form.${field}"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "editor") #elseif($column.htmlType == "editor")
<el-form-item label="${comment}"> <el-col :span="24">
<editor v-model="form.${field}" :min-height="192"/> <el-form-item label="${comment}">
</el-form-item> <editor v-model="form.${field}" :min-height="192"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "select" && "" != $dictType) #elseif($column.htmlType == "select" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-select v-model="form.${field}" placeholder="请选择${comment}"> <el-form-item label="${comment}" prop="${field}">
<el-option <el-select v-model="form.${field}" placeholder="请选择${comment}">
v-for="dict in ${dictType}" <el-option
:key="dict.value" v-for="dict in ${dictType}"
:label="dict.label" :key="dict.value"
:label="dict.label"
#if($column.javaType == "Integer" || $column.javaType == "Long") #if($column.javaType == "Integer" || $column.javaType == "Long")
:value="parseInt(dict.value)" :value="parseInt(dict.value)"
#else #else
:value="dict.value" :value="dict.value"
#end #end
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
#elseif($column.htmlType == "select" && $dictType) #elseif($column.htmlType == "select" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-select v-model="form.${field}" placeholder="请选择${comment}"> <el-form-item label="${comment}" prop="${field}">
<el-option label="请选择字典生成" value="" /> <el-select v-model="form.${field}" placeholder="请选择${comment}">
</el-select> <el-option label="请选择字典生成" value="" />
</el-form-item> </el-select>
</el-form-item>
</el-col>
#elseif($column.htmlType == "checkbox" && "" != $dictType) #elseif($column.htmlType == "checkbox" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-checkbox-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-checkbox <el-checkbox-group v-model="form.${field}">
v-for="dict in ${dictType}" <el-checkbox
:key="dict.value" v-for="dict in ${dictType}"
:label="dict.value"> :key="dict.value"
{{dict.label}} :label="dict.value">
</el-checkbox> {{dict.label}}
</el-checkbox-group> </el-checkbox>
</el-form-item> </el-checkbox-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "checkbox" && $dictType) #elseif($column.htmlType == "checkbox" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-checkbox-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-checkbox>请选择字典生成</el-checkbox> <el-checkbox-group v-model="form.${field}">
</el-checkbox-group> <el-checkbox>请选择字典生成</el-checkbox>
</el-form-item> </el-checkbox-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "radio" && "" != $dictType) #elseif($column.htmlType == "radio" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-radio-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-radio <el-radio-group v-model="form.${field}">
v-for="dict in ${dictType}" <el-radio
:key="dict.value" 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)" :label="parseInt(dict.value)"
#else #else
:label="dict.value" :label="dict.value"
#end #end
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col>
#elseif($column.htmlType == "radio" && $dictType) #elseif($column.htmlType == "radio" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-radio-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-radio label="1">请选择字典生成</el-radio> <el-radio-group v-model="form.${field}">
</el-radio-group> <el-radio label="1">请选择字典生成</el-radio>
</el-form-item> </el-radio-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "datetime") #elseif($column.htmlType == "datetime")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-date-picker clearable <el-form-item label="${comment}" prop="${field}">
v-model="form.${field}" <el-date-picker clearable
type="date" v-model="form.${field}"
value-format="YYYY-MM-DD" type="date"
placeholder="选择${comment}"> value-format="YYYY-MM-DD"
</el-date-picker> placeholder="选择${comment}">
</el-form-item> </el-date-picker>
</el-form-item>
</el-col>
#elseif($column.htmlType == "textarea") #elseif($column.htmlType == "textarea")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="24">
<el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" /> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
#end #end
#end #end
#end #end
#end #end
</el-row>
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">

175
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3ts/index.vue.vm
View File

@@ -163,8 +163,16 @@
/> />
<!-- 添加或修改${functionName}对话框 --> <!-- 添加或修改${functionName}对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body> #if($table.formColNum == 2)
<el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px"> #set($dialogWidth = "800px")
#elseif($table.formColNum == 3)
#set($dialogWidth = "1100px")
#else
#set($dialogWidth = "500px")
#end
<el-dialog :title="title" v-model="open" width="${dialogWidth}" append-to-body>
<el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="100px">
<el-row>
#foreach($column in $columns) #foreach($column in $columns)
#set($field=$column.javaField) #set($field=$column.javaField)
#if($column.insert && !$column.pk) #if($column.insert && !$column.pk)
@@ -177,96 +185,121 @@
#end #end
#set($dictType=$column.dictType) #set($dictType=$column.dictType)
#if($column.htmlType == "input") #if($column.htmlType == "input")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-input v-model="form.${field}" placeholder="请输入${comment}" /> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <el-input v-model="form.${field}" placeholder="请输入${comment}" />
</el-form-item>
</el-col>
#elseif($column.htmlType == "imageUpload") #elseif($column.htmlType == "imageUpload")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<image-upload v-model="form.${field}"/> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <image-upload v-model="form.${field}"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "fileUpload") #elseif($column.htmlType == "fileUpload")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<file-upload v-model="form.${field}"/> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <file-upload v-model="form.${field}"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "editor") #elseif($column.htmlType == "editor")
<el-form-item label="${comment}"> <el-col :span="24">
<editor v-model="form.${field}" :min-height="192"/> <el-form-item label="${comment}">
</el-form-item> <editor v-model="form.${field}" :min-height="192"/>
</el-form-item>
</el-col>
#elseif($column.htmlType == "select" && "" != $dictType) #elseif($column.htmlType == "select" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-select v-model="form.${field}" placeholder="请选择${comment}"> <el-form-item label="${comment}" prop="${field}">
<el-option <el-select v-model="form.${field}" placeholder="请选择${comment}">
v-for="dict in ${dictType}" <el-option
:key="dict.value" v-for="dict in ${dictType}"
:label="dict.label" :key="dict.value"
:label="dict.label"
#if($column.javaType == "Integer" || $column.javaType == "Long") #if($column.javaType == "Integer" || $column.javaType == "Long")
:value="parseInt(dict.value)" :value="parseInt(dict.value)"
#else #else
:value="dict.value" :value="dict.value"
#end #end
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
#elseif($column.htmlType == "select" && $dictType) #elseif($column.htmlType == "select" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-select v-model="form.${field}" placeholder="请选择${comment}"> <el-form-item label="${comment}" prop="${field}">
<el-option label="请选择字典生成" value="" /> <el-select v-model="form.${field}" placeholder="请选择${comment}">
</el-select> <el-option label="请选择字典生成" value="" />
</el-form-item> </el-select>
</el-form-item>
</el-col>
#elseif($column.htmlType == "checkbox" && "" != $dictType) #elseif($column.htmlType == "checkbox" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-checkbox-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-checkbox <el-checkbox-group v-model="form.${field}">
v-for="dict in ${dictType}" <el-checkbox
:key="dict.value" v-for="dict in ${dictType}"
:label="dict.value"> :key="dict.value"
{{dict.label}} :label="dict.value">
</el-checkbox> {{dict.label}}
</el-checkbox-group> </el-checkbox>
</el-form-item> </el-checkbox-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "checkbox" && $dictType) #elseif($column.htmlType == "checkbox" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-checkbox-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-checkbox>请选择字典生成</el-checkbox> <el-checkbox-group v-model="form.${field}">
</el-checkbox-group> <el-checkbox>请选择字典生成</el-checkbox>
</el-form-item> </el-checkbox-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "radio" && "" != $dictType) #elseif($column.htmlType == "radio" && "" != $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-radio-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-radio <el-radio-group v-model="form.${field}">
v-for="dict in ${dictType}" <el-radio
:key="dict.value" 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)" :label="parseInt(dict.value)"
#else #else
:label="dict.value" :label="dict.value"
#end #end
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col>
#elseif($column.htmlType == "radio" && $dictType) #elseif($column.htmlType == "radio" && $dictType)
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-radio-group v-model="form.${field}"> <el-form-item label="${comment}" prop="${field}">
<el-radio label="1">请选择字典生成</el-radio> <el-radio-group v-model="form.${field}">
</el-radio-group> <el-radio label="1">请选择字典生成</el-radio>
</el-form-item> </el-radio-group>
</el-form-item>
</el-col>
#elseif($column.htmlType == "datetime") #elseif($column.htmlType == "datetime")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="${colSpan}">
<el-date-picker clearable <el-form-item label="${comment}" prop="${field}">
v-model="form.${field}" <el-date-picker clearable
type="date" v-model="form.${field}"
value-format="YYYY-MM-DD" type="date"
placeholder="请选择${comment}"> value-format="YYYY-MM-DD"
</el-date-picker> placeholder="请选择${comment}">
</el-form-item> </el-date-picker>
</el-form-item>
</el-col>
#elseif($column.htmlType == "textarea") #elseif($column.htmlType == "textarea")
<el-form-item label="${comment}" prop="${field}"> <el-col :span="24">
<el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" /> <el-form-item label="${comment}" prop="${field}">
</el-form-item> <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
#end #end
#end #end
#end #end
#end #end
</el-row>
#if($table.sub) #if($table.sub)
<el-divider content-position="center">${subTable.functionName}信息</el-divider> <el-divider content-position="center">${subTable.functionName}信息</el-divider>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">

16
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
View File

@@ -69,6 +69,22 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item prop="formColNum">
<span slot="label">
表单布局
<el-tooltip content="选择表单的栅格布局方式" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</span>
<el-select v-model="info.formColNum">
<el-option label="单列" :value="1" />
<el-option label="双列" :value="2" />
<el-option label="三列" :value="3" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="genType"> <el-form-item prop="genType">
<span slot="label"> <span slot="label">

1
sql/ry_20260321.sql → sql/ry_20260402.sql
View File

@@ -674,6 +674,7 @@ create table gen_table (
business_name varchar(30) comment '生成业务名', business_name varchar(30) comment '生成业务名',
function_name varchar(50) comment '生成功能名', function_name varchar(50) comment '生成功能名',
function_author varchar(50) comment '生成功能作者', function_author varchar(50) comment '生成功能作者',
form_col_num int(1) default 1 comment '表单布局（单列 双列 三列）',
gen_type char(1) default '0' comment '生成代码方式（0zip压缩包 1自定义路径）', gen_type char(1) default '0' comment '生成代码方式（0zip压缩包 1自定义路径）',
gen_path varchar(200) default '/' comment '生成路径（不填默认项目路径）', gen_path varchar(200) default '/' comment '生成路径（不填默认项目路径）',
options varchar(1000) comment '其它生成选项', options varchar(1000) comment '其它生成选项',