diff --git a/src/ui/task/calendar/CalShow.tsx b/src/ui/task/calendar/CalShow.tsx index 66db200..e903bac 100644 --- a/src/ui/task/calendar/CalShow.tsx +++ b/src/ui/task/calendar/CalShow.tsx @@ -243,10 +243,10 @@ const CalShow: React.FC = () => { }), [setEvents] ) - const rangeChange = (rangeLet: Date[]|{ start: Date; end: Date })=>{ - console.log("rangeChange:",rangeLet) + const rangeChange = (rangeLet: Date[]|{ start: Date; end: Date },current?:View|undefined)=>{ + console.log("rangeChange:",rangeLet,(current?current:view)) // view 为天的时候类型为数组,index:0为当天 - if (view==="day"&&Array.isArray(rangeLet)) { + if ((current?current:view)==="day"&&Array.isArray(rangeLet)) { if (range.start.valueOf()>rangeLet[0].valueOf()){ setRange({...range,start:rangeLet[0]}) }else if (range.end.valueOf() { } } // 为周的时候类型为数组,周一到周日七天 - if (view==="week"&&Array.isArray(rangeLet)){ + if ((current?current:view)==="week"&&Array.isArray(rangeLet)){ if (range.start.valueOf()>rangeLet[0].valueOf()){ setRange({...range,start:rangeLet[0]}) } @@ -263,7 +263,7 @@ const CalShow: React.FC = () => { } } // 为周的时候类型为对象 - if (view==="month"&& rangeLet && !Array.isArray(rangeLet)){ + if ((current?current:view)==="month"&& rangeLet && !Array.isArray(rangeLet)){ if (range.start.valueOf()>rangeLet.start.valueOf()){ setRange({...range,start:rangeLet.start}) } diff --git a/src/ui/task/project/DetailModelForm.tsx b/src/ui/task/project/DetailModelForm.tsx index 01a87bf..e6bd19b 100644 --- a/src/ui/task/project/DetailModelForm.tsx +++ b/src/ui/task/project/DetailModelForm.tsx @@ -167,7 +167,7 @@ export const DetailModelForm: React.FC = (props) => { values.priority = priority.code } // todo 修改 - if (props.operationId === OPERATION_BUTTON_TYPE.UPDATE) { + if (props.operationId === OPERATION_BUTTON_TYPE.UPDATE||(props.operationId === OPERATION_BUTTON_TYPE.DETAIL&&!editFormDisable)) { await updateTask(values).then(response => { console.log('response', response) if (response.status.success) {