From cce7aa315bd5129373195125b644627155c54b56 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 18 Apr 2024 16:12:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=B1=9E=E6=80=A7=E6=A0=91?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CustomerFormServiceImpl.java | 49 +++++++++++++++++--
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java
index 3095608..1bf126c 100644
--- a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java
+++ b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java
@@ -227,6 +227,11 @@ public class CustomerFormServiceImpl implements CustomerFormService {
 
                     tree.setId("formField:"+cfid);
                     tree.setLabel(cfid);
+
+                    HashMap<String,Object> showMap = new HashMap<>();
+                    showMap.put("show",cfid);
+                    tree.setTreeAttrs(showMap);
+
                     ArrayNode masterTableArr = (ArrayNode) data.get("masterTable");
                     JsonNode sunTableArrObj = data.get("sunTable");
 
@@ -261,12 +266,23 @@ public class CustomerFormServiceImpl implements CustomerFormService {
                         for(FieldBean fieldBean:fieldBeanArrayList){
                             Tree tree1 = new Tree();
                             tree1.setId(tree.getId()+":"+fieldBean.getField());
+                            HashMap<String,Object> map = new HashMap<>();
                             if(StringUtils.isBlank(fieldBean.getComment())){
                                 tree1.setLabel(fieldBean.getField());
+
+
+                                map.put("show",tree.getTreeAttrs().get("show")+"."+fieldBean.getField());
+
+
                             }else{
                                 tree1.setLabel(fieldBean.getComment());
+
+
+                                map.put("show",tree.getTreeAttrs().get("show")+"."+fieldBean.getComment());
+
+
                             }
-                            HashMap<String,Object> map = new HashMap<>();
+
                             map.put("field",fieldBean.getField());
                             map.put("type",fieldBean.getType());
                             map.put("attribute",fieldBean.getAttribute());
@@ -288,17 +304,33 @@ public class CustomerFormServiceImpl implements CustomerFormService {
                             tree1.setId(tree.getId()+":"+sunTable.getTableid());
                             tree1.setParentId(tree.getId());
                             tree1.setLabel(sunTable.getTableid());
+
+                            HashMap<String,Object> showMap1 = new HashMap<>();
+                            showMap1.put("show",tree.getTreeAttrs().get("show")+"."+sunTable.getTableid());
+                            tree1.setTreeAttrs(showMap1);
+
                             ArrayList<Tree> sunFieldList = new ArrayList<>();
                             for(FieldBean fieldBean: sunTable.getFieldBeans()){
 
                                 Tree tree2 = new Tree();
                                 tree2.setId(tree1.getId()+":"+fieldBean.getField());
+                                HashMap<String,Object> map = new HashMap<>();
                                 if(StringUtils.isBlank(fieldBean.getComment())){
                                     tree2.setLabel(fieldBean.getField());
+
+
+                                    map.put("show",tree1.getTreeAttrs().get("show")+"."+fieldBean.getField());
+
+
                                 }else{
                                     tree2.setLabel(fieldBean.getComment());
+
+
+                                    map.put("show",tree1.getTreeAttrs().get("show")+"."+fieldBean.getComment());
+
+
                                 }
-                                HashMap<String,Object> map = new HashMap<>();
+
                                 map.put("field",fieldBean.getField());
                                 map.put("type",fieldBean.getType());
                                 map.put("attribute",fieldBean.getAttribute());
@@ -324,12 +356,23 @@ public class CustomerFormServiceImpl implements CustomerFormService {
                         for(FieldBean fieldBean:fieldBeanArrayList){
                             Tree tree1 = new Tree();
                             tree1.setId(tree.getId()+":"+fieldBean.getField());
+                            HashMap<String,Object> map = new HashMap<>();
                             if(StringUtils.isBlank(fieldBean.getComment())){
                                 tree1.setLabel(fieldBean.getField());
+
+
+                                map.put("show",tree.getTreeAttrs().get("show")+"."+fieldBean.getField());
+
+
                             }else{
                                 tree1.setLabel(fieldBean.getComment());
+
+
+                                map.put("show",tree.getTreeAttrs().get("show")+"."+fieldBean.getComment());
+
+
                             }
-                            HashMap<String,Object> map = new HashMap<>();
+
                             map.put("field",fieldBean.getField());
                             map.put("type",fieldBean.getType());
                             map.put("attribute",fieldBean.getAttribute());