From c1010441cb188129b4a7d3c23b93a1582616ecb0 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Thu, 16 Mar 2023 14:37:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E7=94=A8=E4=BE=8B=E6=98=BE=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1024428 --user=宋昌昌 【测试跟踪】公共用例库-查看用例，显示信息有误 https://www.tapd.cn/55049933/s/1351406
---
 .../components/case/CaseCommentViewItem.vue   |  7 +++
 .../components/case/CaseCommentViewer.vue     |  2 +
 .../components/case/CaseEditInfoComponent.vue |  5 ++-
 .../common/CaseRelationshipTableList.vue      | 44 ++++++++-----------
 .../review/components/TestCaseReviewEdit.vue  |  4 +-
 5 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/test-track/frontend/src/business/case/components/case/CaseCommentViewItem.vue b/test-track/frontend/src/business/case/components/case/CaseCommentViewItem.vue
index fc0381032a..eb87a6426e 100644
--- a/test-track/frontend/src/business/case/components/case/CaseCommentViewItem.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseCommentViewItem.vue
@@ -59,6 +59,7 @@ export default {
       default: false,
     },
     apiUrl: String,
+    isPublicShow: Boolean
   },
   watch: {
     "comment.description": {
@@ -83,6 +84,9 @@ export default {
       return name.substring(0, 2).toUpperCase();
     },
     openEdit() {
+      if (this.isPublicShow) {
+        return;
+      }
       if (getCurrentUser().id !== this.comment.author) {
         this.$warning(this.$t("test_track.comment.cannot_edit"), false);
         return;
@@ -97,6 +101,9 @@ export default {
       this.editComment(description);
     },
     deleteComment() {
+      if (this.isPublicShow) {
+        return;
+      }
       if (getCurrentUser().id !== this.comment.author) {
         this.$warning(this.$t("test_track.comment.cannot_delete"), false);
         return;
diff --git a/test-track/frontend/src/business/case/components/case/CaseCommentViewer.vue b/test-track/frontend/src/business/case/components/case/CaseCommentViewer.vue
index 39fd955efe..14e3b19197 100644
--- a/test-track/frontend/src/business/case/components/case/CaseCommentViewer.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseCommentViewer.vue
@@ -11,6 +11,7 @@
         api-url="/test/case"
         @refresh="getComments"
         :readOnly="readOnly"
+        :is-public-show="isPublicShow"
       ></case-comment-view-item>
     </div>
   </div>
@@ -25,6 +26,7 @@ export default {
       type: Boolean,
       default: false,
     },
+    isPublicShow: Boolean
   },
   components: {
     CaseCommentViewItem,
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 b842bfd583..e3e615eb64 100644
--- a/test-track/frontend/src/business/case/components/case/CaseEditInfoComponent.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseEditInfoComponent.vue
@@ -99,7 +99,7 @@
             </el-scrollbar>
           </div>
         </el-tab-pane>
-        <el-tab-pane :label="$t('case.comment')" name="comment" v-if="!isPublicShow">
+        <el-tab-pane :label="$t('case.comment')" name="comment">
           <span slot="label">
             {{ $t('case.comment') }}
             <div class="el-step__icon is-text ms-api-col ms-header" v-if="comments && comments.length > 0">
@@ -113,6 +113,7 @@
             <el-scrollbar>
               <div class="content-container">
                 <case-comment-viewer
+                  :is-public-show="isPublicShow"
                   @getComments="getComments"
                   :comments="comments"
                   ref="commentRef"
@@ -138,7 +139,7 @@
           </div>
         </el-tab-pane>
       </el-tabs>
-      <div class="comment-common">
+      <div class="comment-common" v-if="!isPublicShow">
         <case-comment-component
           :case-id="caseId"
           :read-only="readOnly"
diff --git a/test-track/frontend/src/business/case/components/common/CaseRelationshipTableList.vue b/test-track/frontend/src/business/case/components/common/CaseRelationshipTableList.vue
index ace94ca361..cefba4782b 100644
--- a/test-track/frontend/src/business/case/components/common/CaseRelationshipTableList.vue
+++ b/test-track/frontend/src/business/case/components/common/CaseRelationshipTableList.vue
@@ -10,28 +10,11 @@
       :screen-height="null"
       @refresh="getTableData"
     >
-      <ms-table-column
-        min-width="200px"
-        width="200px"
-        v-if="relationshipType === 'POST'"
-        :label="$t('commons.relationship.type')"
-      >
-        <template>
-          <div class="pos-label">
-            {{ $t("commons.relationship.current_case") }}
-          </div>
-          <div class="pos-type pos-left-margin">
-            {{ $t("commons.relationship.after_finish") }}
-          </div>
-        </template>
-      </ms-table-column>
-
       <ms-table-column
         prop="targetCustomNum"
         v-if="isCustomNum"
         :label="$t('commons.id')"
         sortable
-        min-width="100px"
         width="100px"
       />
 
@@ -40,7 +23,6 @@
         v-else
         :label="$t('commons.id')"
         sortable
-        min-width="100px"
         width="100px"
       />
 
@@ -48,8 +30,7 @@
         prop="targetName"
         :label="$t('case.case_name')"
         sortable
-        min-width="256px"
-        width="256px"
+        width="200px"
       />
 
       <ms-table-column
@@ -57,7 +38,6 @@
         prop="versionId"
         :label="$t('commons.version')"
         sortable
-        min-width="100px"
         width="100px"
       >
         <template v-slot:default="scope">
@@ -68,13 +48,12 @@
       <ms-table-column
         prop="creator"
         :label="$t('commons.create_user')"
-        min-width="120"
+        width="100"
       >
       </ms-table-column>
 
       <ms-table-column
         prop="status"
-        min-width="100px"
         width="100px"
         :label="$t('api_test.definition.api_case_status')"
       >
@@ -82,9 +61,9 @@
           <status-table-item :value="$t(statusMap.get(row.status))" />
         </template>
       </ms-table-column>
+
       <ms-table-column
-        width="200px"
-        min-width="200px"
+        width="150px"
         v-if="relationshipType === 'PRE'"
         :label="$t('commons.relationship.type')"
       >
@@ -99,6 +78,21 @@
       </ms-table-column>
     </ms-table>
 
+    <ms-table-column
+      width="150px"
+      v-if="relationshipType === 'POST'"
+      :label="$t('commons.relationship.type')"
+    >
+      <template>
+        <div class="pos-label">
+          {{ $t("commons.relationship.current_case") }}
+        </div>
+        <div class="pos-type pos-left-margin">
+          {{ $t("commons.relationship.after_finish") }}
+        </div>
+      </template>
+    </ms-table-column>
+
     <relationship-functional-relevance
       :case-id="caseId"
       :version-enable="versionEnable"
diff --git a/test-track/frontend/src/business/review/components/TestCaseReviewEdit.vue b/test-track/frontend/src/business/review/components/TestCaseReviewEdit.vue
index a735e1828e..2281d7e996 100644
--- a/test-track/frontend/src/business/review/components/TestCaseReviewEdit.vue
+++ b/test-track/frontend/src/business/review/components/TestCaseReviewEdit.vue
@@ -22,7 +22,7 @@
           </el-col>
           <el-col :span="12" :offset="1">
             <el-form-item :label="$t('commons.tag')" :label-width="formLabelWidth" prop="tag">
-              <ms-input-tag :currentScenario="form" ref="tag" size="-" v-if="isStepTableAlive"/>
+              <ms-input-tag :currentScenario="form" ref="tag" v-if="isStepTableAlive"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -125,7 +125,7 @@
 import TestPlanStatusButton from "../../plan/common/TestPlanStatusButton";
 import {getCurrentProjectID} from "metersphere-frontend/src/utils/token";
 import {listenGoBack, removeGoBackListener} from "metersphere-frontend/src/utils"
-import MsInputTag from "metersphere-frontend/src/components/MsInputTag";
+import MsInputTag from "metersphere-frontend/src/components/new-ui/MsInputTag";
 import i18n from "@/i18n";
 import {getMaintainer} from "@/api/project";
 import {saveOrUpdateTestCaseReview} from "@/api/test-review";