From 5ec1cbf4bf0190460909843c63520d29bffca280 Mon Sep 17 00:00:00 2001 From: chenjinsong <523037378@qq.com> Date: Wed, 26 Jan 2022 18:40:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=90=9C=E7=B4=A2=E6=A1=86bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=EF=BC=9B=E5=B0=9A=E5=AD=98=E9=97=AE=E9=A2=98=EF=BC=9A?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A8=A1=E5=BC=8F=E4=B8=8B=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=A4=A7=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/advancedSearch/TextMode.vue | 1 + src/components/advancedSearch/meta/sql-parser.js | 8 ++++---- src/views/entityExplorer/EntityExplorer.vue | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/components/advancedSearch/TextMode.vue b/src/components/advancedSearch/TextMode.vue index fe4d2896..b391b63b 100644 --- a/src/components/advancedSearch/TextMode.vue +++ b/src/components/advancedSearch/TextMode.vue @@ -51,6 +51,7 @@ export default { }, search () { let originalSql = this.codeMirror.getValue() + console.info(originalSql) if (originalSql) { originalSql = originalSql.replace(/"/g, '') const parser = new SqlParser(originalSql, this.columnList) diff --git a/src/components/advancedSearch/meta/sql-parser.js b/src/components/advancedSearch/meta/sql-parser.js index 5f5e0164..12efd1ea 100644 --- a/src/components/advancedSearch/meta/sql-parser.js +++ b/src/components/advancedSearch/meta/sql-parser.js @@ -190,13 +190,13 @@ export default class SqlParser extends SqlParserVisitor { // 字段或值 visitExpressionAtomPredicate (ctx) { - const constant = ctx.getText() + const constant = ctx.getText().toLowerCase() this.buildMeta('expression', constant) } // 操作符 visitComparisonOperator (ctx) { - const comparisonOperator = ctx.getText() + const comparisonOperator = ctx.getText().toLowerCase() this.buildMeta('operator', comparisonOperator) } @@ -208,13 +208,13 @@ export default class SqlParser extends SqlParserVisitor { // in语句 visitInPredicate (ctx) { - const inPredicate = ctx.getText() + const inPredicate = ctx.getText().toLowerCase() this.buildMeta('in', inPredicate) } // like语句 visitLikePredicate (ctx) { - const likePredicate = ctx.getText() + const likePredicate = ctx.getText().toLowerCase() this.buildMeta('like', likePredicate) } } diff --git a/src/views/entityExplorer/EntityExplorer.vue b/src/views/entityExplorer/EntityExplorer.vue index 2f554157..3fb6649e 100644 --- a/src/views/entityExplorer/EntityExplorer.vue +++ b/src/views/entityExplorer/EntityExplorer.vue @@ -455,13 +455,13 @@ export default { if (entityTypeMeta && entityTypeMeta.operator.value === '=') { let entityType = '' this.limitFilterType = false - if (entityTypeMeta.value.value === "'ip'") { + if (entityTypeMeta.value.value.toLowerCase() === "'ip'") { this.limitFilterType = true entityType = 'ip' - } else if (entityTypeMeta.value.value === "'domain'") { + } else if (entityTypeMeta.value.value.toLowerCase() === "'domain'") { this.limitFilterType = true entityType = 'domain' - } else if (entityTypeMeta.value.value === "'app'") { + } else if (entityTypeMeta.value.value.toLowerCase() === "'app'") { this.limitFilterType = true entityType = 'app' } else {