From 74fd9ee6d4f99d5ed6e0428b45cc3e19f75ae2b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com> Date: Fri, 4 Aug 2023 17:42:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95=E5=90=8E?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=8B=BC=E6=8E=A5=E9=94=99=E8=AF=AF=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/charts2/Panel.vue | 2 ++ src/views/charts2/charts/npm/NpmNetworkQuantity.vue | 2 ++ src/views/charts2/charts/npm/NpmTrafficLine.vue | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/views/charts2/Panel.vue b/src/views/charts2/Panel.vue index 49bf286c..59e65c9a 100644 --- a/src/views/charts2/Panel.vue +++ b/src/views/charts2/Panel.vue @@ -364,6 +364,8 @@ export default { let url = '' if (this.queryCondition.indexOf(' OR ') > -1) { condition = this.queryCondition.split(/["|'](.*?)["|']/) + } else if (this.queryCondition.indexOf('+OR+') > -1) { + condition = this.queryCondition.replace(/\+/g, ' ').split(/["|'](.*?)["|']/) } else { condition = this.queryCondition } diff --git a/src/views/charts2/charts/npm/NpmNetworkQuantity.vue b/src/views/charts2/charts/npm/NpmNetworkQuantity.vue index 9fdc244e..9f8b2da7 100644 --- a/src/views/charts2/charts/npm/NpmNetworkQuantity.vue +++ b/src/views/charts2/charts/npm/NpmNetworkQuantity.vue @@ -115,6 +115,8 @@ export default { let url = '' if (this.queryCondition && this.queryCondition.indexOf(' OR ') > -1) { condition = this.queryCondition.split(/["|'](.*?)["|']/) + } else if (this.queryCondition.indexOf('+OR+') > -1) { + condition = this.queryCondition.replace(/\+/g, ' ').split(/["|'](.*?)["|']/) } else { condition = this.queryCondition } diff --git a/src/views/charts2/charts/npm/NpmTrafficLine.vue b/src/views/charts2/charts/npm/NpmTrafficLine.vue index 67cd92c1..f30a4443 100644 --- a/src/views/charts2/charts/npm/NpmTrafficLine.vue +++ b/src/views/charts2/charts/npm/NpmTrafficLine.vue @@ -116,6 +116,8 @@ export default { if (this.queryCondition.indexOf(' OR ') > -1) { condition = this.queryCondition.split(/["|'](.*?)["|']/) + } else if (this.queryCondition.indexOf('+OR+') > -1) { + condition = this.queryCondition.replace(/\+/g, ' ').split(/["|'](.*?)["|']/) } else { condition = this.queryCondition }