diff --git a/src/app/layout.tsx b/src/app/layout.tsx index cdf367c..17d437a 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -2,8 +2,8 @@ import type {Metadata} from "next"; import "@/ui/globals.css"; export const metadata: Metadata = { - title: "任务管理", - description: "任务管理小助手", + title: "马上行计划管理", + description: "马上行计划管理", }; /** * Root Layout (Required) @@ -18,7 +18,7 @@ export default function RootLayout({ return ( - 任务管理 + 马上行计划管理 {/*FOUC，Flash of Unstyled Content*/} diff --git a/src/app/task/drag/layout.tsx b/src/app/task/drag/layout.tsx index 22e2f2b..425ab0b 100644 --- a/src/app/task/drag/layout.tsx +++ b/src/app/task/drag/layout.tsx @@ -26,7 +26,7 @@ export default function Layout({children}: { children: React.ReactNode }) { const requestParam: Request = { pageSize: 1000, pageNumber: 1, - data: {state: data.taskState} + data: {state: data.taskState,pid:pid} } if (data.expectedStartTime.length>0){ const parse = JSON.parse(data.expectedStartTime); diff --git a/src/lib/task/drag/data.tsx b/src/lib/task/drag/data.tsx index d099004..637fdb2 100644 --- a/src/lib/task/drag/data.tsx +++ b/src/lib/task/drag/data.tsx @@ -1,4 +1,5 @@ export type TaskSelectVO = { + pid?:string|undefined|null; name?: string; state?: string; priority?: string; diff --git a/src/ui/task/OperationButton.tsx b/src/ui/task/OperationButton.tsx index 73fbea4..73f493e 100644 --- a/src/ui/task/OperationButton.tsx +++ b/src/ui/task/OperationButton.tsx @@ -12,6 +12,7 @@ import {DetailModelForm} from "@/ui/task/project/DetailModelForm"; export interface OperationButtonProps { itemId: string, + itemName:string, priority?:string, pid: string, pPid: string, @@ -159,15 +160,15 @@ class OperationButton extends React.Component树任务显示子任务, + label: 树任务显示子任务, }, { key: OPERATION_BUTTON_TYPE.SHOW_FOUR, - label: 四象限显示子任务, + label: 四象限显示子任务, }, { key: OPERATION_BUTTON_TYPE.SHOW_CALENDAR, - label: 日历显示子任务, + label: 日历显示子任务, } ]; return diff --git a/src/ui/task/RightOption.tsx b/src/ui/task/RightOption.tsx index 178eb4a..381d810 100644 --- a/src/ui/task/RightOption.tsx +++ b/src/ui/task/RightOption.tsx @@ -7,6 +7,7 @@ import Link from "next/link"; import {DetailModelForm} from "@/ui/task/project/DetailModelForm"; interface OperationButtonProps { itemId: string, + itemName: string, priority?:string, pid: string, pPid: string, @@ -87,15 +88,15 @@ const RightOption: React.FC = (props) => { }, { key: OPERATION_BUTTON_TYPE.SHOW_TREE, - label: 树任务显示子任务, + label: 树任务显示子任务, }, { key: OPERATION_BUTTON_TYPE.SHOW_FOUR, - label: 四象限显示子任务, + label: 四象限显示子任务, }, { key: OPERATION_BUTTON_TYPE.SHOW_CALENDAR, - label: 日历显示子任务, + label: 日历显示子任务, } ]; // 获取系统样式 diff --git a/src/ui/task/TitleOperation.tsx b/src/ui/task/TitleOperation.tsx index 0a106f6..1fb773f 100644 --- a/src/ui/task/TitleOperation.tsx +++ b/src/ui/task/TitleOperation.tsx @@ -1,4 +1,5 @@ -import React, {Fragment, useContext} from "react"; +'use client' +import React, {Fragment, useContext, useEffect} from "react"; import {Button, DatePicker, Select, Space} from "antd"; import {usePathname, useRouter} from "next/navigation"; import {DetailModelForm} from "@/ui/task/project/DetailModelForm"; @@ -31,6 +32,12 @@ export const TitleOperation: React.FC = ({ expectStartTimeParseResult[0] && expectStartTimeParseResult[0].value ? dayjs(expectStartTimeParseResult[0].value.toString()) : undefined, expectStartTimeParseResult[1] && expectStartTimeParseResult[1].value ? dayjs(expectStartTimeParseResult[1].value.toString()) : undefined ]; + const pName = useSearchParams().get("pName"); + useEffect(() => { + if(pName&&pName!=document.title){ + document.title = pName; + } + }, [pName]); return
{ {props.taskList.map((record, index) => { return {(provided, snapshot) => ( - = (props) => { columns={columns} // rowSelection={{ ...rowSelection, checkStrictly}} dataSource={props.resultDataTypeList.filter(resultDataType=>{ - resultDataType.action= + resultDataType.action= if (dataLocalContext.expectedStartTime.length === 0) { return true; } diff --git a/src/ui/task/four/TreeTable.tsx b/src/ui/task/four/TreeTable.tsx index 072399b..60e275b 100644 --- a/src/ui/task/four/TreeTable.tsx +++ b/src/ui/task/four/TreeTable.tsx @@ -166,7 +166,7 @@ const TreeTable: React.FC = (props) => { columns={columns} // rowSelection={{ ...rowSelection, checkStrictly}} dataSource={props.resultDataTypeList.filter(resultDataType=>{ - resultDataType.action= + resultDataType.action= if (dataLocalContext.expectedStartTime.length === 0) { return true; } diff --git a/src/ui/task/project/TreeTablePro.tsx b/src/ui/task/project/TreeTablePro.tsx index 607e4a4..7a0eb22 100644 --- a/src/ui/task/project/TreeTablePro.tsx +++ b/src/ui/task/project/TreeTablePro.tsx @@ -155,7 +155,7 @@ const TreeTablePro: React.FC = () => { key: 'option', title: '操作', valueType: 'option', - render: (_, record) => { actionRef.current?.reload(false); }}/>,