fix(接口定义): 修复部分缺陷

frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue

@@ -2,7 +2,7 @@
   <header class="report-header">
     <el-row>
       <el-col>
-        <span><el-input size="mini" style="width: 200px" v-model="report.name"/> </span>
+        <span v-if="!debug"><el-input size="mini" style="width: 200px" v-model="report.name"/> </span>
         <span class="time"> {{ report.createTime | timestampFormatDate }}</span>
 
         <el-button :disabled="isReadOnly" class="export-button" plain type="primary" size="mini" @click="handleExport(report.name)" style="margin-right: 10px">

frontend/src/business/components/api/automation/report/components/RequestMetric.vue

@@ -1,34 +1,18 @@
 <template>
   <div class="metric-container">
     <el-row type="flex">
-      <div class="metric">
-        <div class="value">{{request.responseResult.responseTime}} ms</div>
-        <div class="name">{{$t('api_report.response_time')}}</div>
-        <br>
-        <div class="value">{{request.responseResult.latency}} ms</div>
-        <div class="name">{{$t('api_report.latency')}}</div>
-      </div>
-      <div class="metric">
-        <div class="value">{{request.requestSize}} bytes</div>
-        <div class="name">{{$t('api_report.request_size')}}</div>
-        <br>
-        <div class="value">{{request.responseResult.responseSize}} bytes</div>
-        <div class="name">{{$t('api_report.response_size')}}</div>
-      </div>
-
-      <div class="metric horizontal">
-        <el-row type="flex">
-          <div class="code">
-            <div class="value" :class="{'error': error}">{{request.responseResult.responseCode}}</div>
-            <div class="name">{{$t('api_report.response_code')}}</div>
-          </div>
-          <div class="split"></div>
-          <div class="message">
-            <div class="value">{{request.responseResult.responseMessage}}</div>
-            <div class="name">{{$t('api_report.response_message')}}</div>
-          </div>
-        </el-row>
-      </div>
+      <el-col>
+        <div style="font-size: 14px;color: #AAAAAA;float: left">{{$t('api_report.response_code')}} :</div>
+        <div style="font-size: 14px;color:#61C550;margin-top:2px;margin-left:10px;float: left">{{request.responseResult.responseCode ? request.responseResult.responseCode :'0'}}</div>
+      </el-col>
+      <el-col>
+        <div style="font-size: 14px;color: #AAAAAA;float: left">{{$t('api_report.response_time')}} :</div>
+        <div style="font-size: 14px;color:#61C550;margin-top:2px;margin-left:10px;float: left">{{request.responseResult.responseTime?request.responseResult.responseTime:0}} ms</div>
+      </el-col>
+      <el-col>
+        <div style="font-size: 14px;color: #AAAAAA;float: left">{{$t('api_report.response_size')}} :</div>
+        <div style="font-size: 14px;color:#61C550; margin-top:2px;margin-left:10px;float: left">{{request.responseResult.responseSize?request.responseResult.responseSize:0}} bytes</div>
+      </el-col>
     </el-row>
   </div>
 </template>

frontend/src/business/components/api/automation/report/components/RequestResult.vue

@@ -3,7 +3,7 @@
     <p class="el-divider--horizontal"></p>
     <div @click="active">
       <el-row :gutter="10" type="flex" align="middle" class="info">
-        <el-col :span="10" v-if="indexNumber!=undefined">
+        <el-col :span="14" v-if="indexNumber!=undefined">
           <div class="method">
             <div class="el-step__icon is-text ms-api-col" v-if="indexNumber%2 ==0">
               <div class="el-step__icon-inner"> {{ indexNumber+1 }}</div>
@@ -14,14 +14,10 @@
             {{ request.name }}
           </div>
         </el-col>
-        <el-col :span="4">
-          <div class="method">
-            {{ request.method }}
-          </div>
-        </el-col>
+
         <el-col :span="5">
           <el-tooltip effect="dark" :content="request.responseResult.responseCode" placement="bottom" :open-delay="800">
-            <div class="url">{{ request.responseResult.responseCode }}</div>
+            <div class="url" style="color: #5daf34">{{ request.responseResult.responseCode }}</div>
           </el-tooltip>
         </el-col>
         <el-col :span="3">
@@ -122,16 +118,18 @@
   }
 
   .ms-api-col {
-    background-color: #FCF1F1;
-    border-color: #67C23A;
+    background-color: #EFF0F0;
+    border-color: #EFF0F0;
     margin-right: 10px;
-    color: #67C23A;
+    font-size: 12px;
+    color: #64666A;
   }
 
   .ms-api-col-create {
     background-color: #EBF2F2;
     border-color: #008080;
     margin-right: 10px;
+    font-size: 12px;
     color: #008080;
   }
 

frontend/src/business/components/api/automation/report/components/RequestResultTail.vue

@@ -1,27 +1,6 @@
 <template>
   <div class="request-result">
-    <div @click="active">
-      <el-row :gutter="10" type="flex" align="middle" class="info">
-        <el-col :span="12">
-          <i class="icon el-icon-arrow-right" :class="{'is-active': isActive}"/>
-          {{scenarioName}}
-        </el-col>
-        <el-col :span="4">
-          {{$t('api_report.start_time')}}
-        </el-col>
-        <el-col :span="2">
-          {{$t('api_report.response_time')}}
-        </el-col>
-        <el-col :span="2">
-          {{$t('api_report.error')}}
-        </el-col>
-        <el-col :span="2">
-          {{$t('api_report.assertions')}}
-        </el-col>
-        <el-col :span="2">
-          {{$t('api_report.result')}}
-        </el-col>
-      </el-row>
+    <div>
       <el-row :gutter="10" type="flex" align="middle" class="info">
         <el-col :span="2">
           <div class="method">
@@ -35,7 +14,7 @@
           </el-tooltip>
         </el-col>
         <el-col :span="4">
-            {{request.startTime | timestampFormatDate(true) }}
+          {{request.startTime | timestampFormatDate(true) }}
         </el-col>
         <el-col :span="2">
           <div class="time">
@@ -67,7 +46,7 @@
           </el-tab-pane>
           <el-tab-pane :label="$t('api_report.request_result')" name="result">
             <ms-request-metric :request="request"/>
-            <ms-request-text  :request="request"/>
+            <ms-request-text :request="request"/>
             <br>
             <ms-response-text :request-type="requestType" :response="request.responseResult"/>
           </el-tab-pane>

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

@@ -63,13 +63,17 @@
     },
     created() {
       if (this.request.protocol === 'HTTP') {
-        let urlObject = new URL(this.request.url);
-        let url = urlObject.protocol + "//" + urlObject.host + "/";
-        let path = this.request.url.substr(url.length);
-        if (!path.startsWith('/')) {
-          path = "/" + path;
+        try {
+          let urlObject = new URL(this.request.url);
+          let url = urlObject.protocol + "//" + urlObject.host + "/";
+          let path = this.request.url.substr(url.length);
+          if (!path.startsWith('/')) {
+            path = "/" + path;
+          }
+          this.request.path = path;
+        } catch (e) {
+          this.request.path = this.request.url;
         }
-        this.request.path = path;
       }
     },
     methods: {

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

@@ -201,9 +201,9 @@
               <div v-if="operatingElements.indexOf('HTTPSamplerProxy')>0 || operatingElements.indexOf('DubboSampler')>0 || operatingElements.indexOf('JDBCSampler')>0 || operatingElements.indexOf('TCPSampler')>0 ">
                 <el-button class="ms-right-buttion" size="small" style="color: #F56C6C;background-color: #FCF1F1" @click="apiListImport">+{{$t('api_test.automation.api_list_import')}}</el-button>
               </div>
-              <div v-if="operatingElements.indexOf('OT_IMPORT')>0">
+              <!--<div v-if="operatingElements.indexOf('OT_IMPORT')>0">
                 <el-button class="ms-right-buttion" size="small" style="color: #409EFF;background-color: #EEF5FE" @click="addComponent('OT_IMPORT')">+{{$t('api_test.automation.external_import')}}</el-button>
-              </div>
+              </div>-->
               <div v-if="operatingElements.indexOf('ConstantTimer')>0">
                 <el-button class="ms-right-buttion" size="small" style="color: #67C23A;background-color: #F2F9EE" @click="addComponent('ConstantTimer')">+{{$t('api_test.automation.wait_controller')}}</el-button>
               </div>

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

@@ -2,10 +2,13 @@
   <el-card>
     <el-row>
       <div>
+        <div class="el-step__icon is-text" :style="styleType" style="margin-right: 10px">
+          <div class="el-step__icon-inner">{{jsr223ProcessorData.index}}</div>
+        </div>
         <el-button class="ms-left-buttion" size="small" :style="styleType" style="color: #B8741A;background-color: #F9F1EA">{{title}}</el-button>
         <i class="icon el-icon-arrow-right" :class="{'is-active': this.jsr223ProcessorData.active}" @click="changeActive" style="margin-left: 20px"/>
         <el-input size="small" v-model="jsr223ProcessorData.name" class="ms-api-header-select" style="width: 380px"/>
-        <el-button size="small" style="float: right" @click="remove">移除</el-button>
+        <el-button size="small" style="float: right" @click="remove">{{$t('commons.remove')}}</el-button>
       </div>
     </el-row>
     <el-collapse-transition>

frontend/src/business/components/api/definition/components/assertion/ApiAssertions.vue

@@ -2,8 +2,11 @@
   <div :style="customizeStyle" v-loading="loading">
     <el-card>
       <div>
+        <div class="el-step__icon is-text" style="color: #A30014;background-color: #F7E6E9;margin-right: 10px" v-if="assertions.index">
+          <div class="el-step__icon-inner">{{assertions.index}}</div>
+        </div>
         <el-button class="ms-left-buttion" size="small" style="color: #A30014;background-color: #F7E6E9">{{$t('api_test.definition.request.assertions_rule')}}</el-button>
-        <el-button size="small" style="float: right;margin-top: 0px" @click="remove">移除</el-button>
+        <el-button size="small" style="float: right;margin-top: 0px" @click="remove">{{$t('commons.remove')}}</el-button>
       </div>
       <div class="assertion-add">
         <el-row :gutter="10">
@@ -11,9 +14,6 @@
             <el-select :disabled="isReadOnly" class="assertion-item" v-model="type"
                        :placeholder="$t('api_test.request.assertions.select_type')"
                        size="small">
-              <!--
-                          <el-option :label="$t('api_test.request.assertions.text')" :value="options.TEXT"/>
-              -->
               <el-option :label="$t('api_test.request.assertions.regex')" :value="options.REGEX"/>
               <el-option :label="'JSONPath'" :value="options.JSON_PATH"/>
               <el-option :label="'XPath'" :value="options.XPATH2"/>
@@ -22,10 +22,6 @@
             </el-select>
           </el-col>
           <el-col :span="20">
-            <!--
-                      <ms-api-assertion-text :is-read-only="isReadOnly" :list="assertions.regex" v-if="type === options.TEXT"
-                                             :callback="after"/>
-            -->
             <ms-api-assertion-regex :is-read-only="isReadOnly" :list="assertions.regex" v-if="type === options.REGEX"
                                     :callback="after"/>
             <ms-api-assertion-json-path :is-read-only="isReadOnly" :list="assertions.jsonPath"
@@ -41,24 +37,8 @@
             </el-button>
           </el-col>
         </el-row>
-
-
-        <!--<div v-if="!scenario">-->
-        <!--<el-row :gutter="10" class="json-path-suggest-button">-->
-        <!--<el-link size="small" type="primary" @click="suggestJsonOpen" style="margin-right: 20px">-->
-        <!--{{ $t('api_test.request.assertions.json_path_suggest') }}-->
-        <!--</el-link>-->
-        <!--<el-link size="small" type="danger" @click="clearJson">-->
-        <!--{{ $t('api_test.request.assertions.json_path_clear') }}-->
-        <!--</el-link>-->
-        <!--</el-row>-->
-        <!--</div>-->
       </div>
 
-
-      <!--<ms-api-jsonpath-suggest-list @addJsonpathSuggest="addJsonpathSuggest" :request="request"-->
-      <!--ref="jsonpathSuggestList"/>-->
-
       <ms-api-assertions-edit :is-read-only="isReadOnly" :assertions="assertions" :reloadData="reloadData" style="margin-bottom: 20px"/>
     </el-card>
   </div>

frontend/src/business/components/api/definition/components/extract/ApiExtract.vue

@@ -1,6 +1,9 @@
 <template>
   <div :style="customizeStyle">
     <el-card>
+      <div class="el-step__icon is-text" style="color: #015478;background-color: #E6EEF2;margin-right: 10px" v-if="extract.index">
+        <div class="el-step__icon-inner">{{extract.index}}</div>
+      </div>
       <el-button class="ms-left-buttion" size="small" style="color: #015478;background-color: #E6EEF2">{{$t('api_test.definition.request.extract_param')}}</el-button>
       <el-button size="small" style="float: right;margin-top: 0px" @click="remove">移除</el-button>
 

frontend/src/business/components/api/definition/components/jmeter/components/sampler/http-sampler/index.js

@@ -37,6 +37,7 @@ export default class HTTPSamplerProxy extends Sampler {
     this.rest = [];
     this.files = [];
     this.headers = [];
+    this.hashTree = [];
   }
 }