From 653b72b223c72f7d1c5581e052ecbf6720638bab Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 9 May 2024 15:02:37 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=86=E6=B5=81=E6=94=AF=E6=8C=81js?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A7=84=E5=88=99=EF=BC=8C=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1152157133275136]后端-条件分流支持js自定义规则，获取表单组件消费数据 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1152157133275136 --- src/main/java/neatlogic/framework/util/FormUtil.java | 2 +- .../framework/matrix/handler/ViewDataSourceHandler.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/framework/util/FormUtil.java b/src/main/java/neatlogic/framework/util/FormUtil.java index 59be77c62..a1fcf9ed3 100644 --- a/src/main/java/neatlogic/framework/util/FormUtil.java +++ b/src/main/java/neatlogic/framework/util/FormUtil.java @@ -420,7 +420,7 @@ public class FormUtil { return resultList; } - private static List getFormAttributeList(JSONObject componentObj, FormAttributeParentVo parent) { + public static List getFormAttributeList(JSONObject componentObj, FormAttributeParentVo parent) { List resultList = new ArrayList<>(); // 标签组件不能改变值，不放入组件列表里 String handler = componentObj.getString("handler"); diff --git a/src/main/java/neatlogic/module/framework/matrix/handler/ViewDataSourceHandler.java b/src/main/java/neatlogic/module/framework/matrix/handler/ViewDataSourceHandler.java index c6733cafd..21c3d1261 100644 --- a/src/main/java/neatlogic/module/framework/matrix/handler/ViewDataSourceHandler.java +++ b/src/main/java/neatlogic/module/framework/matrix/handler/ViewDataSourceHandler.java @@ -239,7 +239,13 @@ public class ViewDataSourceHandler extends MatrixDataSourceHandlerBase { throw new MatrixViewNotFoundException(matrixVo.getName()); } JSONArray attributeList = (JSONArray) JSONPath.read(matrixViewVo.getConfig(), "attributeList"); - return attributeList.toJavaList(MatrixAttributeVo.class); + List matrixAttributeList = attributeList.toJavaList(MatrixAttributeVo.class); + for (MatrixAttributeVo matrixAttributeVo : matrixAttributeList) { + if (matrixAttributeVo.getUniqueIdentifier() == null) { + matrixAttributeVo.setUniqueIdentifier(matrixAttributeVo.getUuid()); + } + } + return matrixAttributeList; } @Override -- Gitee