diff --git a/flyfish-data/src/main/java/com/flyfish/framework/annotations/FormItem.java b/flyfish-data/src/main/java/com/flyfish/framework/annotations/FormItem.java index 26526c5..5e56fbe 100644 --- a/flyfish-data/src/main/java/com/flyfish/framework/annotations/FormItem.java +++ b/flyfish-data/src/main/java/com/flyfish/framework/annotations/FormItem.java @@ -22,10 +22,35 @@ public @interface FormItem { * * @return 结果 */ - FormItemProp[] props() default {}; + Prop[] props() default {}; /** * @return 布局 */ String layout() default ""; + + /** + * 表单域属性 + * + * @author wangyu + */ + @Target(ElementType.FIELD) + @Retention(RetentionPolicy.RUNTIME) + @Documented + @interface Prop { + + /** + * 键 + * + * @return 键 + */ + String key(); + + /** + * 值 + * + * @return 值 + */ + String value(); + } } diff --git a/flyfish-data/src/main/java/com/flyfish/framework/annotations/FormItemProp.java b/flyfish-data/src/main/java/com/flyfish/framework/annotations/FormItemProp.java deleted file mode 100644 index ea74d1e..0000000 --- a/flyfish-data/src/main/java/com/flyfish/framework/annotations/FormItemProp.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.flyfish.framework.annotations; - -import java.lang.annotation.*; - -/** - * 表单域属性 - * - * @author wangyu - */ -@Target(ElementType.FIELD) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface FormItemProp { - - /** - * 键 - * - * @return 键 - */ - String key(); - - /** - * 值 - * - * @return 值 - */ - String value(); -} 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 49b42a9..bc48ac4 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 @@ -113,7 +113,7 @@ public class BeanProperty { property.extra.put("component", item.component()); property.layout = item.layout(); if (ArrayUtils.isNotEmpty(item.props())) { - for (FormItemProp prop : item.props()) { + for (FormItem.Prop prop : item.props()) { property.prop(prop.key(), prop.value()); } }