diff --git a/docker/task-manager-server.jar b/docker/task-manager-server.jar index 164a5f6..4be864a 100644 Binary files a/docker/task-manager-server.jar and b/docker/task-manager-server.jar differ diff --git a/src/ui/task/calendar/CalShow.tsx b/src/ui/task/calendar/CalShow.tsx index 7331b04..d8e0436 100644 --- a/src/ui/task/calendar/CalShow.tsx +++ b/src/ui/task/calendar/CalShow.tsx @@ -15,6 +15,7 @@ import LocalContext from "@/ui/LocalContent"; import withDragAndDrop, {EventInteractionArgs} from "react-big-calendar/lib/addons/dragAndDrop"; import {TaskEvent} from "@/lib/task/calendar/data"; import {number} from "prop-types"; +import {DATE_TIME} from "@/lib/constants"; /** * https://github.com/jquense/react-big-calendar?tab=readme-ov-file @@ -120,7 +121,7 @@ const CalShow: React.FC = () => { } }); console.log('responseD.data.content:',result) - setEvents(result) + setEvents([...result]) } }) } @@ -181,19 +182,19 @@ const CalShow: React.FC = () => { setEvents((prev: TaskEvent[]) => { const existing: TaskEvent | undefined = prev.find((ev: TaskEvent) => ev.resource === event.resource); const filtered: TaskEvent[] | undefined = prev.filter((ev: TaskEvent) => ev.resource !== event.resource); - if (existing !== undefined) { - return [...filtered, {...existing, state:7}]; + let result: TaskEvent[] = []; + if (existing !== undefined&&filtered !== undefined) { + result= [...filtered, {...existing, state:7}]; } - if (filtered !== undefined) { - return [...filtered]; - } - return []; + console.log('result',result) + return result; }) },250) } const moveEvent = useCallback( ({event, start, end, isAllDay: droppedOnAllDaySlot = false}: EventInteractionArgs) => { + console.log("onEventResize || onEventDrop :",start,end) const {allDay} = event if (!allDay && droppedOnAllDaySlot) { event.allDay = true @@ -201,13 +202,13 @@ const CalShow: React.FC = () => { // 数据落库 commonUpdate({ updateColumnList: [{ - name: '期望开始时间', - code: 'expectedStartTime', - value: start + name: 'expectedStartTime', + code: '', + value: start.toLocaleString() }, { - name: '期望结束时间', - code: 'expectedEndTime', - value: end + name: 'expectedEndTime', + code: '', + value: end.toLocaleString() }], conditionColumnList: [{ name: 'id', diff --git a/src/ui/task/project/DetailModelForm.tsx b/src/ui/task/project/DetailModelForm.tsx index 134ea6e..35ec85f 100644 --- a/src/ui/task/project/DetailModelForm.tsx +++ b/src/ui/task/project/DetailModelForm.tsx @@ -117,6 +117,7 @@ export const DetailModelForm: React.FC = (props) => { } values.pPid=pPid; var result:boolean=false; + // todo 修改 await addTask(values).then(response => { console.log('response', response) if (response.status.success) {