diff --git a/src/main/java/neatlogic/framework/util/FormUtil.java b/src/main/java/neatlogic/framework/util/FormUtil.java index 59be77c6238ae36657451c963ea55c202cd2cadf..a1fcf9ed3db55982b47cace10f8acd9472c60012 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 c6733cafddc6ae90a1d18fae119c90bdd8a2b194..21c3d1261e3655144adcf2d28f959a42a3874da0 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