From 2dc9c3ec387494f4a5f5d0cee8d4f89d31a4ab5c Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 13 Nov 2024 15:34:53 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8F=82=E6=95=B0formTable=E5=8F=96=E6=95=B0?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1289119638978560]邮件模板参数formTable取数逻辑优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1289119638978560
---
 .../framework/form/attribute/handler/PasswordHandler.java | 6 ++++--
 .../form/attribute/handler/TableInputerHandler.java       | 8 ++++++--
 .../matrix/handler/ExternalDataSourceHandler.java         | 1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/neatlogic/module/framework/form/attribute/handler/PasswordHandler.java b/src/main/java/neatlogic/module/framework/form/attribute/handler/PasswordHandler.java
index 41e271c8a..d7eb6aae2 100644
--- a/src/main/java/neatlogic/module/framework/form/attribute/handler/PasswordHandler.java
+++ b/src/main/java/neatlogic/module/framework/form/attribute/handler/PasswordHandler.java
@@ -67,7 +67,7 @@ public class PasswordHandler extends FormHandlerBase {
         if (dataObj != null) {
             String data = (String) dataObj;
             if (StringUtils.isNotBlank(data)) {
-                return StringUtils.repeat("*", data.length());
+                return StringUtils.repeat("*", 8);
             }
         }
         return dataObj;
@@ -165,7 +165,9 @@ public class PasswordHandler extends FormHandlerBase {
 //                    return oldSource;
 //                }
 //            }
-            return RC4Util.encrypt((String) source);
+            if (StringUtils.isNotBlank((String) source)) {
+                return RC4Util.encrypt((String) source);
+            }
         }
         return source;
     }
diff --git a/src/main/java/neatlogic/module/framework/form/attribute/handler/TableInputerHandler.java b/src/main/java/neatlogic/module/framework/form/attribute/handler/TableInputerHandler.java
index ddd50210d..d99659620 100644
--- a/src/main/java/neatlogic/module/framework/form/attribute/handler/TableInputerHandler.java
+++ b/src/main/java/neatlogic/module/framework/form/attribute/handler/TableInputerHandler.java
@@ -650,6 +650,8 @@ public class TableInputerHandler extends FormHandlerBase {
         needParseHandlerList.add(FormHandler.FORMSELECT.getHandler());
         needParseHandlerList.add(FormHandler.FORMRADIO.getHandler());
         needParseHandlerList.add(FormHandler.FORMCHECKBOX.getHandler());
+        needParseHandlerList.add(FormHandler.FORMPASSWORD.getHandler());
+        needParseHandlerList.add(FormHandler.FORMUPLOAD.getHandler());
 
         JSONArray tbodyList = new JSONArray();
         for (int i = 0; i < dataArray.size(); i++) {
@@ -657,6 +659,10 @@ public class TableInputerHandler extends FormHandlerBase {
             JSONObject rowDataObj = dataArray.getJSONObject(i);
             for (Map.Entry<String, Object> cellDataObj : rowDataObj.entrySet()) {
                 String key = cellDataObj.getKey();
+                newRowDataObj.put(key, "");
+                if (cellDataObj.getValue() == null) {
+                    continue;
+                }
                 String handler = attributeHandlerMap.get(key);
                 if (noNeedParseHandlerList.contains(handler)) {
                     newRowDataObj.put(key, cellDataObj.getValue());
@@ -668,8 +674,6 @@ public class TableInputerHandler extends FormHandlerBase {
                         attributeDataVo.setDataObj(cellDataObj.getValue());
                         Object result = formAttributeDataConversionHandler.dataTransformationForEmail(attributeDataVo, config);
                         newRowDataObj.put(key, result);
-                    } else {
-                        newRowDataObj.put(key, "");
                     }
                 } else if (Objects.equals("formtable", handler)) {
                     JSONObject config = attributeConfigMap.get(key);
diff --git a/src/main/java/neatlogic/module/framework/matrix/handler/ExternalDataSourceHandler.java b/src/main/java/neatlogic/module/framework/matrix/handler/ExternalDataSourceHandler.java
index 5f2ce7374..08bd2f6df 100644
--- a/src/main/java/neatlogic/module/framework/matrix/handler/ExternalDataSourceHandler.java
+++ b/src/main/java/neatlogic/module/framework/matrix/handler/ExternalDataSourceHandler.java
@@ -455,6 +455,7 @@ public class ExternalDataSourceHandler extends MatrixDataSourceHandlerBase {
             for (MatrixAttributeVo matrixAttributeVo : attributeList) {
                 if (Objects.equals(matrixAttributeVo.getPrimaryKey(), 1)) {
                     uuidColumn = matrixAttributeVo.getUuid();
+                    break;
                 }
             }
             for (int i = 0; i < tbodyList.size(); i++) {
-- 
Gitee