feat(用例管理): 用例列表新增执行结果&列表更新

2024-12-01 19:49:10 +08:00 · 2024-04-17 13:44:00 +08:00 · 2024-04-17 13:44:00 +08:00 · 39b21dccb6
commit 39b21dccb6
parent fe9d313c2a
5 changed files with 147 additions and 27 deletions
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/dto/FunctionalCaseDetailDTO.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/dto/FunctionalCaseDetailDTO.java
@ -118,4 +118,7 @@ public class FunctionalCaseDetailDTO implements Serializable {

    @Schema(description = "变更历史数量")
    private Integer historyCount;
+
+    @Schema(description = "执行结果")
+    private String lastExecuteResult;
 }
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseAddRequest.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseAddRequest.java
@ -78,5 +78,6 @@ public class FunctionalCaseAddRequest implements Serializable {
    @Schema(description = "附件信息")
    private List<FunctionalCaseAttachmentDTO> attachments;

-
+    @Schema(description = "执行结果")
+    private String lastExecuteResult;
 }
--- a/frontend/src/components/business/ms-case-associate/executeResult.vue
+++ b/frontend/src/components/business/ms-case-associate/executeResult.vue
@ -0,0 +1,68 @@
+<template>
+  <div v-if="props.executeResult" class="flex items-center">
+    <MsIcon
+      :type="lastExecuteResultMap[props.executeResult]?.icon || ''"
+      class="mr-1"
+      :class="[lastExecuteResultMap[props.executeResult].color]"
+    ></MsIcon>
+    <span>{{ status?.text || '' }}</span>
+  </div>
+</template>
+
+<script setup lang="ts">
+  import MsIcon from '@/components/pure/ms-icon-font/index.vue';
+
+  import { useI18n } from '@/hooks/useI18n';
+
+  import { LastExecuteResults, StatusType } from '@/enums/caseEnum';
+
+  const { t } = useI18n();
+
+  const props = defineProps<{
+    executeResult?: LastExecuteResults;
+  }>();
+
+  const lastExecuteResultMap = {
+    UN_EXECUTED: {
+      label: 'UN_EXECUTED',
+      icon: StatusType.UN_EXECUTED,
+      statusText: 'caseManagement.featureCase.nonExecution',
+      color: 'text-[rgb(var(--warning-6))]',
+    },
+    PASSED: {
+      label: 'PASSED',
+      icon: StatusType.PASSED,
+      statusText: 'caseManagement.featureCase.passed',
+      color: '',
+    },
+    SKIPPED: {
+      label: 'SKIPPED',
+      icon: StatusType.SKIPPED,
+      statusText: 'caseManagement.featureCase.skip',
+      color: 'text-[rgb(var(--link-6))]',
+    },
+    BLOCKED: {
+      label: 'BLOCKED',
+      icon: StatusType.BLOCKED,
+      statusText: 'caseManagement.featureCase.chokeUp',
+      color: 'text-[rgb(var(--warning-6))]',
+    },
+    FAILED: {
+      label: 'FAILED',
+      icon: StatusType.FAILED,
+      statusText: 'caseManagement.featureCase.failure',
+      color: '',
+    },
+  };
+
+  const status = computed(() => {
+    if (props.executeResult) {
+      const config = lastExecuteResultMap[props.executeResult];
+      return {
+        text: t(config?.statusText || ''),
+      };
+    }
+  });
+</script>
+
+<style lang="less" scoped></style>
--- a/frontend/src/enums/caseEnum.ts
+++ b/frontend/src/enums/caseEnum.ts
@ -12,4 +12,12 @@ export enum StatusType {
  SKIPPED = 'icon-icon_skip_planarity', // 跳过
 }

+export enum LastExecuteResults {
+  UN_EXECUTED = 'UN_EXECUTED',
+  PASSED = 'PASSED',
+  SKIPPED = 'SKIPPED',
+  BLOCKED = 'BLOCKED',
+  FAILED = 'FAILED',
+}
+
 export default {};
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
@ -92,19 +92,42 @@
      </TableFilter>
    </template>
    <template #executeResultFilter="{ columnConfig }">
-      <TableFilter
-        v-model:visible="executeResultFilterVisible"
-        v-model:status-filters="executeResultFilters"
-        :title="(columnConfig.title as string)"
-        :list="executeResultFilterList"
-        value-key="key"
-        @search="initData()"
+      <a-trigger
+        v-model:popup-visible="executeResultFilterVisible"
+        trigger="click"
+        @popup-visible-change="handleFilterHidden"
      >
-        <template #item="{ item }">
-          <MsIcon :type="item.icon || ''" class="mr-1" :class="[item.color]"></MsIcon>
-          <span>{{ item.statusText || '' }}</span>
+        <a-button type="text" class="arco-btn-text--secondary p-[8px_4px]" @click="executeResultFilterVisible = true">
+          <div class="font-medium">
+            {{ t(columnConfig.title as string) }}
+          </div>
+          <icon-down :class="executeResultFilterVisible ? 'text-[rgb(var(--primary-5))]' : ''" />
+        </a-button>
+        <template #content>
+          <div class="arco-table-filters-content">
+            <div class="ml-[6px] flex items-center justify-start px-[6px] py-[2px]">
+              <a-checkbox-group v-model:model-value="executeResultFilters" direction="vertical" size="small">
+                <a-checkbox v-for="key of Object.keys(executionResultMap)" :key="key" :value="key">
+                  <MsIcon
+                    :type="executionResultMap[key]?.icon || ''"
+                    class="mr-1"
+                    :class="[executionResultMap[key].color]"
+                  ></MsIcon>
+                  <span>{{ executionResultMap[key]?.statusText || '' }} </span>
+                </a-checkbox>
+              </a-checkbox-group>
+            </div>
+            <div class="filter-button">
+              <a-button size="mini" class="mr-[8px]" @click="resetExecuteResultFilter">
+                {{ t('common.reset') }}
+              </a-button>
+              <a-button type="primary" size="mini" @click="handleFilterHidden(false)">
+                {{ t('system.orgTemplate.confirm') }}
+              </a-button>
+            </div>
+          </div>
        </template>
-      </TableFilter>
+      </a-trigger>
    </template>
    <template #updateUserFilter="{ columnConfig }">
      <TableFilter
@ -175,12 +198,19 @@
      </a-trigger>
    </template>
    <template #lastExecuteResult="{ record }">
-      <MsIcon
-        :type="executionResultMap[record.lastExecuteResult]?.icon || ''"
-        class="mr-1"
-        :class="[executionResultMap[record.lastExecuteResult].color]"
-      ></MsIcon>
-      <span>{{ executionResultMap[record.lastExecuteResult]?.statusText || '' }}</span>
+      <a-select
+        v-model:model-value="record.lastExecuteResult"
+        :placeholder="t('common.pleaseSelect')"
+        class="param-input w-full"
+        @change="() => handleStatusChange(record)"
+      >
+        <template #label>
+          <span class="text-[var(--color-text-2)]"> <executeResult :execute-result="record.lastExecuteResult" /></span>
+        </template>
+        <a-option v-for="item of LastExecuteResults" :key="item" :value="item">
+          <executeResult :execute-result="item" />
+        </a-option>
+      </a-select>
    </template>
    <template #moduleId="{ record }">
      <a-tree-select
@ -377,6 +407,7 @@
  import { ActionsItem } from '@/components/pure/ms-table-more-action/types';
  import type { TagType, Theme } from '@/components/pure/ms-tag/ms-tag.vue';
  import caseLevel from '@/components/business/ms-case-associate/caseLevel.vue';
+  import executeResult from '@/components/business/ms-case-associate/executeResult.vue';
  import BatchEditModal from './batchEditModal.vue';
  import CaseDetailDrawer from './caseDetailDrawer.vue';
  import FeatureCaseTree from './caseTree.vue';
@ -416,6 +447,7 @@
    DragCase,
  } from '@/models/caseManagement/featureCase';
  import type { TableQueryParams } from '@/models/common';
+  import { LastExecuteResults } from '@/enums/caseEnum';
  import { CaseManagementRouteEnum } from '@/enums/routeEnum';
  import { ColumnEditTypeEnum, TableKeyEnum } from '@/enums/tableEnum';

@ -569,15 +601,15 @@
      width: 200,
      showDrag: true,
    },
-    // {
-    //   title: 'caseManagement.featureCase.tableColumnExecutionResult',
-    //   dataIndex: 'lastExecuteResult',
-    //   slotName: 'lastExecuteResult',
-    //   titleSlotName: 'executeResultFilter',
-    //   showInTable: true,
-    //   width: 200,
-    //   showDrag: true,
-    // },
+    {
+      title: 'caseManagement.featureCase.tableColumnExecutionResult',
+      dataIndex: 'lastExecuteResult',
+      slotName: 'lastExecuteResult',
+      titleSlotName: 'executeResultFilter',
+      showInTable: true,
+      width: 200,
+      showDrag: true,
+    },
    // {
    //   title: 'caseManagement.featureCase.tableColumnVersion',
    //   slotName: 'versionName',
@ -1416,6 +1448,7 @@
      const params = {
        request: {
          ...detailResult,
+          lastExecuteResult: record.lastExecuteResult,
          customFields: customFieldsList,
        },
        fileList: [],
@ -1556,6 +1589,7 @@
    if (!val) {
      initData();
      statusFilterVisible.value = false;
+      executeResultFilterVisible.value = false;
    }
  }

@ -1565,6 +1599,12 @@
    initData();
  }

+  function resetExecuteResultFilter() {
+    executeResultFilters.value = [];
+    executeResultFilterVisible.value = false;
+    initData();
+  }
+
  // 获取三方需求
  onBeforeMount(async () => {
    try {