erupts · erupts · Oct 14, 2023 · Jul 7, 2023 · Aug 21, 2023 · Aug 24, 2023
diff --git a/erupt-annotation/pom.xml b/erupt-annotation/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.2</version>
+        <version>1.12.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 </project>
diff --git a/erupt-annotation/src/main/java/xyz/erupt/annotation/constant/AnnotationConst.java b/erupt-annotation/src/main/java/xyz/erupt/annotation/constant/AnnotationConst.java
@@ -12,6 +12,8 @@ public class AnnotationConst {
 
     public static final String LABEL = "name";
 
+    public static final String REMARK = "remark";
+
     public static final String PID = "pid";
 
     public static final String EMPTY_STR = "";

diff --git a/erupt-annotation/src/main/java/xyz/erupt/annotation/fun/CodeEditHintHandler.java b/erupt-annotation/src/main/java/xyz/erupt/annotation/fun/CodeEditHintHandler.java
@@ -0,0 +1,14 @@
+package xyz.erupt.annotation.fun;
+
+import java.util.List;
+
+/**
+ * @author YuePeng
+ * date 2023/8/24 20:26
+ */
+public interface CodeEditHintHandler {
+
+    //fetch hint list
+    List<String> hint(String[] params);
+
+}
diff --git a/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_erupt/Layout.java b/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_erupt/Layout.java
@@ -11,10 +11,30 @@
     //表格右侧列固定数量
     int tableRightFixed() default 0;
 
+    //分页方式
+    PagingType pagingType() default PagingType.BACKEND;
+
+    //分页大小
+    int pageSize() default 10;
+
+    //可选分页数
+    int[] pageSizes() default {10, 20, 30, 50, 100, 300, 500};
+
 
     enum FormSize {
-        DEFAULT,  //默认
-        FULL_LINE //整行
+        //默认
+        DEFAULT,
+        //整行
+        FULL_LINE
+    }
+
+    enum PagingType {
+        //后端分页
+        BACKEND,
+        //前端分页
+        FRONT,
+        //不分页，最多显示：pageSizes[pageSizes.length - 1] * 10 条
+        NONE
     }
 
 }
diff --git a/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/Edit.java b/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/Edit.java
@@ -96,7 +96,7 @@
     @Match("#item.type().toString()=='REFERENCE_TABLE'")
     ReferenceTableType referenceTableType() default @ReferenceTableType;
 
-    @Match("#item.type().toString()=='CHECKBOX'")
+    @Transient
     CheckboxType checkboxType() default @CheckboxType;
 
     @Match("#item.type().toString()=='CODE_EDITOR'")

diff --git a/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/sub_edit/AttachmentType.java b/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/sub_edit/AttachmentType.java
@@ -13,6 +13,7 @@
     @Comment("附件大小限制，单位KB")
     long size() default -1;
 
+    @Transient
     @Comment("定义独享存储空间，便于文件查找")
     String path() default "";
 

diff --git a/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/sub_edit/CheckboxType.java b/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/sub_edit/CheckboxType.java
@@ -11,4 +11,7 @@
     @Comment("展示列")
     String label() default AnnotationConst.LABEL;
 
+    @Comment("描述列")
+    String remark() default AnnotationConst.EMPTY_STR;
+
 }
diff --git a/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/sub_edit/CodeEditorType.java b/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/sub_edit/CodeEditorType.java
@@ -1,6 +1,9 @@
 package xyz.erupt.annotation.sub_field.sub_edit;
 
 import xyz.erupt.annotation.config.Comment;
+import xyz.erupt.annotation.fun.CodeEditHintHandler;
+
+import java.beans.Transient;
 
 /**
  * @author YuePeng
@@ -14,4 +17,18 @@
     @Comment("编辑器高度")
     int height() default 300;
 
+    @Deprecated
+    @Comment("提示触发字符")
+    String[] triggerCharacters() default "$";
+
+    @Deprecated
+    @Comment("代码提示处理类参数")
+    @Transient
+    String[] hintParams() default {};
+
+    @Deprecated
+    @Comment("代码提示处理类")
+    @Transient
+    Class<CodeEditHintHandler> hint() default CodeEditHintHandler.class;
+
 }
diff --git a/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/sub_edit/HtmlEditorType.java b/erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/sub_edit/HtmlEditorType.java
@@ -2,6 +2,8 @@
 
 import xyz.erupt.annotation.config.Comment;
 
+import java.beans.Transient;
+
 /**
  * @author YuePeng
  * date 2020-02-15
@@ -11,6 +13,7 @@
     @Comment("富文本编辑器类型")
     Type value();
 
+    @Transient
     @Comment("定义独享存储空间，便于文件查找")
     String path() default "";
 

diff --git a/erupt-cloud/erupt-cloud-common/pom.xml b/erupt-cloud/erupt-cloud-common/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.2</version>
+        <version>1.12.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-cloud/erupt-cloud-node-jpa/pom.xml b/erupt-cloud/erupt-cloud-node-jpa/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.2</version>
+        <version>1.12.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-cloud/erupt-cloud-node/pom.xml b/erupt-cloud/erupt-cloud-node/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.2</version>
+        <version>1.12.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-cloud/erupt-cloud-node/src/main/java/xyz/erupt/cloud/node/config/EruptNodeProp.java b/erupt-cloud/erupt-cloud-node/src/main/java/xyz/erupt/cloud/node/config/EruptNodeProp.java
@@ -20,6 +20,9 @@ public class EruptNodeProp {
     //是否开启NODE节点注册
     private boolean enableRegister = true;
 
+    //是否开启附件上传代理，开启后上传能力全部交予server端实现【server端请求node端获取附件上传要求】
+//    private boolean attachmentProxy = true;
+
     //接入应用名称，推荐填写当前 Java 项目名称
     private String nodeName;
 

diff --git a/erupt-cloud/erupt-cloud-server/pom.xml b/erupt-cloud/erupt-cloud-server/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.2</version>
+        <version>1.12.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-core/pom.xml b/erupt-core/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.2</version>
+        <version>1.12.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-core/src/main/java/xyz/erupt/core/controller/EruptComponentController.java b/erupt-core/src/main/java/xyz/erupt/core/controller/EruptComponentController.java
@@ -3,6 +3,7 @@
 import org.springframework.web.bind.annotation.*;
 import xyz.erupt.annotation.fun.VLModel;
 import xyz.erupt.annotation.sub_field.sub_edit.AutoCompleteType;
+import xyz.erupt.annotation.sub_field.sub_edit.CodeEditorType;
 import xyz.erupt.core.annotation.EruptRouter;
 import xyz.erupt.core.constant.EruptRestPath;
 import xyz.erupt.core.exception.EruptApiErrorTip;
@@ -62,7 +63,7 @@ public List<VLModel> findChoiceItem(@PathVariable("erupt") String eruptName,
         return EruptUtil.getChoiceList(eruptModel, fieldModel.getEruptField().edit().choiceType());
     }
 
-    //Gets the TAGS component list data
+    //Gets the TAGS component data
     @GetMapping("/tags-item/{erupt}/{field}")
     @EruptRouter(authIndex = 2, verifyType = EruptRouter.VerifyType.ERUPT)
     public List<String> findTagsItem(@PathVariable("erupt") String eruptName,
@@ -71,4 +72,14 @@ public List<String> findTagsItem(@PathVariable("erupt") String eruptName,
         return EruptUtil.getTagList(fieldModel.getEruptField().edit().tagsType());
     }
 
+    //Gets the CodeEdit component hint data
+    @GetMapping("/code-edit-hints/{erupt}/{field}")
+    @EruptRouter(authIndex = 2, verifyType = EruptRouter.VerifyType.ERUPT)
+    public List<String> codeEditHints(@PathVariable("erupt") String eruptName,
+                                      @PathVariable("field") String field) {
+        EruptFieldModel fieldModel = EruptCoreService.getErupt(eruptName).getEruptFieldMap().get(field);
+        CodeEditorType codeEditType = fieldModel.getEruptField().edit().codeEditType();
+        return EruptSpringUtil.getBean(codeEditType.hint()).hint(codeEditType.hintParams());
+    }
+
 }