Merge pull request edp963#1782 from bogeli5/dev-0.3

bug fix: ScriptUtils.formatHeader
baby636 · Jun 2, 2020 · 7995f6d · 7995f6d
2 parents 6f4b548 + e46a4c2
commit 7995f6d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/server/src/main/java/edp/davinci/common/utils/ScriptUtiils.java b/server/src/main/java/edp/davinci/common/utils/ScriptUtiils.java
@@ -10,6 +10,7 @@
 
 package edp.davinci.common.utils;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import edp.davinci.core.common.Constants;
@@ -67,8 +68,9 @@ public static synchronized ViewExecuteParam getViewExecuteParam(String dashboard
     public static synchronized List<ExcelHeader> formatHeader(String json, List<Param> params) {
 
         Value js = ScriptEnum.INSTANCE.tableFormatJs;
-        Value result = js.execute(json, params);
+        Value result = js.execute(json,  JSON.toJSONString(params));
         List<ExcelHeader> excelHeaders = JSONArray.parseArray(result.toString(), ExcelHeader.class);
         return excelHeaders;
     }
+
 }
diff --git a/server/src/main/resources/templates/js/formatCellValue.js b/server/src/main/resources/templates/js/formatCellValue.js
@@ -5510,7 +5510,8 @@ function parseTableHeader(headerConfig, fields, queryVars) {
     return headerCells
 }
 
-function getFieldsHeader(widgetConfigJson, queryVars) {
+function getFieldsHeader(widgetConfigJson, queryVarsJson) {
+    var queryVars = JSON.parse(queryVarsJson || '[]')
     if (!widgetConfigJson) {
         return []
     }