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

#32

Browse Source
This commit is contained in:
Jan Prochazka
2020-06-18 21:18:30 +02:00
parent ac9bd62ecf
commit cecb88f024
13 changed files with 90 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
import _ from 'lodash';
import { GridConfig, GridCache, GridConfigColumns, createGridCache } from './GridConfig';
import { ForeignKeyInfo, TableInfo, ColumnInfo, DbType, EngineDriver, NamedObjectInfo, DatabaseInfo } from '@dbgate/types';
import { ForeignKeyInfo, TableInfo, ColumnInfo, EngineDriver, NamedObjectInfo, DatabaseInfo } from '@dbgate/types';
import { parseFilter, getFilterType } from '@dbgate/filterparser';
import { filterName } from './filterName';
import { ChangeSetFieldDefinition, ChangeSetRowDefinition } from './ChangeSet';
@@ -19,7 +19,7 @@ export interface DisplayColumn {
foreignKey?: ForeignKeyInfo;
isChecked?: boolean;
hintColumnName?: string;
commonType?: DbType;
dataType?: string;
}
export interface DisplayedColumnEx extends DisplayColumn {
@@ -143,7 +143,7 @@ export abstract class GridDisplay {
const column = displayedColumnInfo[uniqueName];
if (!column) continue;
try {
const condition = parseFilter(filter, getFilterType(column.commonType?.typeCode));
const condition = parseFilter(filter, getFilterType(column.dataType));
if (condition) {
conditions.push(
_.cloneDeepWith(condition, (expr: Expression) => {