dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-18 20:46:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

mutli column condition for JSL data

Browse Source
This commit is contained in:
Jan Prochazka
2023-02-26 15:44:29 +01:00
parent b26be02203
commit 7c03d31b84
6 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -738,7 +738,7 @@ export abstract class GridDisplay {
// return sql;
}
compileFilters(): Condition {
compileJslFilters(): Condition {
const filters = this.config && this.config.filters;
if (!filters) return null;
const conditions = [];
@@ -761,6 +761,17 @@ export abstract class GridDisplay {
// filter parse error - ignore filter
}
}
if (this.config.multiColumnFilter) {
const placeholderCondition = parseFilter(this.config.multiColumnFilter, 'string');
if (placeholderCondition) {
conditions.push({
conditionType: 'anyColumnPass',
placeholderCondition,
});
}
}
if (conditions.length == 0) return null;
return {
conditionType: 'and',