diff --git a/frontend/src/api/modules/bug-management/index.ts b/frontend/src/api/modules/bug-management/index.ts index 90b0968c27..e9f8fd64eb 100644 --- a/frontend/src/api/modules/bug-management/index.ts +++ b/frontend/src/api/modules/bug-management/index.ts @@ -239,3 +239,8 @@ export function cancelAssociation(id: string) { export function getChangeHistoryList(data: TableQueryParams) { return MSR.post({ url: bugURL.getChangeHistoryListUrl, data }); } + +// 校验跳转用例权限 +export function checkCasePermission(projectId: string, caseType: string) { + return MSR.get({ url: `${bugURL.checkCasePermissionUrl}/${projectId}/${caseType}` }); +} diff --git a/frontend/src/api/requrls/bug-management.ts b/frontend/src/api/requrls/bug-management.ts index 44b5f3518a..f3f7befcd9 100644 --- a/frontend/src/api/requrls/bug-management.ts +++ b/frontend/src/api/requrls/bug-management.ts @@ -73,3 +73,6 @@ export const getUnrelatedModuleTreeCountUrl = '/bug/case/un-relate/module/count' // 缺陷管理-变更历史-列表 export const getChangeHistoryListUrl = '/bug/history/page'; + +// 缺陷用例跳转用例是否具备权限 +export const checkCasePermissionUrl = '/bug/case/check-permission'; diff --git a/frontend/src/components/business/ms-comment/input.vue b/frontend/src/components/business/ms-comment/input.vue index 791c69d73f..017046709c 100644 --- a/frontend/src/components/business/ms-comment/input.vue +++ b/frontend/src/components/business/ms-comment/input.vue @@ -6,7 +6,7 @@ 'commentWrapper': props.isUseBottom, }" > -
+
(); const currentContent = defineModel('defaultValue', { default: '' }); - const commentIds = defineModel('noticeUserIds', { default: [] }); - + const userStore = useUserStore(); const emit = defineEmits<{ (event: 'publish', value: string): void; (event: 'cancel'): void; diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue index 826226c27f..fd78592fea 100644 --- a/frontend/src/components/pure/ms-table/base-table.vue +++ b/frontend/src/components/pure/ms-table/base-table.vue @@ -279,6 +279,7 @@ } from './type'; import type { TableChangeExtra, TableColumnData, TableData } from '@arco-design/web-vue'; import type { TableOperationColumn } from '@arco-design/web-vue/es/table/interface'; + import { log } from 'console'; const batchLeft = ref('10px'); const { t } = useI18n(); @@ -398,6 +399,23 @@ tmpArr = props.columns; } currentColumns.value = arr || tmpArr; + // 如果是完全没有列展示除了固定列需要对操作列宽度进行限制和浮动位置限制 + if (props.showSetting) { + const isNoDragColumns = currentColumns.value.filter((item) => item.showDrag).length; + if (!isNoDragColumns) { + currentColumns.value = tmpArr.map((item: any) => { + if (item.slotName === SpecialColumnEnum.OPERATION || item.slotName === SpecialColumnEnum.ACTION) { + return { + ...item, + fixed: '', + }; + } + return { + ...item, + }; + }); + } + } } catch (error) { // eslint-disable-next-line no-console console.error('InitColumn failed', error); diff --git a/frontend/src/views/bug-management/components/bug-detail-drawer.vue b/frontend/src/views/bug-management/components/bug-detail-drawer.vue index f7889a3db4..9b277d02bf 100644 --- a/frontend/src/views/bug-management/components/bug-detail-drawer.vue +++ b/frontend/src/views/bug-management/components/bug-detail-drawer.vue @@ -19,33 +19,36 @@