diff --git a/frontend/src/router/routes/modules/workbench.ts b/frontend/src/router/routes/modules/workbench.ts index 22059e5c10..f7efdc7b07 100644 --- a/frontend/src/router/routes/modules/workbench.ts +++ b/frontend/src/router/routes/modules/workbench.ts @@ -55,7 +55,7 @@ const TestPlan: AppRouteRecordRaw = { { path: 'created', name: WorkbenchRouteEnum.WORKBENCH_INDEX_CREATED, - component: () => import('@/views/workbench/homePage/index.vue'), + component: () => import('@/views/workbench/myCreated/index.vue'), meta: { locale: 'menu.workbenchCreatedSort', roles: ['*'], diff --git a/frontend/src/views/test-plan/testPlan/components/planTable.vue b/frontend/src/views/test-plan/testPlan/components/planTable.vue index 02dc78c91c..15d50f19ec 100644 --- a/frontend/src/views/test-plan/testPlan/components/planTable.vue +++ b/frontend/src/views/test-plan/testPlan/components/planTable.vue @@ -1732,6 +1732,7 @@ defineExpose({ fetchData, emitTableParams, + isAdvancedSearchMode, }); await tableStore.initColumn(TableKeyEnum.TEST_PLAN_ALL_TABLE, columns, 'drawer'); diff --git a/frontend/src/views/test-plan/testPlan/index.vue b/frontend/src/views/test-plan/testPlan/index.vue index 718f74d03d..487abce7ad 100644 --- a/frontend/src/views/test-plan/testPlan/index.vue +++ b/frontend/src/views/test-plan/testPlan/index.vue @@ -292,9 +292,8 @@ } } - const isAdvancedSearchMode = ref(false); - function handleAdvSearch(isStartAdvance: boolean) { - isAdvancedSearchMode.value = isStartAdvance; + const isAdvancedSearchMode = computed(() => planTableRef.value?.isAdvancedSearchMode); + function handleAdvSearch() { setActiveFolder('all'); } diff --git a/frontend/src/views/workbench/myFollowed/components/apiCaseTable.vue b/frontend/src/views/workbench/components/apiCaseTable.vue similarity index 98% rename from frontend/src/views/workbench/myFollowed/components/apiCaseTable.vue rename to frontend/src/views/workbench/components/apiCaseTable.vue index 8212088fc3..79c30562ae 100644 --- a/frontend/src/views/workbench/myFollowed/components/apiCaseTable.vue +++ b/frontend/src/views/workbench/components/apiCaseTable.vue @@ -83,6 +83,7 @@ const props = defineProps<{ project: string; + type: 'my_follow' | 'my_create'; }>(); const { t } = useI18n(); @@ -206,14 +207,14 @@ function goApiCase() { openNewPage(ApiTestRouteEnum.API_TEST_MANAGEMENT, { tab: 'case', - view: 'my_follow', + view: props.type, }); } function init() { setLoadListParams({ projectId: props.project, - viewId: 'my_follow', + viewId: props.type, }); loadList(); } diff --git a/frontend/src/views/workbench/myFollowed/components/bugTable.vue b/frontend/src/views/workbench/components/bugTable.vue similarity index 98% rename from frontend/src/views/workbench/myFollowed/components/bugTable.vue rename to frontend/src/views/workbench/components/bugTable.vue index a7833eca70..2d278b262f 100644 --- a/frontend/src/views/workbench/myFollowed/components/bugTable.vue +++ b/frontend/src/views/workbench/components/bugTable.vue @@ -56,6 +56,7 @@ const props = defineProps<{ project: string; + type: 'my_follow' | 'my_create'; }>(); const appStore = useAppStore(); @@ -223,14 +224,14 @@ function goBugList() { openNewPage(BugManagementRouteEnum.BUG_MANAGEMENT_INDEX, { - view: 'my_follow', + view: props.type, }); } function init() { setLoadListParams({ projectId: props.project, - viewId: 'my_follow', + viewId: props.type, }); loadList(); } diff --git a/frontend/src/views/workbench/myFollowed/components/caseReviewTable.vue b/frontend/src/views/workbench/components/caseReviewTable.vue similarity index 98% rename from frontend/src/views/workbench/myFollowed/components/caseReviewTable.vue rename to frontend/src/views/workbench/components/caseReviewTable.vue index ade4c7f8d3..7c96fe209b 100644 --- a/frontend/src/views/workbench/myFollowed/components/caseReviewTable.vue +++ b/frontend/src/views/workbench/components/caseReviewTable.vue @@ -79,6 +79,7 @@ const props = defineProps<{ project: string; + type: 'my_follow' | 'my_create'; }>(); const { t } = useI18n(); @@ -168,14 +169,14 @@ function goCaseReview() { openNewPage(CaseManagementRouteEnum.CASE_MANAGEMENT_REVIEW, { - view: 'my_follow', + view: props.type, }); } function init() { setLoadListParams({ projectId: props.project, - viewId: 'my_follow', + viewId: props.type, }); loadList(); } diff --git a/frontend/src/views/workbench/myFollowed/components/scenarioCaseTable.vue b/frontend/src/views/workbench/components/scenarioCaseTable.vue similarity index 98% rename from frontend/src/views/workbench/myFollowed/components/scenarioCaseTable.vue rename to frontend/src/views/workbench/components/scenarioCaseTable.vue index b34600f910..83c2f95231 100644 --- a/frontend/src/views/workbench/myFollowed/components/scenarioCaseTable.vue +++ b/frontend/src/views/workbench/components/scenarioCaseTable.vue @@ -90,6 +90,7 @@ const props = defineProps<{ project: string; + type: 'my_follow' | 'my_create'; }>(); const { t } = useI18n(); @@ -244,14 +245,14 @@ function goScenario() { openNewPage(ApiTestRouteEnum.API_TEST_SCENARIO, { - view: 'my_follow', + view: props.type, }); } function init() { setLoadListParams({ projectId: props.project, - viewId: 'my_follow', + viewId: props.type, }); loadList(); } diff --git a/frontend/src/views/workbench/myFollowed/components/testCaseTable.vue b/frontend/src/views/workbench/components/testCaseTable.vue similarity index 98% rename from frontend/src/views/workbench/myFollowed/components/testCaseTable.vue rename to frontend/src/views/workbench/components/testCaseTable.vue index 0d03d54ab6..a5844fc9aa 100644 --- a/frontend/src/views/workbench/myFollowed/components/testCaseTable.vue +++ b/frontend/src/views/workbench/components/testCaseTable.vue @@ -70,6 +70,7 @@ const props = defineProps<{ project: string; + type: 'my_follow' | 'my_create'; }>(); const { t } = useI18n(); @@ -196,7 +197,7 @@ function init() { setLoadListParams({ projectId: props.project, - viewId: 'my_follow', + viewId: props.type, }); loadList(); } @@ -208,7 +209,7 @@ function goTestCase() { openNewPage(CaseManagementRouteEnum.CASE_MANAGEMENT_CASE, { showType: 'list', - view: 'my_follow', + view: props.type, }); } diff --git a/frontend/src/views/workbench/myFollowed/components/testPlanTable.vue b/frontend/src/views/workbench/components/testPlanTable.vue similarity index 98% rename from frontend/src/views/workbench/myFollowed/components/testPlanTable.vue rename to frontend/src/views/workbench/components/testPlanTable.vue index ec361bfec8..fa12d4ec4a 100644 --- a/frontend/src/views/workbench/myFollowed/components/testPlanTable.vue +++ b/frontend/src/views/workbench/components/testPlanTable.vue @@ -4,7 +4,7 @@
{{ t('ms.workbench.myFollowed.feature.TEST_PLAN') }}
- + {{ t('testPlan.testPlanIndex.all') }} @@ -135,6 +135,7 @@ const props = defineProps<{ project: string; + type: 'my_follow' | 'my_create'; }>(); const { t } = useI18n(); @@ -280,7 +281,7 @@ setLoadListParams({ type: showType.value, projectId: props.project, - viewId: 'my_follow', + viewId: props.type, }); loadList(); } @@ -288,7 +289,7 @@ function goTestPlan() { openNewPage(TestPlanRouteEnum.TEST_PLAN_INDEX, { showType: showType.value, - view: 'my_follow', + view: props.type, }); } diff --git a/frontend/src/views/workbench/myCreated/index.vue b/frontend/src/views/workbench/myCreated/index.vue new file mode 100644 index 0000000000..0fa3ccec6c --- /dev/null +++ b/frontend/src/views/workbench/myCreated/index.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/frontend/src/views/workbench/myFollowed/index.vue b/frontend/src/views/workbench/myFollowed/index.vue index 5fb55a30f2..e2b829bbd8 100644 --- a/frontend/src/views/workbench/myFollowed/index.vue +++ b/frontend/src/views/workbench/myFollowed/index.vue @@ -27,24 +27,24 @@ - - - - - - + + + + + +