mirrors/dbgate
1
0
Fork 0
mirror of https://github.com/dbgate/dbgate synced 2024-11-07 20:26:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

mix - more conditions

Browse Source
This commit is contained in:
Jan Prochazka 2020-04-25 21:52:08 +02:00
parent fd7f3d7e47
commit 4e0770d1ab
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/datalib/src/GridDisplay.ts
View File

@ -117,6 +117,7 @@ export abstract class GridDisplay {
} }
applyFilterOnSelect(select: Select, displayedColumnInfo: DisplayedColumnInfo) { applyFilterOnSelect(select: Select, displayedColumnInfo: DisplayedColumnInfo) {
const conditions = [];
for (const uniqueName in this.config.filters) { for (const uniqueName in this.config.filters) {
const filter = this.config.filters[uniqueName]; const filter = this.config.filters[uniqueName];
if (!filter) continue; if (!filter) continue;
@ -125,20 +126,29 @@ export abstract class GridDisplay {
try { try {
const condition = parseFilter(filter, getFilterType(column.commonType?.typeCode)); const condition = parseFilter(filter, getFilterType(column.commonType?.typeCode));
if (condition) { if (condition) {
select.where = _.cloneDeepWith(condition, (expr: Expression) => { conditions.push(
if (expr.exprType == 'placeholder') _.cloneDeepWith(condition, (expr: Expression) => {
return { if (expr.exprType == 'placeholder')
exprType: 'column', return {
columnName: column.columnName, exprType: 'column',
source: { alias: column.sourceAlias }, columnName: column.columnName,
}; source: { alias: column.sourceAlias },
}); };
})
);
} }
} catch (err) { } catch (err) {
console.warn(err.message); console.warn(err.message);
continue; continue;
} }
} }
if (conditions.length > 0) {
select.where = {
conditionType: 'and',
conditions,
};
}
} }
applySortOnSelect(select: Select, displayedColumnInfo: DisplayedColumnInfo) { applySortOnSelect(select: Select, displayedColumnInfo: DisplayedColumnInfo) {