diff --git a/frontend/src/components/business/ms-case-associate/executeResult.vue b/frontend/src/components/business/ms-case-associate/executeResult.vue index 923c648fd3..d0f2d96af2 100644 --- a/frontend/src/components/business/ms-case-associate/executeResult.vue +++ b/frontend/src/components/business/ms-case-associate/executeResult.vue @@ -27,7 +27,7 @@ PENDING: { label: 'PENDING', icon: StatusType.PENDING, - statusText: t('caseManagement.featureCase.nonExecution'), + statusText: t('common.unExecute'), color: 'var(--color-text-brand)', }, SUCCESS: { @@ -39,13 +39,13 @@ BLOCKED: { label: 'BLOCKED', icon: StatusType.BLOCKED, - statusText: t('caseManagement.featureCase.chokeUp'), + statusText: t('common.block'), color: 'rgb(var(--primary-3))', }, ERROR: { label: 'ERROR', icon: StatusType.ERROR, - statusText: t('caseManagement.featureCase.failure'), + statusText: t('common.fail'), color: '', }, }; diff --git a/frontend/src/components/business/ms-case-associate/index.vue b/frontend/src/components/business/ms-case-associate/index.vue index 0a36cf452b..a7319c3acd 100644 --- a/frontend/src/components/business/ms-case-associate/index.vue +++ b/frontend/src/components/business/ms-case-associate/index.vue @@ -212,7 +212,7 @@ moduleCountParams?: TableQueryParams; // 获取模块树数量额外的参数 hideProjectSelect?: boolean; // 是否隐藏项目选择 isHiddenCaseLevel?: boolean; - selectorAll: boolean; + selectorAll?: boolean; }>(), { isHiddenCaseLevel: false, diff --git a/frontend/src/components/pure/ms-advance-filter/locale/en-US.ts b/frontend/src/components/pure/ms-advance-filter/locale/en-US.ts index b307622d79..1e4c0626ed 100644 --- a/frontend/src/components/pure/ms-advance-filter/locale/en-US.ts +++ b/frontend/src/components/pure/ms-advance-filter/locale/en-US.ts @@ -7,7 +7,16 @@ export default { 'advanceFilter.operator.ge': 'ge', 'advanceFilter.operator.lt': 'lt', 'advanceFilter.operator.le': 'le', - 'advanceFilter.operator.equals': 'equals', + 'advanceFilter.operator.equal': 'equal', + 'advanceFilter.operator.notEqual': 'not Equal', + 'advanceFilter.operator.no_check': 'uncheck', + 'advanceFilter.operator.contains': 'contain', + 'advanceFilter.operator.not_contains': 'exclude', + 'advanceFilter.operator.start_with': 'with...start', + 'advanceFilter.operator.end_with': 'with...end', + 'advanceFilter.operator.empty': 'empty', + 'advanceFilter.operator.not_empty': 'not empty', + 'advanceFilter.operator.regexp': 'Regular', 'advanceFilter.operator.between': 'between', 'advanceFilter.setFilterCondition': 'Set Filter Condition', 'advanceFilter.accordBelow': 'Accord below', @@ -17,13 +26,13 @@ export default { 'advanceFilter.addCondition': 'Add Condition', 'advanceFilter.reset': 'Reset', 'advanceFilter.filter': 'Filter', + 'advanceFilter.plaseSelectFilterDataIndex': 'Please select a filter conditions', 'advanceFilter.plaseInputFilterContent': 'Please input filter content', - 'advanceFilter.operator.no_check': 'No check', - 'advanceFilter.operator.contains': 'Contains', - 'advanceFilter.operator.not_contains': 'Not contains', - 'advanceFilter.operator.start_with': 'Start with', - 'advanceFilter.operator.end_with': 'End with', - 'advanceFilter.operator.empty': 'Empty', - 'advanceFilter.operator.not_empty': 'Not empty', - 'advanceFilter.operator.regexp': 'Regexp', + 'advanceFilter.plaseSelectOperator': 'Please select an operator', + 'advanceFilter.operator.length.equal': 'Length equal to', + 'advanceFilter.operator.length.not_equal': 'Not equal in length', + 'advanceFilter.operator.length.gt': 'Length greater than', + 'advanceFilter.operator.length.ge': 'Length greater than or equal to', + 'advanceFilter.operator.length.lt': 'Less than', + 'advanceFilter.operator.length.le': 'Length less than or equal to', }; diff --git a/frontend/src/components/pure/ms-upload/locale/en-US.ts b/frontend/src/components/pure/ms-upload/locale/en-US.ts index 5cce3652e8..6e0de0d1b0 100644 --- a/frontend/src/components/pure/ms-upload/locale/en-US.ts +++ b/frontend/src/components/pure/ms-upload/locale/en-US.ts @@ -9,7 +9,7 @@ export default { 'ms.upload.preview': 'Preview', 'ms.upload.uploadAt': 'Uploaded at', 'ms.upload.associatedAt': 'Associated at', - 'ms.upload.fail': 'Failed', + 'ms.upload.fail': 'Error', 'ms.upload.delete': 'Delete', 'ms.upload.uploadSuccess': 'Upload successful', 'ms.upload.uploadFail': 'Upload failed', diff --git a/frontend/src/enums/reportEnum.ts b/frontend/src/enums/reportEnum.ts index 304f3060c1..f4856267bc 100644 --- a/frontend/src/enums/reportEnum.ts +++ b/frontend/src/enums/reportEnum.ts @@ -29,24 +29,24 @@ export const ReportStatus: Record = { STOPPED: { key: 'STOPPED', icon: 'icon-icon_block_filled', - statusText: t('report.stopped'), + statusText: t('common.stop'), label: 'report.stop', color: '!var(--color-text-input-border)', }, RUNNING: { key: 'RUNNING', icon: 'icon-icon_testing', - statusText: t('report.status.running'), + statusText: t('common.running'), label: 'report.inExecution', color: '!text-[rgb(var(--link-6))]', }, PENDING: { key: 'PENDING', icon: 'icon-icon_wait', - statusText: t('report.status.pending'), + statusText: t('common.unExecute'), label: 'report.queuing', color: '!text-[rgb(var(--link-6))]', }, @@ -123,17 +123,17 @@ export const PlanReportStatus: Record = { key: 'COMPLETED', icon: 'icon-icon_succeed_colorful', statusText: t('report.completed'), - label: 'report.successful', + label: 'common.success', }, }, [ReportStatusEnum.REPORT_STATUS]: { SUCCESS: { icon: 'icon-icon_succeed_colorful', - label: 'report.successful', + label: 'common.success', }, ERROR: { icon: 'icon-icon_close_colorful', - label: 'report.failure', + label: 'common.fail', }, }, }; diff --git a/frontend/src/locale/en-US/common.ts b/frontend/src/locale/en-US/common.ts index 79fb7f5f48..37dee4c84a 100644 --- a/frontend/src/locale/en-US/common.ts +++ b/frontend/src/locale/en-US/common.ts @@ -113,7 +113,7 @@ export default { 'common.clear': 'Clear', 'common.tag': 'Tag', 'common.success': 'Success', - 'common.fail': 'Failed', + 'common.fail': 'Error', 'common.noProject': 'No project, please contact the administrator', 'common.noResource': 'No resource, please contact the administrator', 'common.noSelectProject': 'No optional items available', @@ -166,13 +166,15 @@ export default { 'common.searchByNameAndId': 'Search by ID, name, or tag', 'common.archive': 'archive', 'common.running': 'Running', - 'common.unExecute': 'Not executed', + 'common.unExecute': 'Pending', 'common.pass': 'Pass', 'common.unPass': 'Fail pass', - 'common.block': 'block', + 'common.block': 'Block', 'common.fakeError': 'Fake error', 'common.belongModule': 'Belong module', 'common.moreSetting': 'More settings', + 'common.detail': 'detail', + 'common.baseInfo': 'Basic info', 'common.remark': 'Remark', 'common.case': 'Case', 'common.caseLevel': 'Case level', diff --git a/frontend/src/locale/en-US/index.ts b/frontend/src/locale/en-US/index.ts index 1c4b8bf89e..544e7ec69c 100644 --- a/frontend/src/locale/en-US/index.ts +++ b/frontend/src/locale/en-US/index.ts @@ -22,6 +22,7 @@ export default { 'menu.workbench': 'Workbench', 'menu.testPlan': 'Test Plan', 'menu.testPlanShort': 'Plan', + 'menu.testPlan.testPlanDetail': 'Test plan details', 'menu.bugManagement': 'Bug', 'menu.bugManagementShort': 'Bug', 'menu.bugManagement.bugDetail': 'Bug', diff --git a/frontend/src/views/api-test/report/component/case/setReportChart.vue b/frontend/src/views/api-test/report/component/case/setReportChart.vue index 5d150d7975..b89748e262 100644 --- a/frontend/src/views/api-test/report/component/case/setReportChart.vue +++ b/frontend/src/views/api-test/report/component/case/setReportChart.vue @@ -21,8 +21,8 @@
-