From 6de79df31f62cb55709caeabcd7c26ee659cffe2 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 20 Oct 2020 13:46:19 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/test/components/body/ApiBodyFileUpload.vue           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/test/components/body/ApiBodyFileUpload.vue b/frontend/src/business/components/api/test/components/body/ApiBodyFileUpload.vue
index 909b314ea9..c86aa57fd5 100644
--- a/frontend/src/business/components/api/test/components/body/ApiBodyFileUpload.vue
+++ b/frontend/src/business/components/api/test/components/body/ApiBodyFileUpload.vue
@@ -46,7 +46,10 @@
         handleRemove(file) {
           this.$refs.upload.handleRemove(file);
           for (let i = 0; i < this.parameter.files.length;  i++) {
-            if (file.file.name === this.parameter.files[i].file.name) {
+            let fileName = file.file ? file.file.name : file.name;
+            let paramFileName = this.parameter.files[i].file ?
+              this.parameter.files[i].file.name : this.parameter.files[i].name;
+            if (fileName === paramFileName) {
               this.parameter.files.splice(i, 1);
               this.$refs.upload.handleRemove(file);
               break;

From 73218f5f23533905c0b40ffd2c99ccd3bc360e00 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 20 Oct 2020 14:15:07 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E7=82=B9=E5=87=BB=E9=9D=A2=E5=8C=85=E5=B1=91=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E7=94=A8=E4=BE=8B=EF=BC=8C=E6=88=91=E7=9A=84=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/plan/view/comonents/TestPlanTestCaseList.vue      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
index d04dc6ab9a..22a88bf199 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
@@ -5,7 +5,7 @@
         <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"/>
+            <node-breadcrumb class="table-title" :nodes="selectParentNodes" @refresh="breadcrumbRefresh"/>
           </template>
           <template v-slot:button>
             <ms-table-button :is-tester-permission="true" v-if="!showMyTestCase" icon="el-icon-s-custom"
@@ -392,6 +392,10 @@ export default {
       this.selectRows.clear();
       this.$emit('refresh');
     },
+    breadcrumbRefresh() {
+      this.showMyTestCase = false;
+      this.refresh();
+    },
     refreshTableAndPlan() {
       this.getTestPlanById();
       this.initTableData();

From 7c2254830f11c9d0037a38f7cb503cd75457bd88 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 20 Oct 2020 14:19:26 +0800
Subject: [PATCH 3/5] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E6=A1=88=E4=BE=8B=E5=8A=A0=E8=BD=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=AD=90=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestCaseMapper.xml            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 4b80b7764b..251abaa9d1 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -98,8 +98,8 @@
     </sql>
 
     <select id="getTestCaseByNotInReview" resultType="io.metersphere.base.domain.TestCase">
-        select test_case.id, test_case.name, test_case.priority, test_case.type, test_case.review_status
-        from test_case
+        select test_case.id, test_case.name, test_case.priority, test_case.type, test_case.review_status from test_case as test_case
+        left join test_case_review_test_case as T2 on test_case.id=T2.case_id
         <where>
             <if test="request.combine != null">
                 <include refid="combine">
@@ -107,7 +107,7 @@
                     <property name="name" value="request.name"/>
                 </include>
             </if>
-            and test_case.id not in (select case_id from test_case_review_test_case where review_id =#{request.reviewId})
+            and T2.case_id is null
             <if test="request.name != null">
                 and test_case.name like CONCAT('%', #{request.name},'%')
             </if>
@@ -152,8 +152,8 @@
     </select>
 
     <select id="getTestCaseByNotInPlan" resultType="io.metersphere.base.domain.TestCase">
-        select test_case.id, test_case.name, test_case.priority, test_case.type, test_case.review_status
-        from test_case
+        select test_case.id, test_case.name, test_case.priority, test_case.type, test_case.review_status from test_case as test_case
+        left join test_plan_test_case as T2 on test_case.id=T2.case_id
         <where>
             <if test="request.combine != null">
                 <include refid="combine">
@@ -161,7 +161,7 @@
                     <property name="name" value="request.name"/>
                 </include>
             </if>
-            and test_case.id not in (select case_id from test_plan_test_case where plan_id =#{request.planId})
+            and T2.case_id is null
             <if test="request.name != null">
                 and test_case.name like CONCAT('%', #{request.name},'%')
             </if>

From c44b72e5fa7ed258b8929845549344abdea252a6 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 20 Oct 2020 14:44:07 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E9=80=89=E4=B8=AD=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=8D=95=E4=B8=AA=E6=A8=A1=E5=9D=97=E7=94=A8=E4=BE=8B=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E4=B8=8A=E5=85=B3=E8=81=94=E6=95=B4=E4=B8=AA=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=9A=84=E7=94=A8=E4=BE=8B=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/testcase/PlanCaseRelevanceRequest.java | 13 ++++++++++++-
 .../request/testreview/ReviewRelevanceRequest.java | 14 +++++++++++++-
 .../track/service/TestCaseReviewService.java       |  7 ++-----
 .../metersphere/track/service/TestPlanService.java |  7 ++-----
 .../plan/view/comonents/TestCaseRelevance.vue      |  2 +-
 .../review/view/components/TestReviewRelevance.vue |  2 +-
 6 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/PlanCaseRelevanceRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/PlanCaseRelevanceRequest.java
index 930e262f79..7689ebf5e0 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/PlanCaseRelevanceRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/PlanCaseRelevanceRequest.java
@@ -9,7 +9,18 @@ import java.util.List;
 @Getter
 @Setter
 public class PlanCaseRelevanceRequest {
+    /**
+     * 测试计划ID
+     */
     private String planId;
-    private String projectId;
+
+    /**
+     * 当选择关联全部用例时把加载条件送到后台，从后台查询
+     */
+    private QueryTestCaseRequest request;
+
+    /**
+     * 具体要关联的用例
+     */
     private List<String> testCaseIds = new ArrayList<>();
 }
diff --git a/backend/src/main/java/io/metersphere/track/request/testreview/ReviewRelevanceRequest.java b/backend/src/main/java/io/metersphere/track/request/testreview/ReviewRelevanceRequest.java
index 9b0791364c..3d1fbf5aac 100644
--- a/backend/src/main/java/io/metersphere/track/request/testreview/ReviewRelevanceRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testreview/ReviewRelevanceRequest.java
@@ -1,5 +1,6 @@
 package io.metersphere.track.request.testreview;
 
+import io.metersphere.track.request.testcase.QueryTestCaseRequest;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,7 +10,18 @@ import java.util.List;
 @Getter
 @Setter
 public class ReviewRelevanceRequest {
+    /**
+     * 评审ID
+     */
     private String reviewId;
-    private String projectId;
+    
+    /**
+     * 当选择关联全部用例时把加载条件送到后台，从后台查询
+     */
+
+    private QueryTestCaseRequest request;
+    /**
+     * 具体选择要关联的用例
+     */
     private List<String> testCaseIds = new ArrayList<>();
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
index d2e899d700..e07d3d4cb4 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
@@ -326,12 +326,9 @@ public class TestCaseReviewService {
         if (testCaseIds.isEmpty()) {
             return;
         }
-        // 如果是关联全部指令则从新查询未关联的案例
+        // 如果是关联全部指令则根据条件查询未关联的案例
         if (testCaseIds.get(0).equals("all")) {
-            QueryTestCaseRequest req = new QueryTestCaseRequest();
-            req.setReviewId(request.getReviewId());
-            req.setProjectId(request.getProjectId());
-            List<TestCase> testCases = extTestCaseMapper.getTestCaseByNotInReview(req);
+            List<TestCase> testCases = extTestCaseMapper.getTestCaseByNotInReview(request.getRequest());
             if (!testCases.isEmpty()) {
                 testCaseIds = testCases.stream().map(testCase -> testCase.getId()).collect(Collectors.toList());
             }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index b8d8c0c419..be9d749659 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -211,12 +211,9 @@ public class TestPlanService {
             return;
         }
 
-        // 如果是关联全部指令则从新查询未关联的案例
+        // 如果是关联全部指令则根据条件查询未关联的案例
         if (testCaseIds.get(0).equals("all")) {
-            QueryTestCaseRequest req = new QueryTestCaseRequest();
-            req.setPlanId(request.getPlanId());
-            req.setProjectId(request.getProjectId());
-            List<TestCase> testCases = extTestCaseMapper.getTestCaseByNotInPlan(req);
+            List<TestCase> testCases = extTestCaseMapper.getTestCaseByNotInPlan(request.getRequest());
             if (!testCases.isEmpty()) {
                 testCaseIds = testCases.stream().map(testCase -> testCase.getId()).collect(Collectors.toList());
             }
diff --git a/frontend/src/business/components/track/plan/view/comonents/TestCaseRelevance.vue b/frontend/src/business/components/track/plan/view/comonents/TestCaseRelevance.vue
index c7edff0096..387dd66c6f 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestCaseRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestCaseRelevance.vue
@@ -176,7 +176,7 @@
         let param = {};
         param.planId = this.planId;
         param.testCaseIds = [...this.selectIds];
-        param.projectId = this.projectId;
+        param.request = this.condition;
         // 选择全选则全部加入到评审，无论是否加载完全部
         if (this.testCases.length === param.testCaseIds.length) {
           param.testCaseIds = ['all'];
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue b/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
index 156b1cf319..8e532c480c 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
@@ -185,7 +185,7 @@
         let param = {};
         param.reviewId = this.reviewId;
         param.testCaseIds = [...this.selectIds];
-        param.projectId = this.projectId;
+        param.request = this.condition;
         // 选择全选则全部加入到评审，无论是否加载完全部
         if (this.testReviews.length === param.testCaseIds.length) {
           param.testCaseIds = ['all'];

From 9d05edc6f4982965f845433ebfdca073a031b33b Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 20 Oct 2020 15:32:58 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E5=9F=9F=E5=90=8D=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/test/components/ApiHostTable.vue         | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/ApiHostTable.vue b/frontend/src/business/components/api/test/components/ApiHostTable.vue
index 8242fd086d..b3e5406a0b 100644
--- a/frontend/src/business/components/api/test/components/ApiHostTable.vue
+++ b/frontend/src/business/components/api/test/components/ApiHostTable.vue
@@ -116,17 +116,13 @@
         return true;
       },
       validateDomain(domain) {
-        let url = {};
-        try {
-          if (!domain.startsWith("http") || !domain.startsWith("https")) {
-            domain += "http://";
-          }
-          url = new URL(domain);
-        } catch (e) {
-          this.$warning(this.$t('load_test.input_domain'));
-          return false
+        let strRegex = "^(?=^.{3,255}$)(http(s)?:\\/\\/)?(www\\.)?[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+(:\\d+)*(\\/\\w+\\.\\w+)*$";
+        const re = new RegExp(strRegex);
+        if (re.test(domain) && domain.length < 26) {
+          return true;
         }
-        return true;
+        this.$warning(this.$t('load_test.input_domain'));
+        return false;
       },
       dblHostTable: function (row) {
         row.status = 'edit';