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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Jan Prochazka
2022-06-23 11:18:36 +02:00
parent 42badf17eb 21ccc55e3f
commit 7ca8880c3c
12 changed files with 200 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
import _ from 'lodash';
import { GridConfig, GridCache, GridConfigColumns, createGridCache, GroupFunc } from './GridConfig';
import { GridConfig, GridCache, GridConfigColumns, createGridCache, GroupFunc, createGridConfig } from './GridConfig';
import {
ForeignKeyInfo,
TableInfo,
@@ -194,12 +194,14 @@ export abstract class GridDisplay {
if (condition) {
conditions.push(
_.cloneDeepWith(condition, (expr: Expression) => {
if (expr.exprType == 'placeholder')
return {
exprType: 'column',
columnName: column.columnName,
source: { alias: column.sourceAlias },
};
if (expr.exprType == 'placeholder') {
return this.createColumnExpression(column, { alias: column.sourceAlias });
}
// return {
// exprType: 'column',
// columnName: column.columnName,
// source: { alias: column.sourceAlias },
// };
})
);
}
@@ -445,6 +447,11 @@ export abstract class GridDisplay {
this.reload();
}
resetConfig() {
this.setConfig(cfg => createGridConfig());
this.reload();
}
getChangeSetCondition(row) {
if (!this.changeSetKeyFields) return null;
return _.pick(row, this.changeSetKeyFields);