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

 Conflicts:

	frontend/src/business/components/track/case/components/TestCaseEdit.vue

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

@@ -267,6 +267,9 @@
       open(api) {
         if (api) {
           let data = JSON.parse(JSON.stringify(api));
+          if (data.protocol === "dubbo://") {
+            data.protocol = "DUBBO";
+          }
           data.id = getUUID();
           this.httpForm = {id: data.id, name: data.name, protocol: data.protocol, path: data.path, method: api.method, userId: getCurrentUser().id, request: data};
           this.getMaintainerOptions();

frontend/src/business/components/api/automation/scenario/variable/VariableList.vue

@@ -80,7 +80,7 @@
           </span>
             </el-tooltip>
             <el-row>
-              <el-link class="ms-variable-link" @click="batchAdd" style="color: #783887"> {{ $t("commons.batch_add") }}
+              <el-link class="ms-variable-link" @click="batchAdd" style="color: #783887" :disabled="disabled"> {{ $t("commons.batch_add") }}
               </el-link>
             </el-row>
             <div style="min-height: 400px">

frontend/src/business/components/api/definition/components/request/dubbo/Interface.vue

@@ -1,7 +1,7 @@
 <template>
   <el-form :model="request" :rules="rules" ref="request" label-width="100px" size="small" v-loading="loading"
            :disabled="isReadOnly">
-    <el-button class="get-provider" type="primary" size="small" @click="getProviderList">Get Provider List</el-button>
+    <el-button class="get-provider" type="primary" size="mini" @click="getProviderList">Get Provider List</el-button>
     <el-row>
       <el-col :span="12">
         <el-form-item label="Interfaces" prop="interfaces">

frontend/src/business/components/api/definition/components/response/ResponseResult.vue

@@ -8,20 +8,10 @@
       </el-tab-pane>
 
       <el-tab-pane :label="$t('api_test.definition.request.response_header')" name="headers" class="pane">
-        <!--<div style="width: 400px">-->
-        <!--<pre>{{ response.responseResult.headers }}</pre>-->
-        <!--</div>-->
         <ms-code-edit :mode="'text'" :read-only="true" :data.sync="response.responseResult.headers"/>
-
       </el-tab-pane>
-      <!--<el-tab-pane label="Cookie" name="cookie" class="pane cookie">-->
-      <!--<pre>{{response.cookies}}</pre>-->
-      <!--</el-tab-pane>-->
 
       <el-tab-pane :label="$t('api_test.definition.request.console')" name="console" class="pane">
-        <!--<div style="width: 400px">-->
-        <!--<pre>{{response.responseResult.console}}</pre>-->
-        <!--</div>-->
         <ms-code-edit :mode="'text'" :read-only="true" :data.sync="response.responseResult.console"/>
       </el-tab-pane>
 
@@ -30,29 +20,10 @@
       </el-tab-pane>
 
       <el-tab-pane :label="$t('api_test.request.extract.label')" name="label" class="pane">
-        <!--<div style="width: 400px">-->
-        <!--<pre>{{response.responseResult.vars}}</pre>-->
-        <!--</div>-->
         <ms-code-edit :mode="'text'" :read-only="true" :data.sync="response.responseResult.vars"/>
       </el-tab-pane>
 
       <el-tab-pane :label="$t('api_report.request_body')" name="request_body" class="pane">
-        <!--<div class="ms-div">-->
-        <!--{{$t('api_test.request.address')}} :-->
-        <!--<pre>{{ response.url }}</pre>-->
-        <!--</div>-->
-        <!--<div class="ms-div">-->
-        <!--{{$t('api_test.scenario.headers')}} :-->
-        <!--<pre>{{ response.headers }}</pre>-->
-        <!--</div>-->
-        <!--<div class="ms-div">-->
-        <!--Cookies :-->
-        <!--<pre>{{response.cookies}}</pre>-->
-        <!--</div>-->
-        <!--<div class="ms-div">-->
-        <!--Body :-->
-        <!--<pre>{{response.body ? response.body:""}}</pre>-->
-        <!--</div>-->
         <ms-code-edit :mode="'text'" :read-only="true" :data.sync="reqMessages"/>
       </el-tab-pane>
 

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

@@ -190,8 +190,8 @@ export default {
         let req = this.api.request;
         req.id = getUUID();
         data.request = JSON.stringify(req);
-        data.method = this.api.method;
+        data.method = req.method;
-        data.path = this.api.path;
+        data.path = req.path;
         data.url = this.api.url;
         data.status = this.api.status;
         data.userId = this.api.userId;