From c3267415ddf1385e539d88651e02bd9b8cda4b65 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期四, 14 十一月 2024 09:57:13 +0800
Subject: [PATCH] 表单

---
 src/main/java/com/product/mobile/core/service/FaceMobileService.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/product/mobile/core/service/FaceMobileService.java b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
index 592931a..ef38ae1 100644
--- a/src/main/java/com/product/mobile/core/service/FaceMobileService.java
+++ b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
@@ -191,6 +191,7 @@
 			uuid.setName(f.getString("field_show_name"));
 			uuid.setField(f.getString("field_name"));
 			uuid.setType(f.getString("field_type"));
+			uuid.setRequired(f.getString("is_required"));
 			uuid.setTable(table_name);
 			ls.add(uuid);
 		}
@@ -435,7 +436,7 @@
 			for (FieldSetEntity setEntity : parentGroup) {
 				//鎵惧埌灞炴�у悕绉�= __vModel__
 				String propertyName = setEntity.getString("property_name");
-				if ("componentType".equals(propertyName)) {
+				if ("componentType".equals(propertyName) || "prompt".equals(propertyName)) {
 					continue;
 				}
 				if ("parentType".equals(propertyName) && "subTable".equals(setEntity.getString("property_value")) && subTableField != null) {
@@ -461,6 +462,9 @@
 					}
 				}
 				propertyName = StrUtil.toCamelCase(propertyName);
+				if ("defaultValue".equals(propertyName) && !"0".equals(setEntity.getString("property_value")) && !"1".equals(setEntity.getString("property_value"))) {
+					continue;
+				}
 				if (ReflectUtil.hasField(FaceFieldEntity.class, propertyName) && !"field".equals(setEntity.getString("property_name")) && !"prompt".equals(setEntity.getString("property_name"))) {
 					ReflectUtil.setFieldValue(faceFieldEntity, propertyName, setEntity.getObject("property_value"));
 
@@ -496,7 +500,7 @@
 		for (FieldSetEntity setEntity : configGroup) {
 			//鎵惧埌灞炴�у悕绉�= __vModel__
 			String propertyName = setEntity.getString("property_name");
-			if ("componentType".equals(propertyName)) {
+			if ("componentType".equals(propertyName) || "prompt".equals(propertyName)) {
 				continue;
 			}
 			if ("tag".equals(propertyName)) {
@@ -511,6 +515,9 @@
 				propertyName = "prompt";
 			}
 			propertyName = StrUtil.toCamelCase(propertyName);
+			if ("defaultValue".equals(propertyName) && !"0".equals(setEntity.getString("property_value")) && !"1".equals(setEntity.getString("property_value"))) {
+				continue;
+			}
 			if (ReflectUtil.hasField(FaceFieldEntity.class, propertyName) && !"field".equals(setEntity.getString("property_name")) && !"prompt".equals(setEntity.getString("property_name"))) {
 				ReflectUtil.setFieldValue(faceFieldEntity, propertyName, setEntity.getObject("property_value"));
 			}

--
Gitblit v1.9.2