From 962f0b5e37c3edbdc70a19fea6c6d9e7ef1123da Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 17 Oct 2024 18:45:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E8=A1=A8=E5=8D=95-=E5=AF=86=E7=A0=81=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=8E=9F=E5=AF=86=E7=A0=81=E6=8E=88=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1268877969817600]后端-表单-密码控件查看原密码授权 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1268877969817600 --- .../attribute/handler/SubassemblyHandler.java | 53 +++++++++++++++---- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/src/main/java/neatlogic/module/framework/form/attribute/handler/SubassemblyHandler.java b/src/main/java/neatlogic/module/framework/form/attribute/handler/SubassemblyHandler.java index b8cf55b83..54628ba04 100644 --- a/src/main/java/neatlogic/module/framework/form/attribute/handler/SubassemblyHandler.java +++ b/src/main/java/neatlogic/module/framework/form/attribute/handler/SubassemblyHandler.java @@ -180,18 +180,51 @@ public class SubassemblyHandler extends FormHandlerBase { String uuid = component.getString("uuid"); JSONObject config = component.getJSONObject("config"); IFormAttributeDataConversionHandler formAttributeDataConversionHandler = FormAttributeDataConversionHandlerFactory.getHandler(handler); - if (Objects.equals(handler, FormHandler.FORMSUBASSEMBLY.getHandler())) { + if (Objects.equals(handler, FormHandler.FORMPASSWORD.getHandler())) { + if (Objects.equals(uuid, attributeUuid)) { + String rowUuid = otherParamConfig.getString("rowUuid"); + for (int j = 0; j < dataArray.size(); j++) { + JSONObject dataObj = dataArray.getJSONObject(j); + if (MapUtils.isNotEmpty(dataObj)) { + if (Objects.equals(dataObj.getString("uuid"), rowUuid)) { + + } + Object data = dataObj.get(uuid); + if (data != null) { + String result = formAttributeDataConversionHandler.passwordDecryption(data, config, attributeUuid, otherParamConfig); + if (result != null) { + return result; + } + } + } + } + } + + } else if (Objects.equals(handler, FormHandler.FORMTABLEINPUTER.getHandler())) { + for (int j = 0; j < dataArray.size(); j++) { + JSONObject dataObj = dataArray.getJSONObject(j); + if (MapUtils.isNotEmpty(dataObj)) { + Object data = dataObj.get(uuid); + if (data != null) { + String result = formAttributeDataConversionHandler.passwordDecryption(data, config, attributeUuid, otherParamConfig); + if (result != null) { + return result; + } + } + } + } + } else if (Objects.equals(handler, FormHandler.FORMSUBASSEMBLY.getHandler())) { JSONObject formData1 = component.getJSONObject("formData"); config.put("formData", formData1); - } - for (int j = 0; j < dataArray.size(); j++) { - JSONObject dataObj = dataArray.getJSONObject(j); - if (MapUtils.isNotEmpty(dataObj)) { - Object data = dataObj.get(uuid); - if (data != null) { - String result = formAttributeDataConversionHandler.passwordDecryption(data, config, attributeUuid, otherParamConfig); - if (result != null) { - return result; + for (int j = 0; j < dataArray.size(); j++) { + JSONObject dataObj = dataArray.getJSONObject(j); + if (MapUtils.isNotEmpty(dataObj)) { + Object data = dataObj.get(uuid); + if (data != null) { + String result = formAttributeDataConversionHandler.passwordDecryption(data, config, attributeUuid, otherParamConfig); + if (result != null) { + return result; + } } } } -- Gitee From 54e83844d373ae32d345f0ef3987e8f9e905764e Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 17 Oct 2024 18:48:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E8=A1=A8=E5=8D=95-=E5=AF=86=E7=A0=81=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=8E=9F=E5=AF=86=E7=A0=81=E6=8E=88=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1268877969817600]后端-表单-密码控件查看原密码授权 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1268877969817600 --- .../attribute/handler/SubassemblyHandler.java | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/src/main/java/neatlogic/module/framework/form/attribute/handler/SubassemblyHandler.java b/src/main/java/neatlogic/module/framework/form/attribute/handler/SubassemblyHandler.java index 54628ba04..854171ee1 100644 --- a/src/main/java/neatlogic/module/framework/form/attribute/handler/SubassemblyHandler.java +++ b/src/main/java/neatlogic/module/framework/form/attribute/handler/SubassemblyHandler.java @@ -187,35 +187,23 @@ public class SubassemblyHandler extends FormHandlerBase { JSONObject dataObj = dataArray.getJSONObject(j); if (MapUtils.isNotEmpty(dataObj)) { if (Objects.equals(dataObj.getString("uuid"), rowUuid)) { - - } - Object data = dataObj.get(uuid); - if (data != null) { - String result = formAttributeDataConversionHandler.passwordDecryption(data, config, attributeUuid, otherParamConfig); - if (result != null) { - return result; + Object data = dataObj.get(uuid); + if (data != null) { + String result = formAttributeDataConversionHandler.passwordDecryption(data, config, attributeUuid, otherParamConfig); + if (result != null) { + return result; + } } } } } } - } else if (Objects.equals(handler, FormHandler.FORMTABLEINPUTER.getHandler())) { - for (int j = 0; j < dataArray.size(); j++) { - JSONObject dataObj = dataArray.getJSONObject(j); - if (MapUtils.isNotEmpty(dataObj)) { - Object data = dataObj.get(uuid); - if (data != null) { - String result = formAttributeDataConversionHandler.passwordDecryption(data, config, attributeUuid, otherParamConfig); - if (result != null) { - return result; - } - } - } + } else { + if (Objects.equals(handler, FormHandler.FORMSUBASSEMBLY.getHandler())) { + JSONObject formData1 = component.getJSONObject("formData"); + config.put("formData", formData1); } - } else if (Objects.equals(handler, FormHandler.FORMSUBASSEMBLY.getHandler())) { - JSONObject formData1 = component.getJSONObject("formData"); - config.put("formData", formData1); for (int j = 0; j < dataArray.size(); j++) { JSONObject dataObj = dataArray.getJSONObject(j); if (MapUtils.isNotEmpty(dataObj)) { -- Gitee