jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 优化 excel 导出字典默认转为下拉框

Browse Source
This commit is contained in:
疯狂的狮子Li
2023-07-28 20:08:53 +08:00
parent ec6704181f
commit fea9fdaa5f
10 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
View File

@ -77,14 +77,14 @@ public class SysDictData extends BaseEntity {
/**
* 是否默认（Y是 N否）
*/
@ExcelProperty(value = "是否默认", converter = ExcelDictConvert.class)
@ExcelProperty(value = "是否默认", index = 5, converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_yes_no")
private String isDefault;
/**
* 状态（0正常 1停用）
*/
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelProperty(value = "状态", index = 6, converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_normal_disable")
private String status;

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
View File

@ -53,7 +53,7 @@ public class SysDictType extends BaseEntity {
/**
* 状态（0正常 1停用）
*/
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelProperty(value = "状态", index = 3, converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_normal_disable")
private String status;

4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
View File

@ -64,7 +64,7 @@ public class SysRole extends BaseEntity {
/**
* 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）
*/
@ExcelProperty(value = "数据范围", converter = ExcelDictConvert.class)
@ExcelProperty(value = "数据范围", index = 4, converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
private String dataScope;
@ -81,7 +81,7 @@ public class SysRole extends BaseEntity {
/**
* 角色状态（0正常 1停用）
*/
@ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class)
@ExcelProperty(value = "角色状态", index = 5, converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_normal_disable")
private String status;

3
ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelDownHandler.java
View File

@ -128,6 +128,9 @@ public class ExcelDownHandler implements SheetWriteHandler {
}
}
}
if (CollUtil.isEmpty(dropDownOptions)) {
return;
}
dropDownOptions.forEach(everyOptions -> {
// 如果传递了下拉框选择器参数
if (!everyOptions.getNextOptions().isEmpty()) {

6
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
View File

@ -196,10 +196,8 @@ public class ExcelUtil {
// 合并处理器
builder.registerWriteHandler(new CellMergeStrategy(list, true));
}
if (CollUtil.isNotEmpty(options)) {
// 添加下拉框操作
builder.registerWriteHandler(new ExcelDownHandler(options));
}
// 添加下拉框操作
builder.registerWriteHandler(new ExcelDownHandler(options));
builder.doWrite(list);
}