From cdace51197a7acf10033cc12f2dce3a7aad326e8 Mon Sep 17 00:00:00 2001
From: 严俊东 <1172482914@qq.com>
Date: 星期二, 20 七月 2021 12:49:22 +0800
Subject: [PATCH] code=401时request方法没有返回Promise.reject 修复
---
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 f781b1e..50482c5 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
@@ -101,6 +101,32 @@
public String targetAttr() default "";
/**
+ * 是否自动统计数据,在最后追加一行统计数据总和
+ */
+ public boolean isStatistics() default false;
+
+ /**
+ * 导出字段对齐方式（0：默认；1：靠左；2：居中；3：靠右）
+ */
+ Align align() default Align.AUTO;
+
+ public enum Align
+ {
+ AUTO(0), LEFT(1), CENTER(2), RIGHT(3);
+ private final int value;
+
+ Align(int value)
+ {
+ this.value = value;
+ }
+
+ public int value()
+ {
+ return this.value;
+ }
+ }
+
+ /**
* 字段类型（0：导出导入；1：仅导出；2：仅导入）
*/
Type type() default Type.ALL;
@@ -123,7 +149,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