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/util/FaceUtil.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

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