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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
SPRINX0\prochazka
2024-07-24 15:43:14 +02:00
parent 227d81a01a c3e05e22ad
commit e10e8ca161
10 changed files with 57 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,14 +214,14 @@ export abstract class GridDisplay {
}
if (this.baseTableOrView && this.config.multiColumnFilter) {
try {
const condition = parseFilter(this.config.multiColumnFilter, 'string');
if (condition) {
const orCondition: CompoudCondition = {
conditionType: 'or',
conditions: [],
};
for (const column of this.baseTableOrView.columns) {
const orCondition: CompoudCondition = {
conditionType: 'or',
conditions: [],
};
for (const column of this.baseTableOrView.columns) {
try {
const condition = parseFilter(this.config.multiColumnFilter, getFilterType(column.dataType));
if (condition) {
orCondition.conditions.push(
_.cloneDeepWith(condition, (expr: Expression) => {
if (expr.exprType == 'placeholder') {
@@ -230,12 +230,13 @@ export abstract class GridDisplay {
})
);
}
if (orCondition.conditions.length > 0) {
conditions.push(orCondition);
}
} catch (err) {
// skip for this column
continue;
}
} catch (err) {
console.warn(err.message);
}
if (orCondition.conditions.length > 0) {
conditions.push(orCondition);
}
}
@@ -482,6 +483,7 @@ export abstract class GridDisplay {
this.setConfig(cfg => ({
...cfg,
filters: {},
multiColumnFilter: null,
}));
this.reload();
}