From 7cba18ec274b5f553f37ca3289b57731ed7c52a1 Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Thu, 28 Jan 2021 10:05:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=8F=90=E5=8F=96=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=87=BA=E7=8E=B0=E5=9C=A8=E6=96=AD=E8=A8=80?= =?UTF-8?q?=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/metersphere/api/jmeter/APIBackendListenerClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java index ae9fbf35be..2a8ac063d1 100644 --- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java +++ b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java @@ -337,7 +337,7 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl requestResult.addPassAssertions(); } //xpath 提取错误会添加断言错误 - if (StringUtils.isBlank(responseAssertionResult.getMessage()) || !responseAssertionResult.getMessage().contains("The required item type of the first operand of")) { + if (StringUtils.isBlank(responseAssertionResult.getMessage()) || !responseAssertionResult.getName().endsWith("XPath2Extractor")) { responseResult.getAssertions().add(responseAssertionResult); } } From 6c74486f57e3e304fe26bffd7904607f0cdebfa9 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Thu, 28 Jan 2021 10:31:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?= =?UTF-8?q?=20=E8=8E=B7=E5=8F=96=E7=84=A6=E7=82=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/automation/scenario/variable/EditConstant.vue | 6 ------ 1 file changed, 6 deletions(-) diff --git a/frontend/src/business/components/api/automation/scenario/variable/EditConstant.vue b/frontend/src/business/components/api/automation/scenario/variable/EditConstant.vue index eb4165ff1a..23f3a945db 100644 --- a/frontend/src/business/components/api/automation/scenario/variable/EditConstant.vue +++ b/frontend/src/business/components/api/automation/scenario/variable/EditConstant.vue @@ -30,12 +30,6 @@ this.$refs.nameInput.focus(); }); }, - watch: { - editData() { - this.$refs.nameInput.focus(); - } - } - } From 87d9a046ae0e7a352deb17c4a0626c2696037117 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Thu, 28 Jan 2021 10:40:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?style(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E6=8F=90=E5=8F=96=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/request/http/ApiHttpRequestForm.vue | 3 +-- .../api/definition/components/response/ResponseResult.vue | 8 ++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue b/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue index 921ba00734..8f048b6b23 100644 --- a/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue +++ b/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue @@ -86,10 +86,9 @@ import ApiRequestMethodSelect from "../../collapse/ApiRequestMethodSelect"; import {REQUEST_HEADERS} from "@/common/js/constants"; import MsApiVariable from "../../ApiVariable"; - import {createComponent} from "../../jmeter/components"; import MsApiAssertions from "../../assertion/ApiAssertions"; import MsApiExtract from "../../extract/ApiExtract"; - import {Assertions, Body, Extract, KeyValue} from "../../../model/ApiTestModel"; + import {Body, KeyValue} from "../../../model/ApiTestModel"; import {getUUID} from "@/common/js/utils"; import BatchAddParameter from "../../basis/BatchAddParameter"; import MsApiAdvancedConfig from "./ApiAdvancedConfig"; diff --git a/frontend/src/business/components/api/definition/components/response/ResponseResult.vue b/frontend/src/business/components/api/definition/components/response/ResponseResult.vue index 16e7b73164..39e6c7fb40 100644 --- a/frontend/src/business/components/api/definition/components/response/ResponseResult.vue +++ b/frontend/src/business/components/api/definition/components/response/ResponseResult.vue @@ -8,7 +8,9 @@ - 
{{ response.responseResult.headers }}
+
+ 
{{ response.responseResult.headers }}
+
@@ -25,7 +27,9 @@ - 
{{response.responseResult.vars}}
+
+ 
{{response.responseResult.vars}}
+
From 012b5d64a7614cbf374f90d5c7a74ab89eaa9096 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Thu, 28 Jan 2021 10:46:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):?= =?UTF-8?q?=20=E5=9C=BA=E6=99=AF=E7=94=A8=E4=BE=8B=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E3=80=81ID=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/mapper/ext/ExtTestPlanScenarioCaseMapper.xml | 6 ++++-- .../plan/view/comonents/api/TestPlanApiScenarioList.vue | 8 +++++++- .../view/comonents/api/TestPlanScenarioListHeader.vue | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanScenarioCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanScenarioCaseMapper.xml index 508197b62d..4800d42428 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanScenarioCaseMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanScenarioCaseMapper.xml @@ -19,7 +19,7 @@ select t.id, t.environment_id, t.create_time, t.update_time, t.last_result, t.pass_rate, t.report_id, c.id as case_id, c.project_id, c.user_id,c.api_scenario_module_id, c.module_path, c.name, c.level, - c.status, c.principal, c.step_total, c.follow_people, c.schedule, c.description, + c.status, c.principal, c.step_total, c.follow_people, c.schedule, c.description, c.tags, c.num, p.name as project_name, p.id as project_id, u.name as user_name from test_plan_api_scenario t @@ -44,7 +44,9 @@ - and c.name like CONCAT('%', #{request.name},'%') + and (c.name like CONCAT('%', #{request.name},'%') + or c.num like CONCAT('%', #{request.name},'%') + or c.tags like CONCAT('%', #{request.name},'%')) and t.last_result like CONCAT('%', #{request.status},'%') diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue index bd2789f4b1..fd3fbac396 100644 --- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue +++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue @@ -15,6 +15,7 @@ + @@ -159,6 +160,11 @@ let data = response.data; this.total = data.itemCount; this.tableData = data.listObject; + this.tableData.forEach(item => { + if (item.tags && item.tags.length > 0) { + item.tags = JSON.parse(item.tags); + } + }); this.loading = false; }); }, diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanScenarioListHeader.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanScenarioListHeader.vue index e0433b30cf..a1d6b87f53 100644 --- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanScenarioListHeader.vue +++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanScenarioListHeader.vue @@ -3,7 +3,7 @@ :condition="condition" @search="$emit('refresh')" :show-create="false" - :tip="$t('commons.search_by_name_or_id')"> + :tip="$t('commons.search_by_id_name_tag')">