Merge remote-tracking branch 'origin/master' into master

backend/src/main/java/io/metersphere/notice/service/MailService.java

@@ -144,7 +144,7 @@ public class MailService {
         context.put("testCaseName", testCaseWithBLOBs.getName());
         context.put("description", request.getDescription());
         context.put("url", baseSystemConfigDTO.getUrl());
-        context.put("id", testCaseWithBLOBs.getId());
+        context.put("id", request.getReviewId());
         try {
             String commentTemplate = IOUtils.toString(this.getClass().getResource("/mail/ReviewComments.html"), StandardCharsets.UTF_8);
             sendReviewNotice(addresseeIdList(messageDetail, userIds, eventType), context, commentTemplate);

backend/src/main/java/io/metersphere/track/request/testreview/SaveCommentRequest.java

@@ -7,5 +7,6 @@ import lombok.Setter;
 @Getter
 @Setter
 public class SaveCommentRequest extends TestCaseComment {
+     private String reviewId;
 
 }

backend/src/main/resources/mail/ReviewComments.html

@@ -10,7 +10,7 @@
         ${testCaseName}<br/>
         添加评论：${description}<br/>
         点击下面链接进入用例评审页面</p>
-    <a href="${url}/#/track/review/view">${url}/#/track/review/view</a>
+    <a href="${url}/#/track/review/view/${id}">${url}/#/track/review/view/${id}</a>
 </div>
 </body>
 </html>

frontend/src/business/components/api/test/model/ScenarioModel.js

@@ -1393,7 +1393,6 @@ class JMXGenerator {
     for (let index in request.headers) {
       if (request.headers.hasOwnProperty(index)) {
         if (request.headers[index].name === 'Content-Type' && request.headers[index].enable != false) {
-          request.headers.splice(index, 1);
           hasContentType = true;
           break;
         }

frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue

@@ -204,7 +204,11 @@ export default {
       })
     },
     removeRowTask(index, data) { //移除
-      data.splice(index, 1)
+      if (!data[index].identification) {
+        data.splice(index, 1)
+      } else {
+        data[index].isSet = false
+      }
     },
     deleteRowTask(index, data) { //删除
       this.result = this.$get("/notice/delete/message/" + data.identification, response => {

frontend/src/business/components/settings/organization/components/JenkinsNotification.vue

@@ -205,7 +205,12 @@ export default {
       })
     },
     removeRowTask(index, data) { //移除
-      data.splice(index, 1)
+      if (!data[index].identification) {
+        data.splice(index, 1)
+      } else {
+        data[index].isSet = false
+      }
+
     },
     deleteRowTask(index, data) { //删除
       this.result = this.$get("/notice/delete/message/" + data.identification, response => {

frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue

@@ -196,7 +196,11 @@ export default {
       })
     },
     removeRowTask(index, data) { //移除
-      data.splice(index, 1)
+      if (!data[index].identification) {
+        data.splice(index, 1)
+      } else {
+        data[index].isSet = false
+      }
     },
     deleteRowTask(index, data) { //删除
       this.result = this.$get("/notice/delete/message/" + data.identification, response => {

frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue

@@ -210,7 +210,11 @@ export default {
       })
     },
     removeRowTask(index, data) { //移除
-      data.splice(index, 1)
+      if (!data[index].identification) {
+        data.splice(index, 1)
+      } else {
+        data[index].isSet = false
+      }
     },
     deleteRowTask(index, data) { //删除
       this.result = this.$get("/notice/delete/message/" + data.identification, response => {

frontend/src/business/components/settings/organization/components/TestReviewNotification.vue

@@ -211,7 +211,11 @@ export default {
       })
     },
     removeRowTask(index, data) { //移除
-      data.splice(index, 1)
+      if (!data[index].identification) {
+        data.splice(index, 1)
+      } else {
+        data[index].isSet = false
+      }
     },
     deleteRowTask(index, data) { //删除
       this.result = this.$get("/notice/delete/message/" + data.identification, response => {

frontend/src/business/components/track/review/commom/ReviewComment.vue

@@ -40,7 +40,8 @@ export default {
   components: {ReviewCommentItem},
   props: {
     caseId: String,
-    comments: Array
+    comments: Array,
+    reviewId:String,
   },
   data() {
     return {
@@ -53,6 +54,7 @@ export default {
       let comment = {};
       comment.caseId = this.caseId;
       comment.description = this.textarea;
+      comment.reviewId=this.reviewId;
       if (!this.textarea) {
         this.$warning(this.$t('test_track.comment.description_is_null'));
         return;

frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue

@@ -229,7 +229,7 @@
                 <i class="el-icon-refresh" @click="getComments(testCase)"
                    style="margin-left:10px;font-size: 14px; cursor: pointer"/>
               </template>
-              <review-comment :comments="comments" :case-id="testCase.caseId" @getComments="getComments"/>
+              <review-comment :comments="comments" :case-id="testCase.caseId" :review-id="testCase.reviewId" @getComments="getComments"/>
             </el-card>
           </el-col>
         </div>

frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue

@@ -300,6 +300,7 @@ export default {
       return path + "/" + this.currentPage + "/" + this.pageSize;
     },
     handleEdit(testCase, index) {
+      console.log(testCase)
       this.isReadOnly = false;
       if (!checkoutTestManagerOrTestUser()) {
         this.isReadOnly = true;