Merge branch 'dev' of https://github.com/metersphere/server into dev

frontend/src/business/components/api/test/ApiTestConfig.vue

@@ -200,10 +200,10 @@
 
     computed: {
       isShowRun() {
-        return this.test.projectId && this.test.name && !this.change;
+        return this.test.isValid() && !this.change;
       },
       isDisabled() {
-        return !(this.test.projectId && this.test.name && this.change)
+        return !(this.test.isValid() && this.change)
       }
     },
 

frontend/src/business/components/api/test/components/ApiRequestForm.vue

@@ -56,6 +56,13 @@
     },
 
     data() {
+      let validateURL = (rule, value, callback) => {
+        try {
+          new URL(this.addProtocol(this.request.url));
+        } catch (e) {
+          callback(this.$t('api_test.request.url_invalid'));
+        }
+      };
       return {
         activeName: "parameters",
         rules: {
@@ -63,7 +70,8 @@
             {max: 100, message: this.$t('commons.input_limit', [0, 100]), trigger: 'blur'}
           ],
           url: [
-            {max: 100, message: this.$t('commons.input_limit', [0, 100]), trigger: 'blur'}
+            {max: 100, required: true, message: this.$t('commons.input_limit', [0, 100]), trigger: 'blur'},
+            {validator: validateURL, trigger: 'blur'}
           ]
         }
       }
@@ -74,16 +82,21 @@
         if (!this.request.url) return;
 
         let parameters = [];
-        let url = new URL(this.addProtocol(this.request.url));
+        try {
-        url.searchParams.forEach((value, key) => {
+          let url = new URL(this.addProtocol(this.request.url));
-          if (key && value) {
+          url.searchParams.forEach((value, key) => {
-            parameters.push(new KeyValue(key, value));
+            if (key && value) {
-          }
+              parameters.push(new KeyValue(key, value));
-        });
+            }
-        // 添加一个空的，用于填写
+          });
-        parameters.push(new KeyValue());
+          // 添加一个空的，用于填写
-        this.request.parameters = parameters;
+          parameters.push(new KeyValue());
-        this.request.url = url.toString();
+          this.request.parameters = parameters;
+          this.request.url = url.toString();
+        } catch (e) {
+          this.$error(this.$t('api_test.request.url_invalid'), 2000)
+        }
+
       },
       methodChange(value) {
         if (value === 'GET' && this.activeName === 'body') {

frontend/src/business/components/api/test/components/assertion/ApiAssertionResponseTime.vue

@@ -2,7 +2,7 @@
   <div>
     <el-row :gutter="10" type="flex" justify="space-between" align="middle">
       <el-col>
-        <el-input v-model="time" step="100" size="small" type="number"
+        <el-input :value="value" v-bind="$attrs" step="100" size="small" type="number" @change="change" @input="input"
                   :placeholder="$t('api_test.request.assertions.response_in_time')"/>
       </el-col>
       <el-col class="assertion-btn">
@@ -14,32 +14,32 @@
 </template>
 
 <script>
+
   import {ResponseTime} from "../../model/ScenarioModel";
 
   export default {
     name: "MsApiAssertionResponseTime",
 
     props: {
-      edit: Boolean,
       duration: ResponseTime,
+      value: [Number, String],
+      edit: Boolean,
       callback: Function
     },
 
-    data() {
-      return {
-        time: this.duration.value
-      }
-    },
-
     methods: {
-      add: function () {
+      add() {
-        setTimeout(() => {
+        this.duration.value = this.value;
-          this.duration.value = this.time;
+        this.callback();
-          this.callback();
-        })
       },
-      remove: function () {
+      remove() {
         this.duration.value = undefined;
+      },
+      change(value) {
+        this.$emit('change', value);
+      },
+      input(value) {
+        this.$emit('input', value);
       }
     }
   }

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

@@ -12,8 +12,8 @@
       <el-col :span="20">
         <ms-api-assertion-text :list="assertions.regex" v-if="type === options.TEXT" :callback="after"/>
         <ms-api-assertion-regex :list="assertions.regex" v-if="type === options.REGEX" :callback="after"/>
-        <ms-api-assertion-response-time :duration="assertions.duration" v-if="type === options.RESPONSE_TIME"
+        <ms-api-assertion-response-time v-model="time" :duration="assertions.duration"
-                                        :callback="after"/>
+                                        v-if="type === options.RESPONSE_TIME" :callback="after"/>
       </el-col>
     </el-row>
 
@@ -25,7 +25,7 @@
   import MsApiAssertionText from "./ApiAssertionText";
   import MsApiAssertionRegex from "./ApiAssertionRegex";
   import MsApiAssertionResponseTime from "./ApiAssertionResponseTime";
-  import {ASSERTION_TYPE, Assertions} from "../../model/ScenarioModel";
+  import {ASSERTION_TYPE, Assertions, ResponseTime} from "../../model/ScenarioModel";
   import MsApiAssertionsEdit from "./ApiAssertionsEdit";
 
   export default {
@@ -40,6 +40,7 @@
     data() {
       return {
         options: ASSERTION_TYPE,
+        time: "",
         type: "",
       }
     },

frontend/src/business/components/api/test/components/assertion/ApiAssertionsEdit.vue

@@ -13,7 +13,7 @@
       <div>
         {{$t("api_test.request.assertions.response_time")}}
       </div>
-      <ms-api-assertion-response-time :duration="assertions.duration" :edit="true"/>
+      <ms-api-assertion-response-time v-model="assertions.duration.value" :duration="assertions.duration" :edit="true"/>
     </div>
   </div>
 

frontend/src/business/components/api/test/model/ScenarioModel.js

@@ -110,6 +110,15 @@ export class Test extends BaseConfig {
     return options;
   }
 
+  isValid() {
+    for (let i = 0; i < this.scenarioDefinition.length; i++) {
+      if (this.scenarioDefinition[i].isValid()) {
+        return this.projectId && this.name;
+      }
+    }
+    return false;
+  }
+
   toJMX() {
     return {
       name: this.name + '.jmx',
@@ -136,6 +145,19 @@ export class Scenario extends BaseConfig {
     options.requests = options.requests || [new Request()];
     return options;
   }
+
+  clone() {
+    return new Scenario(this);
+  }
+
+  isValid() {
+    for (let i = 0; i < this.requests.length; i++) {
+      if (this.requests[i].isValid()) {
+        return true;
+      }
+    }
+    return false;
+  }
 }
 
 export class Request extends BaseConfig {
@@ -394,7 +416,8 @@ class JMXGenerator {
   }
 
   addScenarios(testPlan, scenarios) {
-    scenarios.forEach(scenario => {
+    scenarios.forEach(s => {
+      let scenario = s.clone();
       scenario.name = this.replace(scenario.name);
 
       let threadGroup = new ThreadGroup(scenario.name || "");

frontend/src/business/components/performance/report/PerformanceReportView.vue

@@ -178,6 +178,7 @@
                 this.status = data.status;
                 this.reportName = data.name;
                 this.testName = data.testName;
+                this.testId = data.testId;
                 this.projectName = data.projectName;
 
                 this.$set(this.report, "id", reportId);

frontend/src/common/js/message.js

@@ -34,12 +34,12 @@ export default {
       })
     };
 
-    Vue.prototype.$error = function (message) {
+    Vue.prototype.$error = function (message, duration) {
       Message.error({
         message: message,
         type: "error",
         showClose: true,
-        duration: 10000
+        duration: duration || 10000
       })
     };
 

frontend/src/i18n/en-US.js

@@ -276,6 +276,7 @@ export default {
       name: "Scenario Name",
       base_url: "Base URL",
       base_url_description: "Base URL as URL prefix for all requests",
+      url_invalid: "Invalid URL",
       variables: "Variables",
       headers: "Headers",
       kv_description: "Variables are available for all requests",

frontend/src/i18n/zh-CN.js

@@ -287,6 +287,7 @@ export default {
       method: "请求方法",
       url: "请求URL",
       url_description: "例如: https://fit2cloud.com",
+      url_invalid: "URL无效",
       parameters: "请求参数",
       parameters_desc: "参数追加到URL，例如https://fit2cloud.com/entries?key1=Value1&Key2=Value2",
       headers: "请求头",

frontend/src/i18n/zh-TW.js

@@ -289,6 +289,7 @@ export default {
       method: "請求方法",
       url: "請求URL",
       url_description: "例如：https://fit2cloud.com",
+      url_invalid: "URL無效",
       parameters: "請求參數",
       parameters_desc: "參數追加到URL,例如https://fit2cloud.com/entries？key1=Value1&Key2=Value2",
       headers: "請求頭",