diff --git a/src/app/ui/task/project/DetailForm.tsx b/src/app/ui/task/project/DetailForm.tsx index cd4c692..b84b5f9 100644 --- a/src/app/ui/task/project/DetailForm.tsx +++ b/src/app/ui/task/project/DetailForm.tsx @@ -54,10 +54,10 @@ export const DetailForm: React.FC = (props) => { // setTaskMessage(task.data) task.data.state=taskStateList.find(taskState=>taskState.code===task.data.state?.toString())?.name; task.data.priority=taskPriorityList.find(taskPriority=>taskPriority.code===task.data.priority?.toString())?.name; - task.data.actualTimeRange = [task.data.expectedStartTime?dayjs(task.data.expectedStartTime,DATE_TIME):'', - task.data.expectedEndTime?dayjs(task.data.expectedEndTime,DATE_TIME):'']; - task.data.expectedTimeRange = [task.data.actualStartTime?dayjs(task.data.actualStartTime,DATE_TIME):'', - task.data.actualEndTime?dayjs(task.data.actualEndTime,DATE_TIME):'']; + task.data.actualTimeRange = [task.data.actualStartTime?dayjs(task.data.actualStartTime):'', + task.data.actualEndTime?dayjs(task.data.actualEndTime):'']; + task.data.expectedTimeRange = [task.data.expectedStartTime?dayjs(task.data.expectedStartTime):'', + task.data.expectedEndTime?dayjs(task.data.expectedEndTime):'']; form.setFieldsValue(task.data) }else{ message.error(task.status.message); diff --git a/src/app/ui/task/project/TreeTable.tsx b/src/app/ui/task/project/TreeTable.tsx index 89eee9e..a420335 100644 --- a/src/app/ui/task/project/TreeTable.tsx +++ b/src/app/ui/task/project/TreeTable.tsx @@ -6,7 +6,7 @@ import {getTaskTreeResult, taskPriorityList, taskStateList, taskTreeResult} from import {DataType, ResponseVO, ResultPage} from "@/app/lib/definitions"; import OperationButton from "@/app/ui/task/project/OperationButton"; import dayjs from "dayjs"; - +import "@/app/ui/task/project/detailForm.modules.css" type TableRowSelection = TableProps['rowSelection']; @@ -125,7 +125,8 @@ const TreeTable: React.FC = (props) => { columns={columns} // rowSelection={{ ...rowSelection, checkStrictly}} dataSource={data} - pagination={{ pageSize: 10 }} + pagination={{ pageSize: 5 }} + scroll={{ y: 280 }} /> ); diff --git a/src/app/ui/task/project/detailForm.modules.css b/src/app/ui/task/project/detailForm.modules.css index 7c6bb8e..300fd2a 100644 --- a/src/app/ui/task/project/detailForm.modules.css +++ b/src/app/ui/task/project/detailForm.modules.css @@ -1,3 +1,6 @@ .ant-picker-range-separator{ width: 60px; } +.ant-empty-image{ + overflow: hidden; +}