Skip to content

Commit 867c065

Browse files
authored
Merge pull request #243 from erupts/develop
1.12.11
2 parents f25029d + db7deb4 commit 867c065

File tree

93 files changed

+602
-344
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+602
-344
lines changed

erupt-admin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.10</version>
12+
<version>1.12.11</version>
1313
<relativePath>../pom.xml</relativePath>
1414
</parent>
1515

erupt-annotation/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>xyz.erupt</groupId>
1313
<artifactId>erupt</artifactId>
14-
<version>1.12.10</version>
14+
<version>1.12.11</version>
1515
<relativePath>../pom.xml</relativePath>
1616
</parent>
1717
</project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
@Retention(RetentionPolicy.RUNTIME)
77
@Target(ElementType.METHOD)
88
@Documented
9+
@Deprecated
910
public @interface AutoFill {
1011

11-
@Deprecated
1212
String value();
1313

1414
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
*/
77
public class AnnotationConst {
88

9-
public static final String VALUE = "value";
10-
119
public static final String ID = "id";
1210

1311
public static final String LABEL = "name";

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package xyz.erupt.annotation.sub_erupt;
22

3-
import xyz.erupt.annotation.config.AutoFill;
43
import xyz.erupt.annotation.config.Comment;
54
import xyz.erupt.annotation.expr.ExprBool;
65

@@ -12,8 +11,6 @@
1211
*/
1312
public @interface Drill {
1413

15-
@Deprecated
16-
@AutoFill("T(Integer).toString(#item.title().hashCode())")
1714
String code() default "";
1815

1916
String title();

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package xyz.erupt.annotation.sub_erupt;
22

3-
import xyz.erupt.annotation.config.AutoFill;
43
import xyz.erupt.annotation.config.Comment;
54
import xyz.erupt.annotation.expr.ExprBool;
65
import xyz.erupt.annotation.fun.OperationHandler;
@@ -15,17 +14,20 @@
1514
*/
1615
public @interface RowOperation {
1716

18-
@Deprecated
19-
@AutoFill("T(Integer).toString(#item.title().hashCode())")
2017
String code() default "";
2118

2219
String title();
2320

2421
@Transient
2522
ExprBool show() default @ExprBool;
2623

24+
@Comment("功能提示")
2725
String tip() default "";
2826

27+
@Comment("调用提示,空则不提示")
28+
String callHint() default "erupt.operation.call_hint";
29+
30+
2931
@Comment("图标请参考Font Awesome")
3032
String icon() default "fa fa-dot-circle-o";
3133

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
public enum ViewType {
1010
@Comment("根据返回值等特征自动判断")
1111
AUTO,
12-
@Comment("普通文字")
12+
@Comment("普通文文本")
1313
TEXT,
14+
@Comment("安全文本渲染")
15+
SAFE_TEXT,
1416
@Comment("图片")
1517
IMAGE,
1618
@Comment("图片BASE64")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.10</version>
12+
<version>1.12.11</version>
1313
<relativePath>../../pom.xml</relativePath>
1414
</parent>
1515

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.10</version>
12+
<version>1.12.11</version>
1313
<relativePath>../../pom.xml</relativePath>
1414
</parent>
1515

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.10</version>
12+
<version>1.12.11</version>
1313
<relativePath>../../pom.xml</relativePath>
1414
</parent>
1515

0 commit comments

Comments
 (0)