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

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

Browse Source 
Merge pull request !5 from 晨曦/0416
This commit is contained in:
数据小王子 2024-04-16 11:34:16 +00:00 committed by Gitee
commit 844aa24b43
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 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("columns", genTable.getColumns());
velocityContext.put("table", genTable); velocityContext.put("table", genTable);
velocityContext.put("dicts", getDicts(genTable)); velocityContext.put("dicts", getDicts(genTable));
/* 编辑页列数*/
velocityContext.put("editColumns", genTable.getEditColumns());
setMenuVelocityContext(velocityContext, genTable); setMenuVelocityContext(velocityContext, genTable);
if (GenConstants.TPL_TREE.equals(tplCategory)) { if (GenConstants.TPL_TREE.equals(tplCategory)) {
setTreeVelocityContext(velocityContext, genTable); setTreeVelocityContext(velocityContext, genTable);

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

File diff suppressed because it is too large Load Diff

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

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