试验图表;元素表查询增加tableid

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/FormulaController.java

@@ -516,21 +516,23 @@ public class FormulaController {
                        String[] rely = Func.toStr(config.get("rely")).split(",");
                        String ky=rely[0].split(":")[1];
                        String kx=rely[1].split(":")[1];
-                       Map<String,Object> formData = option.getData();
+                       Map<String,Map<String,Object>> formMap = option.getData();
                        List<Map<String,Object>> dataMap;
-                       if(formData!=null&&formData.size()>0){
+                       if(formMap!=null&&formMap.size()>0){
                            dataMap=new ArrayList<>();
                            Map<String,Object> md= new HashMap<>();
                            dataMap.add(md);
                            StringBuilder sy= new StringBuilder();
                            StringBuilder sx = new StringBuilder();
-                           formData.forEach((k,v)->{
-                               String[] ka=k.split("__");
-                               if(ky.equals(ka[0])){
-                                   sy.append(v).append("_^_").append(ka[1]).append("☆");
-                               }else if(kx.equals(ka[0])){
-                                   sx.append(v).append("_^_").append(ka[1]).append("☆");
-                               }
+                           formMap.forEach((o,t)->{
+                               t.forEach((k,v)->{
+                                   String[] ka=k.split("__");
+                                   if(ky.equals(ka[0])){
+                                       sy.append(v).append("_^_").append(ka[1]).append("☆");
+                                   }else if(kx.equals(ka[0])){
+                                       sx.append(v).append("_^_").append(ka[1]).append("☆");
+                                   }
+                               });
                            });
                            if(sy.length()>1){
                                sy.deleteCharAt(sy.length()-1);
@@ -563,9 +565,9 @@ public class FormulaController {
                                   JSONObject chartData= job.getJSONArray("series").getJSONObject(0);
                                   chartData.put("data",jsonArray);
                               }
-                               return R.data(job);
                            }
                        }
+                       return R.data(job);
                    }
                }
             }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsParamController.java

@@ -482,4 +482,8 @@ public class WbsParamController {
         }
     }
 
+    @GetMapping("/test")
+    public R<Object> test() {
+          return R.fail("失败");
+    }
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.xml

@@ -596,6 +596,7 @@
                wt.table_owner                                               as tableOwner,
                wt.is_link_table,
                wt.init_table_name,
+               wt.init_table_id initTableId,
                wt.excel_id                                                  as excelId,
                wt.sort,
                wt.status,

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -1981,7 +1981,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     String kx = rely[1].split(":")[1];
                     Map<String,String> coordsMap = FormulaUtils.getElementCell(wtp.getHtmlUrl());
                     List<String> ly= Arrays.stream((coordsMap.get(ky)).split(";")).filter(Func::isNotBlank).map(k->ky+"__"+k).collect(Collectors.toList());
-                    List<String> lx= Arrays.stream((coordsMap.get(ky)).split(";")).filter(Func::isNotBlank).map(k->kx+"__"+k).collect(Collectors.toList());
+                    List<String> lx= Arrays.stream((coordsMap.get(kx)).split(";")).filter(Func::isNotBlank).map(k->kx+"__"+k).collect(Collectors.toList());
                     List<String> fct= new ArrayList<>();
                     if(ly.size()>0){
                         fct.addAll(ly);