Merge branch 'master' of https://github.com/metersphere/metersphere

backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioRequest.java

@@ -27,4 +27,5 @@ public class ApiScenarioRequest {
     private boolean isSelectThisWeedData;
     private long createTime = 0;
     private String executeStatus;
+    private boolean notInTestPlan;
 }

backend/src/main/java/io/metersphere/api/dto/automation/RunScenarioRequest.java

@@ -4,6 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.util.List;
+import java.util.Map;
 
 @Setter
 @Getter
@@ -32,6 +33,8 @@ public class RunScenarioRequest {
 
     private List<String> scenarioIds;
 
+    private Map<String,String> scenarioTestPlanIdMap;
+
     /**
      * isSelectAllDate：选择的数据是否是全部数据（全部数据是不受分页影响的数据）
      * filters: 数据状态

backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java

@@ -400,8 +400,19 @@ public class ApiAutomationService {
                 scenarios.add(scenario);
                 // 创建场景报告
                 if (reportIds != null) {
-                    createScenarioReport(group.getName(), item.getId(), item.getName(), request.getTriggerMode() == null ? ReportTriggerMode.MANUAL.name() : request.getTriggerMode(),
-                            request.getExecuteType(), item.getProjectId(), request.getReportUserID());
+                    //如果是测试计划页面触发的执行方式，生成报告时createScenarioReport第二个参数需要特殊处理
+                    if(StringUtils.equals(request.getRunMode(),ApiRunMode.SCENARIO_PLAN.name())){
+                        String testPlanScenarioId = item.getId();
+                        if(request.getScenarioTestPlanIdMap()!=null&&request.getScenarioTestPlanIdMap().containsKey(item.getId())){
+                            testPlanScenarioId = request.getScenarioTestPlanIdMap().get(item.getId());
+                        }
+                        createScenarioReport(group.getName(), testPlanScenarioId, item.getName(), request.getTriggerMode() == null ? ReportTriggerMode.MANUAL.name() : request.getTriggerMode(),
+                                request.getExecuteType(), item.getProjectId(), request.getReportUserID());
+                    }else{
+                        createScenarioReport(group.getName(), item.getId(), item.getName(), request.getTriggerMode() == null ? ReportTriggerMode.MANUAL.name() : request.getTriggerMode(),
+                                request.getExecuteType(), item.getProjectId(), request.getReportUserID());
+                    }
+
                     reportIds.add(group.getName());
                 }
                 group.setHashTree(scenarios);

backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java

@@ -134,31 +134,41 @@ public class ApiScenarioReportService {
     }
 
     public ApiScenarioReport updatePlanCase(TestResult result) {
-        TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(result.getTestId());
-        ScenarioResult scenarioResult = result.getScenarios().get(0);
-        if (scenarioResult.getError() > 0) {
-            testPlanApiScenario.setLastResult(ScenarioStatus.Fail.name());
-        } else {
-            testPlanApiScenario.setLastResult(ScenarioStatus.Success.name());
+//        TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(result.getTestId());
+        List<ScenarioResult> scenarioResultList = result.getScenarios();
+        ApiScenarioReport returnReport = null;
+        for (ScenarioResult scenarioResult :
+                scenarioResultList) {
+            ApiScenarioReport report = editReport(scenarioResult);
+            // 报告详情内容
+            ApiScenarioReportDetail detail = new ApiScenarioReportDetail();
+            TestResult newResult = createTestResult(result.getTestId(), scenarioResult);
+            scenarioResult.setName(report.getScenarioName());
+            newResult.addScenario(scenarioResult);
+
+            detail.setContent(JSON.toJSONString(newResult).getBytes(StandardCharsets.UTF_8));
+            detail.setReportId(report.getId());
+            detail.setProjectId(report.getProjectId());
+            apiScenarioReportDetailMapper.insert(detail);
+
+            TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(report.getScenarioId());
+            if(testPlanApiScenario!=null){
+                report.setScenarioId(testPlanApiScenario.getApiScenarioId());
+                apiScenarioReportMapper.updateByPrimaryKeySelective(report);
+                if (scenarioResult.getError() > 0) {
+                    testPlanApiScenario.setLastResult(ScenarioStatus.Fail.name());
+                } else {
+                    testPlanApiScenario.setLastResult(ScenarioStatus.Success.name());
+                }
+                String passRate = new DecimalFormat("0%").format((float) scenarioResult.getSuccess() / (scenarioResult.getSuccess() + scenarioResult.getError()));
+                testPlanApiScenario.setPassRate(passRate);
+                testPlanApiScenario.setReportId(report.getId());
+                testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
+            }
+            returnReport = report;
         }
-        String passRate = new DecimalFormat("0%").format((float) scenarioResult.getSuccess() / (scenarioResult.getSuccess() + scenarioResult.getError()));
-        testPlanApiScenario.setPassRate(passRate);
-        // 存储场景报告
-        ApiScenarioReport report = editReport(scenarioResult);
-        // 报告详情内容
-        ApiScenarioReportDetail detail = new ApiScenarioReportDetail();
-        TestResult newResult = createTestResult(result.getTestId(), scenarioResult);
-        scenarioResult.setName(report.getScenarioName());
-        newResult.addScenario(scenarioResult);
 
-        detail.setContent(JSON.toJSONString(newResult).getBytes(StandardCharsets.UTF_8));
-        detail.setReportId(report.getId());
-        detail.setProjectId(report.getProjectId());
-        apiScenarioReportDetailMapper.insert(detail);
-
-        testPlanApiScenario.setReportId(report.getId());
-        testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
-        return report;
+        return returnReport;
     }
 
     public ApiScenarioReport updateSchedulePlanCase(TestResult result) {

backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml

@@ -164,7 +164,13 @@
             <if test="request.executeStatus == 'executePass'">
                 and api_scenario.last_result = 'Success'
             </if>
-
+            <if test="request.notInTestPlan == true ">
+                and api_scenario.id not in (
+                    select pc.api_scenario_id
+                    from test_plan_api_scenario pc
+                    where pc.test_plan_id = #{request.planId}
+                )
+            </if>
         </where>
         <if test="request.orders != null and request.orders.size() > 0">
             order by

backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml

@@ -145,43 +145,43 @@
     </sql>
     <sql id="combine">
         <if test='${condition}.name != null and (${name} == null or ${name} == "")'>
-            and atc.name
+            and t1.name
             <include refid="condition">
                 <property name="object" value="${condition}.name"/>
             </include>
         </if>
         <if test="${condition}.updateTime != null">
-            and atc.update_time
+            and t1.update_time
             <include refid="condition">
                 <property name="object" value="${condition}.updateTime"/>
             </include>
         </if>
-         <if test="${condition}.createTime != null">
-            and atc.create_time
+        <if test="${condition}.createTime != null">
+            and t1.create_time
             <include refid="condition">
                 <property name="object" value="${condition}.createTime"/>
             </include>
         </if>
         <if test="${condition}.priority != null">
-            and atc.priority
+            and t1.priority
             <include refid="condition">
                 <property name="object" value="${condition}.priority"/>
             </include>
         </if>
         <if test="${condition}.creator != null">
-            and atc.user_id
+            and t1.user_id
             <include refid="condition">
                 <property name="object" value="${condition}.creator"/>
             </include>
         </if>
         <if test="${condition}.tags != null">
-            and atc.tags
+            and t1.tags
             <include refid="condition">
                 <property name="object" value="${condition}.tags"/>
             </include>
         </if>
         <if test="${condition}.status != null">
-            and ader.status
+            and t2.status
             <include refid="condition">
                 <property name="object" value="${condition}.status"/>
             </include>
@@ -190,17 +190,17 @@
     </sql>
     <select id="list" resultType="io.metersphere.api.dto.definition.ApiTestCaseResult">
         SELECT
-            t1.*,
-            t2.STATUS AS execResult,
-            t2.create_time AS execTime,
-            u2.NAME AS createUser,
-            u1.NAME AS updateUser
+        t1.*,
+        t2.STATUS AS execResult,
+        t2.create_time AS execTime,
+        u2.NAME AS createUser,
+        u1.NAME AS updateUser
         FROM
-            api_test_case t1
-            LEFT JOIN api_definition_exec_result t2 ON t1.last_result_id = t2.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
+        api_test_case t1
+        LEFT JOIN api_definition_exec_result t2 ON t1.last_result_id = t2.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
         <where>
             <if test="request.combine != null">
                 <include refid="combine">
@@ -230,32 +230,30 @@
             order by
             <foreach collection="request.orders" separator="," item="order">
                 t1.${order.name} ${order.type}
-             </foreach>
+            </foreach>
         </if>
 
     </select>
 
     <select id="listSimple" resultType="io.metersphere.api.dto.definition.ApiTestCaseDTO">
         select
-          atc.id, atc.project_id, atc.name, atc.api_definition_id, atc.priority, atc.description, atc.create_user_id, atc.update_user_id, atc.create_time, atc.update_time, atc.num,
-          a.module_id, a.path, a.protocol, atc.tags
+        t1.id, t1.project_id, t1.name, t1.api_definition_id, t1.priority, t1.description, t1.create_user_id, t1.update_user_id, t1.create_time, t1.update_time, t1.num,
+        a.module_id, a.path, a.protocol, t1.tags
         from
-          api_test_case atc
-        inner join
-          api_definition a
-        on
-          atc.api_definition_id = a.id
-            <if test="request.protocol != null and request.protocol!=''">
-                and a.protocol = #{request.protocol}
-            </if>
-            <choose>
-                <when test="request.status == 'Trash'">
-                    and a.status = 'Trash'
-                </when>
-                <otherwise>
-                    and a.status != 'Trash'
-                </otherwise>
-            </choose>
+        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
+        <if test="request.protocol != null and request.protocol!=''">
+            and a.protocol = #{request.protocol}
+        </if>
+        <choose>
+            <when test="request.status == 'Trash'">
+                and a.status = 'Trash'
+            </when>
+            <otherwise>
+                and a.status != 'Trash'
+            </otherwise>
+        </choose>
         <where>
             <if test="request.combine != null">
                 <include refid="combine">
@@ -264,25 +262,25 @@
                 </include>
             </if>
             <if test="request.projectId != null and request.projectId!=''">
-                and atc.project_id = #{request.projectId}
+                and t1.project_id = #{request.projectId}
             </if>
             <if test="request.id != null and request.id!=''">
-                and atc.id = #{request.id}
+                and t1.id = #{request.id}
             </if>
             <if test="request.ids != null and request.ids.size() > 0">
                 <if test="request.projectId != null and request.projectId!=''">
                     and
                 </if>
-                atc.id in
+                t1.id in
                 <foreach collection="request.ids" item="caseId" separator="," open="(" close=")">
                     #{caseId}
                 </foreach>
             </if>
             <if test="request.name != null and request.name!=''">
-                and (atc.name like CONCAT('%', #{request.name},'%') or atc.tags like CONCAT('%', #{request.name},'%'))
+                and (t1.name like CONCAT('%', #{request.name},'%') or t1.tags like CONCAT('%', #{request.name},'%'))
             </if>
             <if test="request.createTime > 0">
-                and atc.create_time >= #{request.createTime}
+                and t1.create_time >= #{request.createTime}
             </if>
             <if test="request.moduleIds != null and request.moduleIds.size() > 0">
                 and a.module_id in
@@ -295,7 +293,7 @@
                     <if test="values != null and values.size() > 0">
                         <choose>
                             <when test="key == 'priority'">
-                                and atc.priority in
+                                and t1.priority in
                                 <foreach collection="values" item="value" separator="," open="(" close=")">
                                     #{value}
                                 </foreach>

backend/src/main/java/io/metersphere/job/sechedule/TestPlanTestJob.java

@@ -1,12 +1,7 @@
 package io.metersphere.job.sechedule;
 
 import io.metersphere.api.dto.automation.ExecuteType;
-import io.metersphere.api.dto.automation.RunScenarioRequest;
 import io.metersphere.api.dto.automation.SchedulePlanScenarioExecuteRequest;
-import io.metersphere.api.dto.definition.RunCaseRequest;
-import io.metersphere.api.dto.definition.RunDefinitionRequest;
-import io.metersphere.api.service.ApiAutomationService;
-import io.metersphere.api.service.ApiDefinitionService;
 import io.metersphere.api.service.ApiTestCaseService;
 import io.metersphere.base.domain.*;
 import io.metersphere.commons.constants.ApiRunMode;
@@ -19,13 +14,9 @@ import io.metersphere.track.dto.TestPlanLoadCaseDTO;
 import io.metersphere.track.request.testplan.LoadCaseRequest;
 import io.metersphere.track.request.testplan.RunTestPlanRequest;
 import io.metersphere.track.service.*;
-import org.python.antlr.ast.Str;
 import org.quartz.*;
 
-import javax.annotation.Resource;
 import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 /**
  * 情景测试Job
@@ -130,7 +121,7 @@ public class TestPlanTestJob extends MsScheduleJob {
         scenarioRequest.setTestPlanID(this.resourceId);
         scenarioRequest.setRunMode(ApiRunMode.SCHEDULE_SCENARIO_PLAN.name());
         scenarioRequest.setTestPlanReportId(testPlanReport.getId());
-        testPlanService.runApiCase(scenarioRequest);
+        testPlanService.runScenarioCase(scenarioRequest);
         LogUtil.info("-------------- testplan schedule ---------- scenario case over -----------------");
 
         //执行性能测试任务

backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java

@@ -22,9 +22,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -51,11 +49,12 @@ public class TestPlanScenarioCaseService {
     }
 
     public List<ApiScenarioDTO> relevanceList(ApiScenarioRequest request) {
-        List<String> ids = apiAutomationService.selectIdsNotExistsInPlan(request.getProjectId(), request.getPlanId());
-        if (CollectionUtils.isEmpty(ids)) {
-            return new ArrayList<>();
-        }
-        request.setIds(ids);
+//        List<String> ids = apiAutomationService.selectIdsNotExistsInPlan(request.getProjectId(), request.getPlanId());
+//        if (CollectionUtils.isEmpty(ids)) {
+//            return new ArrayList<>();
+//        }
+//        request.setIds(ids);
+        request.setNotInTestPlan(true);
         return apiAutomationService.list(request);
     }
 
@@ -88,11 +87,17 @@ public class TestPlanScenarioCaseService {
     public String run(RunScenarioRequest request) {
         TestPlanApiScenarioExample example = new TestPlanApiScenarioExample();
         example.createCriteria().andIdIn(request.getPlanCaseIds());
-        List<String> scenarioIds = testPlanApiScenarioMapper.selectByExample(example).stream()
-                .map(TestPlanApiScenario::getApiScenarioId)
-                .collect(Collectors.toList());
-        scenarioIds.addAll(scenarioIds);
+        List<TestPlanApiScenario> testPlanApiScenarioList = testPlanApiScenarioMapper.selectByExample(example);
+
+        List<String> scenarioIds = new ArrayList<>();
+        Map<String,String> scenarioIdApiScarionMap = new HashMap<>();
+        for (TestPlanApiScenario apiScenario:
+                testPlanApiScenarioList) {
+            scenarioIds.add(apiScenario.getApiScenarioId());
+            scenarioIdApiScarionMap.put(apiScenario.getApiScenarioId(),apiScenario.getId());
+        }
         request.setScenarioIds(scenarioIds);
+        request.setScenarioTestPlanIdMap(scenarioIdApiScarionMap);
         request.setRunMode(ApiRunMode.SCENARIO_PLAN.name());
         return apiAutomationService.run(request);
     }

backend/src/main/java/io/metersphere/track/service/TestPlanService.java

@@ -751,7 +751,7 @@ public class TestPlanService {
      * @param request
      * @return
      */
-    public String runApiCase(SchedulePlanScenarioExecuteRequest request) {
+    public String runScenarioCase(SchedulePlanScenarioExecuteRequest request) {
         MsTestPlan testPlan = new MsTestPlan();
         testPlan.setHashTree(new LinkedList<>());
         HashTree jmeterHashTree = new ListedHashTree();

frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue

@@ -65,11 +65,9 @@
         </el-table-column>
         <el-table-column prop="passRate" :label="$t('api_test.automation.passing_rate')"
                          show-overflow-tooltip/>
-        <el-table-column :label="$t('commons.operating')" width="200px" v-if="!referenced">
+        <el-table-column fixed="right" :label="$t('commons.operating')" width="200px" v-if="!referenced">
           <template v-slot:default="{row}">
             <div v-if="trashEnable">
-<!--              <el-button type="text" @click="reductionApi(row)" v-tester>{{ $t('commons.reduction') }}</el-button>-->
-<!--              <el-button type="text" @click="remove(row)" v-tester>{{ $t('api_test.automation.remove') }}</el-button>-->
               <ms-table-operator-button :tip="$t('commons.reduction')" icon="el-icon-refresh-left" @exec="reductionApi(row)" v-tester/>
               <ms-table-operator-button :tip="$t('api_test.automation.remove')" icon="el-icon-delete" @exec="remove(row)" type="danger" v-tester/>
             </div>
@@ -471,9 +469,10 @@
         });
       },
       copy(row) {
-        row.copy = true;
-        row.name = 'copy_'+row.name;
-        this.$emit('edit', row);
+        let rowParam = JSON.parse(JSON.stringify(row));
+        rowParam.copy = true;
+        rowParam.name = 'copy_'+rowParam.name;
+        this.$emit('edit', rowParam);
       },
       showReport(row) {
         this.runVisible = true;

frontend/src/business/components/api/definition/ApiDefinition.vue

@@ -57,7 +57,7 @@
 
           <!-- 添加/编辑测试窗口-->
           <div v-else-if="item.type=== 'ADD'" class="ms-api-div">
-            <ms-api-config @runTest="runTest" @saveApi="saveApi" @createRootModel="createRootModel" ref="apiConfig"
+            <ms-api-config :syncTabs="syncTabs" @runTest="runTest" @saveApi="saveApi" @createRootModel="createRootModel" ref="apiConfig"
                            :current-api="item.api"
                            :currentProtocol="currentProtocol"
                            :moduleOptions="moduleOptions"/>
@@ -76,13 +76,13 @@
 
           <!-- 测试-->
           <div v-else-if="item.type=== 'TEST'" class="ms-api-div">
-            <ms-run-test-http-page :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi"
+            <ms-run-test-http-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi"
                                    @refresh="refresh" v-if="currentProtocol==='HTTP'"/>
-            <ms-run-test-tcp-page :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi"
+            <ms-run-test-tcp-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi"
                                   @refresh="refresh" v-if="currentProtocol==='TCP'"/>
-            <ms-run-test-sql-page :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi"
+            <ms-run-test-sql-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi"
                                   @refresh="refresh" v-if="currentProtocol==='SQL'"/>
-            <ms-run-test-dubbo-page :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi"
+            <ms-run-test-dubbo-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi"
                                     @refresh="refresh" v-if="currentProtocol==='DUBBO'"/>
           </div>
         </el-tab-pane>
@@ -184,7 +184,8 @@
           type: "list",
           closable: false
         }],
-        isApiListEnable: true
+        isApiListEnable: true,
+        syncTabs: [],
       }
     },
     watch: {

frontend/src/business/components/api/definition/components/ApiConfig.vue

@@ -3,16 +3,16 @@
   <div class="card-container">
     <!-- HTTP 请求参数 -->
     <ms-edit-complete-http-api @runTest="runTest" @saveApi="saveApi" @createRootModelInTree="createRootModelInTree" :request="request" :response="response"
-                               :basisData="currentApi" :moduleOptions="moduleOptions" v-if="currentProtocol === 'HTTP'"/>
+                               :basisData="currentApi" :moduleOptions="moduleOptions" :syncTabs="syncTabs" v-if="currentProtocol === 'HTTP'"/>
     <!-- TCP -->
     <ms-edit-complete-tcp-api :request="request" @runTest="runTest" @createRootModelInTree="createRootModelInTree" @saveApi="saveApi" :basisData="currentApi"
-                              :moduleOptions="moduleOptions" v-if="currentProtocol === 'TCP'"/>
+                              :moduleOptions="moduleOptions" :syncTabs="syncTabs" v-if="currentProtocol === 'TCP'"/>
     <!--DUBBO-->
     <ms-edit-complete-dubbo-api :request="request" @runTest="runTest" @createRootModelInTree="createRootModelInTree" @saveApi="saveApi" :basisData="currentApi"
-                                :moduleOptions="moduleOptions" v-if="currentProtocol === 'DUBBO'"/>
+                                :moduleOptions="moduleOptions" :syncTabs="syncTabs" v-if="currentProtocol === 'DUBBO'"/>
     <!--SQL-->
     <ms-edit-complete-sql-api :request="request" @runTest="runTest" @createRootModelInTree="createRootModelInTree" @saveApi="saveApi" :basisData="currentApi"
-                              :moduleOptions="moduleOptions" v-if="currentProtocol === 'SQL'"/>
+                              :moduleOptions="moduleOptions" :syncTabs="syncTabs" v-if="currentProtocol === 'SQL'"/>
   </div>
 </template>
 
@@ -45,6 +45,7 @@
       currentApi: {},
       moduleOptions: {},
       currentProtocol: String,
+      syncTabs: Array,
     },
     created() {
       this.projectId = getCurrentProjectID();
@@ -75,7 +76,7 @@
           this.$emit('runTest', data);
         })
       },
-      createRootModelInTree(){
+      createRootModelInTree() {
         this.$emit("createRootModel");
       },
       getMaintainerOptions() {

frontend/src/business/components/api/definition/components/complete/EditCompleteDubboApi.vue

@@ -44,8 +44,30 @@
       isReadOnly: {
         type: Boolean,
         default: false
+      },
+      syncTabs: Array,
+    },
+    watch: {
+      syncTabs() {
+        if (this.basisData && this.syncTabs && this.syncTabs.includes(this.basisData.id)) {
+          // 标示接口在其他地方更新过，当前页面需要同步
+          let url = "/api/definition/get/";
+          this.$get(url + this.basisData.id, response => {
+            if (response.data) {
+              let request = JSON.parse(response.data.request);
+              let index = this.syncTabs.findIndex(item => {
+                if (item === this.basisData.id) {
+                  return true;
+                }
+              })
+              this.syncTabs.splice(index, 1);
+              Object.assign(this.request, request);
+            }
+          });
+        }
       }
     },
+
     data() {
       return {validated: false}
     },

frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue

@@ -149,7 +149,29 @@
         options: API_STATUS,
       }
     },
-    props: {moduleOptions: {}, request: {}, response: {}, basisData: {}},
+    props: {moduleOptions: {}, request: {}, response: {}, basisData: {}, syncTabs: Array},
+    watch: {
+      syncTabs() {
+        if (this.basisData && this.syncTabs && this.syncTabs.includes(this.basisData.id)) {
+          // 标示接口在其他地方更新过，当前页面需要同步
+          let url = "/api/definition/get/";
+          this.$get(url + this.basisData.id, response => {
+            if (response.data) {
+              let request = JSON.parse(response.data.request);
+              let index = this.syncTabs.findIndex(item => {
+                if (item === this.basisData.id) {
+                  return true;
+                }
+              })
+              this.syncTabs.splice(index, 1);
+              this.httpForm.path = response.data.path;
+              this.httpForm.method = response.data.method;
+              Object.assign(this.request, request);
+            }
+          });
+        }
+      }
+    },
     methods: {
       runTest() {
         this.$refs['httpForm'].validate((valid) => {

frontend/src/business/components/api/definition/components/complete/EditCompleteSQLApi.vue

@@ -43,9 +43,29 @@ export default {
     isReadOnly: {
       type: Boolean,
       default: false
+    },
+    syncTabs:{},
+  },
+  watch: {
+    syncTabs() {
+      if (this.basisData && this.syncTabs && this.syncTabs.includes(this.basisData.id)) {
+        // 标示接口在其他地方更新过，当前页面需要同步
+        let url = "/api/definition/get/";
+        this.$get(url + this.basisData.id, response => {
+          if (response.data) {
+            let request = JSON.parse(response.data.request);
+            let index = this.syncTabs.findIndex(item => {
+              if (item === this.basisData.id) {
+                return true;
+              }
+            })
+            this.syncTabs.splice(index, 1);
+            Object.assign(this.request, request);
+          }
+        });
+      }
     }
   },
-
   data() {
     return {validated: false}
   },

frontend/src/business/components/api/definition/components/complete/EditCompleteTCPApi.vue

@@ -42,14 +42,34 @@ export default {
     isReadOnly: {
       type: Boolean,
       default: false
-    }
+    },
+    syncTabs:Array,
   },
   data() {
     return {
       validated: false,
     }
   },
-
+  watch: {
+    syncTabs() {
+      if (this.basisData && this.syncTabs && this.syncTabs.includes(this.basisData.id)) {
+        // 标示接口在其他地方更新过，当前页面需要同步
+        let url = "/api/definition/get/";
+        this.$get(url + this.basisData.id, response => {
+          if (response.data) {
+            let request = JSON.parse(response.data.request);
+            let index = this.syncTabs.findIndex(item => {
+              if (item === this.basisData.id) {
+                return true;
+              }
+            })
+            this.syncTabs.splice(index, 1);
+            Object.assign(this.request, request);
+          }
+        });
+      }
+    }
+  },
   methods: {
     callback() {
       this.validated = true;

frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue

@@ -89,7 +89,7 @@
         reportId: "",
       }
     },
-    props: {apiData: {}, currentProtocol: String,},
+    props: {apiData: {}, currentProtocol: String,syncTabs: Array},
     methods: {
       handleCommand(e) {
         switch (e) {
@@ -173,6 +173,9 @@
         let bodyFiles = this.getBodyUploadFiles();
         this.$fileUpload(url, null, bodyFiles, this.api, () => {
           this.$success(this.$t('commons.save_success'));
+          if (this.syncTabs.indexOf(this.api.id) === -1) {
+            this.syncTabs.push(this.api.id);
+          }
           this.$emit('saveApi', this.api);
         });
       },
@@ -228,7 +231,8 @@
       }
     },
     created() {
-      this.api = this.apiData;
+      // 深度复制
+      this.api = JSON.parse(JSON.stringify(this.apiData));
       this.api.protocol = this.currentProtocol;
       this.currentRequest = this.api.request;
       this.getEnvironments();

frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue

@@ -113,7 +113,7 @@
         projectId: "",
       }
     },
-    props: {apiData: {}, currentProtocol: String,},
+    props: {apiData: {}, currentProtocol: String, syncTabs: Array},
     methods: {
       handleCommand(e) {
         switch (e) {
@@ -205,6 +205,9 @@
         this.$fileUpload(url, null, bodyFiles, this.api, () => {
           this.$success(this.$t('commons.save_success'));
           this.$emit('saveApi', this.api);
+          if (this.syncTabs.indexOf(this.api.id) === -1) {
+            this.syncTabs.push(this.api.id);
+          }
         });
       },
       selectTestCase(item) {
@@ -230,7 +233,8 @@
     },
     created() {
       this.projectId = getCurrentProjectID();
-      this.api = this.apiData;
+      // 深度复制
+      this.api = JSON.parse(JSON.stringify(this.apiData));
       this.api.protocol = this.currentProtocol;
       this.currentRequest = this.api.request;
       this.getResult();

frontend/src/business/components/api/definition/components/runtest/RunTestSQLPage.vue

@@ -89,7 +89,7 @@
         reportId: "",
       }
     },
-    props: {apiData: {}, currentProtocol: String,},
+    props: {apiData: {}, currentProtocol: String,syncTabs: Array},
     methods: {
       handleCommand(e) {
         switch (e) {
@@ -172,6 +172,9 @@
         let bodyFiles = this.getBodyUploadFiles();
         this.$fileUpload(url, null, bodyFiles, this.api, () => {
           this.$success(this.$t('commons.save_success'));
+          if (this.syncTabs.indexOf(this.api.id) === -1) {
+            this.syncTabs.push(this.api.id);
+          }
           this.$emit('saveApi', this.api);
         });
       },
@@ -227,7 +230,8 @@
       }
     },
     created() {
-      this.api = this.apiData;
+      // 深度复制
+      this.api = JSON.parse(JSON.stringify(this.apiData));
       this.api.protocol = this.currentProtocol;
       this.currentRequest = this.api.request;
       this.getEnvironments();

frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue

@@ -90,7 +90,7 @@
         projectId: ""
       }
     },
-    props: {apiData: {}, currentProtocol: String,},
+    props: {apiData: {}, currentProtocol: String,syncTabs: Array},
     methods: {
       handleCommand(e) {
         switch (e) {
@@ -173,6 +173,9 @@
         let bodyFiles = this.getBodyUploadFiles();
         this.$fileUpload(url, null, bodyFiles, this.api, () => {
           this.$success(this.$t('commons.save_success'));
+          if (this.syncTabs.indexOf(this.api.id) === -1) {
+            this.syncTabs.push(this.api.id);
+          }
           this.$emit('saveApi', this.api);
         });
       },
@@ -194,7 +197,8 @@
       }
     },
     created() {
-      this.api = this.apiData;
+      // 深度复制
+      this.api = JSON.parse(JSON.stringify(this.apiData));
       this.api.protocol = this.currentProtocol;
       this.currentRequest = this.api.request;
       this.projectId = getCurrentProjectID();

frontend/src/business/components/common/json-schema/JsonSchemaEditor.vue

@@ -2,7 +2,7 @@
   <div id="app" v-loading="loading">
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane :label="$t('organization.message.template')" name="apiTemplate">
-        <el-button type="primary" size="mini" style="margin-left: 10px" @click="openOneClickOperation">导入</el-button>
+        <el-button type="primary" size="mini" style="margin: 10px 10px 0px" @click="openOneClickOperation">导入</el-button>
         <div style="min-height: 200px">
           <json-schema-editor class="schema" :value="schema" lang="zh_CN" custom/>
         </div>

frontend/src/business/components/common/json-schema/import/ImportJson.vue

@@ -3,6 +3,7 @@
     title="导入"
     :visible.sync="importVisible"
     width="50%"
+    append-to-body
     show-close
     :close-on-click-modal="false"
     @closed="handleClose">

frontend/src/business/components/common/json-schema/schema/editor/main.vue

@@ -46,7 +46,7 @@
       <json-schema-editor :value="{items:pickValue.items}" :deep="deep+1" disabled isItem :root="false" class="children" :lang="lang" :custom="custom"/>
     </template>
     <!-- 高级设置-->
-    <el-dialog :close-on-click-modal="false" :title="$t('schema.adv_setting')" :visible.sync="modalVisible" :destroy-on-close="true"
+    <el-dialog append-to-body :close-on-click-modal="false" :title="$t('schema.adv_setting')" :visible.sync="modalVisible" :destroy-on-close="true"
                @close="handleClose">
       <p class="tip">基础设置 </p>
       <el-form :inline="true" v-model="advancedValue" class="ms-advanced-search-form">

frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue

@@ -168,7 +168,7 @@ export default {
       deletePath: "/test/case/delete",
       selectRows: new Set(),
       buttons: [
-        {name: this.$t('api_test.definition.request.batch_delete'), handleClick: this.handleDeleteBatch},
+        {name: this.$t('test_track.case.batch_unlink'), handleClick: this.handleDeleteBatch},
         {name: this.$t('api_test.automation.batch_execute'), handleClick: this.handleBatchExecute}
       ],
       typeArr: [

frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue

@@ -117,7 +117,7 @@
         runData: [],
         buttons: [
           {
-            name: this.$t('api_test.definition.request.batch_delete'), handleClick: this.handleDeleteBatch
+            name: this.$t('test_track.case.batch_unlink'), handleClick: this.handleDeleteBatch
           },
           {
             name: this.$t('api_test.automation.batch_execute'), handleClick: this.handleBatchExecute