From dffac08451214056fa032db1598c738a4cec2df4 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Thu, 11 Apr 2024 16:27:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8E=AF=E5=A2=83=E7=AE=A1=E7=90=86tab?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BAbug&=E6=8A=A5=E5=91=8Abug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/pure/ms-table/base-table.vue   |  2 +-
 frontend/src/enums/envEnum.ts                 | 12 +++
 .../report/component/step/stepTree.vue        |  4 +-
 .../report/component/stepProgress.vue         |  4 +-
 .../views/api-test/scenario/create/index.vue  | 31 +++++--
 .../environmental/components/EnvParamBox.vue  | 90 +++++++++++--------
 .../components/common/TabSettingDrawer.vue    |  2 +-
 .../components/envParams/preAndPost.vue       | 17 ++--
 .../environmental/locale/en-US.ts             |  3 +
 .../environmental/locale/zh-CN.ts             |  2 +
 .../taskCenter/component/apiCase.vue          |  3 +-
 .../taskCenter/component/scheduledTask.vue    |  1 +
 12 files changed, 115 insertions(+), 56 deletions(-)

diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue
index c7d97b967e..acac20e6d1 100644
--- a/frontend/src/components/pure/ms-table/base-table.vue
+++ b/frontend/src/components/pure/ms-table/base-table.vue
@@ -51,7 +51,7 @@
               v-model:model-value="record.tableChecked"
               @change="(val) => handleRadioChange(val as boolean, record)"
             />
-            <div v-if="attrs.showPagination" class="w-[16px]"></div>
+            <div v-if="attrs.showPagination && props.showSelectorAll" class="w-[16px]"></div>
           </template>
         </a-table-column>
         <a-table-column
diff --git a/frontend/src/enums/envEnum.ts b/frontend/src/enums/envEnum.ts
index 7c75b1ebd6..586a39f6ab 100644
--- a/frontend/src/enums/envEnum.ts
+++ b/frontend/src/enums/envEnum.ts
@@ -9,3 +9,15 @@ export enum EnvAuthTypeEnum {
   ENVIRONMENT_PARAM = 'ENVIRONMENT_PARAM', // 环境参数
   ENVIRONMENT_GROUP = 'ENVIRONMENT_GROUP', // 环境组
 }
+
+// 环境的tab
+export enum EnvTabTypeEnum {
+  ENVIRONMENT_PARAM = 'ENVIRONMENT_PARAM', // 环境变量
+  ENVIRONMENT_HTTP = 'ENVIRONMENT_HTTP', // Http
+  ENVIRONMENT_DATABASE = 'ENVIRONMENT_DATABASE', // 数据库
+  ENVIRONMENT_HOST = 'ENVIRONMENT_HOST', // 域名
+  ENVIRONMENT_PRE = 'ENVIRONMENT_PRE', // 前置
+  ENVIRONMENT_POST = 'ENVIRONMENT_POST', // 后置
+  ENVIRONMENT_ASSERT = 'ENVIRONMENT_ASSERT', // 断言
+  ENVIRONMENT_SETTING = 'SETTING', // 设置
+}
diff --git a/frontend/src/views/api-test/report/component/step/stepTree.vue b/frontend/src/views/api-test/report/component/step/stepTree.vue
index 46ea0db669..46bcd89f21 100644
--- a/frontend/src/views/api-test/report/component/step/stepTree.vue
+++ b/frontend/src/views/api-test/report/component/step/stepTree.vue
@@ -343,10 +343,10 @@
   }
 
   function showStatus(item: ScenarioItemType) {
-    if (showApiType.value.includes(item.stepType)) {
+    if (showApiType.value.includes(item.stepType) && item.status && item.status !== 'PENDING') {
       return true;
     }
-    return item.children && item.children.length > 0;
+    return item.children && item.children.length > 0 && item.status && item.status !== 'PENDING';
   }
 
   function handleStop(event: Event, step: ScenarioItemType) {
diff --git a/frontend/src/views/api-test/report/component/stepProgress.vue b/frontend/src/views/api-test/report/component/stepProgress.vue
index a914554eed..17e138bc50 100644
--- a/frontend/src/views/api-test/report/component/stepProgress.vue
+++ b/frontend/src/views/api-test/report/component/stepProgress.vue
@@ -89,11 +89,11 @@
         color: 'rgb(var(--success-6))',
       },
       {
-        percentage: (props.reportDetail.stepFakeErrorCount / getCountTotal.value) * 100,
+        percentage: (props.reportDetail.stepErrorCount / getCountTotal.value) * 100,
         color: 'rgb(var(--danger-6))',
       },
       {
-        percentage: (props.reportDetail.stepErrorCount / getCountTotal.value) * 100,
+        percentage: (props.reportDetail.stepFakeErrorCount / getCountTotal.value) * 100,
         color: 'rgb(var(--warning-6))',
       },
       {
diff --git a/frontend/src/views/api-test/scenario/create/index.vue b/frontend/src/views/api-test/scenario/create/index.vue
index c7d9eba1d3..053dbfd0ac 100644
--- a/frontend/src/views/api-test/scenario/create/index.vue
+++ b/frontend/src/views/api-test/scenario/create/index.vue
@@ -35,15 +35,24 @@
             v-model:pre-processor-config="scenario.scenarioConfig.preProcessorConfig"
           />
         </a-tab-pane>
-        <a-tab-pane
-          :key="ScenarioCreateComposition.ASSERTION"
-          :title="t('apiScenario.assertion')"
-          class="scenario-create-tab-pane"
-        >
+        <a-tab-pane :key="ScenarioCreateComposition.ASSERTION" class="scenario-create-tab-pane">
           <assertion
             v-if="activeKey === ScenarioCreateComposition.ASSERTION"
             v-model:assertion-config="scenario.scenarioConfig.assertionConfig"
           />
+          <template #title>
+            <div class="flex items-center">
+              <div> {{ t('apiScenario.assertion') }}</div>
+              <a-badge
+                v-if="scenario.scenarioConfig.assertionConfig.assertions.length"
+                class="-mb-[2px] ml-2"
+                :class="activeKey === ScenarioCreateComposition.ASSERTION ? 'active-badge' : ''"
+                :max-count="99"
+                :text="assertCount"
+              >
+              </a-badge>
+            </div>
+          </template>
         </a-tab-pane>
         <a-tab-pane
           :key="ScenarioCreateComposition.SETTING"
@@ -159,6 +168,12 @@
     });
   }
 
+  const assertCount = computed(() => {
+    return scenario.value.scenarioConfig.assertionConfig.assertions.length > 99
+      ? '99+'
+      : `${scenario.value.scenarioConfig.assertionConfig.assertions.length}` || '';
+  });
+
   defineExpose({
     validScenarioForm,
   });
@@ -182,4 +197,10 @@
       padding: 8px 16px;
     }
   }
+  :deep(.active-badge) {
+    .arco-badge-text,
+    .arco-badge-number {
+      background-color: rgb(var(--primary-5));
+    }
+  }
 </style>
diff --git a/frontend/src/views/project-management/environmental/components/EnvParamBox.vue b/frontend/src/views/project-management/environmental/components/EnvParamBox.vue
index 7015a3eb0b..e8f01fed88 100644
--- a/frontend/src/views/project-management/environmental/components/EnvParamBox.vue
+++ b/frontend/src/views/project-management/environmental/components/EnvParamBox.vue
@@ -32,30 +32,27 @@
           />
         </a-form-item>
       </a-form>
-
-      <a-tabs v-if="contentTabList.length" v-model:active-key="activeKey" class="no-content" @change="handleTabChange">
-        <a-tab-pane v-for="item of contentTabList" :key="item.value" :title="t(item.label)" />
-        <a-tab-pane key="displaySetting" :title="t('project.environmental.displaySetting')" />
-      </a-tabs>
+      <MsTab
+        v-model:active-key="activeKey"
+        :content-tab-list="contentTabList"
+        :get-text-func="getTabBadge"
+        class="no-content relative mb-[16px] border-b"
+        @change="handleTabChange"
+      />
     </div>
-    <a-divider
-      :margin="0"
-      :class="{
-        '!mb-[16px]': !(activeKey === 'pre' || activeKey === 'post'),
-      }"
-    />
     <div class="content h-full">
-      <EnvParamsTab v-if="activeKey === 'envParams'" />
-      <HttpTab v-else-if="activeKey === 'http'" />
-      <DataBaseTab v-else-if="activeKey === 'database'" />
-      <HostTab v-else-if="activeKey === 'host'" ref="hostTabRef" />
-      <!-- <PreTab v-else-if="activeKey === 'pre'" />
-      <PostTab v-else-if="activeKey === 'post'" /> -->
-      <div v-else-if="activeKey === 'pre' || activeKey === 'post'" class="h-full">
+      <EnvParamsTab v-if="activeKey === EnvTabTypeEnum.ENVIRONMENT_PARAM" />
+      <HttpTab v-else-if="activeKey === EnvTabTypeEnum.ENVIRONMENT_HTTP" />
+      <DataBaseTab v-else-if="activeKey === EnvTabTypeEnum.ENVIRONMENT_DATABASE" />
+      <HostTab v-else-if="activeKey === EnvTabTypeEnum.ENVIRONMENT_HOST" ref="hostTabRef" />
+      <div
+        v-else-if="activeKey === EnvTabTypeEnum.ENVIRONMENT_PRE || activeKey === EnvTabTypeEnum.ENVIRONMENT_POST"
+        class="h-full"
+      >
         <PreAndPostTab :active-type="activeKey" />
       </div>
 
-      <AssertTab v-else-if="activeKey === 'assert'" />
+      <AssertTab v-else-if="activeKey === EnvTabTypeEnum.ENVIRONMENT_ASSERT" />
       <template v-for="item in envPluginList" :key="item.pluginId">
         <PluginTab
           v-if="activeKey === item.pluginId"
@@ -81,6 +78,7 @@
   import { Message } from '@arco-design/web-vue';
   import { cloneDeep } from 'lodash-es';
 
+  import MsTab from '@/components/pure/ms-tab/index.vue';
   import TabSettingDrawer from './common/TabSettingDrawer.vue';
   import AssertTab from './envParams/AssertTab.vue';
   import DataBaseTab from './envParams/DatabaseTab.vue';
@@ -98,6 +96,7 @@
   import { hasAnyPermission } from '@/utils/permission';
 
   import { ContentTabItem, EnvPluginListItem } from '@/models/projectManagement/environmental';
+  import { EnvTabTypeEnum } from '@/enums/envEnum';
 
   import { defaultHeaderParamsItem } from '@/views/api-test/components/config';
   import { filterKeyValParams } from '@/views/api-test/components/utils';
@@ -109,7 +108,7 @@
     (e: 'resetEnv'): void;
   }>();
 
-  const activeKey = ref('envParams');
+  const activeKey = ref<string>(EnvTabTypeEnum.ENVIRONMENT_PARAM);
   const envForm = ref();
   const { t } = useI18n();
   const loading = ref(false);
@@ -136,46 +135,55 @@
   const contentTabList = ref<ContentTabItem[]>([]);
   const isDisabled = computed(() => !hasAnyPermission(['PROJECT_ENVIRONMENT:READ+UPDATE']));
 
+  const settingList = [
+    {
+      value: EnvTabTypeEnum.ENVIRONMENT_SETTING,
+      label: t('project.environmental.displaySetting'),
+      canHide: false,
+      isShow: true,
+    },
+  ];
+
   const sourceTabList = [
     {
-      value: 'envParams',
-      label: 'project.environmental.envParams',
+      value: EnvTabTypeEnum.ENVIRONMENT_PARAM,
+      label: t('project.environmental.envParams'),
       canHide: false,
       isShow: true,
     },
     {
-      value: 'http',
-      label: 'project.environmental.HTTP',
+      value: EnvTabTypeEnum.ENVIRONMENT_HTTP,
+      label: t('project.environmental.HTTP'),
       canHide: true,
       isShow: true,
     },
     {
-      value: 'database',
-      label: 'project.environmental.database',
+      value: EnvTabTypeEnum.ENVIRONMENT_DATABASE,
+      label: t('project.environmental.database'),
       canHide: true,
       isShow: true,
     },
     {
-      value: 'host',
-      label: 'project.environmental.HOST',
+      value: EnvTabTypeEnum.ENVIRONMENT_HOST,
+      label: t('project.environmental.HOST'),
       canHide: true,
       isShow: true,
     },
     {
-      value: 'pre',
-      label: 'project.environmental.pre',
+      value: EnvTabTypeEnum.ENVIRONMENT_PRE,
+      label: t('project.environmental.pre'),
       canHide: true,
       isShow: true,
     },
     {
-      value: 'post',
-      label: 'project.environmental.post',
+      value: EnvTabTypeEnum.ENVIRONMENT_POST,
+      label: t('project.environmental.post'),
       canHide: true,
       isShow: true,
     },
     {
-      value: 'assert',
-      label: 'project.environmental.assert',
+      value: EnvTabTypeEnum.ENVIRONMENT_ASSERT,
+      label: t('project.environmental.assert'),
       canHide: true,
       isShow: true,
     },
@@ -191,7 +199,7 @@
     }
   };
   await initPlugin();
-  await store.initContentTabList([...sourceTabList, ...pluginTabList.value]);
+  await store.initContentTabList([...sourceTabList, ...pluginTabList.value, ...settingList]);
   contentTabList.value = ((await store.getContentTabList()) || []).filter((item) => item.isShow);
   // 插件状态存储
 
@@ -274,10 +282,20 @@
   };
 
   const handleTabChange = (key: string | number) => {
-    if (key === 'displaySetting') {
+    if (key === 'SETTING') {
       tabSettingVisible.value = true;
     }
   };
+
+  function getTabBadge(tabKey: string) {
+    switch (tabKey) {
+      case EnvTabTypeEnum.ENVIRONMENT_ASSERT:
+        const assertLength = store.currentEnvDetailInfo.config.assertionConfig.assertions.length;
+        return `${assertLength > 99 ? '99+' : assertLength || ''}`;
+      default:
+        return '';
+    }
+  }
 </script>
 
 <style lang="less" scoped>
diff --git a/frontend/src/views/project-management/environmental/components/common/TabSettingDrawer.vue b/frontend/src/views/project-management/environmental/components/common/TabSettingDrawer.vue
index 81c516b774..70ef3ef236 100644
--- a/frontend/src/views/project-management/environmental/components/common/TabSettingDrawer.vue
+++ b/frontend/src/views/project-management/environmental/components/common/TabSettingDrawer.vue
@@ -73,7 +73,7 @@
 
   const loadColumn = async () => {
     const res = (await store.getContentTabList()) || [];
-    nonCloseColumn.value = res.filter((item) => !item.canHide);
+    nonCloseColumn.value = res.filter((item) => !item.canHide && item.value !== 'SETTING');
     couldCloseColumn.value = res.filter((item) => item.canHide);
   };
 
diff --git a/frontend/src/views/project-management/environmental/components/envParams/preAndPost.vue b/frontend/src/views/project-management/environmental/components/envParams/preAndPost.vue
index cf2ed75780..e4aeca0a58 100644
--- a/frontend/src/views/project-management/environmental/components/envParams/preAndPost.vue
+++ b/frontend/src/views/project-management/environmental/components/envParams/preAndPost.vue
@@ -13,13 +13,13 @@
         }"
       >
         <PreTab
-          v-if="props.activeType === 'pre'"
+          v-if="props.activeType === EnvTabTypeEnum.ENVIRONMENT_PRE"
           :show-associated-scene="showAssociatedScene"
           :show-pre-post-request="!showAssociatedScene"
           :active-tab="activeTab"
         />
         <PostTab
-          v-if="props.activeType === 'post'"
+          v-if="props.activeType === EnvTabTypeEnum.ENVIRONMENT_POST"
           :show-associated-scene="showAssociatedScene"
           :show-pre-post-request="!showAssociatedScene"
           :active-tab="activeTab"
@@ -29,14 +29,14 @@
     <div v-if="activeTab === 'requestProcessorConfig'" class="mt-4 h-full">
       <a-alert class="mb-4" closable> {{ t('project.environmental.requestAlertDesc') }} </a-alert>
       <PreTab
-        v-if="props.activeType === 'pre'"
+        v-if="props.activeType === EnvTabTypeEnum.ENVIRONMENT_PRE"
         :show-associated-scene="showAssociatedScene"
         :show-pre-post-request="!showAssociatedScene"
         :request-radio-text-props="requestPropsText"
         :active-tab="activeTab"
       />
       <PostTab
-        v-if="props.activeType === 'post'"
+        v-if="props.activeType === EnvTabTypeEnum.ENVIRONMENT_POST"
         :show-associated-scene="showAssociatedScene"
         :show-pre-post-request="!showAssociatedScene"
         :request-radio-text-props="requestPropsText"
@@ -52,10 +52,11 @@
   import PostTab from './PostTab.vue';
   import PreTab from './PreTab.vue';
 
-  import { getEnvironment } from '@/api/modules/api-test/common';
   import { useI18n } from '@/hooks/useI18n';
   import useProjectEnvStore from '@/store/modules/setting/useProjectEnvStore';
 
+  import { EnvTabTypeEnum } from '@/enums/envEnum';
+
   const store = useProjectEnvStore();
 
   const { t } = useI18n();
@@ -67,11 +68,11 @@
   const tabList = ref<{ key: string; label: string }[]>([
     {
       key: 'scenarioProcessorConfig',
-      label: '场景',
+      label: t('project.environmental.scenario'),
     },
     {
       key: 'requestProcessorConfig',
-      label: '请求',
+      label: t('project.environmental.request'),
     },
   ]);
   const activeTab = ref<string>('scenarioProcessorConfig');
@@ -81,7 +82,7 @@
 
   const requestPropsText = computed(() => {
     if (activeTab.value === 'requestProcessorConfig') {
-      return props.activeType === 'pre'
+      return props.activeType === EnvTabTypeEnum.ENVIRONMENT_PRE
         ? {
             pre: t('project.environmental.preScriptBefore'),
             post: t('project.environmental.preScriptAfter'),
diff --git a/frontend/src/views/project-management/environmental/locale/en-US.ts b/frontend/src/views/project-management/environmental/locale/en-US.ts
index d2a5c74261..c03db76c7e 100644
--- a/frontend/src/views/project-management/environmental/locale/en-US.ts
+++ b/frontend/src/views/project-management/environmental/locale/en-US.ts
@@ -23,6 +23,8 @@ export default {
   'project.environmental.envDescPlaceholder': 'Please enter the description',
   'project.environmental.envDesc': 'description',
   'project.environmental.envNameRequired': 'Environment name cannot be empty',
+  'project.environmental.scenario': 'scenario',
+  'project.environmental.request': 'request',
   'project.environmental.database': 'Database',
   'project.environmental.HTTP': 'HTTP',
   'project.environmental.HOST': 'HOST',
@@ -129,4 +131,5 @@ export default {
   'project.environmental.http.noneDataExist': 'There is already a domain name with an enabled range of none!',
   'project.environmental.http.selectModule': 'Please select module',
   'script.delete.confirm': 'After deletion, it cannot be restored. Please exercise caution.',
+  'script.delete.scenario': 'scenario',
 };
diff --git a/frontend/src/views/project-management/environmental/locale/zh-CN.ts b/frontend/src/views/project-management/environmental/locale/zh-CN.ts
index 4834f92c15..a8c5f1002a 100644
--- a/frontend/src/views/project-management/environmental/locale/zh-CN.ts
+++ b/frontend/src/views/project-management/environmental/locale/zh-CN.ts
@@ -30,6 +30,8 @@ export default {
   'project.environmental.envDescPlaceholder': '请输入描述',
   'project.environmental.envDesc': '描述',
   'project.environmental.envNameRequired': '环境名称不能为空',
+  'project.environmental.scenario': '场景',
+  'project.environmental.request': '请求',
   'project.environmental.HTTP': 'HTTP',
   'project.environmental.HOST': 'HOST',
   'project.environmental.TCP': 'TCP',
diff --git a/frontend/src/views/project-management/taskCenter/component/apiCase.vue b/frontend/src/views/project-management/taskCenter/component/apiCase.vue
index 0180c55448..2e9d592e88 100644
--- a/frontend/src/views/project-management/taskCenter/component/apiCase.vue
+++ b/frontend/src/views/project-management/taskCenter/component/apiCase.vue
@@ -10,6 +10,7 @@
           class="mx-[8px] w-[240px]"
           @search="searchList"
           @press-enter="searchList"
+          @clear="searchList"
         ></a-input-search>
       </div>
     </div>
@@ -179,7 +180,7 @@
 
   const { t } = useI18n();
   const props = defineProps<{
-    group: string;
+    group: 'system' | 'organization' | 'project';
     moduleType: keyof typeof TaskCenterEnum;
     name: string;
   }>();
diff --git a/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue b/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue
index 4e4e061fba..4b3a6813ad 100644
--- a/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue
+++ b/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue
@@ -14,6 +14,7 @@
           class="mx-[8px] w-[240px]"
           @search="searchList"
           @press-enter="searchList"
+          @clear="searchList"
         ></a-input-search>
       </div>
     </div>