From 941ebbb7b9d01e6cba5442a92545d805f6845bd3 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 13 Mar 2024 18:43: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?=E6=98=AF=E5=90=A6=E5=90=AF=E7=94=A8=E5=85=A8=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/ms-assertion/index.vue           | 53 ++++++++++++++-----
 .../business/ms-assertion/locale/en-US.ts     |  3 ++
 .../business/ms-assertion/locale/zh-CN.ts     |  2 +
 .../components/requestComposition/index.vue   |  2 +
 4 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/business/ms-assertion/index.vue b/frontend/src/components/business/ms-assertion/index.vue
index f01382ca8a..46f04e1113 100644
--- a/frontend/src/components/business/ms-assertion/index.vue
+++ b/frontend/src/components/business/ms-assertion/index.vue
@@ -1,17 +1,30 @@
 <template>
   <div class="ms-assertion">
-    <a-dropdown trigger="hover" @select="handleSelect">
-      <a-button class="w-[84px]" type="outline">
-        <div class="flex flex-row items-center gap-[8px]">
-          <icon-plus />
-          <span>{{ t('ms.assertion.button') }}</span>
-        </div>
-      </a-button>
-      <template #content>
-        <a-doption v-for="item in assertOptionSource" :key="item.value" :value="item.value">{{ item.label }}</a-doption>
-      </template>
-    </a-dropdown>
-
+    <div class="mb-[8px] flex items-center justify-between">
+      <a-dropdown trigger="hover" @select="handleSelect">
+        <a-button class="w-[84px]" type="outline">
+          <div class="flex flex-row items-center gap-[8px]">
+            <icon-plus />
+            <span>{{ t('ms.assertion.button') }}</span>
+          </div>
+        </a-button>
+        <template #content>
+          <a-doption v-for="item in assertOptionSource" :key="item.value" :value="item.value">{{
+            item.label
+          }}</a-doption>
+        </template>
+      </a-dropdown>
+      <div v-if="props.isDefinition && innerConfig" class="flex items-center">
+        <a-switch v-model:model-value="innerConfig.enableGlobal" size="small" type="line" />
+        <div class="ml-[8px] text-[var(--color-text-1)]">{{ t('ms.assertion.openGlobal') }}</div>
+        <a-tooltip :content="t('ms.assertion.openGlobalTip')" position="left">
+          <icon-question-circle
+            class="ml-[4px] text-[var(--color-text-brand)] hover:text-[rgb(var(--primary-5))]"
+            size="16"
+          />
+        </a-tooltip>
+      </div>
+    </div>
     <div v-if="showBody" class="ms-assertion-body w-full">
       <a-scrollbar
         :style="{
@@ -114,6 +127,7 @@
 
 <script lang="ts" setup>
   import { defineModel } from 'vue';
+  import { useVModel } from '@vueuse/core';
   import { cloneDeep } from 'lodash-es';
   import { VueDraggable } from 'vue-draggable-plus';
 
@@ -131,7 +145,7 @@
 
   import { useI18n } from '@/hooks/useI18n';
 
-  import { ExecuteConditionProcessor } from '@/models/apiTest/common';
+  import { ExecuteAssertionConfig , ExecuteConditionProcessor} from '@/models/apiTest/common';
   import { RequestConditionScriptLanguage, ResponseAssertionType, ResponseBodyAssertionType } from '@/enums/apiEnum';
 
   import { ExecuteAssertion, MsAssertionItem } from './type';
@@ -145,6 +159,19 @@
   const focusKey = ref<string>('');
   // 所有的断言列表参数
   const assertions = defineModel<any[]>('params', { default: [] });
+
+  const props = defineProps<{
+    isDefinition?: boolean; // 是否是定义页面
+    assertionConfig?: ExecuteAssertionConfig; // 是否开启全局
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'update:assertionConfig', params: ExecuteAssertionConfig): void;
+    (e: 'change'): void;
+  }>();
+
+  const innerConfig = useVModel(props, 'assertionConfig', emit);
+
   const activeIds = ref('');
   // Item点击的key
   const activeKey = ref<string>('');
diff --git a/frontend/src/components/business/ms-assertion/locale/en-US.ts b/frontend/src/components/business/ms-assertion/locale/en-US.ts
index f1326a7972..b2d09f8b23 100644
--- a/frontend/src/components/business/ms-assertion/locale/en-US.ts
+++ b/frontend/src/components/business/ms-assertion/locale/en-US.ts
@@ -5,4 +5,7 @@ export default {
   'ms.assertion.document': 'Document',
   'ms.assertion.regular': 'Regular',
   'ms.assertion.script': 'Script',
+  'ms.assertion.openGlobal': 'Implement the Global Declaration',
+  'ms.assertion.openGlobalTip':
+    'It is enabled by default. If it is disabled, the global assertion will not be executed when running this interface.',
 };
diff --git a/frontend/src/components/business/ms-assertion/locale/zh-CN.ts b/frontend/src/components/business/ms-assertion/locale/zh-CN.ts
index 8adb65c270..023c19ad0a 100644
--- a/frontend/src/components/business/ms-assertion/locale/zh-CN.ts
+++ b/frontend/src/components/business/ms-assertion/locale/zh-CN.ts
@@ -22,4 +22,6 @@ export default {
   'ms.assertion.typeChecking': '类型校验',
   'ms.assertion.addChild': '添加子字段',
   'ms.assertion.validateChild': '添加子校验',
+  'ms.assertion.openGlobal': '启用全局断言',
+  'ms.assertion.openGlobalTip': '默认开启，关闭则运行该接口时不执行全局断言',
 };
diff --git a/frontend/src/views/api-test/components/requestComposition/index.vue b/frontend/src/views/api-test/components/requestComposition/index.vue
index 8e224303be..5aa30ab6a0 100644
--- a/frontend/src/views/api-test/components/requestComposition/index.vue
+++ b/frontend/src/views/api-test/components/requestComposition/index.vue
@@ -245,6 +245,8 @@
                     <assertion
                       v-else-if="requestVModel.activeTab === RequestComposition.ASSERTION"
                       v-model:params="requestVModel.children[0].assertionConfig.assertions"
+                      :is-definition="props.isDefinition"
+                      :assertion-config="requestVModel.children[0].assertionConfig"
                     />
                     <auth
                       v-else-if="requestVModel.activeTab === RequestComposition.AUTH"