p85126437
/
datagear
forked from p81075629/datagear
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

看板后台生成的css放在最开头，确保页面生成的、用户自定义的css有更高优先级

This commit is contained in:
datagear 2021-09-22 23:14:18 +08:00
parent 8e5d2e22ce
commit 4ad1838f8e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlTplDashboardWidgetRenderer.java
View File

@ -877,6 +877,13 @@ public abstract class HtmlTplDashboardWidgetRenderer extends TextParserSupport
List<String> excludes = StringUtil.splitWithTrim(importExclude, ",");
// 后台生成的样式应该放在最开头，确保页面生成的、用户自定义的css有更高优先级
if (!excludes.contains(this.themeImportName))
{
writeNewLine(out);
writeDashboardThemeStyle(renderContext, renderAttr, out, dashboard);
}
if (this.htmlTplDashboardImport != null)
{
List<ImportItem> importItems = this.htmlTplDashboardImport.getImportItems();
@ -901,12 +908,6 @@ public abstract class HtmlTplDashboardWidgetRenderer extends TextParserSupport
}
}
}
if (!excludes.contains(this.themeImportName))
{
writeNewLine(out);
writeDashboardThemeStyle(renderContext, renderAttr, out, dashboard);
}
}
/**
@ -1029,7 +1030,6 @@ public abstract class HtmlTplDashboardWidgetRenderer extends TextParserSupport
writeNewLine(out);
out.write("</style>");
writeNewLine(out);
return true;
}