From d9ff374c80f3ed9077eae5136a7edea37668afbf Mon Sep 17 00:00:00 2001
From: zhou zhou <zozhouo3o@gmail.com>
Date: 星期五, 17 四月 2026 09:59:08 +0800
Subject: [PATCH] #条码自定义增加图片

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrPrintTemplateServiceImpl.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrPrintTemplateServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrPrintTemplateServiceImpl.java
index d69d567..648a039 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrPrintTemplateServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrPrintTemplateServiceImpl.java
@@ -32,7 +32,7 @@
         implements MatnrPrintTemplateService {
 
     private static final Set<String> SUPPORTED_ELEMENT_TYPES = Collections.unmodifiableSet(
-            new LinkedHashSet<>(Arrays.asList("text", "barcode", "qrcode", "line", "rect", "table"))
+            new LinkedHashSet<>(Arrays.asList("text", "barcode", "qrcode", "image", "line", "rect", "table"))
     );
 
     @Override
@@ -316,6 +316,15 @@
                     throw new CoolException("浜岀淮鐮佸厓绱犲�兼ā鏉夸笉鑳戒负绌�");
                 }
                 break;
+            case "image":
+                if (normalizeText(element.getString("src")).isEmpty()) {
+                    throw new CoolException("鍥剧墖鍏冪礌鍦板潃涓嶈兘涓虹┖");
+                }
+                String objectFit = normalizeText(element.getString("objectFit"));
+                if (!objectFit.isEmpty() && !Arrays.asList("contain", "cover", "fill").contains(objectFit)) {
+                    throw new CoolException("鍥剧墖鍏冪礌濉厖鏂瑰紡浠呮敮鎸� contain銆乧over 鎴� fill");
+                }
+                break;
             case "table":
                 if (element.getJSONArray("columns") == null) {
                     throw new CoolException("琛ㄦ牸鍏冪礌 columns 涓嶈兘涓虹┖");

--
Gitblit v1.9.1