diff --git a/components/project/index.tsx b/components/project/index.tsx index e5b652d..c175355 100644 --- a/components/project/index.tsx +++ b/components/project/index.tsx @@ -19,6 +19,7 @@ import { useProjectStore, } from "@/components/label/store/auth" import { + ALL_CODE, projectLabelTypeOpts, projectStatusOpts, STATUS_CODE, @@ -36,7 +37,6 @@ import { Modal, MultiSelect, Pagination, - Paper, Select, SimpleGrid, Stack, @@ -46,6 +46,15 @@ import { Tooltip, UnstyledButton, } from "@mantine/core" +import { + SettingContentPanel, + SettingFilterActions, + SettingFilterPanel, + SettingHeaderActions, + SettingListHeader, + SettingPage, + SettingPanel, +} from "@/components/setting/PageSurface" import { useForm } from "@mantine/form" import { notifications } from "@mantine/notifications" import { @@ -134,6 +143,7 @@ export default function ProjectInfoPage({ type: "dynamic" | "collect" | "" }) { const router = useRouter() + const storeType = type || "all" const { userOpts } = useAllUserStore() const userName = usePermissionStore((s) => s.user_name) @@ -150,20 +160,20 @@ export default function ProjectInfoPage({ }: any = useProjectStore() const storeParams = useMemo(() => { - return type === "collect" + return storeType === "collect" ? collectParams - : type === "dynamic" + : storeType === "dynamic" ? dynamicParams : allParams - }, [allParams, collectParams, dynamicParams, type]) + }, [allParams, collectParams, dynamicParams, storeType]) const total = useMemo(() => { - return type === "collect" + return storeType === "collect" ? collectTotal - : type === "dynamic" + : storeType === "dynamic" ? dynamicTotal : allTotal - }, [allTotal, collectTotal, dynamicTotal, type]) + }, [allTotal, collectTotal, dynamicTotal, storeType]) const [typeOpts, setTypeOpts] = useState< Array<{ label: string; value: string }> @@ -179,7 +189,7 @@ export default function ProjectInfoPage({ status: "", owner: "", label_type: "", - admin_user: "", + admin_user: [] as string[], start_date: dayjs().subtract(6, "day").format("YYYY-MM-DD"), end_date: dayjs().format("YYYY-MM-DD"), } @@ -200,9 +210,9 @@ export default function ProjectInfoPage({ const queryParams = useMemo(() => { const base = - type === "collect" + storeType === "collect" ? { ...initCollectParams } - : type === "dynamic" + : storeType === "dynamic" ? { ...initDynamicParams } : { ...initAllParams } @@ -214,7 +224,9 @@ export default function ProjectInfoPage({ project_name: appliedFilters.project_name || undefined, project_type: appliedFilters.project_type || undefined, owner: appliedFilters.owner || undefined, - admin_user: appliedFilters.admin_user || undefined, + admin_user: appliedFilters.admin_user?.length + ? appliedFilters.admin_user.map((n) => Number(n)) + : undefined, start_date: appliedFilters.start_date || undefined, end_date: appliedFilters.end_date || undefined, label_type: appliedFilters.label_type @@ -222,11 +234,11 @@ export default function ProjectInfoPage({ : undefined, // 0: 图片标注 1: 点云标注 2: 视频标注 project_data_type: 0, - status: parseStatusValue(appliedFilters.status), + status: parseStatusValue(appliedFilters.status) ?? [...ALL_CODE], } return params - }, [appliedFilters, storeParams, type]) + }, [appliedFilters, storeParams, storeType]) const load = useCallback(async () => { if (!queryTrigger) return @@ -234,10 +246,10 @@ export default function ProjectInfoPage({ try { const res = await getProjectList(queryParams) setRecords(res?.project_list ?? []) - setTotal(res?.total_items ?? 0, type) + setTotal(res?.total_items ?? 0, storeType) } catch (e) { setRecords([]) - setTotal(0, type) + setTotal(0, storeType) notifications.show({ color: "red", title: "加载失败", @@ -246,7 +258,7 @@ export default function ProjectInfoPage({ } finally { setLoading(false) } - }, [queryParams, queryTrigger, setTotal, type]) + }, [queryParams, queryTrigger, setTotal, storeType]) useEffect(() => { load() @@ -345,11 +357,10 @@ export default function ProjectInfoPage({ const canDoAction = !!actionKey return ( - @@ -551,7 +565,7 @@ export default function ProjectInfoPage({ - + ) } @@ -604,19 +618,12 @@ export default function ProjectInfoPage({ } return ( - - + + - - {type === "collect" - ? "我的收藏" - : type === "dynamic" - ? "动态项目" - : "我的项目"} - + 筛选条件 - + setFilters((s) => ({ @@ -688,8 +689,6 @@ export default function ProjectInfoPage({ /> ({ label: o.label, - value: o.label, + value: o.value.toString(), }))} value={filters.status} onChange={(v) => setFilters((s) => ({ ...s, status: v ?? "" }))} /> setFilters((s) => ({ ...s, owner: e.currentTarget.value })) @@ -721,8 +716,6 @@ export default function ProjectInfoPage({ /> ({ label: o.label, value: String(o.value), }))} - value={filters.admin_user || null} - onChange={(v) => - setFilters((s) => ({ ...s, admin_user: v ?? "" })) - } + value={filters.admin_user} + onChange={(v) => setFilters((s) => ({ ...s, admin_user: v }))} + searchable + clearable /> @@ -764,8 +751,6 @@ export default function ProjectInfoPage({ /> @@ -775,18 +760,36 @@ export default function ProjectInfoPage({ - + - + + + + } + />
{ - setSearchParams({ ...storeParams, page_number: p }, type) + setSearchParams({ ...storeParams, page_number: p }, storeType) setQueryTrigger((v) => v + 1) }} onChangePageSize={(s) => { setSearchParams( { ...storeParams, page_number: 1, page_size: s }, - type + storeType ) setQueryTrigger((v) => v + 1) }} />
- + - + ) }