From 8a8e584886e638692dabb8a8ceb75bef319748ff Mon Sep 17 00:00:00 2001 From: "xinxin.wu" Date: Wed, 17 Apr 2024 12:45:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98&?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=94=A8=E4=BE=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/ms-case-associate/index.vue | 76 ++++++++++++------- .../bug-management/components/bugCaseTab.vue | 1 + .../tabContent/tabCase/tabCaseTable.vue | 1 + .../projectAndPermission/basicInfos/index.vue | 11 +-- .../menuManagement/menuManagement.vue | 7 -- .../taskCenter/component/apiCase.vue | 9 ++- .../taskCenter/component/scheduledTask.vue | 15 ++-- 7 files changed, 69 insertions(+), 51 deletions(-) diff --git a/frontend/src/components/business/ms-case-associate/index.vue b/frontend/src/components/business/ms-case-associate/index.vue index f7d7f90d0d..54312cd507 100644 --- a/frontend/src/components/business/ms-case-associate/index.vue +++ b/frontend/src/components/business/ms-case-associate/index.vue @@ -113,7 +113,7 @@
@@ -175,24 +175,30 @@ const appStore = useAppStore(); const { t } = useI18n(); - const props = defineProps<{ - visible: boolean; - projectId?: string; // 项目id - caseId?: string; // 用例id 用例评审那边不需要传递 - getModulesFunc: (params: TableQueryParams) => Promise; // 获取模块树请求 - modulesParams?: Record; // 获取模块树请求 - getTableFunc: (params: TableQueryParams) => Promise>; // 获取表请求函数 - tableParams?: TableQueryParams; // 查询表格的额外的参数 - okButtonDisabled?: boolean; // 确认按钮是否禁用 - currentSelectCase: string | number | Record | undefined; // 当前选中的用例类型 - moduleOptions?: { label: string; value: string }[]; // 功能模块对应用例下拉 - confirmLoading: boolean; - associatedIds: string[]; // 已关联用例id集合用于去重已关联 - hasNotAssociatedIds?: string[]; - type: RequestModuleEnum[keyof RequestModuleEnum]; - moduleCountParams?: TableQueryParams; // 获取模块树数量额外的参数 - hideProjectSelect?: boolean; // 是否隐藏项目选择 - }>(); + const props = withDefaults( + defineProps<{ + visible: boolean; + projectId?: string; // 项目id + caseId?: string; // 用例id 用例评审那边不需要传递 + getModulesFunc: (params: TableQueryParams) => Promise; // 获取模块树请求 + modulesParams?: Record; // 获取模块树请求 + getTableFunc: (params: TableQueryParams) => Promise>; // 获取表请求函数 + tableParams?: TableQueryParams; // 查询表格的额外的参数 + okButtonDisabled?: boolean; // 确认按钮是否禁用 + currentSelectCase: string | number | Record | undefined; // 当前选中的用例类型 + moduleOptions?: { label: string; value: string }[]; // 功能模块对应用例下拉 + confirmLoading: boolean; + associatedIds: string[]; // 已关联用例id集合用于去重已关联 + hasNotAssociatedIds?: string[]; + type: RequestModuleEnum[keyof RequestModuleEnum]; + moduleCountParams?: TableQueryParams; // 获取模块树数量额外的参数 + hideProjectSelect?: boolean; // 是否隐藏项目选择 + isHiddenCaseLevel?: boolean; + }>(), + { + isHiddenCaseLevel: false, + } + ); const emit = defineEmits<{ (e: 'update:visible', val: boolean): void; @@ -318,6 +324,20 @@ const keyword = ref(''); const version = ref(''); + function getCaseLevelColumn() { + if (!props.isHiddenCaseLevel) { + return [ + { + title: 'ms.case.associate.caseLevel', + dataIndex: 'caseLevel', + slotName: 'caseLevel', + width: 90, + }, + ]; + } + return []; + } + const columns: MsTableColumn = [ { title: 'ID', @@ -342,12 +362,7 @@ showTooltip: true, width: 250, }, - { - title: 'ms.case.associate.caseLevel', - dataIndex: 'caseLevel', - slotName: 'caseLevel', - width: 90, - }, + ...getCaseLevelColumn(), { title: 'ms.case.associate.tags', dataIndex: 'tags', @@ -355,6 +370,10 @@ }, ]; + watchEffect(() => { + getCaseLevelColumn(); + }); + const { propsRes, propsEvent, loadList, setLoadListParams, resetSelector, setTableSelected } = useTable( props.getTableFunc, { @@ -379,8 +398,13 @@ ); // 用例等级 + // TODO: 这个版本用例和接口以及场景不存在用例等级 不展示等级内容 function getCaseLevel(record: CaseManagementTable) { - return (record.customFields.find((item: any) => item.name === '用例等级')?.value as CaseLevel) || 'P1'; + if (record.customFields && record.customFields.length) { + const caseItem = record.customFields.find((item: any) => item.fieldName === '用例等级' && item.internal); + return caseItem?.options.find((item: any) => item.value === caseItem?.defaultValue).text; + } + return undefined; } const searchParams = ref({ diff --git a/frontend/src/views/bug-management/components/bugCaseTab.vue b/frontend/src/views/bug-management/components/bugCaseTab.vue index 84a15817ff..8b6d6a4dcc 100644 --- a/frontend/src/views/bug-management/components/bugCaseTab.vue +++ b/frontend/src/views/bug-management/components/bugCaseTab.vue @@ -78,6 +78,7 @@ :case-id="props.bugId" :associated-ids="associatedIds" :type="RequestModuleEnum.BUG_MANAGEMENT" + :is-hidden-case-level="true" @close="emit('close')" @save="saveHandler" > diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabCase/tabCaseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabCase/tabCaseTable.vue index fdf595f3c4..e9fddd1dfa 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabCase/tabCaseTable.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabCase/tabCaseTable.vue @@ -64,6 +64,7 @@ :case-id="props.caseId" :associated-ids="associatedIds" :type="RequestModuleEnum.API_CASE" + :is-hidden-case-level="true" @close="emit('close')" @save="saveHandler" > diff --git a/frontend/src/views/project-management/projectAndPermission/basicInfos/index.vue b/frontend/src/views/project-management/projectAndPermission/basicInfos/index.vue index cc813ce0a8..6a973ba3a2 100644 --- a/frontend/src/views/project-management/projectAndPermission/basicInfos/index.vue +++ b/frontend/src/views/project-management/projectAndPermission/basicInfos/index.vue @@ -5,7 +5,7 @@
{{ t('project.basicInfo.basicInfo') }} {{ projectDetail?.name }} - {{ projectDetail?.enable ? t('project.basicInfo.enable') : t('project.basicInfo.enable') }} + {{ + projectDetail?.deleted ? t('project.basicInfo.deleted') : t('project.basicInfo.enable') + }}
{{ projectDetail?.description }}
diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue b/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue index 24e5dc003f..8a0da4da5d 100644 --- a/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue +++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue @@ -1,13 +1,6 @@