Merge pull request #243 from erupts/develop

1.12.11

Author: erupts

erupt-admin/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.10</version>
+        <version>1.12.11</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

erupt-annotation/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.10</version>
+        <version>1.12.11</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 </project>

erupt-annotation/src/main/java/xyz/erupt/annotation/config/AutoFill.java

@@ -6,9 +6,9 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 @Documented
+@Deprecated
 public @interface AutoFill {
 
-    @Deprecated
     String value();
 
 }

erupt-annotation/src/main/java/xyz/erupt/annotation/constant/AnnotationConst.java

@@ -6,8 +6,6 @@
  */
 public class AnnotationConst {
 
-    public static final String VALUE = "value";
-
     public static final String ID = "id";
 
     public static final String LABEL = "name";

erupt-annotation/src/main/java/xyz/erupt/annotation/sub_erupt/Drill.java

@@ -1,6 +1,5 @@
 package xyz.erupt.annotation.sub_erupt;
 
-import xyz.erupt.annotation.config.AutoFill;
 import xyz.erupt.annotation.config.Comment;
 import xyz.erupt.annotation.expr.ExprBool;
 
@@ -12,8 +11,6 @@
  */
 public @interface Drill {
 
-    @Deprecated
-    @AutoFill("T(Integer).toString(#item.title().hashCode())")
     String code() default "";
 
     String title();

erupt-annotation/src/main/java/xyz/erupt/annotation/sub_erupt/RowOperation.java

@@ -1,6 +1,5 @@
 package xyz.erupt.annotation.sub_erupt;
 
-import xyz.erupt.annotation.config.AutoFill;
 import xyz.erupt.annotation.config.Comment;
 import xyz.erupt.annotation.expr.ExprBool;
 import xyz.erupt.annotation.fun.OperationHandler;
@@ -15,17 +14,20 @@
  */
 public @interface RowOperation {
 
-    @Deprecated
-    @AutoFill("T(Integer).toString(#item.title().hashCode())")
     String code() default "";
 
     String title();
 
     @Transient
     ExprBool show() default @ExprBool;
 
+    @Comment("功能提示")
     String tip() default "";
 
+    @Comment("调用提示,空则不提示")
+    String callHint() default "erupt.operation.call_hint";
+
+
     @Comment("图标请参考Font Awesome")
     String icon() default "fa fa-dot-circle-o";
 

erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/ViewType.java

@@ -9,8 +9,10 @@
 public enum ViewType {
     @Comment("根据返回值等特征自动判断")
     AUTO,
-    @Comment("普通文字")
+    @Comment("普通文文本")
     TEXT,
+    @Comment("安全文本渲染")
+    SAFE_TEXT,
     @Comment("图片")
     IMAGE,
     @Comment("图片BASE64")

erupt-cloud/erupt-cloud-common/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.10</version>
+        <version>1.12.11</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

erupt-cloud/erupt-cloud-node-jpa/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.10</version>
+        <version>1.12.11</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

erupt-cloud/erupt-cloud-node/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.10</version>
+        <version>1.12.11</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>