From 52b07097534491ac283a39279e405d0a67f29130 Mon Sep 17 00:00:00 2001 From: wenyann <64353056+wenyann@users.noreply.github.com> Date: Mon, 29 Mar 2021 16:43:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=A4=B4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/business/components/common/head/HeaderCustom.vue | 4 ++++ frontend/src/business/components/common/model/JsonData.js | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/src/business/components/common/head/HeaderCustom.vue b/frontend/src/business/components/common/head/HeaderCustom.vue index 99bb68f0ae..bd8f9ad28a 100644 --- a/frontend/src/business/components/common/head/HeaderCustom.vue +++ b/frontend/src/business/components/common/head/HeaderCustom.vue @@ -52,6 +52,10 @@ export default { this.defaultCheckedKeys.push(i.id) } ) + if(this.type==='api_list'||this.type==='api_case_list'||this.type==='api_scenario_list'||this.type==='test_plan_function_test_case' + ||this.type==='test_plan_api_case'||this.type==='test_plan_load_case'||this.type==='test_plan_scenario_case'){ + this.fieldSelected=items + } }, saveHeader() { let param = { diff --git a/frontend/src/business/components/common/model/JsonData.js b/frontend/src/business/components/common/model/JsonData.js index 57c5bc5b9a..f064c52d91 100644 --- a/frontend/src/business/components/common/model/JsonData.js +++ b/frontend/src/business/components/common/model/JsonData.js @@ -81,7 +81,6 @@ export const Test_Case_Review_Case_List = [ {id: 'name', label: i18n.t('commons.name')}, {id: 'priority', label: i18n.t('test_track.case.priority')}, {id: 'type', label: i18n.t('test_track.case.type')}, - {id: 'method', label: i18n.t('test_track.case.method')}, {id: 'nodePath', label: i18n.t('test_track.case.module')}, {id: 'projectName', label: i18n.t('test_track.review.review_project')}, {id: 'reviewerName', label: i18n.t('test_track.review.reviewer')}, @@ -107,7 +106,7 @@ export const Test_Plan_Function_Test_Case = [ //测试计划-api用例 export const Test_Plan_Api_Case = [ {id: 'num', label: i18n.t('commons.id')}, - {id: 'name', label: i18n.t('commons.name')}, + {id: 'name', label: i18n.t('api_test.definition.api_name')}, {id: 'priority', label: i18n.t('test_track.case.priority')}, {id: 'path', label: i18n.t('api_test.definition.api_path')}, {id: 'createUser', label: '创建人'}, @@ -124,12 +123,12 @@ export const Test_Plan_Load_Case = [ {id: 'createTime', label: i18n.t('commons.create_time')}, {id: 'status', label: i18n.t('commons.status')}, {id: 'caseStatus', label: i18n.t('test_track.plan.load_case.execution_status')}, - {id: 'loadReportId', label: i18n.t('test_track.plan.load_case.view_report')}, + {id: 'loadReportId', label: i18n.t('test_track.plan.load_case.report')}, ] //测试计划-场景用例 export const Test_Plan_Scenario_Case = [ {id: 'num', label: i18n.t('commons.id')}, - {id: 'name', label: i18n.t('commons.name')}, + {id: 'name', label: i18n.t('api_test.automation.scenario_name')}, {id: 'level', label: i18n.t('api_test.automation.case_level')}, {id: 'tagNames', label: i18n.t('api_test.automation.tag')}, {id: 'userId', label: i18n.t('api_test.automation.creator')}, From 7332bd41ecface53aa32afeab9bb06a6f10f5d30 Mon Sep 17 00:00:00 2001 From: wenyann <64353056+wenyann@users.noreply.github.com> Date: Mon, 29 Mar 2021 18:27:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E7=94=A8=E4=BE=8B=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E8=AF=84=E8=AE=BA=EF=BC=8C=E4=BD=86=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E7=9C=8B=E4=B8=8D=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/track/case/components/TestCaseEdit.vue | 4 +++- .../track/plan/view/comonents/api/TestPlanApiCaseList.vue | 2 +- .../track/plan/view/comonents/load/TestPlanLoadCaseList.vue | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue index 1c3b739cf9..78f0deb323 100644 --- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue +++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue @@ -309,7 +309,7 @@ export default { sysList: [],//一级选择框的数据 options: REVIEW_STATUS, statuOptions: API_STATUS, - comments: [], + comments: [], result: {}, dialogFormVisible: false, form: { @@ -406,6 +406,7 @@ export default { this.getSelectOptions(); if (this.type === 'edit' || this.type === 'copy') { this.open(this.currentTestCaseInfo) + this.getComments(this.currentTestCaseInfo) } // Cascader 级联选择器: 点击文本就让它自动点击前面的input就可以触发选择。 setInterval(function () { @@ -431,6 +432,7 @@ export default { created() { this.loadOptions(); this.addListener(); // 添加 ctrl s 监听 + }, methods: { setModule(id,data) { diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue index 7bdc9737b3..3ad46ae991 100644 --- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue +++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue @@ -104,7 +104,7 @@ - + diff --git a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue index caec94d7a2..d292a02dd6 100644 --- a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue +++ b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue @@ -100,7 +100,7 @@ - +