From 1d6b6c05118eef3c7ea8f994a713b768f92a96f3 Mon Sep 17 00:00:00 2001 From: limin-fit2 Date: Thu, 17 Feb 2022 11:45:01 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=BC=80=E5=85=B3=E6=8F=90?= =?UTF-8?q?=E9=86=92=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/io/metersphere/xpack | 2 +- .../track/plan/components/TestPlanList.vue | 7 +++++- frontend/src/business/components/xpack | 2 +- .../src/common/js/default-table-header.js | 22 +++++++++---------- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index bd451607ee..17293a0e1f 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit bd451607ee198520f89faeebab38dd0c75e7b397 +Subproject commit 17293a0e1faed0922a3914d1f021e947d1da3353 diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue index 13a5d537eb..302ae18b67 100644 --- a/frontend/src/business/components/track/plan/components/TestPlanList.vue +++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue @@ -628,7 +628,12 @@ export default { cancelButtonText: this.$t('commons.cancel'), type: 'warning', }).then(() => { - this.result = this.$post('/test/plan/schedule/updateEnableByPrimyKey', param, response => { + this.result = this.$post('/test/plan/schedule/updateEnableByPrimyKey', param, () => { + if (row.scheduleOpen) { + row.scheduleStatus = 'OPEN' + } else { + row.scheduleStatus = 'SHUT' + } this.$success(this.$t('commons.save_success')); }); }).catch(() => { diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index 54dfbe2f9d..9b80079880 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 54dfbe2f9dfa3ffe6042737f5cbb1768085f7143 +Subproject commit 9b8007988010508ea145e42ab3e088968e3003ea diff --git a/frontend/src/common/js/default-table-header.js b/frontend/src/common/js/default-table-header.js index 4ee65c78e5..cf61dc7cd9 100644 --- a/frontend/src/common/js/default-table-header.js +++ b/frontend/src/common/js/default-table-header.js @@ -118,16 +118,16 @@ export let CUSTOM_TABLE_HEADER = { {id: 'plannedStartTime', key: '7', label: 'test_track.plan.planned_start_time'}, {id: 'plannedEndTime', key: '8', label: 'test_track.plan.planned_end_time'}, {id: 'actualStartTime', key: '9', label: 'test_track.plan.actual_start_time'}, - {id: 'actualEndTime', key: '10', label: 'test_track.plan.actual_end_time'}, - {id: 'tags', key: 'a', label: 'commons.tag'}, - {id: 'scheduleStatus', key: 'b', label: 'commons.trigger_mode.schedule'}, - {id: 'executionTimes', key: 'c', label: 'commons.execution_times'}, - {id: 'passRate', key: 'd', label: 'commons.pass_rate'}, - {id: 'createUser', key: 'e', label: 'commons.create_user'}, - {id: 'testPlanTestCaseCount', key: 'f', label: 'test_track.plan.test_plan_test_case_count'}, - {id: 'testPlanApiCaseCount', key: 'g', label: 'test_track.plan.test_plan_api_case_count'}, - {id: 'testPlanApiScenarioCount', key: 'h', label: 'test_track.plan.test_plan_api_scenario_count'}, - {id: 'testPlanLoadCaseCount', key: 'i', label: 'test_track.plan.test_plan_load_case_count'} + {id: 'actualEndTime', key: 'a', label: 'test_track.plan.actual_end_time'}, + {id: 'tags', key: 'b', label: 'commons.tag'}, + {id: 'scheduleStatus', key: 'c', label: 'commons.trigger_mode.schedule'}, + {id: 'executionTimes', key: 'd', label: 'commons.execution_times'}, + {id: 'passRate', key: 'e', label: 'commons.pass_rate'}, + {id: 'createUser', key: 'f', label: 'commons.create_user'}, + {id: 'testPlanTestCaseCount', key: 'g', label: 'test_track.plan.test_plan_test_case_count'}, + {id: 'testPlanApiCaseCount', key: 'h', label: 'test_track.plan.test_plan_api_case_count'}, + {id: 'testPlanApiScenarioCount', key: 'i', label: 'test_track.plan.test_plan_api_scenario_count'}, + {id: 'testPlanLoadCaseCount', key: 'j', label: 'test_track.plan.test_plan_load_case_count'} ], //测试计划-功能用例 TEST_PLAN_FUNCTION_TEST_CASE: [ @@ -177,7 +177,7 @@ export let CUSTOM_TABLE_HEADER = { {id: 'versionId', key: 'd', label: 'commons.version'}, {id: 'level', key: '3', label: 'api_test.automation.case_level'}, {id: 'tagNames', key: '4', label: 'api_test.automation.tag'}, - {id: 'stepTotal', key: '7', label: 'api_test.automation.step'}, + {id: 'stepTotal', key: '7', label: 'api_test.automation.step'}, {id: 'envs', key: '8', label: 'commons.environment'}, {id: 'passRate', key: '9', label: 'api_test.automation.passing_rate'}, {id: 'maintainer', key: 'a', label: 'api_test.definition.request.responsible'},