mirror of
https://github.com/getrebuild/rebuild.git
synced 2024-11-10 17:04:33 +08:00
export SIGN
This commit is contained in:
parent
ad7fc197cc
commit
6a85025137
2 changed files with 14 additions and 7 deletions
|
@ -173,10 +173,7 @@ public class DataExporter extends SetUser {
|
|||
if (cellVal.toString().equals(FieldValueHelper.NO_READ_PRIVILEGES)) {
|
||||
cellVal = Language.L("[无权限]");
|
||||
|
||||
} else if (dt == DisplayType.FILE
|
||||
|| dt == DisplayType.IMAGE
|
||||
|| dt == DisplayType.AVATAR
|
||||
|| dt == DisplayType.BARCODE) {
|
||||
} else if (!dt.canExport()) {
|
||||
cellVal = Language.L("[暂不支持]");
|
||||
|
||||
} else if (dt == DisplayType.DECIMAL || dt == DisplayType.NUMBER) {
|
||||
|
|
|
@ -26,6 +26,7 @@ import com.rebuild.core.support.i18n.Language;
|
|||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.util.Assert;
|
||||
import org.springframework.util.Base64Utils;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.*;
|
||||
|
@ -198,11 +199,11 @@ public class EasyExcelGenerator extends SetUser {
|
|||
Objects.requireNonNull(MetadataHelper.getLastJoinField(entity, fieldName)));
|
||||
DisplayType dt = easyMeta.getDisplayType();
|
||||
|
||||
if (!dt.canExport()) {
|
||||
if (!dt.canExport() && dt != DisplayType.SIGN) {
|
||||
data.put(fieldName, unsupportFieldTip);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
// 替换成变量名
|
||||
String varName = fieldName;
|
||||
for (Map.Entry<String, String> e : varsMap.entrySet()) {
|
||||
|
@ -219,10 +220,19 @@ public class EasyExcelGenerator extends SetUser {
|
|||
if (fieldValue == null) {
|
||||
data.put(varName, StringUtils.EMPTY);
|
||||
} else {
|
||||
fieldValue = FieldValueHelper.wrapFieldValue(fieldValue, easyMeta, true);
|
||||
|
||||
if (dt == DisplayType.SIGN) {
|
||||
fieldValue = buildImgData((String) fieldValue);
|
||||
} else {
|
||||
fieldValue = FieldValueHelper.wrapFieldValue(fieldValue, easyMeta, true);
|
||||
}
|
||||
data.put(varName, fieldValue);
|
||||
}
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
private byte[] buildImgData(String base64img) {
|
||||
return Base64Utils.decodeFromString(base64img.split("base64,")[1]);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue