From 4911d2000c8a22402053a552308fe1026f1b1219 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Fri, 17 Feb 2023 17:37:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=9B=9E=E6=94=B6=E7=AB=99?=
 =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1023269 --user=宋昌昌 【测试跟踪】功能用例-回收站-文案错误汇总 https://www.tapd.cn/55049933/s/1337139
---
 .../src/components/MsTableOperatorButton.vue   |  4 ++--
 .../src/components/MsTableOperators.vue        |  2 +-
 .../frontend/src/components/new-ui/MsTable.vue |  2 +-
 .../sdk-parent/frontend/src/i18n/lang/en-US.js |  2 ++
 .../frontend/src/i18n/lang/track/en-US.js      |  5 ++++-
 .../frontend/src/i18n/lang/track/zh-CN.js      |  5 ++++-
 .../frontend/src/i18n/lang/track/zh-TW.js      |  5 ++++-
 .../sdk-parent/frontend/src/i18n/lang/zh-CN.js |  2 ++
 .../sdk-parent/frontend/src/i18n/lang/zh-TW.js |  2 ++
 .../business/case/components/TestCaseList.vue  | 18 +++++++++---------
 10 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/components/MsTableOperatorButton.vue b/framework/sdk-parent/frontend/src/components/MsTableOperatorButton.vue
index ec2dd8ae0f..da324bf318 100644
--- a/framework/sdk-parent/frontend/src/components/MsTableOperatorButton.vue
+++ b/framework/sdk-parent/frontend/src/components/MsTableOperatorButton.vue
@@ -110,7 +110,7 @@ export default {
 
 <style scoped>
 .text-btn {
-  width: 28px;
+  width: auto;
   height: 22px;
   font-family: 'PingFang SC';
   font-style: normal;
@@ -123,7 +123,7 @@ export default {
   order: 1;
   flex-grow: 0;
   padding: 0;
-  margin: 0 16px 0 0;
+  margin: 0 10px 0 0;
 }
 
 .active {
diff --git a/framework/sdk-parent/frontend/src/components/MsTableOperators.vue b/framework/sdk-parent/frontend/src/components/MsTableOperators.vue
index e063a247a1..1587bab420 100644
--- a/framework/sdk-parent/frontend/src/components/MsTableOperators.vue
+++ b/framework/sdk-parent/frontend/src/components/MsTableOperators.vue
@@ -1,5 +1,5 @@
 <template>
-  <span>
+  <span class="operator-btn-group">
     <ms-table-operator-button v-for="(btn, index) in buttons" :key="index"
                               v-permission="btn.permissions"
                               :disabled="isDisable(btn)"
diff --git a/framework/sdk-parent/frontend/src/components/new-ui/MsTable.vue b/framework/sdk-parent/frontend/src/components/new-ui/MsTable.vue
index 3472da8165..be5abacf5a 100644
--- a/framework/sdk-parent/frontend/src/components/new-ui/MsTable.vue
+++ b/framework/sdk-parent/frontend/src/components/new-ui/MsTable.vue
@@ -227,7 +227,7 @@ export default {
     operatorWidth: {
       type: String,
       default() {
-        return "130px";
+        return "150px";
       }
     },
     // 操作列的宽度
diff --git a/framework/sdk-parent/frontend/src/i18n/lang/en-US.js b/framework/sdk-parent/frontend/src/i18n/lang/en-US.js
index 835df0e16f..495d8bfeca 100644
--- a/framework/sdk-parent/frontend/src/i18n/lang/en-US.js
+++ b/framework/sdk-parent/frontend/src/i18n/lang/en-US.js
@@ -80,6 +80,7 @@ const message = {
     save_as: 'Save as',
     update: 'Update',
     save_success: 'Saved successfully',
+    recover_success: 'Recover successfully',
     warning_module_add: "Tree modules are up to 8 levels deep",
     send_success: 'Send successfully',
     delete_success: 'Deleted successfully',
@@ -157,6 +158,7 @@ const message = {
     remark: 'Remark',
     delete: 'Delete',
     reduction: 'Reduction',
+    recover: 'Recover',
     not_filled: 'Not filled',
     please_select: 'Please select',
     search_by_name: 'Search by name',
diff --git a/framework/sdk-parent/frontend/src/i18n/lang/track/en-US.js b/framework/sdk-parent/frontend/src/i18n/lang/track/en-US.js
index 4a426f818c..37a40e8700 100644
--- a/framework/sdk-parent/frontend/src/i18n/lang/track/en-US.js
+++ b/framework/sdk-parent/frontend/src/i18n/lang/track/en-US.js
@@ -102,9 +102,12 @@ export default {
     input_demand_name: "Please input demand id or name",
     delete_confirm: "Confirm delete test case",
     case_delete_confirm: "Confirm delete case",
+    case_delete_completely_confirm: "Confirm delete case completely",
     delete: "Delete case",
     batch_delete_confirm: "Confirm delete {0} case?",
+    batch_delete_completely_confirm: "Confirm delete {0} case completely?",
     batch_delete_tip: "It cannot be recovered after delete, please delete carefully",
+    batch_delete_soft_tip: "The test case will be put into trash",
     save_create_continue: "Save and create continue",
     save_add_public: "Save and add public",
     please_create_project: "No project available, please create the project first",
@@ -141,7 +144,7 @@ export default {
     public_warning: 'The public library configuration is not enabled',
     generate_dependencies: 'Generate graph',
     generate_dependencies_warning: 'For a better experience, it is recommended to check the data below 100',
-    batch_delete_case: 'Delete completely',
+    batch_delete_case: 'Delete',
     batch_delete_btn: 'Delete',
     batch_unlink: 'Batch Unlink',
     unlink: 'Unlink',
diff --git a/framework/sdk-parent/frontend/src/i18n/lang/track/zh-CN.js b/framework/sdk-parent/frontend/src/i18n/lang/track/zh-CN.js
index dbbea1cffc..06e6018e97 100644
--- a/framework/sdk-parent/frontend/src/i18n/lang/track/zh-CN.js
+++ b/framework/sdk-parent/frontend/src/i18n/lang/track/zh-CN.js
@@ -95,8 +95,11 @@ export default {
     input_demand_name: "请输入需求ID或名称",
     delete_confirm: "确认删除测试用例",
     case_delete_confirm: "是否删除用例",
+    case_delete_completely_confirm: "是否彻底删除用例",
     batch_delete_confirm: "确定删除{0}项用例?",
+    batch_delete_completely_confirm: "确定彻底删除{0}项用例?",
     batch_delete_tip: "删除后将无法恢复, 请谨慎操作。",
+    batch_delete_soft_tip: "删除的内容将进入回收站",
     delete: "删除用例",
     save_create_continue: "保存并继续创建",
     save_add_public: "保存并添加到公共用例库",
@@ -125,7 +128,7 @@ export default {
     batch_edit_btn: '编辑',
     batch_move_case: '批量移动',
     batch_move_btn: '移动到',
-    batch_delete_case: '徹底刪除',
+    batch_delete_case: '彻底刪除',
     batch_delete_btn: '删除',
     batch_copy: '批量复制',
     batch_copy_btn: '复制到',
diff --git a/framework/sdk-parent/frontend/src/i18n/lang/track/zh-TW.js b/framework/sdk-parent/frontend/src/i18n/lang/track/zh-TW.js
index da65e6c40d..9207cd3142 100644
--- a/framework/sdk-parent/frontend/src/i18n/lang/track/zh-TW.js
+++ b/framework/sdk-parent/frontend/src/i18n/lang/track/zh-TW.js
@@ -95,9 +95,12 @@ export default {
     input_demand_name: "請輸入需求ID或名稱",
     delete_confirm: "確認刪除測試用例",
     case_delete_confirm: "是否刪除用例",
+    case_delete_completely_confirm: "是否徹底删除用例",
     delete: "刪除用例",
     batch_delete_confirm: "確定刪除{0}項用例?",
+    batch_delete_completely_confirm: "確定徹底刪除{0}項用例",
     batch_delete_tip: "刪除後將無法恢復, 請謹慎操作。",
+    batch_delete_soft_tip: "刪除的內容將進入回收站",
     save_create_continue: "保存併繼續創建",
     save_add_public: "保存併添加到公共用例庫",
     please_create_project: "暫無項目，請先創建項目",
@@ -125,7 +128,7 @@ export default {
     batch_edit_btn: '編輯',
     batch_move_case: '批量移動',
     batch_move_btn: '移動到',
-    batch_delete_case: '批量刪除',
+    batch_delete_case: '徹底刪除',
     batch_delete_btn: '刪除',
     batch_copy: '批量復制',
     batch_copy_btn: '復制到',
diff --git a/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js b/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js
index 334932e2d0..83ea12f848 100644
--- a/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js
+++ b/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js
@@ -79,6 +79,7 @@ const message = {
     save_as: '另存为',
     update: '更新',
     save_success: '保存成功',
+    recover_success: '恢复成功',
     warning_module_add: "模块树深度最大为8层",
     send_success: '发送成功',
     delete_success: '删除成功',
@@ -158,6 +159,7 @@ const message = {
     remark: '备注',
     delete: '删除',
     reduction: '恢复',
+    recover: '恢复',
     not_filled: '未填写',
     please_select: '请选择',
     search_by_name: '根据名称搜索',
diff --git a/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js b/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js
index 06e322a490..31799831a5 100644
--- a/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js
+++ b/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js
@@ -79,6 +79,7 @@ const message = {
     save_as: '另存為',
     update: '更新',
     save_success: '保存成功',
+    recover_success: '恢復成功',
     send_success: '發送成功',
     delete_success: '刪除成功',
     relate_success: '關聯成功',
@@ -158,6 +159,7 @@ const message = {
     remark: '備註',
     delete: '刪除',
     reduction: '恢復',
+    recover: '恢復',
     not_filled: '未填寫',
     please_select: '請選擇',
     search_by_name: '根據名稱搜索',
diff --git a/test-track/frontend/src/business/case/components/TestCaseList.vue b/test-track/frontend/src/business/case/components/TestCaseList.vue
index f688a58dbe..9abf19f611 100644
--- a/test-track/frontend/src/business/case/components/TestCaseList.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseList.vue
@@ -25,7 +25,7 @@
     <!-- table -->
     <ms-table
       v-loading="loading"
-      operator-width="170px"
+      operator-width="180px"
       row-key="id"
       :data="page.data"
       :condition="condition"
@@ -424,7 +424,7 @@ export default {
       ],
       trashButtons: [
         {
-          name: this.$t('commons.reduction'),
+          name: this.$t('commons.recover'),
           handleClick: this.batchReduction,
           permissions: ['PROJECT_TRACK_CASE:READ+BATCH_REDUCTION']
         }, {
@@ -457,7 +457,7 @@ export default {
       ],
       trashOperators: [
         {
-          tip: this.$t('commons.reduction'),
+          tip: this.$t('commons.recover'),
           isTextButton: true,
           exec: this.reduction,
           permissions: ['PROJECT_TRACK_CASE:READ+RECOVER']
@@ -877,7 +877,7 @@ export default {
       this.handleEdit(testCase, 'copy');
     },
     handleDelete(testCase) {
-      let title = this.$t('test_track.case.case_delete_confirm') + ": " + testCase.name + "?";
+      let title = this.$t('test_track.case.case_delete_completely_confirm') + ": " + testCase.name + "?";
       this.$confirm(this.$t('test_track.case.batch_delete_tip'), title, {
           cancelButtonText: this.$t("commons.cancel"),
           confirmButtonText: this.$t("commons.delete"),
@@ -898,7 +898,7 @@ export default {
         .then(() => {
           this.$emit('refresh');
           this.initTableData();
-          this.$success(this.$t('commons.save_success'), false);
+          this.$success(this.$t('commons.recover_success'), false);
         });
     },
     handleDeleteToGc(testCase) {
@@ -909,7 +909,7 @@ export default {
             this.$refs.apiDeleteConfirm.open(testCase, this.$t('test_track.case.delete_confirm'));
           } else {
             let title = this.$t('test_track.case.case_delete_confirm') + ": " + testCase.name + "?";
-            this.$confirm(this.$t('test_track.case.batch_delete_tip'), title, {
+            this.$confirm(this.$t('test_track.case.batch_delete_soft_tip'), title, {
                 cancelButtonText: this.$t("commons.cancel"),
                 confirmButtonText: this.$t("commons.delete"),
                 customClass: 'custom-confirm-delete',
@@ -930,11 +930,11 @@ export default {
           this.$emit('refresh');
           this.initTableData();
           this.clearTableSelect();
-          this.$success(this.$t('commons.save_success'), false);
+          this.$success(this.$t('commons.recover_success'), false);
         });
     },
     handleDeleteBatch() {
-      let title = this.$t('test_track.case.batch_delete_confirm', [this.$refs.table.selectIds.length]);
+      let title = this.$t('test_track.case.batch_delete_completely_confirm', [this.$refs.table.selectIds.length]);
       this.$confirm(this.$t('test_track.case.batch_delete_tip'), title, {
           cancelButtonText: this.$t("commons.cancel"),
           confirmButtonText: this.$t("commons.delete"),
@@ -967,7 +967,7 @@ export default {
     },
     handleDeleteBatchToGc() {
       let title = this.$t('test_track.case.batch_delete_confirm', [this.selectCounts]);
-      this.$confirm(this.$t('test_track.case.batch_delete_tip'), title, {
+      this.$confirm(this.$t('test_track.case.batch_delete_soft_tip'), title, {
           cancelButtonText: this.$t("commons.cancel"),
           confirmButtonText: this.$t("commons.delete"),
           customClass: 'custom-confirm-delete',