From aa443207f4d25ab88ce18fef10a97adaa97e084e Mon Sep 17 00:00:00 2001
From: 1708-huayu <57060237+1708-huayu@users.noreply.github.com>
Date: Thu, 2 Jan 2025 19:03:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9C=AA=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/task/four/layout.tsx     | 44 ++++++++++++++++----------------
 src/lib/task/project/data.tsx    |  2 +-
 src/ui/task/calendar/CalShow.tsx |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/app/task/four/layout.tsx b/src/app/task/four/layout.tsx
index 25c00dd..1e68b5e 100644
--- a/src/app/task/four/layout.tsx
+++ b/src/app/task/four/layout.tsx
@@ -13,8 +13,30 @@ import {DataType, ResponseVO, ResultPage} from "@/lib/definitions";
 export default function Layout({children}: { children: React.ReactNode }) {
     const [resultDataTypeList, setResultDataTypeList] = useState<DataType[]>([]);
     const [loadingState,setLoadingState] =useState(true)
+
+    const leftUp:{name:string,operateType:string,value:string|number|boolean}[] = []
+    const data = useContext(LocalContext);
+    console.log('data',data);
+    // 如果有pid,在前端过滤（防止中间数据不满足条件，导致子数据丢失），
+    // 无pid在后端过滤（防止数据量过大）。
+    var pid = useSearchParams().get('pid');
+    console.log('pid!=null',pid!=null);
     const refreshDate = (): void => {
         setLoadingState(true)
+        if (pid!=null) {
+            leftUp.push({name:"pid",value:pid,operateType:"="},
+                {name:'TREE-FILTER',value:"true",operateType: "TREE-FILTER"},
+                {name:'ALL-CHILD',value:"true",operateType: "ALL-CHILD"},
+            );
+        }else {
+            if (data.taskState.length>0){
+                leftUp.push({name:"state",value:data.taskState,operateType:"IN"});
+            }
+            if (data.expectedStartTime.length>0){
+                const parse = JSON.parse(data.expectedStartTime);
+                leftUp.push(...parse);
+            }
+        }
         getTaskTreeResult(JSON.stringify({
             pageSize:1000,
             pageNumber:1,
@@ -44,28 +66,6 @@ export default function Layout({children}: { children: React.ReactNode }) {
         document.getElementById('tenLeft').style.fontSize = divHeight/6*4 + 'px';
         refreshDate()
     }, [useContext(LocalContext)]);
-    const data = useContext(LocalContext);
-    const leftUp:{name:string,operateType:string,value:string|number|boolean}[] = []
-    var pid = useSearchParams().get('pid');
-    // 如果有pid,在前端过滤（防止中间数据不满足条件，导致子数据丢失），
-    // 无pid在后端过滤（防止数据量过大）。
-    console.log('data',data);
-    console.log('pid!=null',pid!=null);
-    if (pid!=null) {
-        leftUp.push({name:"pid",value:pid,operateType:"="},
-            {name:'TREE-FILTER',value:"true",operateType: "TREE-FILTER"},
-            {name:'ALL-CHILD',value:"true",operateType: "ALL-CHILD"},
-
-            );
-    }else {
-        if (data.taskState.length>0){
-            leftUp.push({name:"state",value:data.taskState,operateType:"IN"});
-        }
-        if (data.expectedStartTime.length>0){
-            const parse = JSON.parse(data.expectedStartTime);
-            leftUp.push(...parse);
-        }
-    }
     return (
         <div>
             <div className='firstRow' style={{display: 'flex'}}>
diff --git a/src/lib/task/project/data.tsx b/src/lib/task/project/data.tsx
index 2eaccdb..ab3a00a 100644
--- a/src/lib/task/project/data.tsx
+++ b/src/lib/task/project/data.tsx
@@ -140,7 +140,7 @@ export const taskStateList: DictType[] = [
     // {
     //     id: 6,
     //     code: '6',
-    //     name: '排期中',
+    //     name: '关闭',
     //     order: 6,
     //     color: 'red'
     // },
diff --git a/src/ui/task/calendar/CalShow.tsx b/src/ui/task/calendar/CalShow.tsx
index 0fade59..eff3356 100644
--- a/src/ui/task/calendar/CalShow.tsx
+++ b/src/ui/task/calendar/CalShow.tsx
@@ -40,7 +40,7 @@ const CalShow: React.FC = () => {
         start: dayjs(date).startOf('week').toDate(),
         end: dayjs(date).endOf('week').toDate()
     });
-    const [state, setState] = useState<string>(useContext(LocalContext).taskState);
+    const state=useContext(LocalContext).taskState;
 
     const handleViewChange = (newView: View) => {
         setView(newView);