From 02b95f95a8abd602d2c21ed3e4c736070f2e4d1c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 27 九月 2021 10:36:43 +0800
Subject: [PATCH] 升级file-saver到最新版本2.0.5
---
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
index bfe119e..9fb64da 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
@@ -5,6 +5,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.math.BigDecimal;
+import com.ruoyi.common.utils.poi.ExcelHandlerAdapter;
/**
* 自定义导出Excel数据注解
@@ -108,7 +109,17 @@
/**
* 导出字段对齐方式（0：默认；1：靠左；2：居中；3：靠右）
*/
- Align align() default Align.AUTO;
+ public Align align() default Align.AUTO;
+
+ /**
+ * 自定义数据处理器
+ */
+ public Class<?> handler() default ExcelHandlerAdapter.class;
+
+ /**
+ * 自定义数据处理器参数
+ */
+ public String[] args() default {};
public enum Align
{
@@ -149,7 +160,7 @@
public enum ColumnType
{
- NUMERIC(0), STRING(1);
+ NUMERIC(0), STRING(1), IMAGE(2);
private final int value;
ColumnType(int value)
--
Gitblit v1.9.2