From 48989d38c871957d33c58c9ac7f162bad7d9fb97 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 01 六月 2023 15:22:00 +0800
Subject: [PATCH] 表单设计器--事件
---
src/main/java/com/product/face/service/FaceCacheService.java | 4 ++--
src/main/java/com/product/face/service/FaceDesignService.java | 2 +-
src/main/java/com/product/face/util/FaceUtil.java | 10 ++++++++--
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/product/face/service/FaceCacheService.java b/src/main/java/com/product/face/service/FaceCacheService.java
index 51dcad4..4df8413 100644
--- a/src/main/java/com/product/face/service/FaceCacheService.java
+++ b/src/main/java/com/product/face/service/FaceCacheService.java
@@ -116,7 +116,7 @@
}
fse.getSubData().clear();
String faceNumber = fse.getString(FaceConst.FIELD_FACE_NUMBER);
- List<JSONObject> faceControlList = FaceUtil.getFaceControlList(fieldPropertyDt);
+ List<JSONObject> faceControlList = FaceUtil.getFaceControlList(fse,fieldPropertyDt);
if (faceControlList != null) {
FaceEntity face = new FaceEntity();
face.setData(BaseUtil.fieldSetEntityToJson(fse));
@@ -135,7 +135,7 @@
if (DataTableEntity.isEmpty(fieldPropertyDt)) {
return;
}
- List<JSONObject> faceControlList = FaceUtil.getFaceControlList(fieldPropertyDt);
+ List<JSONObject> faceControlList = FaceUtil.getFaceControlList(fse,fieldPropertyDt);
JSONObject jsonObject = faceControlList.get(0);
if (jsonObject == null || jsonObject.isEmpty()) {
return;
diff --git a/src/main/java/com/product/face/service/FaceDesignService.java b/src/main/java/com/product/face/service/FaceDesignService.java
index 9eb1d40..5cc1b4d 100644
--- a/src/main/java/com/product/face/service/FaceDesignService.java
+++ b/src/main/java/com/product/face/service/FaceDesignService.java
@@ -48,7 +48,7 @@
if (DataTableEntity.isEmpty(fieldPropertyDt)) {
throw new BaseException(ErrorCode.GET_FACE_CONFIG_FAIL);
}
- List<JSONObject> result = FaceUtil.getFaceControlList(fieldPropertyDt);
+ List<JSONObject> result = FaceUtil.getFaceControlList(fse,fieldPropertyDt);
Map<String, Object> other = new HashMap<>();
other.put("drawingList", result);
fse.getSubData().clear();
diff --git a/src/main/java/com/product/face/util/FaceUtil.java b/src/main/java/com/product/face/util/FaceUtil.java
index 8dafdd4..0dd235a 100644
--- a/src/main/java/com/product/face/util/FaceUtil.java
+++ b/src/main/java/com/product/face/util/FaceUtil.java
@@ -23,7 +23,7 @@
public class FaceUtil {
- public static List<JSONObject> getFaceControlList(DataTableEntity faceControlDt) {
+ public static List<JSONObject> getFaceControlList(FieldSetEntity face,DataTableEntity faceControlDt) {
List<JSONObject> result = new ArrayList<>();
List<FieldSetEntity> data = faceControlDt.getData();
Map<String, List<FieldSetEntity>> collect = data.stream()
@@ -35,7 +35,13 @@
.collect(Collectors.groupingBy(item -> item.getString(FaceConst.FIELD_PARENT_UUID))); //鍒嗙粍
for (Map.Entry<String, List<FieldSetEntity>> entry : collect.entrySet()) {
List<FieldSetEntity> propertyList = entry.getValue();
- result.add(getPropertyJson(propertyList, groupContainer));
+ JSONObject propertyJson = getPropertyJson(propertyList, groupContainer);
+ Boolean eventProperty = propertyJson.getBoolean("event_property");
+ if(eventProperty!=null && eventProperty){
+ face.setValue("events",propertyJson.get("events"));
+ continue;
+ }
+ result.add(propertyJson);
}
result.sort(Comparator.comparing(item -> item.getInteger(FaceConst.CONTROL_SEQUENCE)));
return result;
--
Gitblit v1.9.2