From f01bbf0f3ffebe3edaca51cd639480d3808ef80c Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Fri, 29 May 2020 18:13:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=93=8D=E5=BA=94=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=96=AD=E8=A8=80=E6=9B=B4=E6=96=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assertion/ApiAssertionResponseTime.vue    | 28 +++++++++----------
 .../components/assertion/ApiAssertions.vue    |  7 +++--
 .../assertion/ApiAssertionsEdit.vue           |  2 +-
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/assertion/ApiAssertionResponseTime.vue b/frontend/src/business/components/api/test/components/assertion/ApiAssertionResponseTime.vue
index a9b87ef16..6d202e628 100644
--- a/frontend/src/business/components/api/test/components/assertion/ApiAssertionResponseTime.vue
+++ b/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 () {
-        setTimeout(() => {
-          this.duration.value = this.time;
-          this.callback();
-        })
+      add() {
+        this.duration.value = this.value;
+        this.callback();
       },
-      remove: function () {
+      remove() {
         this.duration.value = undefined;
+      },
+      change(value) {
+        this.$emit('change', value);
+      },
+      input(value) {
+        this.$emit('input', value);
       }
     }
   }
diff --git a/frontend/src/business/components/api/test/components/assertion/ApiAssertions.vue b/frontend/src/business/components/api/test/components/assertion/ApiAssertions.vue
index c5b787a91..a9c61a3c2 100644
--- a/frontend/src/business/components/api/test/components/assertion/ApiAssertions.vue
+++ b/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"
-                                        :callback="after"/>
+        <ms-api-assertion-response-time v-model="time" :duration="assertions.duration"
+                                        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: "",
       }
     },
diff --git a/frontend/src/business/components/api/test/components/assertion/ApiAssertionsEdit.vue b/frontend/src/business/components/api/test/components/assertion/ApiAssertionsEdit.vue
index 6c05f40ea..e8f5d6bc0 100644
--- a/frontend/src/business/components/api/test/components/assertion/ApiAssertionsEdit.vue
+++ b/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>
 
-- 
GitLab