fix(project/detail): fix own

app/management/person/dashboard/page.tsx

@@ -84,7 +84,8 @@ function StatCard(props: {
       radius={"md"}
       pos="relative"
       style={{
-        borderColor: "rgba(0,0,0,0.06)",
+        borderColor:
+          "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
         overflow: "hidden",
         display: "flex",
       }}>
@@ -181,7 +182,8 @@ export default function PersonDashboardPage() {
           p="md"
           style={{
             width: 160,
-            borderColor: "rgba(0,0,0,0.06)",
+            borderColor:
+              "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
             display: "flex",
             flexDirection: "column",
             gap: 16,
@@ -251,7 +253,8 @@ export default function PersonDashboardPage() {
           withBorder
           p="md"
           style={{
-            borderColor: "rgba(0,0,0,0.06)",
+            borderColor:
+              "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
             display: "flex",
             flexDirection: "column",
             minHeight: 0,
@@ -266,7 +269,8 @@ export default function PersonDashboardPage() {
           withBorder
           p="md"
           style={{
-            borderColor: "rgba(0,0,0,0.06)",
+            borderColor:
+              "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
             display: "flex",
             flexDirection: "column",
             minHeight: 0,

app/management/person/report/page.tsx

@@ -434,7 +434,10 @@ export default function PersonReportPage() {
         withBorder
         p="md"
         radius="md"
-        style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+        style={{
+          borderColor:
+            "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+        }}>
         <Stack gap="sm">
           <Group justify="space-between" wrap="wrap" gap="sm">
             <Group gap="xs">
@@ -619,7 +622,8 @@ export default function PersonReportPage() {
         p="md"
         radius="md"
         style={{
-          borderColor: "rgba(0,0,0,0.06)",
+          borderColor:
+            "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
           flex: 1,
           minHeight: 0,
           display: "flex",

app/management/project/audit/page.tsx

@@ -403,7 +403,10 @@ export default function ProjectAuditPage() {
         withBorder
         p="md"
         radius="md"
-        style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+        style={{
+          borderColor:
+            "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+        }}>
         <Group justify="space-between" wrap="wrap" gap="sm">
           <Group gap="xs">
             <Text fw={700}>项目审核</Text>
@@ -465,7 +468,7 @@ export default function ProjectAuditPage() {
                 onChange={(e) =>
                   setFilters((s) => ({
                     ...s,
-                    project_name: e.currentTarget.value,
+                    project_name: e.target.value,
                   }))
                 }
               />
@@ -477,7 +480,7 @@ export default function ProjectAuditPage() {
                 onChange={(e) =>
                   setFilters((s) => ({
                     ...s,
-                    project_type: e.currentTarget.value,
+                    project_type: e.target.value,
                   }))
                 }
               />
@@ -527,7 +530,8 @@ export default function ProjectAuditPage() {
         p="md"
         radius="md"
         style={{
-          borderColor: "rgba(0,0,0,0.06)",
+          borderColor:
+            "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
           flex: 1,
           minHeight: 0,
           display: "flex",

app/management/project/detail/InfoSettingContainer.tsx

@@ -5,7 +5,7 @@ import { ProjectDetail } from "@/components/label/api/project/typing"
 import { useAllUserStore } from "@/components/label/store/auth"
 import { Button, Group, Paper, Stack, Switch, Text } from "@mantine/core"
 import { notifications } from "@mantine/notifications"
-import { JSX, useMemo, useState } from "react"
+import { useMemo, useState } from "react"
 import AdminUserModal from "./components/AdminUserModal"
 import LabelSchemeContainer from "./components/LabelSchemeContainer"
 import NoteRulesTable from "./components/NoteRulesTable"
@@ -14,7 +14,6 @@ import TaskStageTabsContainer from "./components/TaskStageTabsContainer"
 
 export default function InfoSettingContainer(props: {
   info: ProjectDetail.DataProps | undefined
-  menuAction?: () => JSX.Element
   userEnums: {
     allEnum: Map<any, any>
     labelEnum: Map<any, any>
@@ -23,7 +22,7 @@ export default function InfoSettingContainer(props: {
   }
   updateAction: () => void
 }) {
-  const { info, menuAction, userEnums, updateAction } = props
+  const { info, userEnums, updateAction } = props
   const projectId = info?.id ?? -1
 
   const { userOpts } = useAllUserStore()
@@ -78,9 +77,11 @@ export default function InfoSettingContainer(props: {
           withBorder
           p="sm"
           radius="md"
-          style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+          style={{
+            borderColor:
+              "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+          }}>
           <Stack gap="sm">
-            {menuAction ? <div>{menuAction()}</div> : null}
             <Group justify="space-between" wrap="wrap">
               <Text fw={700}>基础配置</Text>
               <Button size="xs" variant="default" onClick={updateAction}>

app/management/project/detail/OwnTaskTableContainer.tsx

@@ -5,22 +5,44 @@ import { getTaskList, taskAcquire } from "@/components/label/api/task"
 import { Task } from "@/components/label/api/task/typing"
 import {
   useBackUrlStore,
-  useOwnTaskStore,
   usePermissionStore,
 } from "@/components/label/store/auth"
 import { OwnTaskStatusOpts } from "@/components/label/utils/constants"
-import { Button, Group, Paper, Select, Stack, TextInput } from "@mantine/core"
+import {
+  Text,
+  ActionIcon,
+  Button,
+  Collapse,
+  Flex,
+  Group,
+  Paper,
+  Select,
+  SimpleGrid,
+  Stack,
+  TextInput,
+} from "@mantine/core"
 import { notifications } from "@mantine/notifications"
-import { IconRefresh } from "@tabler/icons-react"
 import { DataTable, DataTableColumn } from "mantine-datatable"
 import { useRouter, useSearchParams } from "next/navigation"
-import { JSX, useCallback, useEffect, useMemo, useState } from "react"
+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"
+
+function createInitialFilters() {
+  return {
+    search_id: "",
+    search_status: "0",
+  }
+}
 
 export default function OwnTaskTableContainer(props: {
   info: ProjectDetail.DataProps | undefined
-  menuAction?: () => JSX.Element
   userEnums: {
     allEnum: Map<any, any>
     labelEnum: Map<any, any>
@@ -28,7 +50,7 @@ export default function OwnTaskTableContainer(props: {
     review2Enum: Map<any, any>
   }
 }) {
-  const { info, menuAction, userEnums } = props
+  const { info, userEnums } = props
   const urlParams = useSearchParams()
   const id = urlParams.get("id")
   const type = urlParams.get("type")
@@ -41,16 +63,18 @@ export default function OwnTaskTableContainer(props: {
   const user_name = usePermissionStore((s) => s.user_name)
   const user_password = usePermissionStore((s) => s.user_password)
 
-  const { params, total, resetParams, setPagination, setTotal } =
+  const [total, setTotal] = useState(0)
-    useOwnTaskStore()
 
+  const [pageNumber, setPageNumber] = useState(1)
+  const [pageSize, setPageSize] = useState(15)
+
+  const [searchExpanded, setSearchExpanded] = useState(false)
+
+  const [filters, setFilters] = useState(() => createInitialFilters())
   const [form, setForm] = useState<{
     search_id: string
     search_status: string
-  }>({
+  }>(createInitialFilters())
-    search_id: "",
-    search_status: "0",
-  })
 
   const [records, setRecords] = useState<Task.DataProps[]>([])
   const [loading, setLoading] = useState(false)
@@ -68,9 +92,8 @@ export default function OwnTaskTableContainer(props: {
   const appliedParams = useMemo(() => {
     const uid = typeof user_id === "number" ? user_id : Number(user_id ?? 0)
     const next: Task.ListRequest = {
-      ...params,
+      page_number: pageNumber ?? 1,
-      page_number: params.page_number ?? 1,
+      page_size: pageSize ?? 20,
-      page_size: params.page_size ?? 20,
       current_uid: uid ? [uid] : undefined,
       project_id: projectId !== -1 ? [projectId] : undefined,
       get_data: false,
@@ -87,7 +110,15 @@ export default function OwnTaskTableContainer(props: {
       delete next.label_status
     }
     return next
-  }, [form.search_id, form.search_status, params, projectId, user_id])
+  }, [
+    ,
+    form.search_id,
+    form.search_status,
+    pageNumber,
+    pageSize,
+    projectId,
+    user_id,
+  ])
 
   const load = useCallback(async () => {
     if (!queryTrigger) return
@@ -114,6 +145,12 @@ export default function OwnTaskTableContainer(props: {
     load()
   }, [load])
 
+  useEffect(() => {
+    queueMicrotask(() => {
+      setQueryTrigger((v) => v + 1)
+    })
+  }, [])
+
   const handleAcquireTask = async (label_action: 1 | 2 | 3) => {
     const uid = typeof user_id === "number" ? user_id : Number(user_id ?? 0)
     if (!uid || projectId === -1) return
@@ -232,26 +269,73 @@ export default function OwnTaskTableContainer(props: {
 
   return (
     <Stack gap="sm" style={{ flex: 1, minHeight: 0 }}>
-      <Paper
+      <Paper withBorder p="sm" radius="sm">
-        withBorder
-        p="sm"
-        radius="md"
-        style={{ borderColor: "rgba(0,0,0,0.06)" }}>
-        <Stack gap="sm">
-          {menuAction ? <div>{menuAction()}</div> : null}
         <Group justify="space-between" wrap="wrap" gap="sm">
-            <Group gap="sm" wrap="wrap">
+          <Group gap="xs">
+            <Text fw={700}>项目审核</Text>
+            <Button
+              size="xs"
+              variant="transparent"
+              rightSection={
+                searchExpanded ? (
+                  <IconChevronUp size={16} />
+                ) : (
+                  <IconChevronDown size={16} />
+                )
+              }
+              onClick={() => setSearchExpanded((v) => !v)}>
+              {searchExpanded ? "收起筛选" : "展开筛选"}
+            </Button>
+          </Group>
+          <Group gap="xs">
+            <Button
+              size="xs"
+              radius={"xs"}
+              variant="default"
+              leftSection={<IconRefresh size={16} />}
+              onClick={() => {
+                const next = createInitialFilters()
+                setFilters(next)
+                setForm(next)
+                setPageNumber(1)
+              }}>
+              重置
+            </Button>
+            <Button
+              size="xs"
+              radius={"xs"}
+              leftSection={<IconSearch size={16} />}
+              onClick={() => {
+                setPageNumber(1)
+                setForm({ ...filters })
+              }}>
+              查询
+            </Button>
+          </Group>
+        </Group>
+        <Collapse
+          in={searchExpanded}
+          transitionDuration={250}
+          transitionTimingFunction="ease"
+          animateOpacity>
+          <Stack gap="sm" mt="sm">
+            <SimpleGrid cols={{ base: 1, sm: 2, md: 3, lg: 4 }} spacing="sm">
               <TextInput
                 size="xs"
+                radius="xs"
                 label="任务ID"
-                value={form.search_id}
+                value={filters.search_id}
                 onChange={(e) =>
-                  setForm((s) => ({ ...s, search_id: e.currentTarget.value }))
+                  setFilters((s) => ({
+                    ...s,
+                    search_id: e.target.value,
+                  }))
                 }
                 style={{ width: 160 }}
               />
               <Select
                 size="xs"
+                radius="xs"
                 label="状态"
                 data={Object.entries(OwnTaskStatusOpts).map(
                   ([value, label]) => ({
@@ -259,28 +343,34 @@ export default function OwnTaskTableContainer(props: {
                     label,
                   })
                 )}
-                value={form.search_status}
+                value={filters.search_status}
                 onChange={(v) =>
-                  setForm((s) => ({ ...s, search_status: v ?? "0" }))
+                  setFilters((s) => ({ ...s, search_status: v ?? "0" }))
                 }
                 allowDeselect={false}
                 style={{ width: 160 }}
               />
-              <Button
+            </SimpleGrid>
-                size="xs"
+          </Stack>
-                leftSection={<IconRefresh size={16} />}
+        </Collapse>
-                loading={loading}
+      </Paper>
-                onClick={() => {
-                  setPagination(1, params.page_size ?? 20)
-                  setQueryTrigger((v) => v + 1)
-                }}>
-                刷新
-              </Button>
-            </Group>
 
-            <Group gap="xs" wrap="wrap">
+      <Paper
+        withBorder
+        p="md"
+        radius="sm"
+        style={{
+          flex: 1,
+          minHeight: 0,
+          display: "flex",
+          flexDirection: "column",
+        }}>
+        <Stack gap={12} align="stretch" style={{ flex: 1, minHeight: 0 }}>
+          <Flex justify={"space-between"} align="center" w="100%">
+            <Flex gap={12}>
               <Button
                 size="xs"
+                radius="xs"
                 variant="default"
                 disabled={!isLabel}
                 onClick={() => handleAcquireTask(1)}>
@@ -288,6 +378,7 @@ export default function OwnTaskTableContainer(props: {
               </Button>
               <Button
                 size="xs"
+                radius="xs"
                 variant="default"
                 disabled={!isReview1}
                 onClick={() => handleAcquireTask(2)}>
@@ -295,35 +386,17 @@ export default function OwnTaskTableContainer(props: {
               </Button>
               <Button
                 size="xs"
+                radius="xs"
                 variant="default"
                 disabled={!isReview2}
                 onClick={() => handleAcquireTask(3)}>
                 领取复审
               </Button>
-              <Button
+            </Flex>
-                size="xs"
+            <ActionIcon onClick={load} variant="transparent">
-                variant="default"
+              <IconRefresh size={16} />
-                onClick={() => {
+            </ActionIcon>
-                  resetParams()
+          </Flex>
-                  setForm({ search_id: "", search_status: "0" })
-                  setQueryTrigger((v) => v + 1)
-                }}>
-                重置
-              </Button>
-              <Button
-                size="xs"
-                onClick={() => {
-                  setPagination(1, params.page_size ?? 20)
-                  setQueryTrigger((v) => v + 1)
-                }}>
-                查询
-              </Button>
-            </Group>
-          </Group>
-        </Stack>
-      </Paper>
-
-      <Group gap={0} align="stretch" style={{ flex: 1, minHeight: 0 }}>
           <DataTable<Task.DataProps>
             width="100%"
             style={{ width: "100%" }}
@@ -336,20 +409,19 @@ export default function OwnTaskTableContainer(props: {
             records={records}
             columns={columns}
             totalRecords={total}
-          recordsPerPage={params.page_size ?? 20}
+            recordsPerPage={pageSize}
-          page={params.page_number ?? 1}
+            page={pageNumber}
-          onPageChange={(p) => {
+            onPageChange={(p) => setPageNumber(p)}
-            setPagination(p, params.page_size ?? 20)
-            setQueryTrigger((v) => v + 1)
-          }}
             onRecordsPerPageChange={(s) => {
-            setPagination(1, s)
+              setPageSize(s)
-            setQueryTrigger((v) => v + 1)
+              setPageNumber(1)
             }}
-          recordsPerPageOptions={[10, 20, 50, 100]}
+            recordsPerPageOptions={[10, 15, 20]}
             noRecordsText="暂无数据"
+            recordsPerPageLabel="当前页数"
           />
-      </Group>
+        </Stack>
+      </Paper>
     </Stack>
   )
 }

app/management/project/detail/TaskBoardContainer.tsx

@@ -8,7 +8,10 @@ export default function TaskBoardContainer() {
       withBorder
       p="md"
       radius="md"
-      style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+      style={{
+        borderColor:
+          "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+      }}>
       <Stack gap="xs">
         <Text fw={700}>统计信息</Text>
         <Text size="sm" c="dimmed">

app/management/project/detail/TaskTableContainer.tsx

@@ -18,15 +18,10 @@ import {
   TextInput,
 } from "@mantine/core"
 import { notifications } from "@mantine/notifications"
-import {
+import { IconArrowsShuffle, IconRoute, IconTrashX } from "@tabler/icons-react"
-  IconArrowsShuffle,
-  IconRefresh,
-  IconRoute,
-  IconTrashX,
-} from "@tabler/icons-react"
 import { DataTable, DataTableColumn } from "mantine-datatable"
 import { useSearchParams } from "next/navigation"
-import { JSX, useCallback, useEffect, useMemo, useState } from "react"
+import { useCallback, useEffect, useMemo, useState } from "react"
 import DispatchModal from "./components/DispatchModal"
 import ReleaseModal from "./components/ReleaseModal"
 import TaskStatusTag from "./components/TaskStatusTag"
@@ -34,7 +29,6 @@ import WorkflowModal from "./components/WorkflowModal"
 
 export default function TaskTableContainer(props: {
   info: ProjectDetail.DataProps | undefined
-  menuAction?: () => JSX.Element
   userEnums: {
     allEnum: Map<any, any>
     labelEnum: Map<any, any>
@@ -42,7 +36,7 @@ export default function TaskTableContainer(props: {
     review2Enum: Map<any, any>
   }
 }) {
-  const { info, menuAction, userEnums } = props
+  const { info, userEnums } = props
   false && console.log(info)
 
   const urlParams = useSearchParams()
@@ -216,9 +210,11 @@ export default function TaskTableContainer(props: {
           withBorder
           p="sm"
           radius="md"
-          style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+          style={{
+            borderColor:
+              "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+          }}>
           <Stack gap="sm">
-            {menuAction ? <div>{menuAction()}</div> : null}
             <Group justify="space-between" wrap="wrap" gap="sm">
               <Group gap="sm" wrap="wrap">
                 <TextInput
@@ -226,7 +222,7 @@ export default function TaskTableContainer(props: {
                   label="任务ID"
                   value={form.search_id}
                   onChange={(e) =>
-                    setForm((s) => ({ ...s, search_id: e.currentTarget.value }))
+                    setForm((s) => ({ ...s, search_id: e.target.value }))
                   }
                   style={{ width: 160 }}
                 />
@@ -246,13 +242,6 @@ export default function TaskTableContainer(props: {
                   allowDeselect={false}
                   style={{ width: 160 }}
                 />
-                <Button
-                  size="xs"
-                  leftSection={<IconRefresh size={16} />}
-                  loading={loading}
-                  onClick={() => setQueryTrigger((v) => v + 1)}>
-                  刷新
-                </Button>
               </Group>
 
               <Group gap="xs" wrap="wrap">

app/management/project/detail/components/LabelSchemeContainer.tsx

@@ -76,7 +76,10 @@ export default function LabelSchemeContainer(props: {
       withBorder
       p="sm"
       radius="md"
-      style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+      style={{
+        borderColor:
+          "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+      }}>
       <Stack gap="sm">
         <Text fw={700}>标注方案</Text>
         <DataTable<ProjectDetail.LabelSchemaList>

app/management/project/detail/components/NoteRulesTable.tsx

@@ -15,7 +15,10 @@ export default function NoteRulesTable(props: {
       withBorder
       p="sm"
       radius="md"
-      style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+      style={{
+        borderColor:
+          "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+      }}>
       <Stack gap="xs">
         <Text fw={700}>批注规则</Text>
 

app/management/project/detail/components/SamplingPlanContainer.tsx

@@ -98,7 +98,10 @@ export default function SamplingPlanContainer(props: {
       withBorder
       p="sm"
       radius="md"
-      style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+      style={{
+        borderColor:
+          "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+      }}>
       <Stack gap="sm">
         <Group justify="space-between" wrap="wrap">
           <Text fw={700}>抽检方案</Text>
@@ -131,7 +134,10 @@ export default function SamplingPlanContainer(props: {
               withBorder
               p="sm"
               radius="md"
-              style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+              style={{
+                borderColor:
+                  "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+              }}>
               <Stack gap="xs">
                 <Text fw={600}>等级 {g}</Text>
                 <NumberInput

app/management/project/detail/components/TaskStageTabsContainer.tsx

@@ -93,7 +93,10 @@ export default function TaskStageTabsContainer(props: {
         withBorder
         p="sm"
         radius="md"
-        style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+        style={{
+          borderColor:
+            "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
+        }}>
         <Stack gap="sm">
           <Text fw={700}>任务工序配置</Text>
           <Group gap="sm" align="stretch" wrap="wrap">
@@ -104,7 +107,8 @@ export default function TaskStageTabsContainer(props: {
                 p="sm"
                 radius="md"
                 style={{
-                  borderColor: "rgba(0,0,0,0.06)",
+                  borderColor:
+                    "light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4))",
                   flex: "1 1 260px",
                   minWidth: 260,
                 }}>

app/management/project/detail/page.tsx

@@ -9,14 +9,13 @@ import {
 } from "@/components/label/store/auth"
 import {
   Breadcrumbs,
-  Button,
+  Flex,
   Group,
   Paper,
   Stack,
   Text,
   UnstyledButton,
 } from "@mantine/core"
-import { IconChevronLeft } from "@tabler/icons-react"
 import { useRouter, useSearchParams } from "next/navigation"
 import { useEffect, useMemo, useState } from "react"
 import InfoSettingContainer from "./InfoSettingContainer"
@@ -114,10 +113,12 @@ export default function CollectionDetailPage() {
             : type === "dynamic"
               ? "动态项目"
               : "全部项目"
-          : "我的收藏",
+          : "全部项目",
         href: type
-          ? `/management/project?type=${type}`
+          ? type === "collect"
-          : "/management/project?type=collect",
+            ? `/management/person/collection`
+            : "/management/project/dynamic"
+          : "/management/project/all",
       },
       {
         title: info?.name || "项目名称",
@@ -177,11 +178,10 @@ export default function CollectionDetailPage() {
                 paddingRight: 14,
                 paddingTop: 6,
                 paddingBottom: 6,
-                borderTopLeftRadius: index === 0 ? 10 : 0,
+                borderTopLeftRadius: index === 0 ? 4 : 0,
-                borderBottomLeftRadius: index === 0 ? 10 : 0,
+                borderBottomLeftRadius: index === 0 ? 4 : 0,
-                borderTopRightRadius: index === menuItems.length - 1 ? 10 : 0,
+                borderTopRightRadius: index === menuItems.length - 1 ? 4 : 0,
-                borderBottomRightRadius:
+                borderBottomRightRadius: index === menuItems.length - 1 ? 4 : 0,
-                  index === menuItems.length - 1 ? 10 : 0,
                 background: active
                   ? "var(--mantine-color-brand-filled)"
                   : "rgba(0,0,0,0.04)",
@@ -198,45 +198,21 @@ export default function CollectionDetailPage() {
 
   return (
     <Stack w="100%" h="calc(100vh - 56px)" p="md" gap="md">
-      <Paper
+      <Paper withBorder p="md" radius="sm">
-        withBorder
-        p="md"
-        radius="md"
-        style={{ borderColor: "rgba(0,0,0,0.06)" }}>
         <Group justify="space-between" wrap="wrap" gap="sm">
-          <Group gap="sm">
+          <Flex gap="sm" w="100%" justify="space-between">
-            <Button
-              variant="subtle"
-              size="xs"
-              leftSection={<IconChevronLeft size={16} />}
-              onClick={() => {
-                router.push(
-                  type
-                    ? `/management/project?type=${type}`
-                    : "/management/project?type=collect"
-                )
-              }}>
-              返回
-            </Button>
             <Breadcrumbs separator=">">{breadcrumbsItems}</Breadcrumbs>
-          </Group>
+            {DetailMenuItems()}
+          </Flex>
         </Group>
       </Paper>
 
       <Stack style={{ flex: 1, minHeight: 0 }} gap="md">
         {selectKey === "own" ? (
-          <OwnTaskTableContainer
+          <OwnTaskTableContainer info={info} userEnums={userEnums} />
-            info={info}
-            userEnums={userEnums}
-            menuAction={DetailMenuItems}
-          />
         ) : null}
         {selectKey === "all" ? (
-          <TaskTableContainer
+          <TaskTableContainer info={info} userEnums={userEnums} />
-            info={info}
-            userEnums={userEnums}
-            menuAction={DetailMenuItems}
-          />
         ) : null}
         {selectKey === "board" ? <TaskBoardContainer /> : null}
         {selectKey === "setting" ? (
@@ -244,7 +220,6 @@ export default function CollectionDetailPage() {
             info={info}
             userEnums={userEnums}
             updateAction={updateProjectInfo}
-            menuAction={DetailMenuItems}
           />
         ) : null}
       </Stack>

components/label/OptStore.tsx

@@ -5,7 +5,6 @@ import { useEffect } from "react"
 import {
   useAllTaskStore,
   useAllUserStore,
-  useOwnTaskStore,
   usePermissionStore,
 } from "./store/auth"
 import { getUserAll, getUserGroupTree } from "./api/user"
@@ -91,7 +90,6 @@ export function OptStore() {
   useEffect(() => {
     if (pathname !== "/project/info/detail" && pathname !== "/label") {
       useAllTaskStore.getState().resetParams()
-      useOwnTaskStore.getState().resetParams()
     }
   }, [pathname])
 

components/project/index.tsx

@@ -588,7 +588,7 @@ export default function ProjectInfoPage({
         withBorder
         p="md"
         radius="md"
-        style={{ borderColor: "rgba(0,0,0,0.06)" }}>
+        style={{ borderColor: "var(--mantine-color-brand-text)" }}>
         <Group justify="space-between" wrap="wrap" gap="sm">
           <Group gap="xs">
             <Text fw={700}>
@@ -765,7 +765,7 @@ export default function ProjectInfoPage({
         p="md"
         radius="md"
         style={{
-          borderColor: "rgba(0,0,0,0.06)",
+          borderColor: "var(--mantine-color-brand-text)",
           flex: 1,
           minHeight: 0,
           display: "flex",