From e5d1fb3d5ce9468b92e79825bbcb38f05ea73aff Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 18:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/ruoyi/inspect/util/PreserveReportPicturePlaceholderHandler.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/util/PreserveReportPicturePlaceholderHandler.java b/inspect-server/src/main/java/com/ruoyi/inspect/util/PreserveReportPicturePlaceholderHandler.java
index 9fb72f7..14b801c 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/util/PreserveReportPicturePlaceholderHandler.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/util/PreserveReportPicturePlaceholderHandler.java
@@ -5,6 +5,7 @@
import com.deepoove.poi.template.ElementTemplate;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -27,13 +28,23 @@
));
private final Configure.ClearHandler clearHandler = new Configure.ClearHandler();
+ private final Set<String> clearPictureTags;
+
+ public PreserveReportPicturePlaceholderHandler() {
+ this(Collections.emptySet());
+ }
+
+ public PreserveReportPicturePlaceholderHandler(Set<String> clearPictureTags) {
+ this.clearPictureTags = clearPictureTags == null ? Collections.emptySet() : clearPictureTags;
+ }
@Override
public void handler(RenderContext<?> context) {
ElementTemplate template = context.getEleTemplate();
if (template != null
&& Character.valueOf('@').equals(template.getSign())
- && DEFERRED_PICTURE_TAGS.contains(template.getTagName())) {
+ && DEFERRED_PICTURE_TAGS.contains(template.getTagName())
+ && !clearPictureTags.contains(template.getTagName())) {
return;
}
clearHandler.handler(context);
--
Gitblit v1.9.3