Tree新增子表标记属性

src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java

@@ -7,6 +7,7 @@ import com.hxgk.lowcode.model.entity.Tree;
 import com.hxgk.lowcode.service.CustomerFormService;
 import com.hxgk.lowcode.service.HrService;
 import com.hxgk.lowcode.utils.JsonData;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -100,4 +101,33 @@ public class AssociatedFormsController {
 
     }
 
+    /*获取关联表单数据标题*/
+    @RequestMapping(value = "AssociatedForms/getAsfDataTitles")
+    public JsonData getAsfDataTitles(@RequestHeader(value = "User-Key") String key,
+                                   @RequestHeader(value = "User-Token") String token,
+                                   @RequestBody Map<String,String> requestBody) {
+        if(StringUtils.isBlank(key)||StringUtils.isBlank(token)){
+            return JsonData.buildError("非法请求");
+        }
+        String formId = requestBody.get("formId");
+        String dataTitle = requestBody.get("dataTitle");
+        String rangeFormula = requestBody.get("rangeFormula");
+        String rangeString = requestBody.get("rangeString");
+        String hideFormula = requestBody.get("hideFormula");
+        String hideString = requestBody.get("hideString");
+
+        /*System.out.println(formId);
+        System.out.println(dataTitle);
+        System.out.println(rangeFormula);
+        System.out.println(rangeString);
+        System.out.println(hideFormula);
+        System.out.println(hideString);*/
+        ArrayList<String> dataTitles = customerFormService.getAsfDataTitles(formId,dataTitle,rangeFormula,rangeString,hideFormula,hideString);
+        /*if(null==fieldList){
+            return JsonData.buildError("非法请求");
+        }*/
+        return JsonData.buildSuccess(formId);
+
+    }
+
 }

src/main/java/com/hxgk/lowcode/model/entity/Tree.java

@@ -15,6 +15,7 @@ public class Tree {
     private String value;
     private HashMap<String,Object> treeAttrs;
     private Boolean disabled;
+    private String type; //table,form,app
 
 
     public Boolean getDisabled() {
@@ -72,4 +73,12 @@ public class Tree {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 }

src/main/java/com/hxgk/lowcode/service/CustomerFormService.java

@@ -14,4 +14,6 @@ public interface CustomerFormService {
     Tree getRoleList();
 
     ArrayList<CustomerFormTableSingleFieldValue> getFieldRecord(String key, String token, String[] optionsValue3FieldArray);
+
+    ArrayList<String> getAsfDataTitles(String formId, String dataTitle,String rangeFormula, String rangeString, String hideFormula, String hideString);
 }

src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java

@@ -409,7 +409,7 @@ public class CustomerFormServiceImpl implements CustomerFormService {
                             tree1.setValue(tree.getId()+":"+sunTable.getTableid());
                             tree1.setParentId(tree.getId());
                             tree1.setLabel(sunTable.getTableid());
-
+                            tree1.setType("table");
                             HashMap<String,Object> showMap1 = new HashMap<>();
                             showMap1.put("show",tree.getTreeAttrs().get("show")+"."+sunTable.getTableid());
                             tree1.setTreeAttrs(showMap1);
@@ -561,8 +561,17 @@ public class CustomerFormServiceImpl implements CustomerFormService {
         }else{
             System.out.println("非法请求!请先登录!");
             return null;
+            /*
+                
+            * */
         }
     }
 
+    @Override
+    public ArrayList<String> getAsfDataTitles(String formId, String dataTitle,String rangeFormula, String rangeString, String hideFormula, String hideString) {
+        //
+        return null;
+    }
+
 
 }