diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue index 098f9674e0..f7f517cb1c 100644 --- a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue +++ b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue @@ -60,7 +60,7 @@ diff --git a/frontend/src/business/components/api/definition/components/import/SwaggerTaskNotification.vue b/frontend/src/business/components/api/definition/components/import/SwaggerTaskNotification.vue index 8d206a2b14..c11e746c6d 100644 --- a/frontend/src/business/components/api/definition/components/import/SwaggerTaskNotification.vue +++ b/frontend/src/business/components/api/definition/components/import/SwaggerTaskNotification.vue @@ -60,7 +60,7 @@ diff --git a/frontend/src/business/components/settings/workspace/components/ScheduleTaskNotification.vue b/frontend/src/business/components/settings/workspace/components/ScheduleTaskNotification.vue index fcc17a2114..01c42eaafc 100644 --- a/frontend/src/business/components/settings/workspace/components/ScheduleTaskNotification.vue +++ b/frontend/src/business/components/settings/workspace/components/ScheduleTaskNotification.vue @@ -60,7 +60,7 @@ diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue index 9ed62909af..273bc47410 100644 --- a/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue +++ b/frontend/src/business/components/settings/workspace/components/api/ApiAutomationNotification.vue @@ -62,7 +62,7 @@ diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue index 72df488913..b47b140eba 100644 --- a/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue +++ b/frontend/src/business/components/settings/workspace/components/api/ApiDefinitionNotification.vue @@ -62,7 +62,7 @@ diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiHomeNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiHomeNotification.vue index ff3ab4b143..075590a73f 100644 --- a/frontend/src/business/components/settings/workspace/components/api/ApiHomeNotification.vue +++ b/frontend/src/business/components/settings/workspace/components/api/ApiHomeNotification.vue @@ -62,7 +62,7 @@ diff --git a/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue b/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue index 7a208ec3a5..cf3e300521 100644 --- a/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue +++ b/frontend/src/business/components/settings/workspace/components/api/ApiReportNotification.vue @@ -62,7 +62,7 @@ diff --git a/frontend/src/business/components/settings/workspace/components/jenkins/JenkinsNotification.vue b/frontend/src/business/components/settings/workspace/components/jenkins/JenkinsNotification.vue index 9f51d8e16b..c0fc2569fe 100644 --- a/frontend/src/business/components/settings/workspace/components/jenkins/JenkinsNotification.vue +++ b/frontend/src/business/components/settings/workspace/components/jenkins/JenkinsNotification.vue @@ -62,7 +62,7 @@ diff --git a/frontend/src/business/components/settings/workspace/components/performance/PerformanceReportNotification.vue b/frontend/src/business/components/settings/workspace/components/performance/PerformanceReportNotification.vue index 098f590a91..2c220cedb6 100644 --- a/frontend/src/business/components/settings/workspace/components/performance/PerformanceReportNotification.vue +++ b/frontend/src/business/components/settings/workspace/components/performance/PerformanceReportNotification.vue @@ -62,7 +62,7 @@ diff --git a/frontend/src/business/components/settings/workspace/components/performance/PerformanceTestNotification.vue b/frontend/src/business/components/settings/workspace/components/performance/PerformanceTestNotification.vue index 5309182bd6..eb532b511f 100644 --- a/frontend/src/business/components/settings/workspace/components/performance/PerformanceTestNotification.vue +++ b/frontend/src/business/components/settings/workspace/components/performance/PerformanceTestNotification.vue @@ -62,7 +62,7 @@ diff --git a/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue b/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue index f862d70f60..afee25f8b5 100644 --- a/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue +++ b/frontend/src/business/components/settings/workspace/components/track/DefectTaskNotification.vue @@ -62,7 +62,7 @@ diff --git a/frontend/src/business/components/settings/workspace/components/track/TestCaseNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TestCaseNotification.vue index 1e41ea0eb9..8a66a61eb8 100644 --- a/frontend/src/business/components/settings/workspace/components/track/TestCaseNotification.vue +++ b/frontend/src/business/components/settings/workspace/components/track/TestCaseNotification.vue @@ -62,7 +62,7 @@ diff --git a/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue index fd5cc14d85..b436eb7df0 100644 --- a/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue +++ b/frontend/src/business/components/settings/workspace/components/track/TestPlanTaskNotification.vue @@ -61,7 +61,7 @@ diff --git a/frontend/src/business/components/settings/workspace/components/track/TestReviewNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TestReviewNotification.vue index f3da1a4377..d7c69a3b67 100644 --- a/frontend/src/business/components/settings/workspace/components/track/TestReviewNotification.vue +++ b/frontend/src/business/components/settings/workspace/components/track/TestReviewNotification.vue @@ -62,7 +62,7 @@ diff --git a/frontend/src/business/components/settings/workspace/components/track/TrackHomeNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TrackHomeNotification.vue index fda958175d..6dcc3630c6 100644 --- a/frontend/src/business/components/settings/workspace/components/track/TrackHomeNotification.vue +++ b/frontend/src/business/components/settings/workspace/components/track/TrackHomeNotification.vue @@ -62,7 +62,7 @@ diff --git a/frontend/src/business/components/settings/workspace/components/track/TrackReportNotification.vue b/frontend/src/business/components/settings/workspace/components/track/TrackReportNotification.vue index 675bb28361..be0a4f0ad9 100644 --- a/frontend/src/business/components/settings/workspace/components/track/TrackReportNotification.vue +++ b/frontend/src/business/components/settings/workspace/components/track/TrackReportNotification.vue @@ -62,7 +62,7 @@ diff --git a/frontend/src/business/components/settings/workspace/template/TestCaseTemplateEdit.vue b/frontend/src/business/components/settings/workspace/template/TestCaseTemplateEdit.vue index 441c1b5100..545b9d440c 100644 --- a/frontend/src/business/components/settings/workspace/template/TestCaseTemplateEdit.vue +++ b/frontend/src/business/components/settings/workspace/template/TestCaseTemplateEdit.vue @@ -99,7 +99,7 @@ export default { }, computed: { caseTypeOption() { - return CASE_TYPE_OPTION; + return new CASE_TYPE_OPTION(); }, isSystem() { return this.form.system; diff --git a/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue b/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue index 505685f6ad..648c73a187 100644 --- a/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue +++ b/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue @@ -142,7 +142,7 @@ export default { return CUSTOM_FIELD_LIST; }, caseTypeFilters() { - return CASE_TYPE_OPTION; + return new CASE_TYPE_OPTION(); }, tableHeight() { return getDefaultTableHeight(); diff --git a/frontend/src/business/components/track/plan/components/ScheduleNotification.vue b/frontend/src/business/components/track/plan/components/ScheduleNotification.vue index 23bec87f1c..ba504eb1c4 100644 --- a/frontend/src/business/components/track/plan/components/ScheduleNotification.vue +++ b/frontend/src/business/components/track/plan/components/ScheduleNotification.vue @@ -60,7 +60,7 @@ diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index a598375541..a821f89c14 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit a598375541a45898616db5085fd38c192bd6df4b +Subproject commit a821f89c1409b4a4713442a79a7964e61f30355b diff --git a/frontend/src/common/js/table-constants.js b/frontend/src/common/js/table-constants.js index afd110feb0..9857a38f4a 100644 --- a/frontend/src/common/js/table-constants.js +++ b/frontend/src/common/js/table-constants.js @@ -24,15 +24,17 @@ export const CUSTOM_FIELD_SCENE_OPTION = [ {value: 'ISSUE',text: 'workspace.issue_template_manage'}, ]; -export const CASE_TYPE_OPTION = [ - {value: 'functional',text: '功能用例'}, -]; +export function CASE_TYPE_OPTION(){ + return [ + {value: 'functional', text: i18n.t('api_test.home_page.failed_case_list.table_value.case_type.functional')}, + ]; +} export const ISSUE_PLATFORM_OPTION = [ {value: LOCAL, text: 'Metersphere'}, {value: TAPD, text: 'Tapd'}, {value: JIRA, text: 'JIRA'}, - {value: ZEN_TAO, text: '禅道'}, + {value: ZEN_TAO, text: 'Zentao'}, {value: AZURE_DEVOPS, text: 'Azure Devops'}, ]; @@ -75,12 +77,12 @@ export const SYSTEM_FIELD_NAME_MAP = { export const ISSUE_STATUS_MAP = { - 'new': '新建', - 'closed': '已关闭', - 'resolved': '已解决', - 'active': '激活', - 'delete': '已删除', - 'created':'新建' + 'new': i18n.t('test_track.issue.status_new'), + 'closed': i18n.t('test_track.issue.status_closed'), + 'resolved': i18n.t('test_track.issue.status_resolved'), + 'active': i18n.t('test_track.issue.status_active'), + 'delete': i18n.t('test_track.issue.status_delete'), + 'created':i18n.t('test_track.issue.status_new') } export function API_SCENARIO_FILTERS () {