From 14b21ca544f121cb9c946a6accdd2013342d8f5a Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Fri, 22 Jan 2021 15:21:37 +0800
Subject: [PATCH 01/10] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E9=A6=96=E9=A1=B5-=E8=BF=90=E8=A1=8C=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

接口测试首页-运行中的定时任务增加字段
---
 .../dto/datacount/response/TaskInfoResult.java    |  4 ++--
 .../base/mapper/ext/ExtApiTestCaseMapper.xml      |  7 +++++++
 .../base/mapper/ext/ExtScheduleMapper.xml         |  4 ++--
 .../api/automation/schedule/ScheduleMaintain.vue  |  2 +-
 .../api/homepage/components/RunningTaskList.vue   | 15 ++++++++++++---
 frontend/src/i18n/en-US.js                        |  3 +++
 frontend/src/i18n/zh-CN.js                        |  3 +++
 frontend/src/i18n/zh-TW.js                        |  3 +++
 8 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/datacount/response/TaskInfoResult.java b/backend/src/main/java/io/metersphere/api/dto/datacount/response/TaskInfoResult.java
index e9eff7cf0b..6c90913005 100644
--- a/backend/src/main/java/io/metersphere/api/dto/datacount/response/TaskInfoResult.java
+++ b/backend/src/main/java/io/metersphere/api/dto/datacount/response/TaskInfoResult.java
@@ -13,8 +13,8 @@ public class TaskInfoResult {
     private int index;
     //任务ID
     private String taskID;
-    //场景名称
-    private String scenario;
+    //任务名称
+    private String name;
     //场景ID
     private String scenarioId;
     //规则
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 b5c9256f6a..7d0e59cd5d 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
@@ -198,6 +198,7 @@
         FROM
         api_test_case t1
         LEFT JOIN api_definition_exec_result t2 ON t1.last_result_id = t2.id
+        inner join api_definition a on  t1.api_definition_id = a.id
         LEFT JOIN USER u1 ON t1.update_user_id = u1.id
         LEFT JOIN USER u2 ON t1.create_user_id = u2.id
         LEFT JOIN USER u3 ON t2.user_id = u3.id
@@ -224,6 +225,12 @@
             <if test="request.apiDefinitionId != null and request.apiDefinitionId!=''">
                 AND t1.api_definition_id = #{request.apiDefinitionId}
             </if>
+            <if test="request.moduleIds != null and request.moduleIds.size() > 0">
+                and a.module_id in
+                <foreach collection="request.moduleIds" item="nodeId" separator="," open="(" close=")">
+                    #{nodeId}
+                </foreach>
+            </if>
         </where>
 
         <if test="request.orders != null and request.orders.size() > 0">
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
index 7f6e5e2802..f17df6bc52 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
@@ -50,14 +50,14 @@
         AND create_time BETWEEN #{startTime} and #{endTime}
     </select>
     <select id="findRunningTaskInfoByProjectID" resultType="io.metersphere.api.dto.datacount.response.TaskInfoResult">
-        SELECT apiScene.id AS scenarioId,apiScene.`name` AS scenario,sch.id AS taskID,sch.`value` AS rule,sch.`enable` AS `taskStatus`,u.`name` AS creator,sch.update_time AS updateTime,
+        SELECT apiScene.id AS scenarioId,apiScene.`name` AS `name` ,sch.id AS taskID,sch.`value` AS rule,sch.`enable` AS `taskStatus`,u.`name` AS creator,sch.update_time AS updateTime,
                'scenario' AS taskType
         FROM api_scenario apiScene
          INNER JOIN `schedule` sch ON apiScene.id = sch.resource_id
          INNER JOIN `user` u ON u.id = sch.user_id
         WHERE sch.`enable` = true AND apiScene.project_id = #{0,jdbcType=VARCHAR}
         UNION
-        SELECT testPlan.id AS scenarioId,testPlan.`name` AS scenario,sch.id AS taskID,sch.`value` AS rule,sch.`enable` AS `taskStatus`,u.`name` AS creator,sch.update_time AS updateTime,
+        SELECT testPlan.id AS scenarioId,testPlan.`name` AS `name`,sch.id AS taskID,sch.`value` AS rule,sch.`enable` AS `taskStatus`,u.`name` AS creator,sch.update_time AS updateTime,
                'testPlan' AS taskType
         FROM test_plan testPlan
          INNER JOIN `schedule` sch ON testPlan.id = sch.resource_id
diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue b/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
index f2fdac6ef6..b0ff4810af 100644
--- a/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
+++ b/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :close-on-click-modal="false" width="60%" class="schedule-edit" :visible.sync="dialogVisible"
+  <el-dialog :close-on-click-modal="false" width="60%" class="schedule-edit" :visible.sync="dialogVisible" :append-to-body='true'
              @close="close">
     <template>
       <div>
diff --git a/frontend/src/business/components/api/homepage/components/RunningTaskList.vue b/frontend/src/business/components/api/homepage/components/RunningTaskList.vue
index 3e1083685e..6381e79068 100644
--- a/frontend/src/business/components/api/homepage/components/RunningTaskList.vue
+++ b/frontend/src/business/components/api/homepage/components/RunningTaskList.vue
@@ -7,13 +7,19 @@
     </template>
     <el-table border :data="tableData" class="adjust-table table-content" height="300px">
       <el-table-column prop="index"  :label="$t('api_test.home_page.running_task_list.table_coloum.index')" width="80" show-overflow-tooltip/>
-      <el-table-column prop="scenario"  :label="$t('api_test.home_page.running_task_list.table_coloum.scenario')" width="200" >
+      <el-table-column prop="name"  :label="$t('commons.name')" width="200" >
         <template v-slot:default="{row}">
           <el-link type="info" @click="redirect(row)">
-            {{ row.scenario }}
+            {{ row.name }}
           </el-link>
         </template>
       </el-table-column>
+      <el-table-column prop="taskType"  :label="$t('api_test.home_page.running_task_list.table_coloum.task_type')" width="120" show-overflow-tooltip>
+        <template v-slot:default="scope">
+          <ms-tag v-if="scope.row.taskType == 'scenario'" type="success" effect="plain" :content="$t('api_test.home_page.running_task_list.scenario_schedule')"/>
+          <ms-tag v-if="scope.row.taskType == 'testPlan'" type="warning" effect="plain" :content="$t('api_test.home_page.running_task_list.test_plan_schedule')"/>
+        </template>
+      </el-table-column>
       <el-table-column prop="rule"  :label="$t('api_test.home_page.running_task_list.table_coloum.run_rule')" width="120" show-overflow-tooltip/>
       <el-table-column width="100" :label="$t('api_test.home_page.running_task_list.table_coloum.task_status')">
         <template v-slot:default="scope">
@@ -46,9 +52,12 @@
 
 <script>
 import {getCurrentProjectID} from "@/common/js/utils";
+import MsTag from "@/business/components/common/components/MsTag";
 export default {
   name: "MsRunningTaskList",
-
+  components: {
+    MsTag
+  },
 
   data() {
     return {
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 96fe5c8d34..8983e7d6d1 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -919,12 +919,15 @@ export default {
         table_coloum: {
           index: "Index",
           scenario: "Scene",
+          task_type: "Task Type",
           run_rule: "Rule",
           task_status: "Status",
           next_execution_time: "Next Execution Time",
           create_user: "Creator",
           update_time: "Update time",
         },
+        scenario_schedule: "Scenario",
+        test_plan_schedule: "Test plan",
         confirm: {
           close_title: "Do you want to close this scheduled task？",
         }
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index c5100604de..a32931f34c 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -922,12 +922,15 @@ export default {
         table_coloum: {
           index: "序号",
           scenario: "场景名称",
+          task_type: "任务类型",
           run_rule: "运行规则",
           task_status: "任务状态",
           next_execution_time: "下次执行时间",
           create_user: "创建人",
           update_time: "更新时间",
         },
+        scenario_schedule: "场景",
+        test_plan_schedule: "测试计划",
         confirm: {
           close_title: "要关闭这条定时任务吗？",
         }
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index b21290c81b..558a59a981 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -920,12 +920,15 @@ export default {
         table_coloum: {
           index: "序號",
           scenario: "場景名稱",
+          task_type: "任務類型",
           run_rule: "運行規則",
           task_status: "任務狀態",
           next_execution_time: "下次執行時間",
           create_user: "創建人",
           update_time: "更新時間",
         },
+        scenario_schedule: "場景",
+        test_plan_schedule: "測試計畫",
         confirm: {
           close_title: "要關閉這條定時任務嗎？",
         }

From 9025f428764b6852272bbeb4bb6d01d170aacb2a Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 22 Jan 2021 16:15:04 +0800
Subject: [PATCH 02/10] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=89=E8=BF=AD=E4=BB=A3=E6=AC=A1=E6=95=B0=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=B2=A1=E5=8F=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/performance/test/EditPerformanceTest.vue  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/performance/test/EditPerformanceTest.vue b/frontend/src/business/components/performance/test/EditPerformanceTest.vue
index 8af0e56832..61c6f721bb 100644
--- a/frontend/src/business/components/performance/test/EditPerformanceTest.vue
+++ b/frontend/src/business/components/performance/test/EditPerformanceTest.vue
@@ -291,7 +291,7 @@ export default {
     },
     fileChange(threadGroups) {
       let handler = this.$refs.pressureConfig;
-      handler.threadGroups = threadGroups;
+
       threadGroups.forEach(tg => {
         tg.threadNumber = tg.threadNumber || 10;
         tg.duration = tg.duration || 10;
@@ -301,8 +301,13 @@ export default {
         tg.threadType = tg.threadType || 'DURATION';
         tg.iterateNum = tg.iterateNum || 1;
         tg.iterateRampUp = tg.iterateRampUp || 10;
-        handler.calculateChart(tg);
       });
+
+      this.$set(handler, "threadGroups", threadGroups);
+
+      threadGroups.forEach(tg => {
+        handler.calculateChart(tg);
+      })
     }
   }
 }

From 96926b33117dcebd0a9dbea8f004125bafade106 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 22 Jan 2021 16:20:43 +0800
Subject: [PATCH 03/10] =?UTF-8?q?refactor:=20=E8=AE=BE=E7=BD=AE=E8=BF=AD?=
 =?UTF-8?q?=E4=BB=A3=E6=AC=A1=E6=95=B0=E5=92=8Crpslimit=E7=9A=84=E4=B8=8A?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/test/components/PerformancePressureConfig.vue  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
index 88098c33af..6131c8241d 100644
--- a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
@@ -58,6 +58,7 @@
                     v-model="threadGroup.rpsLimit"
                     @change="calculateChart(threadGroup)"
                     :min="1"
+                    :max="500"
                     size="mini"/>
                 </el-form-item>
                 <br>
@@ -87,6 +88,7 @@
                     :disabled="isReadOnly"
                     v-model="threadGroup.iterateNum"
                     :min="1"
+                    :max="10000"
                     @change="calculateChart(threadGroup)"
                     size="mini"/>
                 </el-form-item>
@@ -98,6 +100,7 @@
                     :disabled="isReadOnly || !threadGroup.rpsLimitEnable"
                     v-model="threadGroup.rpsLimit"
                     :min="1"
+                    :max="500"
                     size="mini"/>
                 </el-form-item>
                 <br>

From 6243e3a410ca714e88495d0f2b0b59a95d1d1c3d Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 22 Jan 2021 16:30:49 +0800
Subject: [PATCH 04/10] =?UTF-8?q?feat:=20=E7=94=A8=E4=BE=8B=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=94=AF=E6=8C=81=E4=B8=8A=E4=B8=80=E6=9D=A1=E4=B8=8B?=
 =?UTF-8?q?=E4=B8=80=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestCaseMapper.xml     |   9 +-
 .../track/controller/TestCaseController.java  |   7 +
 .../testcase/QueryTestCaseRequest.java        |   2 +
 .../track/service/TestCaseService.java        |  15 ++
 .../components/MsPreviousNextButton.vue       |  57 ++++++++
 .../components/track/case/TestCase.vue        |   6 +
 .../track/case/components/TestCaseEdit.vue    | 136 +++++++++++++-----
 .../track/case/components/TestCaseList.vue    |   4 +
 .../functional/FunctionalTestCaseEdit.vue     |  29 +---
 9 files changed, 205 insertions(+), 60 deletions(-)
 create mode 100644 frontend/src/business/components/common/components/MsPreviousNextButton.vue

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 2e56a4b202..730baeb9d8 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
@@ -268,7 +268,14 @@
 
     <select id="list" resultType="io.metersphere.track.dto.TestCaseDTO">
         select
-        <include refid="io.metersphere.base.mapper.TestCaseMapper.Base_Column_List"/>
+        <if test="request.selectFields != null and request.selectFields.size() > 0">
+            <foreach collection="request.selectFields" item="field" separator=",">
+                ${field}
+            </foreach>
+        </if>
+        <if test="request.selectFields == null or request.selectFields.size() == 0">
+            <include refid="io.metersphere.base.mapper.TestCaseMapper.Base_Column_List"/>
+        </if>
         from test_case
         <where>
             <if test="request.combine != null">
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
index ecf8290d04..6308f89b33 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
@@ -14,10 +14,12 @@ import io.metersphere.excel.domain.ExcelResponse;
 import io.metersphere.service.CheckPermissionService;
 import io.metersphere.service.FileService;
 import io.metersphere.track.dto.TestCaseDTO;
+import io.metersphere.track.dto.TestPlanCaseDTO;
 import io.metersphere.track.request.testcase.EditTestCaseRequest;
 import io.metersphere.track.request.testcase.QueryTestCaseRequest;
 import io.metersphere.track.request.testcase.TestCaseBatchRequest;
 import io.metersphere.track.request.testplan.FileOperationRequest;
+import io.metersphere.track.request.testplancase.QueryTestPlanCaseRequest;
 import io.metersphere.track.service.TestCaseService;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
@@ -65,6 +67,11 @@ public class TestCaseController {
         return testCaseService.listTestCaseMthod(request);
     }
 
+    @PostMapping("/list/ids")
+    public List<TestCaseDTO> getTestPlanCaseIds(@RequestBody QueryTestCaseRequest request) {
+        return testCaseService.listTestCaseIds(request);
+    }
+
 
     @GetMapping("recent/{count}")
     public List<TestCase> recentTestPlans(@PathVariable int count) {
diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java
index c24ece68ea..2328e5de13 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java
@@ -22,6 +22,8 @@ public class QueryTestCaseRequest extends TestCase {
 
     private Map<String, List<String>> filters;
 
+    private List<String> selectFields;
+
     private String planId;
 
     private String workspaceId;
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 5666e3285b..7634e20c4d 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -676,4 +676,19 @@ public class TestCaseService {
         editTestCase(request);
         return request.getId();
     }
+
+    public List<TestCaseDTO> listTestCaseIds(QueryTestCaseRequest request) {
+        List<OrderRequest> orderList = ServiceUtils.getDefaultOrder(request.getOrders());
+        OrderRequest order = new OrderRequest();
+        // 对模板导入的测试用例排序
+        order.setName("sort");
+        order.setType("desc");
+        orderList.add(order);
+        request.setOrders(orderList);
+        List<String> selectFields = new ArrayList<>();
+        selectFields.add("id");
+        selectFields.add("name");
+        request.setSelectFields(selectFields);
+        return extTestCaseMapper.list(request);
+    }
 }
diff --git a/frontend/src/business/components/common/components/MsPreviousNextButton.vue b/frontend/src/business/components/common/components/MsPreviousNextButton.vue
new file mode 100644
index 0000000000..ae2a31ad71
--- /dev/null
+++ b/frontend/src/business/components/common/components/MsPreviousNextButton.vue
@@ -0,0 +1,57 @@
+<template>
+  <span class="previous-next-button">
+    <span class="head-right-tip" v-if="index + 1 === list.length">
+      {{ $t('test_track.plan_view.pre_case') }} : {{list[index - 1] ? list[index - 1].name : ''}}
+    </span>
+    <span class="head-right-tip" v-if="index + 1 !== list.length">
+      {{ $t('test_track.plan_view.next_case') }} : {{list[index + 1] ? list[index + 1].name : ''}}
+    </span>
+
+    <el-button plain size="mini" icon="el-icon-arrow-up" :disabled="index + 1 <= 1" @click="handlePre()"/>
+    <span>
+      {{ index + 1 }}/{{ list.length }}
+    </span>
+    <el-button plain size="mini" icon="el-icon-arrow-down" :disabled="index + 1 >= list.length" @click="handleNext()"/>
+  </span>
+</template>
+
+<script>
+    export default {
+      name: "MsPreviousNextButton",
+      data() {
+        return {
+
+        }
+      },
+      props: {
+        list: {
+          type: Array,
+          default() {
+            return []
+          }
+        },
+        index: {
+          type: Number,
+          default() {
+            return 0
+          }
+        }
+      },
+      methods: {
+        handlePre() {
+          this.$emit('pre');
+        },
+        handleNext() {
+          this.$emit('next');
+        }
+      }
+    }
+</script>
+
+<style scoped>
+
+  .head-right-tip {
+    color: darkgrey;
+  }
+
+</style>
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index 860164b0f9..09cb2a382a 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -21,6 +21,7 @@
         @refresh="refresh"
         @refreshAll="refreshAll"
         @moveToNode="moveToNode"
+        @setCondition="setCondition"
         ref="testCaseList">
       </test-case-list>
     </ms-main-container>
@@ -30,6 +31,7 @@
       :read-only="testCaseReadOnly"
       :tree-nodes="treeNodes"
       :select-node="selectNode"
+      :select-condition="condition"
       ref="testCaseEditDialog">
     </test-case-edit>
 
@@ -73,6 +75,7 @@ export default {
       selectParentNodes: [],
       testCaseReadOnly: true,
       selectNode: {},
+      condition: {}
     }
   },
   mounted() {
@@ -165,6 +168,9 @@ export default {
     setTreeNodes(data) {
       this.treeNodes = data;
     },
+    setCondition(data) {
+      this.condition = data;
+    },
     moveSave(param) {
       this.result = this.$post('/test/case/batch/edit', param, () => {
         this.$success(this.$t('commons.save_success'));
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 97c21c59da..e5d99f60e1 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -5,6 +5,19 @@
              :title="operationType == 'edit' ? ( readOnly ? $t('test_track.case.view_case') : $t('test_track.case.edit_case')) : $t('test_track.case.create')"
              :visible.sync="dialogFormVisible" width="85%" v-if="dialogFormVisible">
 
+    <template v-slot:title>
+      <el-row>
+        <el-col :span="4">
+         <span>
+           {{operationType == 'edit' ? ( readOnly ? $t('test_track.case.view_case') : $t('test_track.case.edit_case')) : $t('test_track.case.create')}}
+         </span>
+        </el-col>
+        <el-col class="head-right" :span="19">
+          <ms-previous-next-button v-if="operationType = 'edit'" :index="index" @pre="handlePre" @next="handleNext" :list="testCases"/>
+        </el-col>
+      </el-row>
+    </template>
+
     <el-row :gutter="10">
       <div>
         <el-col :span="17">
@@ -279,10 +292,11 @@ import {getCurrentProjectID} from "../../../../../common/js/utils";
 import {buildNodePath} from "../../../api/definition/model/NodeTree";
 import CaseComment from "@/business/components/track/case/components/CaseComment";
 import MsInputTag from "@/business/components/api/automation/scenario/MsInputTag";
+import MsPreviousNextButton from "../../../common/components/MsPreviousNextButton";
 
 export default {
   name: "TestCaseEdit",
-  components: {MsInputTag, CaseComment, MsDialogFooter, TestCaseAttachment},
+  components: {MsPreviousNextButton, MsInputTag, CaseComment, MsDialogFooter, TestCaseAttachment},
   data() {
     return {
       result: {},
@@ -335,6 +349,8 @@ export default {
         {value: 'manual', label: this.$t('test_track.case.manual')}
       ],
       testCase: {},
+      testCases: [],
+      index: 0
     };
   },
   props: {
@@ -348,6 +364,9 @@ export default {
     selectNode: {
       type: Object
     },
+    selectCondition: {
+      type: Object
+    },
   },
   mounted() {
     this.getSelectOptions();
@@ -363,18 +382,12 @@ export default {
       this.$nextTick(() => (this.isStepTableAlive = true));
     },
     open(testCase) {
-      this.testCase = {};
-      if (testCase) {
-        testCase.tags = JSON.parse(testCase.tags);
-        // 复制 不查询评论
-        this.testCase = testCase.isCopy ? {} : testCase;
-      }
-      this.resetForm();
       this.projectId = getCurrentProjectID();
       if (window.history && window.history.pushState) {
         history.pushState(null, null, document.URL);
         window.addEventListener('popstate', this.close);
       }
+      this.resetForm();
       listenGoBack(this.close);
       this.operationType = 'add';
       if (testCase) {
@@ -383,13 +396,13 @@ export default {
         //复制
         if (testCase.name === '') {
           this.operationType = 'add';
+          this.setFormData(testCase);
+          this.setTestCaseExtInfo(testCase);
+          this.getSelectOptions();
+          this.reload();
+        } else {
+          this.initTestCases(testCase);
         }
-        let tmp = {};
-        Object.assign(tmp, testCase);
-        tmp.steps = JSON.parse(testCase.steps);
-        Object.assign(this.form, tmp);
-        this.form.module = testCase.nodeId;
-        this.getFileMetaData(testCase);
       } else {
         if (this.selectNode.data) {
           this.form.module = this.selectNode.data.id;
@@ -403,12 +416,56 @@ export default {
         this.form.type = 'functional';
         this.form.method = 'manual';
         this.form.maintainer = user.id;
+        this.getSelectOptions();
+        this.reload();
       }
-
-      this.getSelectOptions();
-      this.reload();
       this.dialogFormVisible = true;
     },
+    handlePre() {
+      this.index--;
+      this.getTestCase(this.index)
+    },
+    handleNext() {
+      this.index++;
+      this.getTestCase(this.index);
+    },
+    initTestCases(testCase) {
+      this.result = this.$post('/test/case/list/ids', this.selectCondition, response => {
+        this.testCases = response.data;
+        for (let i = 0; i < this.testCases.length; i++) {
+          if (this.testCases[i].id === testCase.id) {
+            this.index = i;
+            this.getTestCase(i);
+          }
+        }
+      });
+    },
+    getTestCase(index) {
+      let testCase = this.testCases[index];
+      this.result = this.$get('/test/case/get/' + testCase.id, response => {
+        let testCase = response.data;
+        this.setFormData(testCase);
+        this.setTestCaseExtInfo(testCase);
+        this.getSelectOptions();
+        this.reload();
+      })
+    },
+    setFormData(testCase) {
+      testCase.tags = JSON.parse(testCase.tags);
+      let tmp = {};
+      Object.assign(tmp, testCase);
+      tmp.steps = JSON.parse(testCase.steps);
+      Object.assign(this.form, tmp);
+      this.form.module = testCase.nodeId;
+      this.getFileMetaData(testCase);
+    },
+    setTestCaseExtInfo (testCase) {
+      this.testCase = {};
+      if (testCase) {
+        // 复制 不查询评论
+        this.testCase = testCase.isCopy ? {} : testCase;
+      }
+    },
     getFileMetaData(testCase) {
       this.fileList = [];
       this.tableData = [];
@@ -607,28 +664,33 @@ export default {
       if (this.$refs['caseFrom']) {
         this.$refs['caseFrom'].validate((valid) => {
           this.$refs['caseFrom'].resetFields();
-          this.form.name = '';
-          this.form.module = '';
-          this.form.type = '';
-          this.form.method = '';
-          this.form.maintainer = '';
-          this.form.priority = '';
-          this.form.prerequisite = '';
-          this.form.remark = '';
-          this.form.testId = '';
-          this.form.testName = '';
-          this.form.steps = [{
-            num: 1,
-            desc: '',
-            result: ''
-          }];
-          this.uploadList = [];
-          this.fileList = [];
-          this.tableData = [];
+          this._resetForm();
           return true;
         });
+      } else {
+        this._resetForm();
       }
     },
+    _resetForm() {
+      this.form.name = '';
+      this.form.module = '';
+      this.form.type = '';
+      this.form.method = '';
+      this.form.maintainer = '';
+      this.form.priority = '';
+      this.form.prerequisite = '';
+      this.form.remark = '';
+      this.form.testId = '';
+      this.form.testName = '';
+      this.form.steps = [{
+        num: 1,
+        desc: '',
+        result: ''
+      }];
+      this.uploadList = [];
+      this.fileList = [];
+      this.tableData = [];
+    },
     handleExceed() {
       this.$error(this.$t('load_test.file_size_limit'));
     },
@@ -748,4 +810,8 @@ export default {
   height: calc(100vh - 120px);
 }
 
+.head-right {
+  text-align: right;
+}
+
 </style>
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 42e4bcd735..7d62024dec 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -286,12 +286,16 @@ export default {
     }
   },
   created: function () {
+    this.$emit('setCondition', this.condition);
     this.initTableData();
   },
   watch: {
     selectNodeIds() {
       this.currentPage = 1;
       this.initTableData();
+    },
+    condition() {
+      this.$emit('setCondition', this.condition);
     }
   },
   methods: {
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
index f54379606e..6c1b606dbf 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
@@ -20,32 +20,15 @@
 
                   <el-row type="flex" class="head-bar">
 
-                    <el-col>
+                    <el-col :span="4">
                       <el-button plain size="mini"
                                  icon="el-icon-back"
                                  @click="cancel">{{ $t('test_track.return') }}
                       </el-button>
                     </el-col>
 
-                    <el-col 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 : ''
-                        }}
-                      </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 : ''
-                              }}
-                      </span>
-
-                      <el-button plain size="mini" icon="el-icon-arrow-up"
-                                 :disabled="index + 1 <= 1"
-                                 @click="handlePre()"/>
-                      <span>  {{ index + 1 }}/{{ testCases.length }} </span>
-                      <el-button plain size="mini" icon="el-icon-arrow-down"
-                                 :disabled="index + 1 >= testCases.length"
-                                 @click="handleNext()"/>
+                    <el-col class="head-right" :span="20">
+                      <ms-previous-next-button :index="index" @pre="handlePre" @next="handleNext" :list="testCases"/>
                     </el-col>
 
                   </el-row>
@@ -370,10 +353,12 @@ import PerformanceTestResult from "../test/PerformanceTestResult";
 import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import TestCaseAttachment from "@/business/components/track/case/components/TestCaseAttachment";
 import CaseComment from "@/business/components/track/case/components/CaseComment";
+import MsPreviousNextButton from "../../../../../common/components/MsPreviousNextButton";
 
 export default {
   name: "FunctionalTestCaseEdit",
   components: {
+    MsPreviousNextButton,
     CaseComment,
     PerformanceTestResult,
     PerformanceTestDetail,
@@ -722,10 +707,6 @@ export default {
   float: right;
 }
 
-.head-right-tip {
-  color: darkgrey;
-}
-
 .el-scrollbar {
   height: 100%;
 }

From f2c93f828b6ae54ef743ebafa54aa4e966b9a76b Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 22 Jan 2021 16:32:13 +0800
Subject: [PATCH 05/10] =?UTF-8?q?fix:=20=E7=BC=96=E8=BE=91=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E6=96=B0=E5=A2=9E=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E6=9D=A1=E4=B8=8B=E4=B8=80=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/track/case/components/TestCaseEdit.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index e5d99f60e1..e98c8ff9c1 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -13,7 +13,7 @@
          </span>
         </el-col>
         <el-col class="head-right" :span="19">
-          <ms-previous-next-button v-if="operationType = 'edit'" :index="index" @pre="handlePre" @next="handleNext" :list="testCases"/>
+          <ms-previous-next-button v-if="operationType == 'edit'" :index="index" @pre="handlePre" @next="handleNext" :list="testCases"/>
         </el-col>
       </el-row>
     </template>

From 8e1f189ce95e012810d01f2578092e1c183006c9 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Fri, 22 Jan 2021 17:01:41 +0800
Subject: [PATCH 06/10] =?UTF-8?q?feat:=20swagger=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ApiDefinitionController.java   |   4 +
 .../api/service/ApiDefinitionService.java     |   4 +
 .../commons/utils/UrlTestUtils.java           |   4 +-
 .../job/sechedule/ScheduleManager.java        |   3 +-
 .../job/sechedule/SwaggerUrlImportJob.java    |   2 +
 .../engine/docker/DockerTestEngine.java       |   4 +-
 .../metersphere/service/ScheduleService.java  |   5 +-
 .../automation/scenario/EditApiScenario.vue   |   4 +-
 .../complete/EditCompleteHTTPApi.vue          |  14 ++-
 .../components/import/ApiImport.vue           | 115 ++++++++++++------
 .../components/module/ApiModule.vue           |   2 +-
 .../components/module/ApiModuleHeader.vue     |  18 ++-
 .../settings/system/Organization.vue          |   3 +
 frontend/src/common/js/regex.js               |   2 +-
 frontend/src/i18n/en-US.js                    |   2 +
 frontend/src/i18n/zh-CN.js                    |   2 +
 frontend/src/i18n/zh-TW.js                    |   2 +
 17 files changed, 132 insertions(+), 58 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
index 548efbfca9..b5eb53ac4c 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
@@ -144,6 +144,10 @@ public class ApiDefinitionController {
     public void createSchedule(@RequestBody Schedule request) {
         apiDefinitionService.createSchedule(request);
     }
+    @PostMapping(value = "/schedule/update")
+    public void updateSchedule(@RequestBody Schedule request){
+        apiDefinitionService.updateSchedule(request);
+    }
 
     @PostMapping("/getReference")
     public ReferenceDTO getReference(@RequestBody ApiScenarioRequest request) {
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index e5f2d6bdb4..54b810a949 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -604,6 +604,10 @@ public class ApiDefinitionService {
         this.addOrUpdateSwaggerImportCronJob(request);
 
     }
+    public void updateSchedule(Schedule request){
+        scheduleService.editSchedule(request);
+        this.addOrUpdateSwaggerImportCronJob(request);
+    }
 
     private void addOrUpdateSwaggerImportCronJob(Schedule request) {
         scheduleService.addOrUpdateCronJob(request, SwaggerUrlImportJob.getJobKey(request.getResourceId()), SwaggerUrlImportJob.getTriggerKey(request.getResourceId()), SwaggerUrlImportJob.class);
diff --git a/backend/src/main/java/io/metersphere/commons/utils/UrlTestUtils.java b/backend/src/main/java/io/metersphere/commons/utils/UrlTestUtils.java
index d536cf484d..d891194623 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/UrlTestUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/UrlTestUtils.java
@@ -5,7 +5,7 @@ import java.net.URLConnection;
 
 public class UrlTestUtils {
 
-    public static boolean testUrlWithTimeOut(String urlString, int timeOutMillSeconds) {
+   /* public static boolean testUrlWithTimeOut(String urlString, int timeOutMillSeconds) {
         try {
             URL url = new URL(urlString);
             URLConnection co = url.openConnection();
@@ -16,5 +16,5 @@ public class UrlTestUtils {
             LogUtil.error(e);
             return false;
         }
-    }
+    }*/
 }
diff --git a/backend/src/main/java/io/metersphere/job/sechedule/ScheduleManager.java b/backend/src/main/java/io/metersphere/job/sechedule/ScheduleManager.java
index 7c64968203..d0575bb36a 100644
--- a/backend/src/main/java/io/metersphere/job/sechedule/ScheduleManager.java
+++ b/backend/src/main/java/io/metersphere/job/sechedule/ScheduleManager.java
@@ -290,11 +290,12 @@ public class ScheduleManager {
         addOrUpdateCronJob(jobKey, triggerKey, jobClass, cron, null);
     }
 
-    public JobDataMap getDefaultJobDataMap(String resourceId, String expression, String userId) {
+    public JobDataMap getDefaultJobDataMap(String resourceId, String expression, String userId,String swaggerUrl) {
         JobDataMap jobDataMap = new JobDataMap();
         jobDataMap.put("resourceId", resourceId);
         jobDataMap.put("expression", expression);
         jobDataMap.put("userId", userId);
+        jobDataMap.put("swaggerUrl",swaggerUrl);
         return jobDataMap;
     }
 
diff --git a/backend/src/main/java/io/metersphere/job/sechedule/SwaggerUrlImportJob.java b/backend/src/main/java/io/metersphere/job/sechedule/SwaggerUrlImportJob.java
index 4cf4fd7479..0e517e8843 100644
--- a/backend/src/main/java/io/metersphere/job/sechedule/SwaggerUrlImportJob.java
+++ b/backend/src/main/java/io/metersphere/job/sechedule/SwaggerUrlImportJob.java
@@ -24,6 +24,8 @@ public class SwaggerUrlImportJob extends MsScheduleJob {
         ApiTestImportRequest request = new ApiTestImportRequest();
         request.setProjectId(resourceId);
         request.setSwaggerUrl(swaggerUrl);
+        request.setPlatform("Swagger2");
+        request.setSaved(true);
         apiDefinitionService.apiTestImport(null, request);
     }
 
diff --git a/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java b/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java
index abcfa543c8..da06425f46 100644
--- a/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java
+++ b/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java
@@ -80,10 +80,10 @@ public class DockerTestEngine extends AbstractEngine {
         }
 
         // docker 不能从 localhost 中下载文件
-        if (StringUtils.contains(metersphereUrl, "http://localhost")
+       /* if (StringUtils.contains(metersphereUrl, "http://localhost")
                 || !UrlTestUtils.testUrlWithTimeOut(metersphereUrl, 1000)) {
             MSException.throwException(Translator.get("run_load_test_file_init_error"));
-        }
+        }*/
 
         Map<String, String> env = new HashMap<>();
         env.put("RATIO", "" + ratio);
diff --git a/backend/src/main/java/io/metersphere/service/ScheduleService.java b/backend/src/main/java/io/metersphere/service/ScheduleService.java
index 12820f9114..2da372b26f 100644
--- a/backend/src/main/java/io/metersphere/service/ScheduleService.java
+++ b/backend/src/main/java/io/metersphere/service/ScheduleService.java
@@ -111,7 +111,7 @@ public class ScheduleService {
                     LogUtil.error("初始化任务：" + JSON.toJSONString(schedule));
                     scheduleManager.addOrUpdateCronJob(new JobKey(schedule.getKey(), schedule.getGroup()),
                             new TriggerKey(schedule.getKey(), schedule.getGroup()), Class.forName(schedule.getJob()), schedule.getValue(),
-                            scheduleManager.getDefaultJobDataMap(schedule.getResourceId(), schedule.getValue(), schedule.getUserId()));
+                            scheduleManager.getDefaultJobDataMap(schedule.getResourceId(), schedule.getValue(), schedule.getUserId(),schedule.getSwaggerUrl()));
                 }
             } catch (Exception e) {
                 LogUtil.error("初始化任务失败", e);
@@ -139,7 +139,8 @@ public class ScheduleService {
         String cronExpression = request.getValue();
         if (enable != null && enable && StringUtils.isNotBlank(cronExpression)) {
             try {
-                scheduleManager.addOrUpdateCronJob(jobKey, triggerKey, clazz, cronExpression, scheduleManager.getDefaultJobDataMap(request.getResourceId(), cronExpression, SessionUtils.getUser().getId()));
+                scheduleManager.addOrUpdateCronJob(jobKey, triggerKey, clazz, cronExpression,
+                        scheduleManager.getDefaultJobDataMap(request.getResourceId(), cronExpression, SessionUtils.getUser().getId(),request.getSwaggerUrl()));
             } catch (SchedulerException e) {
                 LogUtil.error(e.getMessage(), e);
                 MSException.throwException("定时任务开启异常");
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 7f67e9d0e3..17692a0f33 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -66,7 +66,6 @@
                     :value="item.id">
                   </el-option>
                 </el-select>
-
               </el-form-item>
             </el-col>
           </el-row>
@@ -92,7 +91,7 @@
       <!-- 场景步骤-->
       <div v-loading="loading">
         <div @click="showAll">
-          <p class="tip">{{$t('api_test.automation.scenario_step')}} </p>
+          <p class="tip">{{ $t('api_test.automation.scenario_stepscenario_step') }} </p>
         </div>
         <el-row>
           <el-col :span="21">
@@ -854,7 +853,6 @@
           this.result = this.$get("/api/automation/getApiScenario/" + this.currentScenario.id, response => {
             if (response.data) {
               this.path = "/api/automation/update";
-              this.currentScenario.description = response.data.description;
               if (response.data.scenarioDefinition != null) {
                 let obj = JSON.parse(response.data.scenarioDefinition);
                 if (obj) {
diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
index 4530217333..a4298a747c 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
@@ -42,9 +42,14 @@
                   <div v-else>
                     <el-option :key="0" :value="''">
                       <div style="margin-left: 40px">
-                        <span style="font-size: 14px;color: #606266;font-weight: 48.93">{{ $t('api_test.definition.select_comp.no_data') }},
+                        <span style="font-size: 14px;color: #606266;font-weight: 48.93">{{
+                            $t('api_test.definition.select_comp.no_data')
+                          }},
                         </span>
-                        <el-link type="primary" @click="createModules">{{ $t('api_test.definition.select_comp.add_data') }}</el-link>
+                        <el-link type="primary" @click="createModules">{{
+                            $t('api_test.definition.select_comp.add_data')
+                          }}
+                        </el-link>
                       </div>
                     </el-option>
                   </div>
@@ -95,7 +100,8 @@
         <!-- 请求参数 -->
         <div>
           <p class="tip">{{ $t('api_test.definition.request.req_param') }} </p>
-          <ms-api-request-form :showScript="false" :request="request" :headers="request.headers" :isShowEnable="isShowEnable"/>
+          <ms-api-request-form :showScript="false" :request="request" :headers="request.headers"
+                               :isShowEnable="isShowEnable"/>
         </div>
 
       </el-form>
@@ -202,7 +208,7 @@ export default {
       if (!this.httpForm.path || this.httpForm.path.indexOf('?') === -1) return;
       let url = this.getURL(this.addProtocol(this.httpForm.path));
       if (url) {
-        this.httpForm.path = decodeURIComponent(this.httpForm.path.substr(0,this.httpForm.path.indexOf("?")));
+        this.httpForm.path = decodeURIComponent(this.httpForm.path.substr(0, this.httpForm.path.indexOf("?")));
       }
     },
     addProtocol(url) {
diff --git a/frontend/src/business/components/api/definition/components/import/ApiImport.vue b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
index b119b49ad2..0c264eecfa 100644
--- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
@@ -19,43 +19,60 @@
     </div>
 
     <el-form :model="formData" :rules="rules" label-width="100px" v-loading="result.loading" ref="form">
+      <el-row>
+        <el-col :span="9">
+          <el-form-item :label="$t('commons.import_module')"
+                        v-if="selectedPlatformValue != 'Swagger2' || (selectedPlatformValue == 'Swagger2' && !swaggerUrlEable)">
+            <el-select size="small" v-model="formData.moduleId" class="project-select" clearable>
+              <el-option v-for="item in moduleOptions" :key="item.id" :label="item.path" :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('commons.import_mode')"
+                        v-if="selectedPlatformValue != 'Swagger2' || (selectedPlatformValue == 'Swagger2' && !swaggerUrlEable)">
+            <el-select size="small" v-model="formData.modeId" class="project-select" clearable>
+              <el-option v-for="item in modeOptions" :key="item.id" :label="item.name" :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10" style="margin-left: 20px">
+          <el-upload
+            v-if="selectedPlatformValue != 'Swagger2' || (selectedPlatformValue == 'Swagger2' && !swaggerUrlEable)"
+            class="api-upload"
+            drag
+            action=""
+            :http-request="upload"
+            :limit="1"
+            :beforeUpload="uploadValidate"
+            :on-remove="handleRemove"
+            :file-list="fileList"
+            :on-exceed="handleExceed"
+            multiple>
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text" v-html="$t('load_test.upload_tips')"></div>
+            <div class="el-upload__tip" slot="tip">{{ $t('api_test.api_import.file_size_limit') }}</div>
+          </el-upload>
+        </el-col>
 
-      <el-upload
-        v-if="selectedPlatformValue != 'Swagger2' || (selectedPlatformValue == 'Swagger2' && !swaggerUrlEable)"
-        class="api-upload"
-        drag
-        action=""
-        :http-request="upload"
-        :limit="1"
-        :beforeUpload="uploadValidate"
-        :on-remove="handleRemove"
-        :file-list="fileList"
-        :on-exceed="handleExceed"
-        multiple>
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text" v-html="$t('load_test.upload_tips')"></div>
-        <div class="el-upload__tip" slot="tip">{{ $t('api_test.api_import.file_size_limit') }}</div>
-      </el-upload>
+        <el-form-item :label="'Swagger URL'" prop="wgerUrl" v-if="isSwagger2 && swaggerUrlEable" class="swagger-url">
+          <el-input size="small" v-model="formData.swaggerUrl" clearable show-word-limit/>
+        </el-form-item>
+        <el-form-item v-if="isSwagger2" class="swagger-enable" :class="{'swagger-url-disable': !swaggerUrlEable}">
+          <el-switch
+            v-model="swaggerUrlEable"
+            :active-text="$t('api_test.api_import.swagger_url_import')">
+          </el-switch>
+        </el-form-item>
 
-      <el-form-item :label="'Swagger URL'" prop="wgerUrl" v-if="isSwagger2 && swaggerUrlEable" class="swagger-url">
-        <el-input size="small" v-model="formData.swaggerUrl" clearable show-word-limit/>
-      </el-form-item>
+        <el-form-item v-if="isSwagger2 && swaggerUrlEable">
+          <el-switch
+            v-model="swaggerSynchronization"
+            @click.native="scheduleEdit"
+            :active-text="$t('api_test.api_import.timing_synchronization')">
+          </el-switch>
+        </el-form-item>
+        <schedule-import ref="scheduleEdit"></schedule-import>
+      </el-row>
 
-      <el-form-item v-if="isSwagger2" class="swagger-enable" :class="{'swagger-url-disable': !swaggerUrlEable}">
-        <el-switch
-          v-model="swaggerUrlEable"
-          :active-text="$t('api_test.api_import.swagger_url_import')">
-        </el-switch>
-      </el-form-item>
-
-      <el-form-item v-if="isSwagger2 && swaggerUrlEable">
-        <el-switch
-          v-model="swaggerSynchronization"
-          @click.native="scheduleEdit"
-          :active-text="$t('api_test.api_import.timing_synchronization')">
-        </el-switch>
-      </el-form-item>
-      <schedule-import ref="scheduleEdit"></schedule-import>
 
     </el-form>
 
@@ -76,6 +93,8 @@ import MsDialogFooter from "../../../../common/components/MsDialogFooter";
 import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import {getCurrentProjectID} from "../../../../../../common/js/utils";
 import ScheduleImport from "@/business/components/api/definition/components/import/ImportScheduleEdit";
+import {buildNodePath} from "@/business/components/api/definition/model/NodeTree";
+
 export default {
   name: "ApiImport",
   components: {ScheduleImport, MsDialogFooter},
@@ -83,14 +102,24 @@ export default {
     saved: {
       type: Boolean,
       default: true,
-    }
+    },
+    moduleOptions: {}
   },
   data() {
     return {
       visible: false,
       swaggerUrlEable: false,
-      swaggerSynchronization:false,
+      swaggerSynchronization: false,
       showEnvironmentSelect: true,
+      modeOptions: [{
+        id: 'fullCoverage',
+        name: '全量覆盖'
+      },
+        {
+          id: 'incrementalMerge',
+          name: '增量合并'
+        }],
+      protocol: "",
       platforms: [
         {
           name: 'Metersphere',
@@ -122,7 +151,9 @@ export default {
       useEnvironment: false,
       formData: {
         file: undefined,
-        swaggerUrl: ''
+        swaggerUrl: '',
+        modeId: '',
+        moduleId: ''
       },
       rules: {},
       currentModule: {},
@@ -148,15 +179,19 @@ export default {
     }
   },
   methods: {
-    scheduleEdit(){
-      if(this.swaggerSynchronization){
-       this.$refs.scheduleEdit.open(this.buildParam());
+    scheduleEdit() {
+      if (this.swaggerSynchronization) {
+        this.$refs.scheduleEdit.open(this.buildParam());
+      } else {
+        this.result = this.$post("/api/definition/schedule/update", this.schedule, response => {
+        });
       }
     },
     open(module) {
       this.currentModule = module;
       this.visible = true;
       listenGoBack(this.close);
+
     },
     upload(file) {
       this.formData.file = file.file;
diff --git a/frontend/src/business/components/api/definition/components/module/ApiModule.vue b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
index 73e221ba19..5e6a17da7d 100644
--- a/frontend/src/business/components/api/definition/components/module/ApiModule.vue
+++ b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
@@ -72,7 +72,7 @@
         }
       },
       planId: String,
-      relevanceProjectId: String
+      relevanceProjectId: String,
     },
     computed: {
       isPlanModel() {
diff --git a/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue b/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
index b6c49762be..be32a14310 100644
--- a/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
+++ b/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
@@ -33,7 +33,7 @@
       @saveAsEdit="saveAsEdit"
       @refresh="refresh"
       ref="basisApi"/>
-    <api-import ref="apiImport" @refresh="$emit('refresh')"/>
+    <api-import ref="apiImport" :moduleOptions="moduleOptions" @refresh="$emit('refresh')"/>
   </div>
 </template>
 
@@ -43,6 +43,7 @@ import MsAddBasisApi from "../basis/AddBasisApi";
 import ApiImport from "../import/ApiImport";
 import ModuleTrashButton from "./ModuleTrashButton";
 import {getCurrentProjectID} from "../../../../../../common/js/utils";
+import {buildNodePath} from "@/business/components/api/definition/model/NodeTree";
 
 export default {
   name: "ApiModuleHeader",
@@ -50,6 +51,7 @@ export default {
   data() {
     return {
       options: OPTIONS,
+      moduleOptions: {}
     }
   },
   props: {
@@ -70,9 +72,10 @@ export default {
       default() {
         return false
       }
-    }
+    },
   },
   methods: {
+
     handleCommand(e) {
       switch (e) {
         case "debug":
@@ -88,6 +91,17 @@ export default {
             this.$warning(this.$t('commons.check_project_tip'));
             return;
           }
+          this.protocol = "HTTP";
+          this.result = this.$get("/api/module/list/" + getCurrentProjectID() + "/" + this.protocol, response => {
+            if (response.data != undefined && response.data != null) {
+              this.data = response.data;
+              let moduleOptions = [];
+              this.data.forEach(node => {
+                buildNodePath(node, {path: ''}, moduleOptions);
+              });
+              this.moduleOptions = moduleOptions
+            }
+          });
           this.$refs.apiImport.open(this.currentModule);
           break;
         default:
diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue
index 888236af0f..8fc66f3284 100644
--- a/frontend/src/business/components/settings/system/Organization.vue
+++ b/frontend/src/business/components/settings/system/Organization.vue
@@ -252,6 +252,9 @@ export default {
   activated() {
     this.initTableData();
   },
+  created() {
+    this.list()
+  },
   methods: {
     create() {
       this.dialogOrgAddVisible = true;
diff --git a/frontend/src/common/js/regex.js b/frontend/src/common/js/regex.js
index 9320e4d0c0..3896d86635 100644
--- a/frontend/src/common/js/regex.js
+++ b/frontend/src/common/js/regex.js
@@ -1 +1 @@
-export const PHONE_REGEX = '^1(3|4|5|7|8|9)\\d{9}$';
+export const PHONE_REGEX = '^1(3|4|5｜6|7|8|9)\\d{9}$';
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 7ab5af8958..0b5bb806e2 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1,5 +1,7 @@
 export default {
   commons: {
+    import_mode: 'Import mode',
+    import_module: 'Import module',
     please_fill_in_the_template: 'Please fill in the template',
     cut_back_old_version: 'Cut back to old version',
     cut_back_new_version: 'Switch back to new version',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index c1bfaf44ac..c6d885c7d2 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1,5 +1,7 @@
 export default {
   commons: {
+    import_mode: '导入模式',
+    import_module: '导入模块',
     please_fill_in_the_template: '请填写模版内容',
     cut_back_old_version: '切回旧版',
     cut_back_new_version: '切回新版',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 2087fad310..90c0057fa4 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1,5 +1,7 @@
 export default {
   commons: {
+    import_mode: '導入模式',
+    import_module: '導入模塊',
     please_fill_in_the_template: '請填寫模版內容',
     cut_back_old_version: '切回舊版',
     cut_back_new_version: '切回新版',

From 3048d8b52d5a50997dfb6b25015883b438e5e871 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Fri, 22 Jan 2021 17:06:03 +0800
Subject: [PATCH 07/10] =?UTF-8?q?feat:=20swagger=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/commons/utils/UrlTestUtils.java  | 4 ++--
 .../performance/engine/docker/DockerTestEngine.java           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/commons/utils/UrlTestUtils.java b/backend/src/main/java/io/metersphere/commons/utils/UrlTestUtils.java
index d891194623..d536cf484d 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/UrlTestUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/UrlTestUtils.java
@@ -5,7 +5,7 @@ import java.net.URLConnection;
 
 public class UrlTestUtils {
 
-   /* public static boolean testUrlWithTimeOut(String urlString, int timeOutMillSeconds) {
+    public static boolean testUrlWithTimeOut(String urlString, int timeOutMillSeconds) {
         try {
             URL url = new URL(urlString);
             URLConnection co = url.openConnection();
@@ -16,5 +16,5 @@ public class UrlTestUtils {
             LogUtil.error(e);
             return false;
         }
-    }*/
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java b/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java
index da06425f46..abcfa543c8 100644
--- a/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java
+++ b/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java
@@ -80,10 +80,10 @@ public class DockerTestEngine extends AbstractEngine {
         }
 
         // docker 不能从 localhost 中下载文件
-       /* if (StringUtils.contains(metersphereUrl, "http://localhost")
+        if (StringUtils.contains(metersphereUrl, "http://localhost")
                 || !UrlTestUtils.testUrlWithTimeOut(metersphereUrl, 1000)) {
             MSException.throwException(Translator.get("run_load_test_file_init_error"));
-        }*/
+        }
 
         Map<String, String> env = new HashMap<>();
         env.put("RATIO", "" + ratio);

From 4b41e9df0c8f26ff6fa154a62dc4ab4fc63782f1 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 22 Jan 2021 17:14:12 +0800
Subject: [PATCH 08/10] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E6=8A=A5=E5=91=8A=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TestResultAdvanceChartComponent.vue               | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TestResultAdvanceChartComponent.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TestResultAdvanceChartComponent.vue
index f587d05600..35ebb9a58e 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TestResultAdvanceChartComponent.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TestResultAdvanceChartComponent.vue
@@ -119,7 +119,7 @@
           this.functionalCharData = [];
           if (this.executeResult.functionalResult) {
             this.executeResult.functionalResult.forEach(item => {
-              let data = this.dataMap.get(item.status);
+              let data = this.copyData(item.status);
               data.value = item.count;
               this.functionalCharData.push(data);
             });
@@ -129,7 +129,7 @@
           this.apiCharData = [];
           if (this.executeResult.apiResult) {
             this.executeResult.apiResult.forEach(item => {
-              let data = this.dataMap.get(item.status);
+              let data = this.copyData(item.status);
               data.value = item.count;
               this.apiCharData.push(data);
             });
@@ -139,7 +139,7 @@
           this.scenarioCharData = [];
           if (this.executeResult.apiResult) {
             this.executeResult.scenarioResult.forEach(item => {
-              let data = this.dataMap.get(item.status);
+              let data = this.copyData(item.status);
               data.value = item.count;
               this.scenarioCharData.push(data);
             });
@@ -149,12 +149,15 @@
           this.loadCharData = [];
           if (this.executeResult.loadResult) {
             this.executeResult.loadResult.forEach(item => {
-              let data = this.dataMap.get(item.status);
+              let data = this.copyData(item.status);
               data.value = item.count;
               this.loadCharData.push(data);
             });
           }
         },
+        copyData(status) {
+          return JSON.parse(JSON.stringify(this.dataMap.get(status)))
+        },
         reload() {
           this.isShow = false;
           this.$nextTick(function () {

From 5f8ecf76cf48d837e4345c97bd8f42d27f5922f3 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 22 Jan 2021 18:06:18 +0800
Subject: [PATCH 09/10] =?UTF-8?q?fix:=20swagger2.0=E5=AF=BC=E5=85=A5body?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/api/parse/Swagger2Parser.java  | 15 +++++++++++++--
 .../api/service/ApiDefinitionService.java         |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java b/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
index aa20d97e7a..4b293deb5b 100644
--- a/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
+++ b/backend/src/main/java/io/metersphere/api/parse/Swagger2Parser.java
@@ -69,7 +69,7 @@ public class Swagger2Parser extends SwaggerAbstractParser {
                 ApiDefinitionResult apiDefinition = buildApiDefinition(request.getId(), operation, pathName, method.name());
                 parseParameters(operation, request);
                 apiDefinition.setRequest(JSON.toJSONString(request));
-                apiDefinition.setResponse(JSON.toJSONString(parseResponse(operation.getResponses())));
+                apiDefinition.setResponse(JSON.toJSONString(parseResponse(operation, operation.getResponses())));
                 buildModule(parentNode, apiDefinition, operation.getTags(), importRequest.isSaved());
                 results.add(apiDefinition);
             }
@@ -163,11 +163,13 @@ public class Swagger2Parser extends SwaggerAbstractParser {
                 "", parameter.getRequired());
     }
 
-    private HttpResponse parseResponse(Map<String, Response> responses) {
+    private HttpResponse parseResponse(Operation operation, Map<String, Response> responses) {
         HttpResponse msResponse = new HttpResponse();
         msResponse.setBody(new Body());
+        msResponse.getBody().setKvs(new ArrayList<>());
         msResponse.setHeaders(new ArrayList<>());
         msResponse.setType(RequestType.HTTP);
+        msResponse.getBody().setType(getBodyType(operation));
         // todo 状态码要调整？
         msResponse.setStatusCode(new ArrayList<>());
         if (responses != null) {
@@ -234,6 +236,15 @@ public class Swagger2Parser extends SwaggerAbstractParser {
                 }
             }
             return propertyList.toString();
+        } else if (schema instanceof ModelImpl) {
+            ModelImpl model = (ModelImpl) schema;
+            if (StringUtils.equals("object", model.getType())) {
+                model.getProperties();
+                if (model != null) {
+                    JSONObject bodyParameters = getBodyParameters(model.getProperties(), new HashSet<>());
+                    return bodyParameters.toJSONString();
+                }
+            }
         }
         return "";
     }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index e5f2d6bdb4..8612cb5634 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -314,7 +314,7 @@ public class ApiDefinitionService {
         } else {
             //如果存在则修改
             apiDefinition.setId(sameRequest.get(0).getId());
-            apiDefinitionMapper.updateByPrimaryKey(apiDefinition);
+            apiDefinitionMapper.updateByPrimaryKeyWithBLOBs(apiDefinition);
         }
         return apiDefinition;
     }

From fed842e44203b278b933c2e2220bcd52d1766b0b Mon Sep 17 00:00:00 2001
From: Dream95 <864197662@qq.com>
Date: Fri, 22 Jan 2021 18:11:38 +0800
Subject: [PATCH 10/10] =?UTF-8?q?bugfix=20=E4=BF=AE=E5=A4=8D'[]'=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8Fjson=E8=A7=A3=E6=9E=90=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20(#1242)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/metersphere/metersphere/issues/1144

Co-authored-by: zhouyx <zhouyx1@guahao.com>
---
 .../commons/utils/JsonPathUtils.java          | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/commons/utils/JsonPathUtils.java b/backend/src/main/java/io/metersphere/commons/utils/JsonPathUtils.java
index 239c7c09a0..296621089f 100644
--- a/backend/src/main/java/io/metersphere/commons/utils/JsonPathUtils.java
+++ b/backend/src/main/java/io/metersphere/commons/utils/JsonPathUtils.java
@@ -1,30 +1,23 @@
 package io.metersphere.commons.utils;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONPath;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class JsonPathUtils {
 
     public static List<HashMap> getListJson(String jsonString) {
 
-        JSONObject jsonObject = JSONObject.parseObject(jsonString);
+        JSON jsonObject = jsonString.startsWith("[")?JSONObject.parseArray(jsonString):JSONObject.parseObject(jsonString);
         List<HashMap> allJsons =new ArrayList<>();
 
         // 获取到所有jsonpath后，获取所有的key
-        List<String> jsonPaths = JSONPath.paths(jsonObject).keySet()
-            .stream()
-            .collect(Collectors.toList());
+        List<String> jsonPaths = new ArrayList<>(JSONPath.paths(jsonObject).keySet());
         //去掉根节点key
         List<String> parentNode = new ArrayList<>();
         //根节点key