huangge1199/ruoyi-flex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !5 from 晨曦/0416

Browse Source
This commit is contained in:
晨曦 2024-04-16 11:07:27 +00:00 committed by Gitee
commit 580b8dacae
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 717 additions and 691 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -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);

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

@ -147,8 +147,9 @@
/>
</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">
<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)
@ -159,6 +160,18 @@
#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">
@ -253,8 +266,10 @@
<el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
</el-form-item>
#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">

3
script/sql/mysql/update.sql
View File

@ -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`;

3
script/sql/postgresql/update.sql
View File

@ -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`;