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

fixes

Browse Source
This commit is contained in:
Jan Prochazka
2024-08-19 13:16:13 +02:00
parent 64e770f51e
commit 12d60c7ed9
5 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/datalib/src/PerspectiveTreeNode.ts
View File

@@ -9,7 +9,15 @@ import type {
TableInfo,
ViewInfo,
} from 'dbgate-types';
import { detectSqlFilterBehaviour, equalFullName, isCollectionInfo, isTableInfo, isViewInfo, stringFilterBehaviour } from 'dbgate-tools';
import {
detectSqlFilterBehaviour,
equalFullName,
isCollectionInfo,
isTableInfo,
isViewInfo,
mongoFilterBehaviour,
stringFilterBehaviour,
} from 'dbgate-tools';
import {
ChangePerspectiveConfigFunc,
createPerspectiveNodeConfig,
@@ -346,7 +354,7 @@ export abstract class PerspectiveTreeNode {
const base = this.getBaseTableFromThis() as TableInfo | ViewInfo;
if (!base) return null;
try {
const condition = parseFilter(this.nodeConfig?.multiColumnFilter, 'string');
const condition = parseFilter(this.nodeConfig?.multiColumnFilter, stringFilterBehaviour);
if (condition) {
const orCondition: CompoudCondition = {
conditionType: 'or',
@@ -380,7 +388,7 @@ export abstract class PerspectiveTreeNode {
const pattern = this.dataProvider?.dataPatterns?.[this.designerId];
if (!pattern) return null;
const condition = parseFilter(this.nodeConfig?.multiColumnFilter, 'mongo');
const condition = parseFilter(this.nodeConfig?.multiColumnFilter, mongoFilterBehaviour);
if (!condition) return null;
const res = pattern.columns.map(col => {
return _cloneDeepWith(condition, expr => {
@@ -951,7 +959,7 @@ export class PerspectivePatternColumnNode extends PerspectiveTreeNode {
get filterBehaviour(): FilterBehaviour {
if (this.tableColumn) return detectSqlFilterBehaviour(this.tableColumn.dataType);
return 'mongo';
return mongoFilterBehaviour;
}
get preloadedLevelData() {
@@ -1093,7 +1101,7 @@ export class PerspectivePatternColumnNode extends PerspectiveTreeNode {
parseFilterCondition(source = null): {} {
const filter = this.getFilter();
if (!filter) return null;
const condition = parseFilter(filter, 'mongo');
const condition = parseFilter(filter, mongoFilterBehaviour);
if (!condition) return null;
return _cloneDeepWith(condition, expr => {
if (expr.__placeholder__) {