From ead49634135c7ffdd5b32ae299d4a76140803747 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 27 Jan 2021 14:56:33 +0800
Subject: [PATCH 1/9] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E4=BE=8B=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=94=A8=E4=BE=8B=E6=97=B6=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=9C=AA=E6=B8=85=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/definition/components/case/ApiCaseItem.vue           | 3 ++-
 .../api/definition/components/case/ApiCaseList.vue           | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
index 231fbc59b4..7fcfa5c573 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -212,7 +212,8 @@
         this.$emit('singleRun', data);
       },
       copyCase(data) {
-        let obj = {name: "copy_" + data.name, priority: data.priority, active: true, request: data.request};
+        let uuid = getUUID();
+        let obj = {name: "copy_" + data.name, priority: data.priority, active: true, request: data.request, uuid: uuid};
         this.$emit('copyCase', obj);
       },
       selectTestCase(item, $event) {
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
index 0ca8e31d57..08f54fca93 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
@@ -20,7 +20,7 @@
 
       <el-container v-loading="result.loading">
         <el-main>
-          <div v-for="(item,index) in apiCaseList" :key="index">
+          <div v-for="(item,index) in apiCaseList" :key="item.id ? item.id : item.uuid">
             <api-case-item v-loading="singleLoading && singleRunId === item.id || batchLoadingIds.indexOf(item.id) > -1"
                            @refresh="refresh"
                            @singleRun="singleRun"
@@ -243,7 +243,8 @@
           if (!request.hashTree) {
             request.hashTree = [];
           }
-          let obj = {apiDefinitionId: this.api.id, name: '', priority: 'P0', active: true, tags: []};
+          let uuid = getUUID();
+          let obj = {apiDefinitionId: this.api.id, name: '', priority: 'P0', active: true, tags: [], uuid: uuid};
           obj.request = request;
           this.apiCaseList.unshift(obj);
         }

From e95632b94a04ec712bf341ab79cb336628f18195 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Wed, 27 Jan 2021 15:16:33 +0800
Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?-=E5=BC=80=E5=90=AF=E5=AE=9A=E6=97=B6=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=96=91=E4=BC=BC=E6=9C=AA=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复测试计划-开启定时执行任务未执行的问题 ： 性能测试在定时任务执行完成后进行报告ID的更新、修复了没有情景案例的情况下不执行性能测试的问题
---
 .../job/sechedule/TestPlanTestJob.java        | 38 ++++++++++---------
 .../track/service/TestPlanReportService.java  | 12 ++++++
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/job/sechedule/TestPlanTestJob.java b/backend/src/main/java/io/metersphere/job/sechedule/TestPlanTestJob.java
index 264a66f673..aad6505a13 100644
--- a/backend/src/main/java/io/metersphere/job/sechedule/TestPlanTestJob.java
+++ b/backend/src/main/java/io/metersphere/job/sechedule/TestPlanTestJob.java
@@ -105,25 +105,27 @@ public class TestPlanTestJob extends MsScheduleJob {
             //需要更新这里来保证PlanCase的状态能正常更改
             apiTestCaseService.run(blobs,UUID.randomUUID().toString(),testPlanReport.getId(),this.resourceId,ApiRunMode.SCHEDULE_API_PLAN.name());
         }
-        LogUtil.info("-------------- testplan schedule ---------- api case over -----------------");
-        //执行场景执行任务
-        SchedulePlanScenarioExecuteRequest scenarioRequest = new SchedulePlanScenarioExecuteRequest();
-        String senarionReportID = UUID.randomUUID().toString();
-        scenarioRequest.setId(senarionReportID);
-        scenarioRequest.setReportId(senarionReportID);
-        scenarioRequest.setProjectId(projectID);
-        scenarioRequest.setTriggerMode(ReportTriggerMode.SCHEDULE.name());
-        scenarioRequest.setExecuteType(ExecuteType.Saved.name());
-        Map<String, Map<String,String>> testPlanScenarioIdMap = new HashMap<>();
-        testPlanScenarioIdMap.put(resourceId, this.planScenarioIdMap);
-        scenarioRequest.setTestPlanScenarioIDMap(testPlanScenarioIdMap);
-        scenarioRequest.setReportUserID(this.userId);
-        scenarioRequest.setTestPlanID(this.resourceId);
-        scenarioRequest.setRunMode(ApiRunMode.SCHEDULE_SCENARIO_PLAN.name());
-        scenarioRequest.setTestPlanReportId(testPlanReport.getId());
-        testPlanService.runScenarioCase(scenarioRequest);
-        LogUtil.info("-------------- testplan schedule ---------- scenario case over -----------------");
 
+        //执行场景执行任务
+        if(!planScenarioIdMap.isEmpty()){
+            LogUtil.info("-------------- testplan schedule ---------- api case over -----------------");
+            SchedulePlanScenarioExecuteRequest scenarioRequest = new SchedulePlanScenarioExecuteRequest();
+            String senarionReportID = UUID.randomUUID().toString();
+            scenarioRequest.setId(senarionReportID);
+            scenarioRequest.setReportId(senarionReportID);
+            scenarioRequest.setProjectId(projectID);
+            scenarioRequest.setTriggerMode(ReportTriggerMode.SCHEDULE.name());
+            scenarioRequest.setExecuteType(ExecuteType.Saved.name());
+            Map<String, Map<String,String>> testPlanScenarioIdMap = new HashMap<>();
+            testPlanScenarioIdMap.put(resourceId, this.planScenarioIdMap);
+            scenarioRequest.setTestPlanScenarioIDMap(testPlanScenarioIdMap);
+            scenarioRequest.setReportUserID(this.userId);
+            scenarioRequest.setTestPlanID(this.resourceId);
+            scenarioRequest.setRunMode(ApiRunMode.SCHEDULE_SCENARIO_PLAN.name());
+            scenarioRequest.setTestPlanReportId(testPlanReport.getId());
+            testPlanService.runScenarioCase(scenarioRequest);
+            LogUtil.info("-------------- testplan schedule ---------- scenario case over -----------------");
+        }
         //执行性能测试任务
         List<String> performaneReportIDList = new ArrayList<>();
         for (Map.Entry<String,String> entry: this.performanceIdMap.entrySet()) {
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
index 2064106194..d1d172ff8e 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
@@ -281,6 +281,18 @@ public class TestPlanReportService {
             component.afterBuild(testCaseReportMetricDTO);
         });
 
+        if (StringUtils.equals(ReportTriggerMode.SCHEDULE.name(),triggerMode)
+                &&StringUtils.equals(resourceRunMode, ApiRunMode.SCHEDULE_PERFORMANCE_TEST.name())) {
+            //如果是性能测试作为触发，由于延迟原因可能会出现报告已经结束但是状态还是进行中的状态
+            List<TestCaseReportStatusResultDTO> loadResult = testCaseReportMetricDTO.getExecuteResult().getLoadResult();
+            for (TestCaseReportStatusResultDTO  dto: loadResult) {
+                if(StringUtils.equals(dto.getStatus(),TestPlanTestCaseStatus.Underway.name())){
+                    dto.setStatus(TestPlanTestCaseStatus.Pass.name());
+                }
+            }
+            testCaseReportMetricDTO.getExecuteResult().setLoadResult(loadResult);
+        }
+
         TestPlanReportDataExample example = new TestPlanReportDataExample();
         example.createCriteria().andTestPlanReportIdEqualTo(planReportId);
         List<TestPlanReportDataWithBLOBs> testPlanReportDataList = testPlanReportDataMapper.selectByExampleWithBLOBs(example);

From 77fcc6907d671fa50fdd17f1f070bef53142eda7 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Wed, 27 Jan 2021 15:34:15 +0800
Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?-=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B-?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=8D=95=E4=B8=AA=E6=89=A7=E8=A1=8C=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E5=90=8E=E6=89=A7=E8=A1=8C=E6=97=B6=E9=97=B4=E6=9C=AA?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复测试计划-接口测试用例-手动单个执行用例后执行时间未更新试的问题
---
 .../io/metersphere/track/service/TestPlanApiCaseService.java    | 1 +
 .../io/metersphere/track/service/TestPlanReportService.java     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
index afdce0e41c..17ae51df69 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
@@ -115,6 +115,7 @@ public class TestPlanApiCaseService {
         TestPlanApiCase apiCase = new TestPlanApiCase();
         apiCase.setId(id);
         apiCase.setStatus(status);
+        apiCase.setUpdateTime(System.currentTimeMillis());
         testPlanApiCaseMapper.updateByPrimaryKeySelective(apiCase);
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
index d1d172ff8e..1e1e9ccbcc 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
@@ -449,7 +449,7 @@ public class TestPlanReportService {
                     if(loadTestReportFromDatabase == null){
                         //检查错误数据
                         if(errorDataCheckMap.containsKey(loadTestReportId)){
-                            if(errorDataCheckMap.get(loadTestReportId)>20){
+                            if(errorDataCheckMap.get(loadTestReportId)>10){
                                 performaneReportIDList.remove(loadTestReportId);
                             }else {
                                 errorDataCheckMap.put(loadTestReportId,errorDataCheckMap.get(loadTestReportId)+1);

From 7eec10e634946e4d2db7a3d878cfec6e522bf612 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 27 Jan 2021 15:38:12 +0800
Subject: [PATCH 4/9] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92):=20=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=A0=87=E7=AD=BE=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtTestPlanTestCaseMapper.xml     |  4 ++--
 .../functional/FunctionalTestCaseList.vue        | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
index 9b56ef1f8d..fabf6ce1da 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
@@ -122,7 +122,7 @@
 
     <select id="list" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
         select test_plan_test_case.id as id, test_case.id as caseId, test_case.name, test_case.priority,
-        test_case.type,test_case.test_id as testId,test_case.node_id,
+        test_case.type,test_case.test_id as testId,test_case.node_id, test_case.tags,
         test_case.node_path, test_case.method, test_case.num, test_plan_test_case.executor, test_plan_test_case.status,
         test_plan_test_case.update_time, test_case_node.name as model, project.name as projectName,
         test_plan_test_case.plan_id as planId
@@ -139,7 +139,7 @@
             </if>
             <if test="request.name != null">
                 and (test_case.name like CONCAT('%', #{request.name},'%') or test_case.num like
-                CONCAT('%',#{request.name},'%'))
+                CONCAT('%',#{request.name},'%') or test_case.tags like CONCAT('%', #{request.name},'%'))
             </if>
             <if test="request.id != null">
                 and test_case.id = #{request.id}
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
index dc9fdd7ebe..7c59c40b52 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -76,6 +76,15 @@
           </template>
         </el-table-column>
 
+        <el-table-column prop="tags" :label="$t('commons.tag')">
+          <template v-slot:default="scope">
+            <ms-tag v-for="(tag, index) in scope.row.showTags"
+                    :key="tag + '_' + index"
+                    type="success" effect="plain"
+                    :content="tag"/>
+          </template>
+        </el-table-column>
+
         <el-table-column
           prop="method"
           :filters="methodFilters"
@@ -231,6 +240,7 @@ import ShowMoreBtn from "../../../../case/components/ShowMoreBtn";
 import BatchEdit from "../../../../case/components/BatchEdit";
 import ClassicEditor from "@ckeditor/ckeditor5-build-classic";
 import {hub} from "@/business/components/track/plan/event-bus";
+import MsTag from "@/business/components/common/components/MsTag";
 
 export default {
   name: "FunctionalTestCaseList",
@@ -243,7 +253,7 @@ export default {
     StatusTableItem,
     PriorityTableItem, StatusEdit, ExecutorEdit, MsTipButton, MsTablePagination,
     MsTableHeader, NodeBreadcrumb, MsTableButton, ShowMoreBtn,
-    BatchEdit
+    BatchEdit, MsTag
   },
   data() {
     return {
@@ -373,6 +383,7 @@ export default {
           this.tableData = data.listObject;
           for (let i = 0; i < this.tableData.length; i++) {
             if (this.tableData[i]) {
+              this.$set(this.tableData[i], "showTags", JSON.parse(this.tableData[i].tags));
               this.$set(this.tableData[i], "issuesSize", 0);
               this.$get("/issues/get/" + this.tableData[i].caseId).then(response => {
                 let issues = response.data.data;
@@ -597,4 +608,7 @@ export default {
   cursor: pointer;
 }
 
+.el-tag {
+  margin-left: 10px;
+}
 </style>

From 65b4ee425d2bdc5917fc7a1477028ae483c7c831 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Wed, 27 Jan 2021 15:49:48 +0800
Subject: [PATCH 5/9] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?-=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A-=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=A4=A7=E9=87=8F=E6=95=B0=E6=8D=AE=E6=8A=A5=E5=91=8A=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

接口测试-测试报告-删除大量数据报告失败
---
 .../api/service/ApiScenarioReportService.java | 40 ++++++++++++++++---
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
index f30550e488..0fcf3f2735 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
@@ -343,13 +343,41 @@ public class ApiScenarioReportService {
             ids = allIds.stream().filter(id -> !reportRequest.getUnSelectIds().contains(id)).collect(Collectors.toList());
         }
 
-        ApiScenarioReportDetailExample detailExample = new ApiScenarioReportDetailExample();
-        detailExample.createCriteria().andReportIdIn(ids);
-        apiScenarioReportDetailMapper.deleteByExample(detailExample);
+        //为预防数量太多，调用删除方法时引起SQL过长的Bug，此处采取分批执行的方式。
+        //每次处理的数据数量
+        int handleCount = 7000;
+        //每次处理的集合
+        List<String> handleIdList = new ArrayList<>(handleCount);
+        while (ids.size() > handleCount){
+            handleIdList = new ArrayList<>(handleCount);
+            List<String> otherIdList = new ArrayList<>();
+            for (int index = 0;index < ids.size();index++){
+                if(index<handleCount){
+                    handleIdList.add(ids.get(index));
+                }else{
+                    otherIdList.add(ids.get(index));
+                }
+            }
+            //处理本次的数据
+            ApiScenarioReportDetailExample detailExample = new ApiScenarioReportDetailExample();
+            detailExample.createCriteria().andReportIdIn(handleIdList);
+            apiScenarioReportDetailMapper.deleteByExample(detailExample);
+            ApiScenarioReportExample apiTestReportExample = new ApiScenarioReportExample();
+            apiTestReportExample.createCriteria().andIdIn(handleIdList);
+            apiScenarioReportMapper.deleteByExample(apiTestReportExample);
+            //转存剩余的数据
+            ids = otherIdList;
+        }
 
-        ApiScenarioReportExample apiTestReportExample = new ApiScenarioReportExample();
-        apiTestReportExample.createCriteria().andIdIn(ids);
-        apiScenarioReportMapper.deleteByExample(apiTestReportExample);
+        //处理最后剩余的数据
+        if(!ids.isEmpty()){
+            ApiScenarioReportDetailExample detailExample = new ApiScenarioReportDetailExample();
+            detailExample.createCriteria().andReportIdIn(ids);
+            apiScenarioReportDetailMapper.deleteByExample(detailExample);
+            ApiScenarioReportExample apiTestReportExample = new ApiScenarioReportExample();
+            apiTestReportExample.createCriteria().andIdIn(ids);
+            apiScenarioReportMapper.deleteByExample(apiTestReportExample);
+        }
     }
 
     public long countByProjectID(String projectId) {

From ae909070a212bf568545270bac0d64213f8f9cdd Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 27 Jan 2021 16:00:18 +0800
Subject: [PATCH 6/9] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=8F=90=E7=A4=BA=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml | 3 ++-
 .../io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml   | 4 +++-
 .../io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml   | 4 +++-
 .../components/api/automation/scenario/ApiScenarioList.vue    | 2 +-
 .../api/definition/components/list/ApiCaseSimpleList.vue      | 2 +-
 .../components/api/definition/components/list/ApiList.vue     | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
index 3a61cea026..99ddcbffd6 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
@@ -219,7 +219,8 @@
             </if>
             <if test="request.name != null">
                 and (api_definition.name like CONCAT('%', #{request.name},'%')
-                    or api_definition.tags like CONCAT('%', #{request.name},'%'))
+                    or api_definition.tags like CONCAT('%', #{request.name},'%')
+                    or api_definition.num like CONCAT('%', #{request.name},'%'))
             </if>
             <if test="request.protocol != null">
                 AND api_definition.protocol = #{request.protocol}
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
index 1f391c031a..415d22029b 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
@@ -143,7 +143,9 @@
             </if>
 
             <if test="request.name != null">
-                and (api_scenario.name like CONCAT('%', #{request.name},'%') or api_scenario.tags like CONCAT('%', #{request.name},'%'))
+                and (api_scenario.name like CONCAT('%', #{request.name},'%')
+                        or api_scenario.tags like CONCAT('%', #{request.name},'%')
+                        or api_scenario.num like CONCAT('%', #{request.name},'%'))
             </if>
             <if test="request.workspaceId != null">
                 AND project.workspace_id = #{request.workspaceId}
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index dadfca7047..6d0445ee17 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -284,7 +284,9 @@
                 </foreach>
             </if>
             <if test="request.name != null and request.name!=''">
-                and (t1.name like CONCAT('%', #{request.name},'%') or t1.tags like CONCAT('%', #{request.name},'%'))
+                and (t1.name like CONCAT('%', #{request.name},'%')
+                         or t1.tags like CONCAT('%', #{request.name},'%')
+                         or t1.num like CONCAT('%', #{request.name},'%'))
             </if>
             <if test="request.createTime > 0">
                 and t1.create_time >= #{request.createTime}
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 0bad51deb4..db128915a9 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -3,7 +3,7 @@
     <el-card class="table-card" v-loading="loading">
       <template v-slot:header>
         <ms-table-header :condition.sync="condition" @search="selectByParam" title=""
-                         :show-create="false"/>
+                         :show-create="false" :tip="$t('commons.search_by_id_name_tag')"/>
       </template>
 
       <el-table ref="scenarioTable" border :data="tableData" class="adjust-table ms-select-all-fixed"
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index 5b5ad9a684..c03f81887b 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -5,7 +5,7 @@
       @isApiListEnableChange="isApiListEnableChange">
       <el-link type="primary" style="float:right;margin-top: 5px" @click="open">{{$t('commons.adv_search.title')}}</el-link>
 
-      <el-input placeholder="搜索" @blur="search" @keyup.enter.native="search" class="search-input" size="small"
+      <el-input :placeholder="$t('commons.search_by_id_name_tag')" @blur="search" @keyup.enter.native="search" class="search-input" size="small"
                 v-model="condition.name"/>
 
       <el-table v-loading="result.loading"
diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index 35ee040bde..837f51cffd 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -5,7 +5,7 @@
       @isApiListEnableChange="isApiListEnableChange">
 
       <el-link type="primary" @click="open" style="float: right;margin-top: 5px">{{$t('commons.adv_search.title')}}</el-link>
-      <el-input :placeholder="$t('api_monitor.please_search')" @blur="search" class="search-input" size="small" @keyup.enter.native="search"
+      <el-input :placeholder="$t('commons.search_by_id_name_tag')" @blur="search" class="search-input" size="small" @keyup.enter.native="search"
                 v-model="condition.name"/>
 
       <el-table v-loading="result.loading"

From e8d2f8b92bac35391470a10af2ea2aa9582583d4 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Wed, 27 Jan 2021 16:15:32 +0800
Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?-=E9=A6=96=E9=A1=B5-=E5=9C=BA=E6=99=AF=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1-=E6=9C=AC=E5=91=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B7=B3=E8=BD=AC=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

解决接口测试-首页-场景用例数量统计-本周新增跳转错误的错误
---
 .../components/api/automation/ApiAutomation.vue        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue
index 4f949f2248..7017e65001 100644
--- a/frontend/src/business/components/api/automation/ApiAutomation.vue
+++ b/frontend/src/business/components/api/automation/ApiAutomation.vue
@@ -97,6 +97,7 @@
         renderComponent: true,
         isHide: true,
         activeName: 'default',
+        redirectFlag: 'none',
         currentModule: null,
         moduleOptions: [],
         tabs: [],
@@ -150,6 +151,15 @@
       },
       changeRedirectParam(redirectIDParam) {
         this.redirectID = redirectIDParam;
+        if(redirectIDParam!=null){
+          if(this.redirectFlag == "none"){
+            this.activeName = "default";
+            this.addListener();
+            this.redirectFlag = "redirected";
+          }
+        }else{
+          this.redirectFlag = "none";
+        }
       },
       addTab(tab) {
         if (!getCurrentProjectID()) {

From 92fd2166ef2bfc60db446779fbbbd7719556eede Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 27 Jan 2021 16:24:35 +0800
Subject: [PATCH 8/9] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92):=20=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=9B=BA=E5=AE=9A=E6=93=8D=E4=BD=9C=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functional/FunctionalTestCaseList.vue     | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
index 7c59c40b52..65ab346889 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -78,10 +78,9 @@
 
         <el-table-column prop="tags" :label="$t('commons.tag')">
           <template v-slot:default="scope">
-            <ms-tag v-for="(tag, index) in scope.row.showTags"
-                    :key="tag + '_' + index"
-                    type="success" effect="plain"
-                    :content="tag"/>
+            <div v-for="(tag, index) in scope.row.showTags" :key="tag + '_' + index">
+              <ms-tag type="success" effect="plain" :content="tag"/>
+            </div>
           </template>
         </el-table-column>
 
@@ -188,8 +187,9 @@
           </template>
         </el-table-column>
         <el-table-column
-            min-width="100"
-            :label="$t('commons.operating')">
+          fixed="right"
+          min-width="100"
+          :label="$t('commons.operating')">
           <template v-slot:default="scope">
             <ms-table-operator-button :is-tester-permission="true" :tip="$t('commons.edit')" icon="el-icon-edit"
                                       @exec="handleEdit(scope.row)"/>
@@ -267,7 +267,7 @@ export default {
       currentPage: 1,
       pageSize: 10,
       total: 0,
-      status:'default',
+      status: 'default',
       selectRows: new Set(),
       testPlan: {},
       isReadOnly: false,
@@ -329,7 +329,7 @@ export default {
     planId: {
       type: String
     },
-    clickType:String,
+    clickType: String,
     selectNodeIds: {
       type: Array
     },
@@ -364,10 +364,10 @@ export default {
         // param.planId = this.planId;
         this.condition.planId = this.planId;
       }
-      if(this.clickType){
-        if(this.status =='default'){
+      if (this.clickType) {
+        if (this.status == 'default') {
           this.condition.status = this.clickType;
-        }else{
+        } else {
           this.condition.status = null;
         }
         this.status = 'all';
@@ -392,7 +392,11 @@ export default {
                   this.$set(this.tableData[i], "issuesContent", issues);
                 }
               }).catch(() => {
-                this.$set(this.tableData[i], "issuesContent", [{title: '获取缺陷失败',description: '获取缺陷失败',platform: '获取缺陷失败' }]);
+                this.$set(this.tableData[i], "issuesContent", [{
+                  title: '获取缺陷失败',
+                  description: '获取缺陷失败',
+                  platform: '获取缺陷失败'
+                }]);
               })
             }
           }

From 3dd54a302a555ee8613297233ff13bc2f993becd Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Wed, 27 Jan 2021 16:45:08 +0800
Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96-=E5=9C=BA=E6=99=AF=E5=88=97=E8=A1=A8-=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E7=A7=BB=E5=8A=A8=EF=BC=8C=E5=BC=B9=E6=A1=86=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

解决接口自动化-场景列表-批量移动，弹框显示的问题
---
 .../business/components/track/case/components/BatchMove.vue    | 1 +
 frontend/src/i18n/en-US.js                                     | 3 ++-
 frontend/src/i18n/zh-CN.js                                     | 3 ++-
 frontend/src/i18n/zh-TW.js                                     | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/track/case/components/BatchMove.vue b/frontend/src/business/components/track/case/components/BatchMove.vue
index eebc783ffd..327bcd8bec 100644
--- a/frontend/src/business/components/track/case/components/BatchMove.vue
+++ b/frontend/src/business/components/track/case/components/BatchMove.vue
@@ -15,6 +15,7 @@
           :filter-node-method="filterNode"
           :expand-on-click-node="false"
           highlight-current
+          style="overflow: auto"
           @node-click="nodeClick"
           ref="tree"
         >
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 18be511007..2fe22d51ab 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -150,7 +150,8 @@ export default {
       name: "Trigger Mode",
       manual: "Manual trigger",
       schedule: "Scheduled Task",
-      api: "API call"
+      api: "API call",
+      case: "Case"
     },
     adv_search: {
       title: 'Advanced Search',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index ddd79f959d..13b22bef25 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -151,7 +151,8 @@ export default {
       name: "触发方式",
       manual: "手动触发",
       schedule: "定时任务",
-      api: "API调用"
+      api: "API调用",
+      case: "用例触发"
     },
     adv_search: {
       title: '高级搜索',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 0298d2bba4..0be0a853ba 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -151,7 +151,8 @@ export default {
       name: "觸發方式",
       manual: "手動觸發",
       schedule: "定時任務",
-      api: "API調用"
+      api: "API調用",
+      case: "用例觸發"
     },
     adv_search: {
       title: '高級搜索',