From f9327486095f55d9055ec569b52635e3cdae5dcd Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 24 Mar 2023 11:17:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Djsonpath=E6=96=AD=E8=A8=80=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E4=B8=8D=E5=87=86=E7=A1=AE=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1024854 --user=王孝刚 [接口测试] github#23072断言,Not
Contains类型的，在报告里体现的描述不准确。 https://www.tapd.cn/55049933/s/1355501
---
 .../assertion/ApiAssertionJsonPath.vue        | 33 ++++++++++---------
 .../assertion/ApiAssertionJsonPath.vue        |  5 +--
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/api-test/frontend/src/business/definition/components/assertion/ApiAssertionJsonPath.vue b/api-test/frontend/src/business/definition/components/assertion/ApiAssertionJsonPath.vue
index 4fd194c713..7d463bc52a 100644
--- a/api-test/frontend/src/business/definition/components/assertion/ApiAssertionJsonPath.vue
+++ b/api-test/frontend/src/business/definition/components/assertion/ApiAssertionJsonPath.vue
@@ -9,7 +9,7 @@
             maxlength="500"
             size="small"
             show-word-limit
-            :placeholder="$t('api_test.request.extract.json_path_expression')" />
+            :placeholder="$t('api_test.request.extract.json_path_expression')"/>
         </el-tooltip>
       </el-col>
       <el-col>
@@ -19,14 +19,14 @@
           class="ms-col-type"
           size="small"
           style="width: 40%; margin-right: 10px"
-          @change="reload">
-          <el-option :label="$t('api_test.request.assertions.contains')" value="CONTAINS" />
-          <el-option :label="$t('api_test.request.assertions.not_contains')" value="NOT_CONTAINS" />
-          <el-option :label="$t('api_test.request.assertions.equals')" value="EQUALS" />
-          <el-option :label="$t('commons.adv_search.operators.not_equals')" value="NOT_EQUALS" />
-          <el-option :label="$t('commons.adv_search.operators.gt')" value="GT" />
-          <el-option :label="$t('commons.adv_search.operators.lt')" value="LT" />
-          <el-option :label="$t('api_test.request.assertions.regular_match')" value="REGEX" />
+          @change="setJSONPathDescription">
+          <el-option :label="$t('api_test.request.assertions.contains')" value="CONTAINS"/>
+          <el-option :label="$t('api_test.request.assertions.not_contains')" value="NOT_CONTAINS"/>
+          <el-option :label="$t('api_test.request.assertions.equals')" value="EQUALS"/>
+          <el-option :label="$t('commons.adv_search.operators.not_equals')" value="NOT_EQUALS"/>
+          <el-option :label="$t('commons.adv_search.operators.gt')" value="GT"/>
+          <el-option :label="$t('commons.adv_search.operators.lt')" value="LT"/>
+          <el-option :label="$t('api_test.request.assertions.regular_match')" value="REGEX"/>
         </el-select>
         <el-input
           :disabled="isReadOnly"
@@ -34,12 +34,12 @@
           size="small"
           show-word-limit
           :placeholder="$t('api_test.request.assertions.expect')"
-          style="width: 50%" />
+          style="width: 50%"/>
         <el-tooltip placement="top" v-if="jsonPath.option === 'REGEX'">
           <div slot="content">
             {{ $t('api_test.request.assertions.regex_info') }}
           </div>
-          <i class="el-icon-question" style="cursor: pointer" />
+          <i class="el-icon-question" style="cursor: pointer"/>
         </el-tooltip>
       </el-col>
       <el-col class="assertion-btn">
@@ -49,7 +49,7 @@
             class="enable-switch"
             size="mini"
             :disabled="isReadOnly"
-            style="width: 30px; margin-right: 10px" />
+            style="width: 30px; margin-right: 10px"/>
         </el-tooltip>
         <el-button
           :disabled="isReadOnly"
@@ -57,7 +57,7 @@
           icon="el-icon-copy-document"
           circle
           @click="copyRow"
-          v-if="edit" />
+          v-if="edit"/>
         <el-button
           :disabled="isReadOnly"
           type="danger"
@@ -65,7 +65,7 @@
           icon="el-icon-delete"
           circle
           @click="remove"
-          v-if="edit" />
+          v-if="edit"/>
         <el-button :disabled="isReadOnly" type="primary" size="mini" @click="add" v-else>
           {{ $t('api_test.request.assertions.add') }}
         </el-button>
@@ -75,7 +75,7 @@
 </template>
 
 <script>
-import { JSONPath } from '../../model/ApiTestModel';
+import {JSONPath} from '../../model/ApiTestModel';
 
 export default {
   name: 'MsApiAssertionJsonPath',
@@ -145,7 +145,8 @@ export default {
     setJSONPathDescription() {
       this.showTip = !this.jsonPath || !this.jsonPath.expression || this.jsonPath.expression.length < 50;
       this.jsonPath.description =
-        this.jsonPath.expression + ' expect: ' + (this.jsonPath.expect ? this.jsonPath.expect : '');
+        this.jsonPath.expression + " " + this.jsonPath.option + ": " + (this.jsonPath.expect ? this.jsonPath.expect : '');
+      this.reload();
     },
     copyRow() {
       let jsonPath = new JSONPath(this.jsonPath);
diff --git a/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionJsonPath.vue b/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionJsonPath.vue
index 91a4400b91..95f69ca857 100644
--- a/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionJsonPath.vue
+++ b/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionJsonPath.vue
@@ -9,7 +9,7 @@
       </el-col>
       <el-col>
         <el-select :disabled="isReadOnly" v-model="jsonPath.option" class="ms-col-type" size="small"
-                   style="width:40%;margin-right: 10px" @change="reload">
+                   style="width:40%;margin-right: 10px" @change="setJSONPathDescription">
           <el-option :label="$t('api_test.request.assertions.contains')" value="CONTAINS"/>
           <el-option :label="$t('api_test.request.assertions.not_contains')" value="NOT_CONTAINS"/>
           <el-option :label="$t('api_test.request.assertions.equals')" value="EQUALS"/>
@@ -110,7 +110,8 @@ export default {
     },
     setJSONPathDescription() {
       this.showTip = !this.jsonPath || !this.jsonPath.expression || this.jsonPath.expression.length < 50;
-      this.jsonPath.description = this.jsonPath.expression + " expect: " + (this.jsonPath.expect ? this.jsonPath.expect : '');
+      this.jsonPath.description = this.jsonPath.expression + " " + this.jsonPath.option + ": " + (this.jsonPath.expect ? this.jsonPath.expect : '');
+      this.reload();
     }
   }
 }