From cec4ff28c2c8478b7be14a310479446151166df4 Mon Sep 17 00:00:00 2001 From: wenyann <64353056+wenyann@users.noreply.github.com> Date: Mon, 22 Mar 2021 23:23:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=BB=98=E8=AE=A4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/automation/scenario/ApiScenarioList.vue | 2 +- .../components/list/ApiCaseSimpleList.vue | 2 +- .../api/definition/components/list/ApiList.vue | 2 +- .../components/common/head/HeaderCustom.vue | 17 ++++++----------- .../track/case/components/TestCaseCreate.vue | 9 ++++----- .../track/case/components/TestCaseList.vue | 2 +- .../track/plan/components/TestPlanList.vue | 2 +- .../view/comonents/api/TestPlanApiCaseList.vue | 2 +- .../comonents/api/TestPlanApiScenarioList.vue | 2 +- .../functional/FunctionalTestCaseList.vue | 2 +- .../comonents/load/TestPlanLoadCaseList.vue | 2 +- 11 files changed, 19 insertions(+), 25 deletions(-) diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue index 141b314e7f..e05f4fa481 100644 --- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue +++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue @@ -244,7 +244,7 @@ return { type: API_SCENARIO_LIST, headerItems: Api_Scenario_List, - tableLabel: [], + tableLabel: Api_Scenario_List, loading: false, screenHeight: document.documentElement.clientHeight - 280,//屏幕高度, condition: { diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue index 4754744b4d..9493dc16be 100644 --- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue +++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue @@ -186,7 +186,7 @@ export default { return { type: API_CASE_LIST, headerItems: Api_Case_List, - tableLabel: [], + tableLabel: Api_Case_List, condition: { components: API_CASE_CONFIGS }, diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue index 6069e06e71..11efdfd8ee 100644 --- a/frontend/src/business/components/api/definition/components/list/ApiList.vue +++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue @@ -272,7 +272,7 @@ return { type: API_LIST, headerItems: Api_List, - tableLabel: [], + tableLabel: Api_List, condition: { components: API_DEFINITION_CONFIGS }, diff --git a/frontend/src/business/components/common/head/HeaderCustom.vue b/frontend/src/business/components/common/head/HeaderCustom.vue index 3becf9b217..d13351763c 100644 --- a/frontend/src/business/components/common/head/HeaderCustom.vue +++ b/frontend/src/business/components/common/head/HeaderCustom.vue @@ -47,18 +47,14 @@ export default { }, open(items) { this.defaultCheckedKeys = [] - this.dialogTableVisible = true - this.fieldSelected = items - if (items.size <= 0) { - this.optionalField = this.optionalFields - } else { - items.forEach(i => { - this.defaultCheckedKeys.push(i.id) - } - ) - } + items.forEach(i => { + this.defaultCheckedKeys.push(i.id) + } + ) console.log(this.defaultCheckedKeys) + console.log(this.optionalFields) + console.log(this.fieldSelected) }, saveHeader() { @@ -83,7 +79,6 @@ export default { }, - // 切换模式 现有树形穿梭框模式transfer 和通讯录模式addressList // changeMode() { // if (this.mode == "transfer") { diff --git a/frontend/src/business/components/track/case/components/TestCaseCreate.vue b/frontend/src/business/components/track/case/components/TestCaseCreate.vue index e132bdfc4e..9f39733f06 100644 --- a/frontend/src/business/components/track/case/components/TestCaseCreate.vue +++ b/frontend/src/business/components/track/case/components/TestCaseCreate.vue @@ -105,13 +105,12 @@ export default { this.testCaseForm.projectId = getCurrentProjectID(); this.testCaseForm.type = ""; this.testCaseForm.priority = "P0"; - this.testCaseForm.method = "manual"; - if(this.currentModule!==undefined){ + if (this.currentModule !== undefined || this.currentModule !== null || this.currentModule !== 0 || this.currentModule !== "") { this.testCaseForm.nodePath = this.currentModule.path; this.testCaseForm.nodeId = this.currentModule.id; - }else{ - this.testCaseForm.nodePath="/全部用例" - this.testCaseForm.nodeId="root" + } else { + this.testCaseForm.nodePath = "/全部用例" + this.testCaseForm.nodeId = "root" } this.result = this.$post(path, this.testCaseForm, response => { this.testCaseForm.id=response.data.id diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue index 3f40e08997..71af994e97 100644 --- a/frontend/src/business/components/track/case/components/TestCaseList.vue +++ b/frontend/src/business/components/track/case/components/TestCaseList.vue @@ -259,7 +259,7 @@ export default { return { type: TEST_CASE_LIST, headerItems: Track_Test_Case, - tableLabel: [], + tableLabel: Track_Test_Case, result: {}, deletePath: "/test/case/delete", condition: { diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue index 90aa51084e..cd19db1a97 100644 --- a/frontend/src/business/components/track/plan/components/TestPlanList.vue +++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue @@ -248,7 +248,7 @@ export default { return { type: TEST_PLAN_LIST, headerItems: Test_Plan_List, - tableLabel: [], + tableLabel: Test_Plan_List, result: {}, enableDeleteTip: false, queryPath: "/test/plan/list", 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 c72d1eab50..370799ede6 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 @@ -192,7 +192,7 @@ export default { return { type: TEST_PLAN_API_CASE, headerItems: Test_Plan_Api_Case, - tableLabel: [], + tableLabel: Test_Plan_Api_Case, condition: {}, selectCase: {}, result: {}, 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 556f0ba211..3a7f032486 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 @@ -148,7 +148,7 @@ export default { return { type: TEST_PLAN_SCENARIO_CASE, headerItems: Test_Plan_Scenario_Case, - tableLabel: [], + tableLabel: Test_Plan_Scenario_Case, loading: false, condition: {}, currentScenario: {}, diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue index 0fe3a3c88a..6a9f98e8ce 100644 --- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue +++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue @@ -312,7 +312,7 @@ export default { return { type: TEST_PLAN_FUNCTION_TEST_CASE, headerItems: Test_Plan_Function_Test_Case, - tableLabel: [], + tableLabel: Test_Plan_Function_Test_Case, result: {}, deletePath: "/test/case/delete", condition: { 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 3b480b7226..db66a0d7ce 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 @@ -154,7 +154,7 @@ export default { return { type: TEST_PLAN_LOAD_CASE, headerItems: Test_Plan_Load_Case, - tableLabel: [], + tableLabel: Test_Plan_Load_Case, condition: {}, result: {}, tableData: [],