diff --git a/frontend/src/components/pure/ms-popconfirm/index.vue b/frontend/src/components/pure/ms-popconfirm/index.vue index 1b5d56fe22..8fdb5bf758 100644 --- a/frontend/src/components/pure/ms-popconfirm/index.vue +++ b/frontend/src/components/pure/ms-popconfirm/index.vue @@ -18,9 +18,9 @@ class="mr-[2px] text-xl text-[rgb(var(--danger-6))]" /> - +
{{ props.title || '' }} - +
@@ -59,7 +59,7 @@ /> -
+
{{ props.cancelText || t('common.cancel') }} @@ -171,7 +171,7 @@ const titleClass = computed(() => { return props.isDelete ? 'ml-2 font-medium text-[var(--color-text-1)] text-[14px]' - : 'mb-[8px] font-medium text-[var(--color-text-1)] text-[14px]'; + : 'mb-[8px] font-medium text-[var(--color-text-1)] text-[14px] leading-[22px]'; }); watch( @@ -215,4 +215,8 @@ }); - + diff --git a/frontend/src/components/pure/ms-table/columnSelector.vue b/frontend/src/components/pure/ms-table/columnSelector.vue index 3f6d9af595..bc8472c0de 100644 --- a/frontend/src/components/pure/ms-table/columnSelector.vue +++ b/frontend/src/components/pure/ms-table/columnSelector.vue @@ -53,8 +53,9 @@
-
{{ t((item.title || item.columnTitle) as string) }}
+
{{ t((item.title || item.columnTitle) as string) }}
+ hasAnyPermission(['FUNCTIONAL_CASE:READ+UPDATE', 'FUNCTIONAL_CASE:READ+DELETE']) + ); + const columns: MsTableColumn = [ { 'title': 'caseManagement.featureCase.tableColumnID', @@ -471,13 +476,13 @@ showDrag: true, }, { - title: 'caseManagement.featureCase.tableColumnActions', + title: hasOperationPermission.value ? 'caseManagement.featureCase.tableColumnActions' : '', slotName: 'operation', dataIndex: 'operation', fixed: 'right', - width: 260, showInTable: true, showDrag: false, + width: hasOperationPermission.value ? 260 : 50, }, ]; diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/addDefectDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/addDefectDrawer.vue index 245b7f2b1a..f905d74149 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/addDefectDrawer.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/addDefectDrawer.vue @@ -48,7 +48,10 @@ visible: boolean; }>(); - const emit = defineEmits(['update:visible']); + const emit = defineEmits<{ + (e: 'update:visible', visible: boolean): void; + (e: 'success'): void; + }>(); const { t } = useI18n(); @@ -93,6 +96,7 @@ request: { ...form.value, customFields: templateCustomFields.value }, fileList: [], }); + emit('success'); Message.success(t('caseManagement.featureCase.quicklyCreateDefectSuccess')); if (!isContinue) { handleDrawerCancel(); diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue index bd23073c6d..47eb62498a 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue @@ -17,14 +17,14 @@
{{ t('caseManagement.featureCase.testPlanLinkList') }}
- + - + }} + --> - + (false); @@ -272,6 +278,7 @@ try { if (showType.value === 'link') { await cancelAssociatedDebug(id); + getFetch(); Message.success(t('caseManagement.featureCase.cancelLinkSuccess')); } } catch (error) { diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabComment/tabCommentIndex.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabComment/tabCommentIndex.vue index 431f6c8cd2..6c7e1c3944 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabComment/tabCommentIndex.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabComment/tabCommentIndex.vue @@ -5,7 +5,7 @@ {{ t('caseManagement.featureCase.caseComment') }} {{ t('caseManagement.featureCase.reviewComment') }} - {{ t('caseManagement.featureCase.executiveReview') }} +
@@ -25,7 +25,7 @@ @update-or-add="handleUpdateOrAdd" /> - +
@@ -89,15 +89,13 @@ setCount(commentList.value); break; case 'reviewComment': - initReviewCommentList(); - await initCommentList(); + await initReviewCommentList(); setCount(reviewCommentList.value); break; case 'executiveComment': await initCommentList(); setCount(commentList.value); break; - default: break; } @@ -146,8 +144,10 @@ watch( () => activeComment.value, - () => { - getAllCommentList(); + (val) => { + if (val) { + getAllCommentList(); + } } ); diff --git a/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts b/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts index 39b5f56127..ac304452fd 100644 --- a/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts +++ b/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts @@ -252,4 +252,5 @@ export default { 'caseManagement.featureCase.defectSource': 'defect Source', 'caseManagement.featureCase.sortSuccess': 'Sort successfully', 'caseManagement.featureCase.zentao': 'zentao', + 'caseManagement.featureCase.searchPlaceholder': 'Search by id or name', }; diff --git a/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts b/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts index 0c3ccaba8b..70dafde60b 100644 --- a/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts +++ b/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts @@ -247,4 +247,5 @@ export default { 'caseManagement.featureCase.defectSource': '缺陷来源', 'caseManagement.featureCase.sortSuccess': '排序成功', 'caseManagement.featureCase.zentao': '禅道', + 'caseManagement.featureCase.searchPlaceholder': '通过id或名称搜索', }; diff --git a/frontend/src/views/case-management/caseReview/caseDetail.vue b/frontend/src/views/case-management/caseReview/caseDetail.vue index 20ca668a54..5b8d9691fa 100644 --- a/frontend/src/views/case-management/caseReview/caseDetail.vue +++ b/frontend/src/views/case-management/caseReview/caseDetail.vue @@ -82,7 +82,13 @@ 【{{ caseDetail.num }}】{{ caseDetail.name }}
- + {{ t('common.edit') }} diff --git a/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue b/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue index 5627f608b7..8119fe73a9 100644 --- a/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue +++ b/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue @@ -68,7 +68,7 @@