From 19826609a5fa5412f69f121da9d215257059f951 Mon Sep 17 00:00:00 2001 From: "xinxin.wu" Date: Wed, 22 May 2024 17:29:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E7=AE=A1=E7=90=86host=E4=BF=9D=E5=AD=98bug&=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E5=85=B3=E8=81=94=E6=8A=BD=E5=B1=89=E9=87=8C=E8=BE=B9=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E7=94=A8=E4=BE=8B=E7=AD=89=E5=AD=97=E6=AE=B5&?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/ms-case-associate/index.vue | 78 ++++++++++++++++++- .../management/mock/mockMatchRuleForm.vue | 2 +- .../components/export/validateResult.vue | 5 +- .../environmental/components/EnvParamBox.vue | 2 +- .../environmental/index.vue | 5 ++ .../testPlan/components/associateDrawer.vue | 2 +- .../testPlan/components/planTable.vue | 2 +- .../testPlan/components/statusProgress.vue | 2 +- .../views/test-plan/testPlan/detail/index.vue | 12 +-- 9 files changed, 90 insertions(+), 20 deletions(-) diff --git a/frontend/src/components/business/ms-case-associate/index.vue b/frontend/src/components/business/ms-case-associate/index.vue index a7319c3acd..a03d38c916 100644 --- a/frontend/src/components/business/ms-case-associate/index.vue +++ b/frontend/src/components/business/ms-case-associate/index.vue @@ -25,10 +25,10 @@
-
+
+ + + + +
@@ -172,6 +189,7 @@ import MsBaseTable from '@/components/pure/ms-table/base-table.vue'; import { MsTableColumn } from '@/components/pure/ms-table/type'; import useTable from '@/components/pure/ms-table/useTable'; + import ExecuteStatusTag from '@/components/business/ms-case-associate/executeResult.vue'; import MsTree from '@/components/business/ms-tree/index.vue'; import type { MsTreeNodeData } from '@/components/business/ms-tree/types'; import caseLevel from './caseLevel.vue'; @@ -186,8 +204,10 @@ import type { ProjectListItem } from '@/models/setting/project'; import { CaseLinkEnum } from '@/enums/caseEnum'; import { CaseManagementRouteEnum } from '@/enums/routeEnum'; + import { FilterSlotNameEnum } from '@/enums/tableFilterEnum'; import { initGetModuleCountFunc, type RequestModuleEnum } from './utils'; + import { executionResultMap, statusIconMap } from '@/views/case-management/caseManagementFeature/components/utils'; const router = useRouter(); const appStore = useAppStore(); @@ -359,6 +379,55 @@ return []; } + const reviewResultOptions = computed(() => { + return Object.keys(statusIconMap).map((key) => { + return { + value: key, + label: statusIconMap[key].statusText, + }; + }); + }); + const executeResultOptions = computed(() => { + return Object.keys(executionResultMap).map((key) => { + return { + value: key, + label: executionResultMap[key].statusText, + }; + }); + }); + + function getReviewStatus() { + if (!props.isHiddenCaseLevel) { + return [ + { + title: 'caseManagement.featureCase.tableColumnReviewResult', + dataIndex: 'reviewStatus', + slotName: 'reviewStatus', + filterConfig: { + options: reviewResultOptions.value, + filterSlotName: FilterSlotNameEnum.CASE_MANAGEMENT_REVIEW_RESULT, + }, + showInTable: true, + width: 150, + showDrag: true, + }, + { + title: 'caseManagement.featureCase.tableColumnExecutionResult', + dataIndex: 'lastExecuteResult', + slotName: 'lastExecuteResult', + filterConfig: { + options: executeResultOptions.value, + filterSlotName: FilterSlotNameEnum.CASE_MANAGEMENT_EXECUTE_RESULT, + }, + showInTable: true, + width: 150, + showDrag: true, + }, + ]; + } + return []; + } + const columns: MsTableColumn = [ { title: 'ID', @@ -366,16 +435,18 @@ slotName: 'num', sortIndex: 1, showTooltip: true, + // TODO 后台没有加 // sortable: { // sortDirections: ['ascend', 'descend'], // sorter: true, // }, - width: 150, + width: 120, fixed: 'left', }, { title: 'ms.case.associate.caseName', dataIndex: 'name', + // TODO 后台没有加 // sortable: { // sortDirections: ['ascend', 'descend'], // sorter: true, @@ -384,6 +455,7 @@ width: 250, }, ...getCaseLevelColumn(), + ...getReviewStatus(), { title: 'ms.case.associate.tags', dataIndex: 'tags', diff --git a/frontend/src/views/api-test/management/components/management/mock/mockMatchRuleForm.vue b/frontend/src/views/api-test/management/components/management/mock/mockMatchRuleForm.vue index 5430d0fc63..48e5a421b7 100644 --- a/frontend/src/views/api-test/management/components/management/mock/mockMatchRuleForm.vue +++ b/frontend/src/views/api-test/management/components/management/mock/mockMatchRuleForm.vue @@ -36,7 +36,7 @@
-
+
{{ t('caseManagement.featureCase.backCaseList') }} @@ -403,14 +404,18 @@ console.log(error); } }; + const exportLoading = ref(false); // 处理环境变量导出 const handleEnvExport = async (id: string | string[]) => { + exportLoading.value = true; try { const blob = await exportEnv(Array.isArray(id) ? id : [id]); downloadByteFile(blob, 'EnvParam.json'); } catch (error) { // eslint-disable-next-line no-console console.log(error); + } finally { + exportLoading.value = false; } }; const globalEnvRef = ref(); diff --git a/frontend/src/views/test-plan/testPlan/components/associateDrawer.vue b/frontend/src/views/test-plan/testPlan/components/associateDrawer.vue index 7ecf510753..707e704909 100644 --- a/frontend/src/views/test-plan/testPlan/components/associateDrawer.vue +++ b/frontend/src/views/test-plan/testPlan/components/associateDrawer.vue @@ -12,7 +12,7 @@ :project-id="currentProjectId" :type="RequestModuleEnum.CASE_MANAGEMENT" hide-project-select - is-hidden-case-level + :is-hidden-case-level="false" :selector-all="true" @save="saveHandler" > diff --git a/frontend/src/views/test-plan/testPlan/components/planTable.vue b/frontend/src/views/test-plan/testPlan/components/planTable.vue index 52d8f3abd3..7a47847504 100644 --- a/frontend/src/views/test-plan/testPlan/components/planTable.vue +++ b/frontend/src/views/test-plan/testPlan/components/planTable.vue @@ -365,7 +365,7 @@ columnSelectorDisabled: true, }, { - title: 'testPlan.testPlanIndex.executionResult', + title: 'common.status', dataIndex: 'status', slotName: 'status', filterConfig: { diff --git a/frontend/src/views/test-plan/testPlan/components/statusProgress.vue b/frontend/src/views/test-plan/testPlan/components/statusProgress.vue index 9f1e48a13a..07ceb5b892 100644 --- a/frontend/src/views/test-plan/testPlan/components/statusProgress.vue +++ b/frontend/src/views/test-plan/testPlan/components/statusProgress.vue @@ -111,7 +111,7 @@ }, { percentage: (blockCount / caseTotal) * 100, - color: 'rgb(var(--link-6))', + color: 'rgb(var(--primary-3))', }, { percentage: (fakeErrorCount / caseTotal) * 100, diff --git a/frontend/src/views/test-plan/testPlan/detail/index.vue b/frontend/src/views/test-plan/testPlan/detail/index.vue index 48b5efc962..004facb7d6 100644 --- a/frontend/src/views/test-plan/testPlan/detail/index.vue +++ b/frontend/src/views/test-plan/testPlan/detail/index.vue @@ -32,7 +32,7 @@ {{ t('common.edit') }} {{ t('common.copy') }} - +