test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 撤销表列操作_紧急

This commit is contained in:
xinxin.wu 2024-03-15 15:27:19 +08:00 committed by Craftsman
parent 99fd56d3d4
commit db9ce01770
5 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
frontend/src/components/pure/ms-table/base-table.vue
View File

@ -4,7 +4,7 @@
<slot name="quickCreate"></slot>
</div>
<a-table
v-bind="{ ...$attrs, ...scrollObj }"
v-bind="$attrs"
:row-class="getRowClass"
:span-method="spanMethod"
:columns="currentColumns"
@ -390,7 +390,7 @@
return undefined;
});
let scrollObj: Record<string, any> = {};
// let scrollObj: Record<string, any> = {};
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);

12
frontend/src/config/pathMap.ts
View File

@ -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: [],

1
frontend/src/locale/en-US/index.ts
View File

@ -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',

1
frontend/src/locale/zh-CN/index.ts
View File

@ -22,6 +22,7 @@ export default {
'menu.testPlan': '测试计划',
'menu.bugManagement': '缺陷管理',
'menu.bugManagement.bugDetail': '缺陷管理',
'menu.bugManagement.bugRecycle': '回收站',
'menu.caseManagement': '用例管理',
'menu.apiTest': '接口测试',
'menu.apiTest.debug': '接口调试',

2
frontend/src/views/bug-management/locale/zh-CN.ts
View File

@ -2,7 +2,7 @@ export default {
bugManagement: {
index: '缺陷管理',
addBug: '创建缺陷',
editBug: '编辑缺陷',
editBug: '更新缺陷',
createBug: '创建缺陷',
syncBug: '同步缺陷',
ID: 'ID',