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

fix(工作台): 修复工作台跳转bugs

This commit is contained in:
xinxin.wu 2024-12-12 18:44:33 +08:00 committed by Craftsman
parent 92200c4ed1
commit 0da20a700b
6 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -848,7 +848,7 @@
};
const filterData = computed(() => {
return (attrs.filter || {}) as Record<string, any>;
return { ...(attrs.filter || {}) } as Record<string, any>;
});
const handleFilterConfirm = (

12
frontend/src/views/api-test/management/components/management/api/apiTable.vue
View File

@ -626,22 +626,16 @@
async function loadApiList(hasRefreshTree: boolean) {
const moduleIds = await getModuleIds();
let filterParams = {
...propsRes.value.filter,
};
if (route.query.home) {
filterParams = {
...propsRes.value.filter,
...NAV_NAVIGATION[route.query.home as WorkNavValueEnum],
};
propsRes.value.filter = { ...NAV_NAVIGATION[route.query.home as WorkNavValueEnum] };
}
const params = {
keyword: keyword.value,
projectId: appStore.currentProjectId,
moduleIds,
protocols: isAdvancedSearchMode.value ? protocolList.value.map((item) => item.protocol) : props.selectedProtocols,
filter: filterParams,
filter: propsRes.value.filter,
viewId: viewId.value,
combineSearch: advanceFilter,
};
@ -649,7 +643,7 @@
if (!hasRefreshTree && typeof refreshModuleTreeCount === 'function' && !isAdvancedSearchMode.value) {
refreshModuleTreeCount({
keyword: keyword.value,
filter: filterParams,
filter: propsRes.value.filter,
moduleIds: [],
protocols: props.selectedProtocols,
projectId: appStore.currentProjectId,

8
frontend/src/views/api-test/management/components/management/case/caseTable.vue
View File

@ -672,12 +672,8 @@
async function loadCaseList() {
const selectModules = await getModuleIds();
let filterParams = { ...propsRes.value.filter };
if (route.query.home) {
filterParams = {
...propsRes.value.filter,
...NAV_NAVIGATION[route.query.home as WorkNavValueEnum],
};
propsRes.value.filter = { ...NAV_NAVIGATION[route.query.home as WorkNavValueEnum] };
}
const params = {
@ -686,7 +682,7 @@
projectId: appStore.currentProjectId,
moduleIds: selectModules,
protocols: isAdvancedSearchMode.value ? protocolList.value.map((item) => item.protocol) : props.selectedProtocols,
filter: filterParams,
filter: propsRes.value.filter,
viewId: viewId.value,
combineSearch: advanceFilter,
};

6
frontend/src/views/api-test/scenario/components/scenarioTable.vue
View File

@ -977,10 +977,8 @@
async function loadScenarioList(refreshTreeCount?: boolean) {
const moduleIds = await getModuleIds();
let filterParams = { ...propsRes.value.filter };
if (route.query.home) {
filterParams = {
...propsRes.value.filter,
propsRes.value.filter = {
...NAV_NAVIGATION[route.query.home as WorkNavValueEnum],
};
}
@ -988,7 +986,7 @@
keyword: keyword.value,
projectId: appStore.currentProjectId,
moduleIds,
filter: filterParams,
filter: propsRes.value.filter,
};
setLoadListParams({ ...params, viewId: viewId.value, combineSearch: advanceFilter });
await loadList();

9
frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
View File

@ -1028,13 +1028,8 @@
}
}
let filterParams = { ...propsRes.value.filter };
if (route.query.home) {
filterParams = {
...propsRes.value.filter,
...NAV_NAVIGATION[route.query.home as WorkNavValueEnum],
};
propsRes.value.filter = { ...NAV_NAVIGATION[route.query.home as WorkNavValueEnum] };
}
return {
@ -1044,7 +1039,7 @@
selectAll: batchParams.value.selectAll,
selectIds: batchParams.value.selectedIds || [],
keyword: keyword.value,
filter: filterParams,
filter: propsRes.value.filter,
};
}
// 获取父组件模块数量

8
frontend/src/views/test-plan/testPlan/components/planTable.vue
View File

@ -900,15 +900,11 @@
moduleIds = [];
}
let filterParams = { ...propsRes.value.filter };
if (route.query.home) {
if (route.query.home === WorkNavValueEnum.TEST_PLAN_ARCHIVED) {
viewId.value = 'archived';
} else {
filterParams = {
...propsRes.value.filter,
...NAV_NAVIGATION[route.query.home as WorkNavValueEnum],
};
propsRes.value.filter = { ...NAV_NAVIGATION[route.query.home as WorkNavValueEnum] };
}
}
@ -920,7 +916,7 @@
selectAll: !!batchParams.value?.selectAll,
selectIds: batchParams.value.selectedIds || [],
keyword: keyword.value,
filter: filterParams,
filter: propsRes.value.filter,
};
}