From 270a52a422ce64d99a74f964e05b2e9b9c7fc6f6 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 13 Mar 2024 16:45:21 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E6=96=AD=E8=A8=80=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api-test/components/requestComposition/index.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/api-test/components/requestComposition/index.vue b/frontend/src/views/api-test/components/requestComposition/index.vue
index 7912b08717..d19bd89499 100644
--- a/frontend/src/views/api-test/components/requestComposition/index.vue
+++ b/frontend/src/views/api-test/components/requestComposition/index.vue
@@ -242,6 +242,10 @@
                       :is-definition="props.isDefinition"
                       @change="handleActiveDebugChange"
                     />
+                    <assertion
+                      v-else-if="requestVModel.activeTab === RequestComposition.ASSERTION"
+                      v-model:params="requestVModel.children[0].assertionConfig.assertions"
+                    />
                     <auth
                       v-else-if="requestVModel.activeTab === RequestComposition.AUTH"
                       v-model:params="requestVModel.authConfig"
@@ -488,6 +492,7 @@
   import MsSplitBox from '@/components/pure/ms-split-box/index.vue';
   import MsTab from '@/components/pure/ms-tab/index.vue';
   import MsTagsInput from '@/components/pure/ms-tags-input/index.vue';
+  import assertion from '@/components/business/ms-assertion/index.vue';
   import auth from './auth.vue';
   import postcondition from './postcondition.vue';
   import precondition from './precondition.vue';
@@ -710,6 +715,8 @@
         return `${requestVModel.value.children[0].preProcessorConfig.processors.length || ''}`;
       case RequestComposition.POST_CONDITION:
         return `${requestVModel.value.children[0].postProcessorConfig.processors.length || ''}`;
+      case RequestComposition.ASSERTION:
+        return `${requestVModel.value.children[0].assertionConfig.assertions.length || ''}`;
       case RequestComposition.AUTH:
         return requestVModel.value.authConfig.authType !== RequestAuthType.NONE ? '1' : '';
       default:
@@ -1147,10 +1154,7 @@
         children: [
           {
             polymorphicName: 'MsCommonElement', // 协议多态名称，写死MsCommonElement
-            assertionConfig: {
-              enableGlobal: false,
-              assertions: [],
-            },
+            assertionConfig: requestVModel.value.children[0].assertionConfig,
             postProcessorConfig: filterConditionsSqlValidParams(requestVModel.value.children[0].postProcessorConfig),
             preProcessorConfig: filterConditionsSqlValidParams(requestVModel.value.children[0].preProcessorConfig),
           },