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:
baiqi 2024-10-29 15:24:36 +08:00 committed by 刘瑞斌
parent e0c8a5ddf6
commit b94e9c21a7
3 changed files with 194 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
frontend/src/views/taskCenter/component/caseTaskDetailTable.vue
View File

@ -31,6 +31,7 @@
</MsTag>
</div>
<ms-base-table
ref="tableRef"
v-bind="propsRes"
:action-config="tableBatchActions"
v-on="propsEvent"
@ -157,6 +158,7 @@
const appStore = useAppStore();
const tableStore = useTableStore();
const tableRef = ref<InstanceType<typeof MsBaseTable>>();
const keyword = ref('');
const resourcePool = ref<string[]>([]);
const resourcePoolOptions = ref<CascaderOption[]>([]);
@ -357,6 +359,64 @@
});
}
watch(
() => [appStore.projectList, appStore.orgList],
() => {
if (appStore.projectList.length > 0 && appStore.orgList.length > 0) {
if (props.type === 'system') {
columns.splice(
2,
2,
{
title: 'common.belongProject',
dataIndex: 'projectName',
showTooltip: true,
width: 200,
showDrag: true,
filterConfig: {
options: appStore.projectList.map((item) => ({
label: item.name,
value: item.id,
})),
filterSlotName: FilterSlotNameEnum.GLOBAL_TASK_CENTER_BELONG_PROJECT,
},
},
{
title: 'common.belongOrg',
dataIndex: 'organizationName',
showTooltip: true,
width: 200,
showDrag: true,
filterConfig: {
options: appStore.orgList.map((item) => ({
label: item.name,
value: item.id,
})),
filterSlotName: FilterSlotNameEnum.GLOBAL_TASK_CENTER_BELONG_PROJECT,
},
}
);
} else if (props.type === 'org') {
columns.splice(2, 1, {
title: 'common.belongProject',
dataIndex: 'projectName',
showTooltip: true,
width: 200,
showDrag: true,
filterConfig: {
options: appStore.projectList.map((item) => ({
label: item.name,
value: item.id,
})),
filterSlotName: FilterSlotNameEnum.GLOBAL_TASK_CENTER_BELONG_PROJECT,
},
});
}
tableRef.value?.initColumn(columns);
}
}
);
function getCurrentPermission(action: 'STOP') {
return {
system: {

62
frontend/src/views/taskCenter/component/caseTaskTable.vue
View File

@ -14,6 +14,7 @@
</MsTag>
</div>
<ms-base-table
ref="tableRef"
v-bind="propsRes"
:action-config="tableBatchActions"
v-on="propsEvent"
@ -237,6 +238,7 @@
const tableStore = useTableStore();
const appStore = useAppStore();
const tableRef = ref<InstanceType<typeof MsBaseTable>>();
const keyword = ref('');
const columns: MsTableColumn = [
{
@ -419,6 +421,64 @@
});
}
watch(
() => [appStore.projectList, appStore.orgList],
() => {
if (appStore.projectList.length > 0 && appStore.orgList.length > 0) {
if (props.type === 'system') {
columns.splice(
2,
2,
{
title: 'common.belongProject',
dataIndex: 'projectName',
showTooltip: true,
width: 200,
showDrag: true,
filterConfig: {
options: appStore.projectList.map((item) => ({
label: item.name,
value: item.id,
})),
filterSlotName: FilterSlotNameEnum.GLOBAL_TASK_CENTER_BELONG_PROJECT,
},
},
{
title: 'common.belongOrg',
dataIndex: 'organizationName',
showTooltip: true,
width: 200,
showDrag: true,
filterConfig: {
options: appStore.orgList.map((item) => ({
label: item.name,
value: item.id,
})),
filterSlotName: FilterSlotNameEnum.GLOBAL_TASK_CENTER_BELONG_PROJECT,
},
}
);
} else if (props.type === 'org') {
columns.splice(2, 1, {
title: 'common.belongProject',
dataIndex: 'projectName',
showTooltip: true,
width: 200,
showDrag: true,
filterConfig: {
options: appStore.projectList.map((item) => ({
label: item.name,
value: item.id,
})),
filterSlotName: FilterSlotNameEnum.GLOBAL_TASK_CENTER_BELONG_PROJECT,
},
});
}
tableRef.value?.initColumn(columns);
}
}
);
function getCurrentPermission(action: 'STOP' | 'DELETE') {
return {
system: {
@ -757,6 +817,8 @@
showReportDetail(record);
} else if ([ExecuteTaskType.TEST_PLAN_GROUP, ExecuteTaskType.TEST_PLAN].includes(record.taskType)) {
openNewPage(TestPlanRouteEnum.TEST_PLAN_REPORT, {
orgId: record.organizationId,
pId: record.projectId,
id: record.reportId,
type: record.taskType === ExecuteTaskType.TEST_PLAN_GROUP ? 'GROUP' : '',
});

72
frontend/src/views/taskCenter/component/systemTaskTable.vue
View File

@ -14,6 +14,7 @@
</MsTag>
</div>
<ms-base-table
ref="tableRef"
v-bind="propsRes"
:action-config="tableBatchActions"
no-disable
@ -140,6 +141,7 @@
const tableStore = useTableStore();
const appStore = useAppStore();
const tableRef = ref<InstanceType<typeof MsBaseTable>>();
const keyword = ref('');
const taskTypeOptions: Record<string, any>[] = [];
const thirdPartyTypeKeys: string[] = [];
@ -312,6 +314,64 @@
});
}
watch(
() => [appStore.projectList, appStore.orgList],
() => {
if (appStore.projectList.length > 0 && appStore.orgList.length > 0) {
if (props.type === 'system') {
columns.splice(
2,
2,
{
title: 'common.belongProject',
dataIndex: 'projectName',
showTooltip: true,
width: 200,
showDrag: true,
filterConfig: {
options: appStore.projectList.map((item) => ({
label: item.name,
value: item.id,
})),
filterSlotName: FilterSlotNameEnum.GLOBAL_TASK_CENTER_BELONG_PROJECT,
},
},
{
title: 'common.belongOrg',
dataIndex: 'organizationName',
showTooltip: true,
width: 200,
showDrag: true,
filterConfig: {
options: appStore.orgList.map((item) => ({
label: item.name,
value: item.id,
})),
filterSlotName: FilterSlotNameEnum.GLOBAL_TASK_CENTER_BELONG_PROJECT,
},
}
);
} else if (props.type === 'org') {
columns.splice(2, 1, {
title: 'common.belongProject',
dataIndex: 'projectName',
showTooltip: true,
width: 200,
showDrag: true,
filterConfig: {
options: appStore.projectList.map((item) => ({
label: item.name,
value: item.id,
})),
filterSlotName: FilterSlotNameEnum.GLOBAL_TASK_CENTER_BELONG_PROJECT,
},
});
}
tableRef.value?.initColumn(columns);
}
}
);
await tableStore.initColumn(TableKeyEnum.TASK_CENTER_SYSTEM_TASK, columns, 'drawer');
function getCurrentPermission(action: 'DELETE' | 'EDIT') {
@ -468,31 +528,43 @@
switch (record.resourceType) {
case SystemTaskType.API_IMPORT:
openNewPage(ApiTestRouteEnum.API_TEST_MANAGEMENT, {
orgId: record.organizationId,
pId: record.projectId,
taskDrawer: true,
});
break;
case SystemTaskType.TEST_PLAN:
openNewPage(TestPlanRouteEnum.TEST_PLAN_INDEX_DETAIL, {
orgId: record.organizationId,
pId: record.projectId,
id: record.resourceId,
});
break;
case SystemTaskType.TEST_PLAN_GROUP:
openNewPage(TestPlanRouteEnum.TEST_PLAN_INDEX, {
orgId: record.organizationId,
pId: record.projectId,
groupId: record.resourceNum,
});
break;
case SystemTaskType.API_SCENARIO:
openNewPage(ApiTestRouteEnum.API_TEST_SCENARIO, {
orgId: record.organizationId,
pId: record.projectId,
id: record.resourceId,
});
break;
case SystemTaskType.BUG_SYNC:
openNewPage(ProjectManagementRouteEnum.PROJECT_MANAGEMENT_PERMISSION_MENU_MANAGEMENT, {
orgId: record.organizationId,
pId: record.projectId,
module: MenuEnum.bugManagement,
});
break;
case SystemTaskType.DEMAND_SYNC:
openNewPage(ProjectManagementRouteEnum.PROJECT_MANAGEMENT_PERMISSION_MENU_MANAGEMENT, {
orgId: record.organizationId,
pId: record.projectId,
module: MenuEnum.caseManagement,
});
break;