From 5325ecd535fbeb881a0ce035dd1c371964d3c8d1 Mon Sep 17 00:00:00 2001
From: shixiaohua <shi_xiaohua@qq.com>
Date: Tue, 23 Apr 2024 14:45:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=9C=9F=E6=9C=9B=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/ui/task/project/DetailForm.tsx         | 8 ++++----
 src/app/ui/task/project/TreeTable.tsx          | 5 +++--
 src/app/ui/task/project/detailForm.modules.css | 3 +++
 3 files changed, 10 insertions(+), 6 deletions(-)

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<DetailFormProps> = (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<T> = TableProps<T>['rowSelection'];
 
 
@@ -125,7 +125,8 @@ const TreeTable: React.FC<TableSearchType> = (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;
+}