Merge remote-tracking branch 'origin/master'

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

@@ -562,8 +562,8 @@ public class FormulaController {
                               if(!jsonArray.isEmpty()){
                                   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/service/impl/ExcelTabServiceImpl.java

@@ -1992,6 +1992,8 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     String formChartKey= String.join(",", fct);
                     if(Func.isNotEmpty(formChartKey)){
                         reData.put("formChartKey",formChartKey);
+                        String key=Func.toStr(config.get("ekey"));
+                        reData.put("formchartKeyShow",key+"__"+coordsMap.get(key).split(";")[0]);
                     }
                 }
             }

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

@@ -2186,9 +2186,9 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                 Element inputElement = table.select("el-input[keyname^=" + kt + "__").first();
                 String keyname = inputElement.attr("keyname");
                 Element echartElement = new Element("hc-echart");
-                echartElement.attr(":option", "formData." + keyname);
-                echartElement.attr("id", keyname);
-                echartElement.attr("keyname", keyname);
+                echartElement.attr(":option", "formData." + keyname)
+                .attr("keyname", keyname)
+                .attr(":ref","(el) => setChartRefs(el, '"+wtp.getPKeyId()+"' , '"+keyname+"')");
                 inputElement.replaceWith(echartElement);
                 table.select("el-input[keyname^=" + ky + "__").forEach(e -> e.attr("@blur", "getRegularExpression($event,'','请输入字符串',22,1, 'chart', 1, 0)"));
                 table.select("el-input[keyname^=" + kx + "__").forEach(e -> e.attr("@blur", "getRegularExpression($event,'','请输入字符串',22,1, 'chart', 0, 1)"));