From e0613b0d64ae2ae3c6734714e1e64b268c740da6 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 16 十月 2024 11:08:05 +0800
Subject: [PATCH] 表单设计器,缓存

---
 src/main/java/com/product/face/service/FaceDesignService.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/product/face/service/FaceDesignService.java b/src/main/java/com/product/face/service/FaceDesignService.java
index 1f89e1b..30ca858 100644
--- a/src/main/java/com/product/face/service/FaceDesignService.java
+++ b/src/main/java/com/product/face/service/FaceDesignService.java
@@ -51,6 +51,16 @@
 		List<JSONObject> result = FaceUtil.getFaceControlList(fse, fieldPropertyDt);
 		Map<String, Object> other = new HashMap<>();
 		other.put("drawingList", result);
+		DataTableEntity faceCustomField = fse.getSubDataTable("product_sys_face_custom_field");
+		if (!DataTableEntity.isEmpty(faceCustomField)) {
+			for (int i = 0; i < faceCustomField.getRows(); i++) {
+				faceCustomField.setFieldValue(i, "customField", true);
+				faceCustomField.setFieldValue(i, "added", true);
+			}
+			other.put("product_sys_face_custom_field", BaseUtil.dataTableEntityToJson(faceCustomField));
+		} else {
+			other.put("product_sys_face_custom_field", new String[]{});
+		}
 		fse.getSubData().clear();
 		return BaseUtil.success(fse, other);
 	}
@@ -74,7 +84,7 @@
 		for (int i = 0; i < fields.getRows(); i++) {
 			if (fields.getBoolean(i, "event_property")) {
 				DataTableEntity subDataTable = fields.getFieldSetEntity(i).getSubDataTable("event_array");
-				if(DataTableEntity.isEmpty(subDataTable)){
+				if (DataTableEntity.isEmpty(subDataTable)) {
 					continue;
 				}
 				fields.setFieldValue(i, "event_array", BaseUtil.dataTableEntityToJson(subDataTable));
@@ -89,6 +99,9 @@
 		if (!StringUtils.isEmpty(fse.getUUID())) {
 			getBaseDao().delete(FaceConst.TABLE_FACE_FIELD_CONTROL_PROPERTY, "master_uuid=?", new Object[]{fse.getUUID()});
 		}
+		if (StringUtils.isEmpty(fse.getString("terminal_type"))) {
+			fse.setValue("terminal_type", 1);
+		}
 		getBaseDao().saveFieldSetEntity(fse);
 		fse.getSubData().clear();
 		return fse;

--
Gitblit v1.9.2