From 1eee458e1a5dba8b78017fe1ca40eaf687eff9aa Mon Sep 17 00:00:00 2001 From: metersphere-bot <78466014+metersphere-bot@users.noreply.github.com> Date: Wed, 28 Apr 2021 20:42:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BD=E9=99=85=E5=8C=96=E8=A1=A5?= =?UTF-8?q?=E5=85=85=20(#2419)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 国际化 * fix: 国际化补充 Co-authored-by: chenjianxing Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com> --- .../common/components/MsSingleHandleDrag.vue | 12 ++++- .../business/components/settings/router.js | 2 +- .../workspace/template/CustomFieldEdit.vue | 19 ++++---- .../template/CustomFieldFormList.vue | 14 +++--- .../workspace/template/CustomFieldList.vue | 20 ++++----- .../template/CustomFieldRelateList.vue | 21 ++++----- .../template/CustomFiledComponent.vue | 11 +++-- .../template/FieldCustomDataTableItem.vue | 4 +- .../workspace/template/FieldTemplateEdit.vue | 14 +++--- .../workspace/template/IssueTemplateEdit.vue | 8 ++-- .../workspace/template/IssuesTemplateList.vue | 12 ++--- .../template/TestCaseTemplateEdit.vue | 9 ++-- .../template/TestCaseTemplateList.vue | 22 +++++----- .../track/case/components/StepChangeItem.vue | 12 ++--- .../track/case/components/TestCaseEdit.vue | 4 +- .../case/components/TestCaseEditOtherInfo.vue | 8 ++-- .../case/components/TestCaseIssueRelate.vue | 4 +- .../case/components/TestPlanIssueEdit.vue | 2 +- .../track/issue/IssueEditDetail.vue | 8 ++-- .../components/track/issue/IssueList.vue | 2 +- .../track/issue/TestCaseIssueList.vue | 2 +- frontend/src/i18n/en-US.js | 44 ++++++++++++++++++- frontend/src/i18n/zh-CN.js | 44 ++++++++++++++++++- frontend/src/i18n/zh-TW.js | 44 ++++++++++++++++++- 24 files changed, 236 insertions(+), 106 deletions(-) diff --git a/frontend/src/business/components/common/components/MsSingleHandleDrag.vue b/frontend/src/business/components/common/components/MsSingleHandleDrag.vue index 0714e4ca2..957582ac4 100644 --- a/frontend/src/business/components/common/components/MsSingleHandleDrag.vue +++ b/frontend/src/business/components/common/components/MsSingleHandleDrag.vue @@ -2,8 +2,8 @@
- - 添加选项 + + 添加选项
@@ -30,6 +30,7 @@
@@ -51,6 +52,7 @@ export default { }; }, props: { + disable: Boolean, data: { type: Array, default() { @@ -66,6 +68,9 @@ export default { { icon: 'el-icon-edit', click: (element, idx) => { + if (this.disable) { + return; + } if (!element.system) { this.editIndex = idx; } @@ -74,6 +79,9 @@ export default { { icon: 'el-icon-close', click: (element, idx) => { + if (this.disable) { + return; + } this.data.splice(idx, 1); } }, diff --git a/frontend/src/business/components/settings/router.js b/frontend/src/business/components/settings/router.js index 89009e6af..5c4e8d052 100644 --- a/frontend/src/business/components/settings/router.js +++ b/frontend/src/business/components/settings/router.js @@ -20,7 +20,7 @@ export default { { path: 'workspace/template/field', component: () => import('@/business/components/settings/workspace/template/CustomFieldList'), - meta: {workspaceTemplate: true, title: '自定义字段'}, + meta: {workspaceTemplate: true, title: 'custom_field.name'}, }, { path: 'workspace/template/case', diff --git a/frontend/src/business/components/settings/workspace/template/CustomFieldEdit.vue b/frontend/src/business/components/settings/workspace/template/CustomFieldEdit.vue index a145aa121..ff9f3cf43 100644 --- a/frontend/src/business/components/settings/workspace/template/CustomFieldEdit.vue +++ b/frontend/src/business/components/settings/workspace/template/CustomFieldEdit.vue @@ -3,22 +3,22 @@ width="30%" :visible.sync="visible" @confirm="save" - :title="'创建字段'" + :title="$t('custom_field.create')" append-to-body ref="msEditDialog"> - - + + - + - - + + - - + + diff --git a/frontend/src/business/components/settings/workspace/template/CustomFieldFormList.vue b/frontend/src/business/components/settings/workspace/template/CustomFieldFormList.vue index fc19dfc84..eea275080 100644 --- a/frontend/src/business/components/settings/workspace/template/CustomFieldFormList.vue +++ b/frontend/src/business/components/settings/workspace/template/CustomFieldFormList.vue @@ -9,7 +9,7 @@ ref="table">