diff --git a/src/main/java/com/rebuild/core/service/dashboard/charts/TableChart.java b/src/main/java/com/rebuild/core/service/dashboard/charts/TableChart.java index 372d48510..336ac3f9d 100644 --- a/src/main/java/com/rebuild/core/service/dashboard/charts/TableChart.java +++ b/src/main/java/com/rebuild/core/service/dashboard/charts/TableChart.java @@ -19,7 +19,6 @@ import org.apache.commons.lang3.ArrayUtils; import java.math.BigDecimal; import java.text.MessageFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -113,7 +112,13 @@ public class TableChart extends ChartData { } String tableHtml = new TableBuilder(this, dataRaw).toHTML(); - return JSONUtils.toJSONObject("html", tableHtml); + + JSONObject renderOption = config.getJSONObject("option"); + if (renderOption == null) renderOption = new JSONObject(); + + return JSONUtils.toJSONObject( + new String[]{"html", "_renderOption"}, + new Object[]{tableHtml, renderOption}); } protected boolean isShowLineNumber() { diff --git a/src/main/java/com/rebuild/core/service/dashboard/charts/TreemapChart.java b/src/main/java/com/rebuild/core/service/dashboard/charts/TreemapChart.java index 7bcc7cb11..a6bd6c6e9 100644 --- a/src/main/java/com/rebuild/core/service/dashboard/charts/TreemapChart.java +++ b/src/main/java/com/rebuild/core/service/dashboard/charts/TreemapChart.java @@ -48,7 +48,8 @@ public class TreemapChart extends ChartData { JSONObject renderOption = config.getJSONObject("option"); if (renderOption == null) renderOption = new JSONObject(); - renderOption.put("dataFlags", new String[] { getNumericalFlag(num1) }); + renderOption.put("dataFlags", new String[]{getNumericalFlag(num1)}); + renderOption.remove("useBgcolor"); return JSONUtils.toJSONObject( new String[]{"data", "xLabel", "xAmount", "_renderOption"}, diff --git a/src/main/resources/web/assets/css/charts.css b/src/main/resources/web/assets/css/charts.css index 6074f130c..021095146 100644 --- a/src/main/resources/web/assets/css/charts.css +++ b/src/main/resources/web/assets/css/charts.css @@ -744,6 +744,10 @@ See LICENSE and COMMERCIAL in the project root for license information. right: 0; } +.chart-box.TABLE .chart.ctable .table { + background-color: transparent; +} + /* gradient-backgrounds.css */ .gradient-bg-1 { diff --git a/src/main/resources/web/dashboard/chart-design.html b/src/main/resources/web/dashboard/chart-design.html index 5a6b2c1a7..91bb323af 100644 --- a/src/main/resources/web/dashboard/chart-design.html +++ b/src/main/resources/web/dashboard/chart-design.html @@ -211,7 +211,7 @@ -
+