From a25428e991d8f813ebea49d98038e16c0b76a306 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Mon, 20 Mar 2023 18:27:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E9=AA=8C=E6=94=B6=E9=97=AE=E9=A2=98=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1011487 --user=宋昌昌 【Bug转需求】【测试跟踪】功能用例-设计验收问题汇总 https://www.tapd.cn/55049933/s/1353075
---
 .../src/components/ListItemDeleteConfirm.vue  | 10 +++----
 .../src/components/head/DrawerHeader.vue      | 13 ++++++++-
 .../frontend/src/i18n/lang/track/en-US.js     |  2 +-
 .../frontend/src/i18n/lang/track/zh-CN.js     |  2 +-
 .../frontend/src/i18n/lang/track/zh-TW.js     |  2 +-
 .../frontend/src/business/TestTrack.vue       |  5 ++--
 .../components/case/CaseCommentComponent.vue  |  1 +
 .../components/case/CaseEditInfoComponent.vue |  4 +++
 .../case/components/case/CaseTestRelate.vue   |  2 +-
 .../components/case/relate/CaseApiRelate.vue  |  2 +-
 .../components/case/relate/CaseLoadRelate.vue |  2 +-
 .../case/relate/CaseScenarioRelate.vue        |  2 +-
 .../case/relate/CaseUiScenarioRelate.vue      |  2 +-
 .../components/public/PublicTestCaseList.vue  |  2 +-
 .../components/richtext/MsMarkDownText.vue    | 28 ++++++++++---------
 15 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/components/ListItemDeleteConfirm.vue b/framework/sdk-parent/frontend/src/components/ListItemDeleteConfirm.vue
index 6f66ba6279..0bc94a9796 100644
--- a/framework/sdk-parent/frontend/src/components/ListItemDeleteConfirm.vue
+++ b/framework/sdk-parent/frontend/src/components/ListItemDeleteConfirm.vue
@@ -2,7 +2,7 @@
   <el-dialog
     :title="title"
     :visible.sync="deleteApiVisible"
-    :show-close="false"
+    :show-close="true"
     append-to-body
     width="30%"
   >
@@ -12,10 +12,10 @@
     </el-radio-group>
 
     <template v-slot:footer>
-      <ms-dialog-footer
-        @cancel="close"
-        @confirm="handleDelete">
-      </ms-dialog-footer>
+      <el-button @click="close" size="small">{{ $t('commons.cancel') }}</el-button>
+      <el-button v-prevent-re-click type="primary" @click="handleDelete" size="small" style="margin-left: 10px">
+        {{ $t('commons.confirm') }}
+      </el-button>
     </template>
   </el-dialog>
 </template>
diff --git a/framework/sdk-parent/frontend/src/components/head/DrawerHeader.vue b/framework/sdk-parent/frontend/src/components/head/DrawerHeader.vue
index 816abc5bca..8ccedaa25f 100644
--- a/framework/sdk-parent/frontend/src/components/head/DrawerHeader.vue
+++ b/framework/sdk-parent/frontend/src/components/head/DrawerHeader.vue
@@ -18,7 +18,7 @@
               <i class="el-icon-download"/>
               {{ $t('commons.export') }}
             </span>
-            <el-dropdown-menu slot="dropdown">
+            <el-dropdown-menu slot="dropdown" class="drawer-header">
               <el-dropdown-item @click.native.stop="exportJPG">JPG</el-dropdown-item>
               <el-dropdown-item @click.native.stop="exportPNG">PNG</el-dropdown-item>
             </el-dropdown-menu>
@@ -147,3 +147,14 @@ i.delimiter {
   background-color: transparent!important;
 }
 </style>
+
+<style>
+.drawer-header .el-dropdown-menu__item {
+  color: #1F2329 !important;
+}
+
+.drawer-header .el-dropdown-menu__item:hover {
+  background-color: rgba(31, 35, 41, 0.1) !important;
+  color: #1F2329 !important;
+}
+</style>
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 25f3a693df..54f7224981 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
@@ -115,7 +115,7 @@ export default {
     batch_delete_tip:
       "It cannot be recovered after delete, please delete carefully",
     public_batch_delete_tip:
-      "It cannot be restored after deletion, please proceed with caution.",
+      "It will be removed from public case, Carefully.",
     public_remove: "Remove",
     batch_delete_soft_tip: "The test case will be put into trash",
     save_create_continue: "Save and create continue",
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 5c70ce9d76..290ee7d32f 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
@@ -100,7 +100,7 @@ export default {
     batch_delete_confirm: "确定删除{0}项用例?",
     batch_delete_completely_confirm: "确定彻底删除{0}项用例?",
     batch_delete_tip: "删除后将无法恢复, 请谨慎操作。",
-    public_batch_delete_tip: "移除后将无法恢复, 请谨慎操作。",
+    public_batch_delete_tip: "将从公共用例库移除, 请谨慎操作。",
     public_remove: "移除",
     batch_delete_soft_tip: "删除的内容将进入回收站",
     delete: "删除用例",
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 9f6e169703..149e01b914 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
@@ -101,7 +101,7 @@ export default {
     batch_delete_confirm: "確定刪除{0}項用例?",
     batch_delete_completely_confirm: "確定徹底刪除{0}項用例",
     batch_delete_tip: "刪除後將無法恢復, 請謹慎操作。",
-    public_batch_delete_tip: "移除後將無法恢復, 請謹慎操作。",
+    public_batch_delete_tip: "將從公共用例庫移除, 請謹慎操作。",
     public_remove: "移除",
     batch_delete_soft_tip: "刪除的內容將進入回收站",
     save_create_continue: "保存併繼續創建",
diff --git a/test-track/frontend/src/business/TestTrack.vue b/test-track/frontend/src/business/TestTrack.vue
index 60eaacb14d..9d2024c82f 100644
--- a/test-track/frontend/src/business/TestTrack.vue
+++ b/test-track/frontend/src/business/TestTrack.vue
@@ -58,7 +58,7 @@ input.el-input__inner {
  * el-message
  */
 .el-message-box__header {
-  padding: 20px 24px 0 24px;
+  padding: 24px 24px 0 24px;
   min-height: 24px;
 }
 
@@ -79,7 +79,7 @@ input.el-input__inner {
 }
 
 .el-message-box__content {
-  padding: 35px 0px 0px 24px;
+  padding: 24px 0px 0px 24px;
   font-family: 'PingFang SC';
   font-style: normal;
   font-weight: 400;
@@ -94,6 +94,7 @@ input.el-input__inner {
 .el-message-box {
   width: 420px;
   height: 174px;
+  padding-bottom: 0;
 }
 
 .el-message-box__btns {
diff --git a/test-track/frontend/src/business/case/components/case/CaseCommentComponent.vue b/test-track/frontend/src/business/case/components/case/CaseCommentComponent.vue
index bc7691a054..bbedc57bd2 100644
--- a/test-track/frontend/src/business/case/components/case/CaseCommentComponent.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseCommentComponent.vue
@@ -81,6 +81,7 @@ export default {
         this.cancel("");
         this.refresh(comment.caseId);
         this.formData.richText = "";
+        this.$emit('toggleCommentTab')
       });
     },
     refresh(id) {
diff --git a/test-track/frontend/src/business/case/components/case/CaseEditInfoComponent.vue b/test-track/frontend/src/business/case/components/case/CaseEditInfoComponent.vue
index 72c744f76a..f097769f31 100644
--- a/test-track/frontend/src/business/case/components/case/CaseEditInfoComponent.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseEditInfoComponent.vue
@@ -146,6 +146,7 @@
           :case-id="caseId"
           :read-only="readOnly"
           @stateChange="handleCommentStateChange"
+          @toggleCommentTab="toggleCommentTab"
           @getComments="getComments"
         />
       </div>
@@ -337,6 +338,9 @@ export default {
     handleCommentStateChange(state) {
       this.commentState = state;
     },
+    toggleCommentTab() {
+      this.caseActiveName = 'comment';
+    },
     setRelationshipCount(count) {
       this.relationshipCount = count;
     },
diff --git a/test-track/frontend/src/business/case/components/case/CaseTestRelate.vue b/test-track/frontend/src/business/case/components/case/CaseTestRelate.vue
index 3cdfd604b9..807976e1e7 100644
--- a/test-track/frontend/src/business/case/components/case/CaseTestRelate.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseTestRelate.vue
@@ -207,7 +207,7 @@ export default {
         type: 'warning'
       }).then(() => {
         deleteRelateTest(row.testCaseId, row.testId).then(() => {
-          this.$success(this.$t("commons.save_success"), false);
+          this.$success(this.$t('test_track.cancel_relevance_success'), false);
           this.initTable();
         });
       });
diff --git a/test-track/frontend/src/business/case/components/case/relate/CaseApiRelate.vue b/test-track/frontend/src/business/case/components/case/relate/CaseApiRelate.vue
index a54d25ee11..6b1effad20 100644
--- a/test-track/frontend/src/business/case/components/case/relate/CaseApiRelate.vue
+++ b/test-track/frontend/src/business/case/components/case/relate/CaseApiRelate.vue
@@ -105,7 +105,7 @@ export default {
     saveCaseRelevance() {
       let ids = this.$refs.apiCaseList.getSelectIds();
       saveCaseRelevanceApi(this.caseId, ids).then(() => {
-        this.$success(this.$t("commons.save_success"), false);
+        this.$success(this.$t("commons.relate_success"), false);
         this.$emit("refresh");
         this.$refs.baseRelevance.close();
       });
diff --git a/test-track/frontend/src/business/case/components/case/relate/CaseLoadRelate.vue b/test-track/frontend/src/business/case/components/case/relate/CaseLoadRelate.vue
index 4c8ec72df3..4e0a57684b 100644
--- a/test-track/frontend/src/business/case/components/case/relate/CaseLoadRelate.vue
+++ b/test-track/frontend/src/business/case/components/case/relate/CaseLoadRelate.vue
@@ -82,7 +82,7 @@ export default {
     saveCaseRelevance() {
       let ids = this.$refs.apiCaseList.getSelectIds();
       saveCaseRelevanceLoad(this.caseId, ids).then(() => {
-        this.$success(this.$t("commons.save_success"), false);
+        this.$success(this.$t("commons.relate_success"), false);
         this.$emit("refresh");
         this.$refs.baseRelevance.close();
       });
diff --git a/test-track/frontend/src/business/case/components/case/relate/CaseScenarioRelate.vue b/test-track/frontend/src/business/case/components/case/relate/CaseScenarioRelate.vue
index 6b147c990d..9fc6230cab 100644
--- a/test-track/frontend/src/business/case/components/case/relate/CaseScenarioRelate.vue
+++ b/test-track/frontend/src/business/case/components/case/relate/CaseScenarioRelate.vue
@@ -103,7 +103,7 @@ export default {
     saveCaseRelevance() {
       let ids = this.$refs.apiCaseList.getSelectIds();
       saveCaseRelevanceScenario(this.caseId, ids).then(() => {
-        this.$success(this.$t("commons.save_success"), false);
+        this.$success(this.$t("commons.relate_success"), false);
         this.$emit("refresh");
         this.$refs.baseRelevance.close();
       });
diff --git a/test-track/frontend/src/business/case/components/case/relate/CaseUiScenarioRelate.vue b/test-track/frontend/src/business/case/components/case/relate/CaseUiScenarioRelate.vue
index 482b3f86f0..6fa9fec2f0 100644
--- a/test-track/frontend/src/business/case/components/case/relate/CaseUiScenarioRelate.vue
+++ b/test-track/frontend/src/business/case/components/case/relate/CaseUiScenarioRelate.vue
@@ -105,7 +105,7 @@ export default {
     saveCaseRelevance() {
       let ids = this.$refs.apiCaseList.getSelectIds();
       saveUiCaseRelevanceScenario(this.caseId, ids).then(() => {
-        this.$success(this.$t("commons.save_success"), false);
+        this.$success(this.$t("commons.relate_success"), false);
         this.$emit("refresh");
         this.$refs.baseRelevance.close();
       });
diff --git a/test-track/frontend/src/business/case/components/public/PublicTestCaseList.vue b/test-track/frontend/src/business/case/components/public/PublicTestCaseList.vue
index 21c5232178..a6f289615b 100644
--- a/test-track/frontend/src/business/case/components/public/PublicTestCaseList.vue
+++ b/test-track/frontend/src/business/case/components/public/PublicTestCaseList.vue
@@ -563,7 +563,7 @@ export default {
     },
     handleDeleteBatchToPublic() {
       let title = this.$t('case.public.batch_remove_confirm', [this.$refs.table.selectIds.length]);
-      this.$confirm(title, '', {
+      this.$confirm(this.$t('test_track.case.public_batch_delete_tip'), title, {
           cancelButtonText: this.$t("commons.cancel"),
           confirmButtonText: this.$t("test_track.case.public_remove"),
           customClass: 'custom-confirm-delete',
diff --git a/test-track/frontend/src/business/case/components/richtext/MsMarkDownText.vue b/test-track/frontend/src/business/case/components/richtext/MsMarkDownText.vue
index abcf7a67ab..70bb57bd8d 100644
--- a/test-track/frontend/src/business/case/components/richtext/MsMarkDownText.vue
+++ b/test-track/frontend/src/business/case/components/richtext/MsMarkDownText.vue
@@ -6,13 +6,13 @@
                   :placeholder="placeholder"
                   @imgDel="imgDel" v-model="data[prop]" ref="md"/>
   </template>
-  
+
   <script>
   import {getCurrentUser} from "metersphere-frontend/src/utils/token";
   import {getUUID} from "metersphere-frontend/src/utils";
   import {deleteMarkDownImg, uploadMarkDownImg} from "metersphere-frontend/src/api/img";
   import {DEFAULT_XSS_ATTR} from "metersphere-frontend/src/utils/constants";
-  
+
   export default {
     name: "MsMarkDownText",
     components: {},
@@ -122,7 +122,7 @@
         defaultOpenValue: 'preview'
       }
     },
-  
+
     computed: {
       language() {
         const user = getCurrentUser();
@@ -181,7 +181,7 @@
           });
         }
       }
-  
+
     },
     methods: {
       imgAdd(pos, file) {
@@ -232,11 +232,11 @@
         // canvas.addEventListener("click", function () {
         //   wrap.remove();
         // });
-  
+
         //创建el-image-viewer__mask遮罩元素div
         let mask = document.createElement("div");
         mask.classList.add("el-image-viewer__mask");
-  
+
         //创建el-image-viewer__wrapper元素div
         let wrap = document.createElement("div");
         wrap.classList.add("el-image-viewer__wrapper");
@@ -255,25 +255,27 @@
     }
   }
   </script>
-  
+
   <style scoped>
-  
   .v-note-wrapper {
     display: block !important;
     position: static !important;
   }
-  
+
   :deep(.dropdown-item.dropdown-images) {
     display: none;
   }
-  
+
   :deep(.v-note-op .v-left-item.transition .op-icon.fa.fa-mavon-picture-o.dropdown.dropdown-wrapper .op-image.popup-dropdown.transition) {
     margin-left: 45px;
   }
-  
-  
+
+
   :deep(.v-note-op .v-left-item.transition .add-image-link-wrapper .add-image-link .op-btn.sure) {
     background: #783887;
   }
+
+  :deep(.content-input-wrapper) {
+    border-radius: 4px;
+  }
   </style>
-  
\ No newline at end of file