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";