From 6f5c0a17dd08ca94a600bd7984d1cdbdebe0f5ed Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Wed, 29 Sep 2021 10:37:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat=EF=BC=9A=E6=A1=86=E6=9E=B6=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AE=8C=E6=95=B4=E7=9A=84?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/flyfish/framework/beans/meta/BeanProperty.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java b/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java
index a7a44c3..d6fcf18 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java
+++ b/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java
@@ -408,6 +408,9 @@ public class BeanProperty {
             // 处理值生成策略，此处可清除原策略
             if (ArrayUtils.isNotEmpty(prop.generated())) {
                 property.extra.put(BeanProps.GENERATED, MergedAnnotations.from(prop.mapping()).get(MappedTo.class).asMap());
+                if (StringUtils.isBlank((String)property.extra.get(BeanProps.COMPONENT))) {
+                    property.extra.put(BeanProps.COMPONENT, "input-hidden");
+                }
             } else {
                 property.extra.remove(BeanProps.GENERATED);
                 if ("input-hidden".equals(property.extra.get(BeanProps.COMPONENT))) {

From 7d2eedb2310dc74c62202f194085c56145dea8fa Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Wed, 29 Sep 2021 10:50:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat=EF=BC=9A=E6=A1=86=E6=9E=B6=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AE=8C=E6=95=B4=E7=9A=84?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/flyfish/framework/beans/meta/BeanProperty.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java b/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java
index d6fcf18..f430b10 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java
+++ b/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java
@@ -407,7 +407,7 @@ public class BeanProperty {
             }
             // 处理值生成策略，此处可清除原策略
             if (ArrayUtils.isNotEmpty(prop.generated())) {
-                property.extra.put(BeanProps.GENERATED, MergedAnnotations.from(prop.mapping()).get(MappedTo.class).asMap());
+                property.extra.put(BeanProps.GENERATED, MergedAnnotations.from(prop.generated()).get(Generation.class).asMap());
                 if (StringUtils.isBlank((String)property.extra.get(BeanProps.COMPONENT))) {
                     property.extra.put(BeanProps.COMPONENT, "input-hidden");
                 }