From 056a972a718f189d844753cb7a21413153cd026a Mon Sep 17 00:00:00 2001
From: WangXu10 <xu.wang@fit2cloud.com>
Date: Sat, 16 Mar 2024 19:22:51 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E5=89=8D=E5=90=8E=E7=BD=AE&=E6=96=AD?=
 =?UTF-8?q?=E8=A8=80&=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scenario/components/assertion.vue         | 12 +++++--
 .../api-test/scenario/components/params.vue   |  4 +--
 .../api-test/scenario/components/prePost.vue  | 34 +++++++++++++++++--
 .../api-test/scenario/components/setting.vue  | 10 ++++--
 4 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/frontend/src/views/api-test/scenario/components/assertion.vue b/frontend/src/views/api-test/scenario/components/assertion.vue
index 1a46d3c6dd..69ddbf5f9d 100644
--- a/frontend/src/views/api-test/scenario/components/assertion.vue
+++ b/frontend/src/views/api-test/scenario/components/assertion.vue
@@ -1,7 +1,15 @@
 <template>
-  <div> assertion </div>
+  <assertion v-model:params="assertions" :is-definition="false" :assertion-config="assertionConfig" />
 </template>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+  import assertion from '@/components/business/ms-assertion/index.vue';
+
+  const assertions = ref([]);
+  const assertionConfig = ref({
+    enableGlobal: false,
+    assertions: [],
+  });
+</script>
 
 <style lang="less" scoped></style>
diff --git a/frontend/src/views/api-test/scenario/components/params.vue b/frontend/src/views/api-test/scenario/components/params.vue
index fba35ce946..5ec3cdcd7c 100644
--- a/frontend/src/views/api-test/scenario/components/params.vue
+++ b/frontend/src/views/api-test/scenario/components/params.vue
@@ -4,11 +4,11 @@
       {{ t('apiScenario.params.priority') }}
     </a-alert>
   </div>
-  <div class="mb-[16px]">
+  <!--  <div class="mb-[16px]">
     <a-radio-group v-model="activeRadio" type="button" size="medium">
       <a-radio value="convention">{{ t('apiScenario.params.convention') }}</a-radio>
     </a-radio-group>
-  </div>
+  </div>-->
   <div class="mb-[16px] flex items-center justify-between">
     <a-input-search
       v-model="searchValue"
diff --git a/frontend/src/views/api-test/scenario/components/prePost.vue b/frontend/src/views/api-test/scenario/components/prePost.vue
index db64ae0beb..459fd74b8d 100644
--- a/frontend/src/views/api-test/scenario/components/prePost.vue
+++ b/frontend/src/views/api-test/scenario/components/prePost.vue
@@ -1,7 +1,35 @@
 <template>
-  <div> prePost </div>
+  <div class="condition">
+    <div>
+      <precondition v-model:config="preProcessorConfig" :is-definition="false" />
+    </div>
+    <a-divider class="my-[8px]" type="dashed" />
+    <div>
+      <postcondition v-model:config="postProcessorConfig" :is-definition="false" :layout="activeLayout" />
+    </div>
+  </div>
 </template>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+  import postcondition from '@/views/api-test/components/requestComposition/postcondition.vue';
+  import precondition from '@/views/api-test/components/requestComposition/precondition.vue';
 
-<style lang="less" scoped></style>
+  const activeLayout = ref<'horizontal' | 'vertical'>('vertical');
+  const preProcessorConfig = ref({
+    enableGlobal: false,
+    processors: [],
+  });
+  const postProcessorConfig = ref({
+    enableGlobal: false,
+    processors: [],
+  });
+</script>
+
+<style lang="less" scoped>
+  .condition {
+    flex-shrink: 0;
+    width: 100%;
+    height: 700px;
+    overflow: overlay;
+  }
+</style>
diff --git a/frontend/src/views/api-test/scenario/components/setting.vue b/frontend/src/views/api-test/scenario/components/setting.vue
index 8c32680165..6e768b5674 100644
--- a/frontend/src/views/api-test/scenario/components/setting.vue
+++ b/frontend/src/views/api-test/scenario/components/setting.vue
@@ -1,7 +1,13 @@
 <template>
-  <div> setting </div>
+  <setting v-model:params="otherConfig" />
 </template>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+  import setting from '@/views/api-test/components/requestComposition/setting.vue';
+
+  import { ExecuteOtherConfig } from '@/models/apiTest/common';
+
+  const otherConfig = ref({} as ExecuteOtherConfig);
+</script>
 
 <style lang="less" scoped></style>