From 832b4d540d593b3e343a31e8063394fa57d91358 Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Tue, 20 Aug 2024 10:35:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E6=96=AD=E8=A8=80=E5=93=8D=E5=BA=94=E4=BD=93=E6=8F=90=E5=8F=96?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ms-assertion/comp/ResponseBodyTab.vue     | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/business/ms-assertion/comp/ResponseBodyTab.vue b/frontend/src/components/business/ms-assertion/comp/ResponseBodyTab.vue
index 23a957ec14..914d9fa253 100644
--- a/frontend/src/components/business/ms-assertion/comp/ResponseBodyTab.vue
+++ b/frontend/src/components/business/ms-assertion/comp/ResponseBodyTab.vue
@@ -354,7 +354,6 @@
 </template>
 
 <script setup lang="ts">
-  import { useVModel } from '@vueuse/core';
   import { TableColumnData, TableData } from '@arco-design/web-vue';
   import { cloneDeep } from 'lodash-es';
 
@@ -375,8 +374,8 @@
     insertNode,
   } from '@/utils/tree';
 
-  import { ExecuteConditionProcessor, JSONPathExtract, RegexExtract, XPathExtract } from '@/models/apiTest/common';
-  import { ResponseBodyAssertionType } from '@/enums/apiEnum';
+  import { JSONPathExtract, RegexExtract, XPathExtract } from '@/models/apiTest/common';
+  import { RequestExtractExpressionEnum, ResponseBodyAssertionType } from '@/enums/apiEnum';
 
   import {
     defaultAssertParamsItem,
@@ -394,7 +393,6 @@
 
   const props = withDefaults(
     defineProps<{
-      data: Param;
       response?: string;
       disabled?: boolean;
       showExtraction?: boolean;
@@ -405,13 +403,14 @@
   );
 
   const emit = defineEmits<{
-    (e: 'update:data', data: ExecuteConditionProcessor): void;
     (e: 'copy'): void;
     (e: 'delete', id: number): void;
     (e: 'change', param: Param): void;
   }>();
 
-  const condition = useVModel(props, 'data', emit);
+  const condition = defineModel<Param>('data', {
+    required: true,
+  });
 
   const rootId = 0; // 1970-01-01 00:00:00 UTC
 
@@ -480,6 +479,27 @@
     },
   ];
 
+  onBeforeMount(() => {
+    condition.value.jsonPathAssertion.assertions = condition.value.jsonPathAssertion.assertions?.map((e: Param) => {
+      return {
+        ...e,
+        extractType: RequestExtractExpressionEnum.JSON_PATH,
+      };
+    });
+    condition.value.xpathAssertion.assertions = condition.value.xpathAssertion.assertions?.map((e: Param) => {
+      return {
+        ...e,
+        extractType: RequestExtractExpressionEnum.X_PATH,
+      };
+    });
+    condition.value.regexAssertion.assertions = condition.value.regexAssertion.assertions?.map((e: Param) => {
+      return {
+        ...e,
+        extractType: RequestExtractExpressionEnum.REGEX,
+      };
+    });
+  });
+
   const handleChange = (data: any[], type: string, isInit?: boolean) => {
     switch (type) {
       case ResponseBodyAssertionType.JSON_PATH: