public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-23 22:08:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(视图): 过滤器支持and、or逻辑

Browse Source
This commit is contained in:
junjie
2021-12-13 16:38:22 +08:00
parent 87ea43b09d
commit 6cb70f33a5
25 changed files with 1818 additions and 1575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/resources/sql/sqlTemplate.stg
View File

@@ -18,7 +18,7 @@ FROM
<table.tableName> <table.tableAlias>
<if(filters)>
WHERE
<filters:{filter|<if(filter)><filter.whereField> <filter.whereTermAndValue><endif>}; separator="\nAND ">
<filters:{filter|<if(filter)><filter><endif>}; separator="\nAND ">
<endif>
<if(groups)>
GROUP BY
@@ -51,7 +51,7 @@ FROM
<table.tableName> <table.tableAlias>
<if(filters)>
WHERE
<filters:{filter|<if(filter)><filter.whereField> <filter.whereTermAndValue><endif>}; separator="\nAND ">
<filters:{filter|<if(filter)><filter><endif>}; separator="\nAND ">
<endif>
<if(isGroup && groups)>
GROUP BY