From 4811432acc8b78266518dd39bddef2f204c3bf57 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Wed, 31 Mar 2021 12:59:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8Dcsv=20=E5=88=86=E9=9A=94?= =?UTF-8?q?=E7=AC=A6=E4=B8=8D=E8=83=BD=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/automation/scenario/variable/VariableList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue b/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue index 493fae9fb5..8f23c32cb6 100644 --- a/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue +++ b/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue @@ -226,7 +226,7 @@ this.headers = headers; } this.visible = true; - this.editData = {type: "CONSTANT"}; + this.editData = {type: "CONSTANT", delimiter: ","}; this.addParameters(this.editData); this.disabled = disabled; }, From e092a7a130fc42495e1b910517f2411ccad9814a Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Wed, 31 Mar 2021 13:03:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96):=20=E6=94=BE=E5=BC=80=E5=85=A8=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/api/automation/scenario/EnvSelect.vue | 6 +++--- frontend/src/business/components/xpack | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/business/components/api/automation/scenario/EnvSelect.vue b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue index 6340706b4d..bfb759b091 100644 --- a/frontend/src/business/components/api/automation/scenario/EnvSelect.vue +++ b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue @@ -243,9 +243,9 @@ } }) } else { - // this.checkFullUrl(data); - // sign = this.isFullUrl; - sign = false; + this.checkFullUrl(data); + sign = this.isFullUrl; + //sign = false; } // 校验是否全是全路径 diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index a37e6bb56f..07951ba17a 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit a37e6bb56ffaa7ecc4ee128640e9415304ad41b6 +Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd From ed3e076a014612cb092562c27062490a0da2364e Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Wed, 31 Mar 2021 13:17:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96):=20=E6=94=BE=E5=BC=80=E5=85=A8=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/api/automation/scenario/EnvSelect.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/frontend/src/business/components/api/automation/scenario/EnvSelect.vue b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue index bfb759b091..5bdd88307f 100644 --- a/frontend/src/business/components/api/automation/scenario/EnvSelect.vue +++ b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue @@ -243,13 +243,11 @@ } }) } else { - this.checkFullUrl(data); - sign = this.isFullUrl; - //sign = false; + sign = false; } - // 校验是否全是全路径 - + this.checkFullUrl(data); + sign = this.isFullUrl; } if (!sign) { From 4045f5546fa25243df8c1f70837d4bf4dc0ec413 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Wed, 31 Mar 2021 13:23:26 +0800 Subject: [PATCH 4/4] chore: sync --- frontend/src/business/components/xpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index 07951ba17a..a37e6bb56f 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd +Subproject commit a37e6bb56ffaa7ecc4ee128640e9415304ad41b6