fix:修改状态未更新

This commit is contained in:
1708-huayu 2025-01-02 19:03:47 +08:00
parent cf8fdda4b6
commit aa443207f4
3 changed files with 24 additions and 24 deletions

View File

@ -13,8 +13,30 @@ import {DataType, ResponseVO, ResultPage} from "@/lib/definitions";
export default function Layout({children}: { children: React.ReactNode }) { export default function Layout({children}: { children: React.ReactNode }) {
const [resultDataTypeList, setResultDataTypeList] = useState<DataType[]>([]); const [resultDataTypeList, setResultDataTypeList] = useState<DataType[]>([]);
const [loadingState,setLoadingState] =useState(true) 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 => { const refreshDate = (): void => {
setLoadingState(true) 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({ getTaskTreeResult(JSON.stringify({
pageSize:1000, pageSize:1000,
pageNumber:1, pageNumber:1,
@ -44,28 +66,6 @@ export default function Layout({children}: { children: React.ReactNode }) {
document.getElementById('tenLeft').style.fontSize = divHeight/6*4 + 'px'; document.getElementById('tenLeft').style.fontSize = divHeight/6*4 + 'px';
refreshDate() refreshDate()
}, [useContext(LocalContext)]); }, [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 ( return (
<div> <div>
<div className='firstRow' style={{display: 'flex'}}> <div className='firstRow' style={{display: 'flex'}}>

View File

@ -140,7 +140,7 @@ export const taskStateList: DictType[] = [
// { // {
// id: 6, // id: 6,
// code: '6', // code: '6',
// name: '排期中', // name: '关闭',
// order: 6, // order: 6,
// color: 'red' // color: 'red'
// }, // },

View File

@ -40,7 +40,7 @@ const CalShow: React.FC = () => {
start: dayjs(date).startOf('week').toDate(), start: dayjs(date).startOf('week').toDate(),
end: dayjs(date).endOf('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) => { const handleViewChange = (newView: View) => {
setView(newView); setView(newView);