feat(接口定义): 断言规则处理

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

@@ -58,7 +58,7 @@
     <!--<ms-api-jsonpath-suggest-list @addJsonpathSuggest="addJsonpathSuggest" :request="request"-->
     <!--ref="jsonpathSuggestList"/>-->
 
-    <ms-api-assertions-edit :is-read-only="isReadOnly" :assertions="assertions" style="margin-bottom: 20px"/>
+    <ms-api-assertions-edit :is-read-only="isReadOnly" :assertions="assertions" :reloadData="reloadData" style="margin-bottom: 20px"/>
   </div>
 </template>
 
@@ -72,6 +72,7 @@
   import MsApiAssertionJsr223 from "./ApiAssertionJsr223";
   import MsApiJsonpathSuggestList from "./ApiJsonpathSuggestList";
   import MsApiAssertionXPath2 from "./ApiAssertionXPath2";
+  import {getUUID} from "@/common/js/utils";
 
   export default {
     name: "MsApiAssertions",
@@ -100,12 +101,14 @@
         time: "",
         type: "",
         loading: false,
+        reloadData: "",
       }
     },
 
     methods: {
       after() {
         this.type = "";
+        this.reloadData = getUUID().substring(0, 8);
         this.reload();
       },
       suggestJsonOpen() {
@@ -121,7 +124,7 @@
           this.loading = false
         })
       },
-      remove(){
+      remove() {
         this.$emit('remove', this.assertions);
       },
       addJsonpathSuggest(jsonPathList) {

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-loading="loading">
     <div class="assertion-item-editing regex" v-if="assertions.regex.length > 0">
       <div>
         {{ $t("api_test.request.assertions.regex") }}
@@ -26,7 +26,7 @@
       </div>
       <div class="regex-item" v-for="(xPath, index) in assertions.xpath2" :key="index">
         <ms-api-assertion-x-path2 :is-read-only="isReadOnly" :list="assertions.xpath2"
-                                 :x-path2="xPath" :edit="true" :index="index"/>
+                                  :x-path2="xPath" :edit="true" :index="index"/>
       </div>
     </div>
 
@@ -52,65 +52,84 @@
 </template>
 
 <script>
-import MsApiAssertionRegex from "./ApiAssertionRegex";
-import MsApiAssertionDuration from "./ApiAssertionDuration";
-import MsApiAssertionJsonPath from "./ApiAssertionJsonPath";
-import MsApiAssertionJsr223 from "@/business/components/api/test/components/assertion/ApiAssertionJsr223";
-import MsApiAssertionXPath2 from "./ApiAssertionXPath2";
+  import MsApiAssertionRegex from "./ApiAssertionRegex";
+  import MsApiAssertionDuration from "./ApiAssertionDuration";
+  import MsApiAssertionJsonPath from "./ApiAssertionJsonPath";
+  import MsApiAssertionJsr223 from "@/business/components/api/test/components/assertion/ApiAssertionJsr223";
+  import MsApiAssertionXPath2 from "./ApiAssertionXPath2";
 
-export default {
-  name: "MsApiAssertionsEdit",
+  export default {
+    name: "MsApiAssertionsEdit",
 
-  components: {
-    MsApiAssertionXPath2,
-    MsApiAssertionJsr223, MsApiAssertionJsonPath, MsApiAssertionDuration, MsApiAssertionRegex},
+    components: {
+      MsApiAssertionXPath2,
+      MsApiAssertionJsr223, MsApiAssertionJsonPath, MsApiAssertionDuration, MsApiAssertionRegex
+    },
 
-  props: {
-    assertions: {},
-    isReadOnly: {
-      type: Boolean,
-      default: false
-    }
-  },
-
-  computed: {
-    isShow() {
-      let rt = this.assertions.duration;
-      return rt.value !== undefined;
+    props: {
+      assertions: {},
+      reloadData: String,
+      isReadOnly: {
+        type: Boolean,
+        default: false
+      }
+    },
+    data() {
+      return {
+        loading: false,
+      }
+    },
+    computed: {
+      isShow() {
+        let rt = this.assertions.duration;
+        return rt.value !== undefined;
+      }
+    },
+    watch: {
+      reloadData() {
+        this.reload();
+      }
+    },
+    methods: {
+      reload() {
+        this.loading = true
+        this.$nextTick(() => {
+          this.loading = false
+        })
+      },
     }
   }
-}
 </script>
 
 <style scoped>
-.assertion-item-editing {
-  padding-left: 10px;
-  margin-top: 10px;
-}
+  .assertion-item-editing {
+    padding-left: 10px;
+    margin-top: 10px;
+  }
 
-.assertion-item-editing.regex {
-  border-left: 2px solid #7B0274;
-}
+  .assertion-item-editing.regex {
+    border-left: 2px solid #7B0274;
+  }
 
-.assertion-item-editing.json_path {
-  border-left: 2px solid #44B3D2;
-}
+  .assertion-item-editing.json_path {
+    border-left: 2px solid #44B3D2;
+  }
 
-.assertion-item-editing.response-time {
-  border-left: 2px solid #DD0240;
-}
+  .assertion-item-editing.response-time {
+    border-left: 2px solid #DD0240;
+  }
 
-.assertion-item-editing.jsr223 {
-  border-left: 2px solid #1FDD02;
-}
+  .assertion-item-editing.jsr223 {
+    border-left: 2px solid #1FDD02;
+  }
 
-.assertion-item-editing.x_path {
-  border-left: 2px solid #fca130;
-}
+  .assertion-item-editing.x_path {
+    border-left: 2px solid #fca130;
+  }
 
-.regex-item {
-  margin-top: 10px;
-}
+  .regex-item {
+    margin-top: 10px;
+  }
 
 
 </style>

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

@@ -25,7 +25,7 @@
         </el-row>
       </div>
 
-      <ms-api-extract-edit :is-read-only="isReadOnly" :extract="extract"/>
+      <ms-api-extract-edit :is-read-only="isReadOnly" :reloadData="reloadData" :extract="extract"/>
     </div>
   </div>
 </template>
@@ -34,6 +34,7 @@
   import {EXTRACT_TYPE} from "../../model/ApiTestModel";
   import MsApiExtractEdit from "./ApiExtractEdit";
   import MsApiExtractCommon from "./ApiExtractCommon";
+  import {getUUID} from "@/common/js/utils";
 
   export default {
     name: "MsApiExtract",
@@ -55,12 +56,14 @@
       return {
         options: EXTRACT_TYPE,
         type: "",
+        reloadData: "",
       }
     },
 
     methods: {
       after() {
         this.type = "";
+        this.reloadData = getUUID().substring(0, 8);
       },
       remove() {
         this.$emit('remove', this.extract);

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-loading="loading">
     <div class="extract-item-editing regex" v-if="extract.regex.length > 0">
       <div>
         {{$t("api_test.request.extract.regex")}}
@@ -47,12 +47,27 @@
       isReadOnly: {
         type: Boolean,
         default: false
+      },
+      reloadData: String,
+    },
+    watch: {
+      reloadData() {
+        this.reload();
       }
     },
 
+    methods: {
+      reload() {
+        this.loading = true
+        this.$nextTick(() => {
+          this.loading = false
+        })
+      },
+    },
     data() {
       return {
-        type: EXTRACT_TYPE
+        type: EXTRACT_TYPE,
+        loading: false
       }
     }
   }