From fc707c6baad34cdd171cdfd99d00ed2b5b42a4c4 Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Fri, 8 Oct 2021 23:35:32 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=9B=B4?=
 =?UTF-8?q?=E4=B8=B0=E5=AF=8C=E7=9A=84=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/flyfish/framework/beans/meta/BeanProperty.java   | 4 +++-
 .../main/java/com/flyfish/framework/beans/meta/BeanProps.java | 4 ++++
 2 files changed, 7 insertions(+), 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 e15b984..48b108d 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
@@ -376,7 +376,9 @@ public class BeanProperty {
         if (StringUtils.isNotBlank(item.help())) {
             property.extra.put(BeanProps.HELP, item.help());
         }
-        property.layout = item.layout();
+        if (StringUtils.isNotBlank(item.layout())) {
+            property.layout = item.layout();
+        }
         if (ArrayUtils.isNotEmpty(item.props())) {
             for (FormItem.Prop prop : item.props()) {
                 property.prop(prop.key(), prop.value());
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProps.java b/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProps.java
index 678363a..e8fa641 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProps.java
+++ b/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProps.java
@@ -20,6 +20,10 @@ public interface BeanProps {
 
     String LAYOUT_SINGLE = "single";
 
+    String LAYOUT_HALF_2 = "half2";
+
+    String LAYOUT_FULL_2 = "full2";
+
     String COMPONENT = "component";
 
     String HELP = "help";