diff --git a/app/management/project/detail/OwnTaskTableContainer.tsx b/app/management/project/detail/OwnTaskTableContainer.tsx index 4e7b8b9..3ad7c8a 100644 --- a/app/management/project/detail/OwnTaskTableContainer.tsx +++ b/app/management/project/detail/OwnTaskTableContainer.tsx @@ -9,7 +9,6 @@ import { } from "@/components/label/store/auth" import { OwnTaskStatusOpts } from "@/components/label/utils/constants" import { - Text, ActionIcon, Button, Collapse, @@ -19,20 +18,21 @@ import { Select, SimpleGrid, Stack, + Text, TextInput, } from "@mantine/core" import { notifications } from "@mantine/notifications" -import { DataTable, DataTableColumn } from "mantine-datatable" -import { useRouter, useSearchParams } from "next/navigation" -import { useCallback, useEffect, useMemo, useState } from "react" -import TaskStatusTag from "./components/TaskStatusTag" -import { runCommand } from "./util" import { IconChevronDown, IconChevronUp, IconRefresh, IconSearch, } from "@tabler/icons-react" +import { DataTable, DataTableColumn } from "mantine-datatable" +import { useRouter, useSearchParams } from "next/navigation" +import { useCallback, useEffect, useMemo, useState } from "react" +import TaskStatusTag from "./components/TaskStatusTag" +import { runCommand } from "./util" function createInitialFilters() { return { @@ -51,6 +51,7 @@ export default function OwnTaskTableContainer(props: { } }) { const { info, userEnums } = props + const urlParams = useSearchParams() const id = urlParams.get("id") const type = urlParams.get("type") @@ -183,7 +184,7 @@ export default function OwnTaskTableContainer(props: { width: 100, render: (record) => ( + ), + }, { accessor: "label_status", title: "状态", @@ -706,7 +748,7 @@ export default function TaskTableContainer(props: { }, ] return cols - }, []) + }, [info, projectId, router, setBackProps, type, user_name, user_password]) return ( <> diff --git a/components/label/components/TopTools.tsx b/components/label/components/TopTools.tsx index 382e312..a6092b3 100644 --- a/components/label/components/TopTools.tsx +++ b/components/label/components/TopTools.tsx @@ -24,17 +24,14 @@ import { } from "@mantine/core" import { useForm } from "@mantine/form" import { notifications } from "@mantine/notifications" -import { - IconCaretDownFilled, - IconChevronDown, - IconCornerRightUp, -} from "@tabler/icons-react" +import { IconCaretDownFilled, IconChevronDown } from "@tabler/icons-react" import dayjs from "dayjs" import duration from "dayjs/plugin/duration" import { BadgeInfoIcon, Baseline, ChevronDownIcon, + ChevronLeftIcon, CirclePlus, ClipboardList, Cloud, @@ -1540,12 +1537,12 @@ const TopTools = ( px="md" flex={1} style={{ justifyContent: "flex-start" }}> - {/* { if (isView) { - const url = backUrl || "/project/info" + const url = backUrl || "/management/project/all" // handleBackup("auto_backup"); router.push(url) // 重置图片比例及选中标注对象 @@ -1556,8 +1553,8 @@ const TopTools = ( } }}> - */} - + {/* { @@ -1565,7 +1562,7 @@ const TopTools = ( window.open(url, "_blank") }}> - + */}