diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseCommentService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseCommentService.java
index afb023f345..8c42b89389 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseCommentService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseCommentService.java
@@ -46,4 +46,10 @@ public class TestCaseCommentService {
         });
         return testCaseComments;
     }
+
+    public void deleteComment(String caseId) {
+        TestCaseCommentExample testCaseCommentExample = new TestCaseCommentExample();
+        testCaseCommentExample.createCriteria().andCaseIdEqualTo(caseId);
+        testCaseCommentMapper.deleteByExample(testCaseCommentExample);
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index 07bb336bad..bdf3db6b67 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -77,6 +77,8 @@ public class TestCaseService {
     TestCaseIssueService testCaseIssueService;
     @Resource
     TestCaseReviewTestCaseMapper testCaseReviewTestCaseMapper;
+    @Resource
+    TestCaseCommentService testCaseCommentService;
 
     public void addTestCase(TestCaseWithBLOBs testCase) {
         testCase.setName(testCase.getName());
@@ -155,6 +157,7 @@ public class TestCaseService {
         example.createCriteria().andCaseIdEqualTo(testCaseId);
         testPlanTestCaseMapper.deleteByExample(example);
         testCaseIssueService.delTestCaseIssues(testCaseId);
+        testCaseCommentService.deleteComment(testCaseId);
         return testCaseMapper.deleteByPrimaryKey(testCaseId);
     }
 
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index d5b4969642..321c869938 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit d5b4969642fd8d10cc2f949d7377e0a0e5217a3a
+Subproject commit 321c869938357e8c2253e5bd86c963828664ae23
diff --git a/frontend/src/business/components/track/review/commom/ReviewComment.vue b/frontend/src/business/components/track/review/commom/ReviewComment.vue
index b4cf98b8bd..3a6b1a3b65 100644
--- a/frontend/src/business/components/track/review/commom/ReviewComment.vue
+++ b/frontend/src/business/components/track/review/commom/ReviewComment.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-loading="result.loading">
-    <div style="height:60vh;overflow-y: scroll">
+    <div class="comment-list">
       <review-comment-item v-for="(comment,index) in comments" :key="index" :comment="comment"/>
       <div v-if="comments.length === 0" style="text-align: center">
         <i class="el-icon-chat-line-square" style="font-size: 15px;color: #8a8b8d;">
@@ -64,8 +64,13 @@ export default {
 </script>
 
 <style scoped>
-  .send-btn {
-    margin-top: 5px;
-    width: 100%;
-  }
+.send-btn {
+  margin-top: 5px;
+  width: 100%;
+}
+
+.comment-list {
+  overflow-y: scroll;
+  height: calc(70vh);
+}
 </style>
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
index 74d03c1efb..730715b783 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
@@ -23,23 +23,27 @@
                     <el-col :span="12">
                       <el-button plain size="mini"
                                  icon="el-icon-back"
-                                 @click="cancel">{{$t('test_track.return')}}
+                                 @click="cancel">{{ $t('test_track.return') }}
                       </el-button>
                     </el-col>
 
                     <el-col :span="12" class="head-right">
 
                 <span class="head-right-tip" v-if="index + 1 == testCases.length">
-                  {{$t('test_track.plan_view.pre_case')}} : {{testCases[index - 1] ? testCases[index - 1].name : ''}}
+                  {{ $t('test_track.plan_view.pre_case') }} : {{
+                    testCases[index - 1] ? testCases[index - 1].name : ''
+                  }}
                 </span>
                       <span class="head-right-tip" v-if="index + 1 != testCases.length">
-                  {{$t('test_track.plan_view.next_case')}} : {{testCases[index + 1] ? testCases[index + 1].name : ''}}
+                  {{ $t('test_track.plan_view.next_case') }} : {{
+                          testCases[index + 1] ? testCases[index + 1].name : ''
+                        }}
                 </span>
 
                       <el-button plain size="mini" icon="el-icon-arrow-up"
                                  :disabled="index + 1 <= 1"
                                  @click="handlePre()"/>
-                      <span>  {{index + 1}}/{{testCases.length}} </span>
+                      <span>  {{ index + 1 }}/{{ testCases.length }} </span>
                       <el-button plain size="mini" icon="el-icon-arrow-down"
                                  :disabled="index + 1 >= testCases.length"
                                  @click="handleNext()"/>
@@ -57,7 +61,7 @@
 
                   <el-row style="margin-top: 0px;">
                     <el-col>
-                      <el-divider content-position="left">{{testCase.name}}</el-divider>
+                      <el-divider content-position="left">{{ testCase.name }}</el-divider>
                     </el-col>
                   </el-row>
 
@@ -66,37 +70,38 @@
                 <div class="case_container">
                   <el-row>
                     <el-col :span="4" :offset="1">
-                      <span class="cast_label">{{$t('test_track.case.priority')}}：</span>
-                      <span class="cast_item">{{testCase.priority}}</span>
+                      <span class="cast_label">{{ $t('test_track.case.priority') }}：</span>
+                      <span class="cast_item">{{ testCase.priority }}</span>
                     </el-col>
                     <el-col :span="5">
-                      <span class="cast_label">{{$t('test_track.case.case_type')}}：</span>
-                      <span class="cast_item" v-if="testCase.type == 'functional'">{{$t('commons.functional')}}</span>
-                      <span class="cast_item" v-if="testCase.type == 'performance'">{{$t('commons.performance')}}</span>
-                      <span class="cast_item" v-if="testCase.type == 'api'">{{$t('commons.api')}}</span>
+                      <span class="cast_label">{{ $t('test_track.case.case_type') }}：</span>
+                      <span class="cast_item" v-if="testCase.type == 'functional'">{{ $t('commons.functional') }}</span>
+                      <span class="cast_item"
+                            v-if="testCase.type == 'performance'">{{ $t('commons.performance') }}</span>
+                      <span class="cast_item" v-if="testCase.type == 'api'">{{ $t('commons.api') }}</span>
                     </el-col>
                   </el-row>
 
                   <el-row>
                     <el-col :span="4" :offset="1">
-                      <span class="cast_label">{{$t('test_track.case.method')}}：</span>
-                      <span v-if="testCase.method == 'manual'">{{$t('test_track.case.manual')}}</span>
-                      <span v-if="testCase.method == 'auto'">{{$t('test_track.case.auto')}}</span>
+                      <span class="cast_label">{{ $t('test_track.case.method') }}：</span>
+                      <span v-if="testCase.method == 'manual'">{{ $t('test_track.case.manual') }}</span>
+                      <span v-if="testCase.method == 'auto'">{{ $t('test_track.case.auto') }}</span>
                     </el-col>
                     <el-col :span="5">
-                      <span class="cast_label">{{$t('test_track.case.module')}}：</span>
-                      <span class="cast_item">{{testCase.nodePath}}</span>
+                      <span class="cast_label">{{ $t('test_track.case.module') }}：</span>
+                      <span class="cast_item">{{ testCase.nodePath }}</span>
                     </el-col>
                     <el-col :span="4" :offset="1">
-                      <span class="cast_label">{{$t('test_track.plan.plan_project')}}：</span>
-                      <span class="cast_item">{{testCase.projectName}}</span>
+                      <span class="cast_label">{{ $t('test_track.plan.plan_project') }}：</span>
+                      <span class="cast_item">{{ testCase.projectName }}</span>
                     </el-col>
                   </el-row>
 
                   <el-row>
                     <el-col :offset="1">
-                      <span class="cast_label">{{$t('test_track.case.prerequisite')}}：</span>
-                      <span class="cast_item">{{testCase.prerequisite}}</span>
+                      <span class="cast_label">{{ $t('test_track.case.prerequisite') }}：</span>
+                      <span class="cast_item">{{ testCase.prerequisite }}</span>
                     </el-col>
                   </el-row>
 
@@ -123,7 +128,7 @@
                   <el-row v-if="testCase.method && testCase.method != 'auto'">
                     <el-col :span="20" :offset="1">
                       <div>
-                        <span class="cast_label">{{$t('test_track.case.steps')}}：</span>
+                        <span class="cast_label">{{ $t('test_track.case.steps') }}：</span>
                       </div>
                       <el-table
                         :data="testCase.steptResults"
@@ -196,8 +201,9 @@
                   <el-row>
                     <el-col :span="15" :offset="1">
                       <div>
-                        <span class="cast_label">{{$t('commons.remark')}}：</span>
-                        <span v-if="testCase.remark == null || testCase.remark == ''" style="color: darkgrey">{{$t('commons.not_filled')}}</span>
+                        <span class="cast_label">{{ $t('commons.remark') }}：</span>
+                        <span v-if="testCase.remark == null || testCase.remark == ''"
+                              style="color: darkgrey">{{ $t('commons.not_filled') }}</span>
                       </div>
                       <div>
                         <el-input :rows="3"
@@ -240,7 +246,7 @@ import PerformanceTestDetail from "../../../plan/view/comonents/test/Performance
 import ApiTestResult from "../../../plan/view/comonents/test/ApiTestResult";
 import ApiTestDetail from "../../../plan/view/comonents/test/ApiTestDetail";
 import TestPlanTestCaseStatusButton from "../../../plan/common/TestPlanTestCaseStatusButton";
-import {listenGoBack, removeGoBackListener} from "../../../../../../common/js/utils";
+import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import ReviewComment from "../../commom/ReviewComment";
 
 export default {
@@ -419,69 +425,69 @@ export default {
 
 <style scoped>
 
-  .border-hidden >>> .el-textarea__inner {
-    border-style: hidden;
-    background-color: white;
-    color: #606266;
-  }
+.border-hidden >>> .el-textarea__inner {
+  border-style: hidden;
+  background-color: white;
+  color: #606266;
+}
 
-  .cast_label {
-    color: dimgray;
-  }
+.cast_label {
+  color: dimgray;
+}
 
-  .status-button {
-    padding-left: 4%;
-  }
+.status-button {
+  padding-left: 4%;
+}
 
-  .head-right {
-    text-align: right;
-  }
+.head-right {
+  text-align: right;
+}
 
-  .el-col:not(.test-detail) {
-    line-height: 50px;
-  }
+.el-col:not(.test-detail) {
+  line-height: 50px;
+}
 
-  .issues-edit >>> p {
-    line-height: 16px;
-  }
+.issues-edit >>> p {
+  line-height: 16px;
+}
 
-  .status-button {
-    float: right;
-  }
+.status-button {
+  float: right;
+}
 
-  .head-right-tip {
-    color: darkgrey;
-  }
+.head-right-tip {
+  color: darkgrey;
+}
 
-  .el-scrollbar {
-    height: 100%;
-  }
+.el-scrollbar {
+  height: 100%;
+}
 
-  .container {
-    height: 100vh;
-  }
+.container {
+  height: 100vh;
+}
 
-  .case_container > .el-row {
-    margin-top: 1%;
-  }
+.case_container > .el-row {
+  margin-top: 1%;
+}
 
-  .el-switch >>> .el-switch__label {
-    color: dimgray;
-  }
+.el-switch >>> .el-switch__label {
+  color: dimgray;
+}
 
-  .el-switch >>> .el-switch__label.is-active {
-    color: #409EFF;
-  }
+.el-switch >>> .el-switch__label.is-active {
+  color: #409EFF;
+}
 
-  .container >>> .el-card__body {
-    height: 90vh !important;
-  }
+.container >>> .el-card__body {
+  height: calc(100vh - 70px);
+}
 
-  .comment-card >>> .el-card__header {
-    padding: 0 20px;
-  }
+.comment-card >>> .el-card__header {
+  padding: 0 20px;
+}
 
-  .comment-card >>> .el-card__body {
-    height: 80vh !important;
-  }
+.comment-card >>> .el-card__body {
+  height: calc(100vh - 120px);
+}
 </style>
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
index 6df0aebf21..064a354443 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
@@ -5,7 +5,8 @@
         <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="initTableData"
                          :show-create="false" :tip="$t('commons.search_by_name_or_id')">
           <template v-slot:title>
-            <node-breadcrumb class="table-title" :nodes="selectParentNodes" @refresh="refresh" :title="$t('test_track.review_view.all_review')"/>
+            <node-breadcrumb class="table-title" :nodes="selectParentNodes" @refresh="refresh"
+                             :title="$t('test_track.review_view.all_review')"/>
           </template>
           <template v-slot:button>
             <ms-table-button :is-tester-permission="true" icon="el-icon-video-play"
@@ -37,7 +38,7 @@
           type="selection"/>
         <el-table-column width="40" :resizable="false" align="center">
           <template v-slot:default="scope">
-<!--            <show-more-btn :is-show="scope.row.showMore" :buttons="buttons" :size="selectRows.size"/>-->
+            <!--            <show-more-btn :is-show="scope.row.showMore" :buttons="buttons" :size="selectRows.size"/>-->
           </template>
         </el-table-column>
         <el-table-column
@@ -97,7 +98,7 @@
 
         <el-table-column
           prop="reviewerName"
-          :label="$t('test_track.review.review_creator')"
+          :label="$t('test_track.review.reviewer')"
           show-overflow-tooltip
         >
         </el-table-column>
@@ -428,14 +429,14 @@ export default {
 
 <style scoped>
 
-  .search {
-    margin-left: 10px;
-    width: 240px;
-  }
+.search {
+  margin-left: 10px;
+  width: 240px;
+}
 
-  .test-case-status, .el-table {
-    cursor: pointer;
-  }
+.test-case-status, .el-table {
+  cursor: pointer;
+}
 
 </style>
 
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 0a375848d0..f2d5a342c8 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 0a375848d034d20eaf05caf11769e1c75c39235c
+Subproject commit f2d5a342c82e629f510550d5778d752bb73bf5e7