diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue index 2b65e95dd9..2f0332bb35 100644 --- a/frontend/src/components/pure/ms-table/base-table.vue +++ b/frontend/src/components/pure/ms-table/base-table.vue @@ -4,7 +4,7 @@ = {}; + // let scrollObj: Record = {}; const initColumn = async (arr?: MsTableColumn) => { try { let tmpArr: MsTableColumn = []; @@ -401,29 +401,29 @@ } 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, - }; - } - return { - ...item, - width: '', - }; - }); - scrollObj = { - scroll: { - x: 'auto', - }, - }; - } else { - scrollObj = {}; - } - } + // 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, + // }; + // } + // return { + // ...item, + // width: '', + // }; + // }); + // scrollObj = { + // scroll: { + // x: 'auto', + // }, + // }; + // } else { + // scrollObj = {}; + // } + // } } catch (error) { // eslint-disable-next-line no-console console.error('InitColumn failed', error); diff --git a/frontend/src/config/pathMap.ts b/frontend/src/config/pathMap.ts index 9de51b90d8..1e183828d2 100644 --- a/frontend/src/config/pathMap.ts +++ b/frontend/src/config/pathMap.ts @@ -119,7 +119,7 @@ export const pathMap: PathMapItem[] = [ level: MENU_LEVEL[2], children: [ { - key: 'BUG_MANAGEMENT_BUG_INDEX', // 缺陷管理-缺陷首页 + key: 'BUG_MANAGEMENT_BUG_INDEX', // 缺陷管理 locale: 'menu.bugManagement.bugDetail', route: RouteEnum.BUG_MANAGEMENT_INDEX, permission: [], @@ -127,15 +127,7 @@ export const pathMap: PathMapItem[] = [ alias: 'BUG_SYNC_TASK', }, { - key: 'BUG_MANAGEMENT_BUG_DETAIL', // 缺陷管理-缺陷详情 - locale: 'menu.bugManagement.bugDetail', - route: RouteEnum.BUG_MANAGEMENT_DETAIL, - permission: [], - level: MENU_LEVEL[2], - alias: 'BUG_TASK', - }, - { - key: 'BUG_MANAGEMENT_BUG_recycle', // 缺陷管理-回收站 + key: 'BUG_MANAGEMENT_BUG_RECYCLE', // 缺陷管理-回收站 locale: 'menu.bugManagement.bugRecycle', route: RouteEnum.BUG_MANAGEMENT_RECYCLE, permission: [], diff --git a/frontend/src/locale/en-US/index.ts b/frontend/src/locale/en-US/index.ts index 6f454582d3..131e5e9663 100644 --- a/frontend/src/locale/en-US/index.ts +++ b/frontend/src/locale/en-US/index.ts @@ -22,6 +22,7 @@ export default { 'menu.workbench': 'Workbench', 'menu.testPlan': 'Test Plan', 'menu.bugManagement': 'Bug', + ' menu.bugManagement.bugRecycle': 'Recycle', 'menu.caseManagement': 'Case Management', 'menu.apiTest': 'API Test', 'menu.apiTest.debug': 'API debug', diff --git a/frontend/src/locale/zh-CN/index.ts b/frontend/src/locale/zh-CN/index.ts index 58dd84aee1..660d274993 100644 --- a/frontend/src/locale/zh-CN/index.ts +++ b/frontend/src/locale/zh-CN/index.ts @@ -22,6 +22,7 @@ export default { 'menu.testPlan': '测试计划', 'menu.bugManagement': '缺陷管理', 'menu.bugManagement.bugDetail': '缺陷管理', + 'menu.bugManagement.bugRecycle': '回收站', 'menu.caseManagement': '用例管理', 'menu.apiTest': '接口测试', 'menu.apiTest.debug': '接口调试', diff --git a/frontend/src/views/bug-management/locale/zh-CN.ts b/frontend/src/views/bug-management/locale/zh-CN.ts index f6073e914b..074fdbcbfe 100644 --- a/frontend/src/views/bug-management/locale/zh-CN.ts +++ b/frontend/src/views/bug-management/locale/zh-CN.ts @@ -2,7 +2,7 @@ export default { bugManagement: { index: '缺陷管理', addBug: '创建缺陷', - editBug: '编辑缺陷', + editBug: '更新缺陷', createBug: '创建缺陷', syncBug: '同步缺陷', ID: 'ID',