From 8ba062054c890a61cb0b64ecad72414cdebe6cac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?=
 <https://liuhonghong@git.meslab.cn>
Date: Thu, 28 Sep 2023 14:05:41 +0800
Subject: [PATCH] =?UTF-8?q?CN-1363=20fix:=20=E4=BF=AE=E5=A4=8D=E5=8D=95?=
 =?UTF-8?q?=E5=BC=95=E5=8F=B7=E5=86=85=E4=B8=8D=E8=83=BD=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?=E9=80=97=E5=8F=B7=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E8=AF=AD=E5=8F=A5=E4=B8=AD=E5=BC=95=E5=8F=B7=E5=86=85?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E9=80=97=E5=8F=B7=E5=90=8E=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5has=E5=87=BD=E6=95=B0=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/advancedSearch/meta/parser.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/advancedSearch/meta/parser.js b/src/components/advancedSearch/meta/parser.js
index d7167be1..1a79fa85 100644
--- a/src/components/advancedSearch/meta/parser.js
+++ b/src/components/advancedSearch/meta/parser.js
@@ -527,7 +527,9 @@ export default class Parser {
       }
       // 在单引号里，又在括号里，则遇到逗号、右括号就报错
       if (isInBracket && isInApostrophe) {
-        if ([',', ')'].indexOf(strArr[j]) > -1) {
+        // if ([',', ')'].indexOf(strArr[j]) > -1) {
+        // 目前有ip in ('1.1.1.1,2.2.2.2')该情况，后续待验证
+        if ([')'].indexOf(strArr[j]) > -1) {
           errorList.push(new ParserError(j, errorTypes.syntaxError, errorDesc.syntaxError.unclosedApostrophe))
           break
         }
@@ -678,6 +680,7 @@ export default class Parser {
                     break
                   }
                 } else {
+                  console.log('后面是连接符或空', prevToken, token, nextToken)
                   // 前面是连接符或操作符或空后面是连接符或空
                   // 后面是连接符或空
                   if (!nextToken || nextToken.type === types.connection) {
@@ -709,6 +712,13 @@ export default class Parser {
                       meta.column.label = token.value
                       meta.column.type = columnType.fullText
                     }
+                  } else if (nextToken.type === types.rightBracket) {
+                    // 此处操作为ip='1,2' and has(tag,'222')中 ,'222')的情况
+                    if (prevToken) {
+                      if (prevToken.type === types.comma && token.type === types.commonStr && nextToken.type === types.rightBracket) {
+                        meta.value.value = token.value
+                      }
+                    }
                   } else {
                     errorList.push(new ParserError(token.end, errorTypes.syntaxError, errorDesc.syntaxError.unexpectedString))
                     break