feat:突然没有了。。主要是因为后端改了时间格式。

This commit is contained in:
shixiaohua 2024-05-30 17:55:55 +08:00
parent 25b2ad52a1
commit 8fcc35d3cb
3 changed files with 15 additions and 13 deletions

Binary file not shown.

View File

@ -15,6 +15,7 @@ import LocalContext from "@/ui/LocalContent";
import withDragAndDrop, {EventInteractionArgs} from "react-big-calendar/lib/addons/dragAndDrop"; import withDragAndDrop, {EventInteractionArgs} from "react-big-calendar/lib/addons/dragAndDrop";
import {TaskEvent} from "@/lib/task/calendar/data"; import {TaskEvent} from "@/lib/task/calendar/data";
import {number} from "prop-types"; import {number} from "prop-types";
import {DATE_TIME} from "@/lib/constants";
/** /**
* https://github.com/jquense/react-big-calendar?tab=readme-ov-file * 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) console.log('responseD.data.content:',result)
setEvents(result) setEvents([...result])
} }
}) })
} }
@ -181,19 +182,19 @@ const CalShow: React.FC = () => {
setEvents((prev: TaskEvent[]) => { setEvents((prev: TaskEvent[]) => {
const existing: TaskEvent | undefined = prev.find((ev: TaskEvent) => ev.resource === event.resource); const existing: TaskEvent | undefined = prev.find((ev: TaskEvent) => ev.resource === event.resource);
const filtered: TaskEvent[] | undefined = prev.filter((ev: TaskEvent) => ev.resource !== event.resource); const filtered: TaskEvent[] | undefined = prev.filter((ev: TaskEvent) => ev.resource !== event.resource);
if (existing !== undefined) { let result: TaskEvent[] = [];
return [...filtered, {...existing, state:7}]; if (existing !== undefined&&filtered !== undefined) {
result= [...filtered, {...existing, state:7}];
} }
if (filtered !== undefined) { console.log('result',result)
return [...filtered]; return result;
}
return [];
}) })
},250) },250)
} }
const moveEvent = useCallback( const moveEvent = useCallback(
({event, start, end, isAllDay: droppedOnAllDaySlot = false}: EventInteractionArgs<TaskEvent>) => { ({event, start, end, isAllDay: droppedOnAllDaySlot = false}: EventInteractionArgs<TaskEvent>) => {
console.log("onEventResize || onEventDrop :",start,end)
const {allDay} = event const {allDay} = event
if (!allDay && droppedOnAllDaySlot) { if (!allDay && droppedOnAllDaySlot) {
event.allDay = true event.allDay = true
@ -201,13 +202,13 @@ const CalShow: React.FC = () => {
// 数据落库 // 数据落库
commonUpdate({ commonUpdate({
updateColumnList: [{ updateColumnList: [{
name: '期望开始时间', name: 'expectedStartTime',
code: 'expectedStartTime', code: '',
value: start value: start.toLocaleString()
}, { }, {
name: '期望结束时间', name: 'expectedEndTime',
code: 'expectedEndTime', code: '',
value: end value: end.toLocaleString()
}], }],
conditionColumnList: [{ conditionColumnList: [{
name: 'id', name: 'id',

View File

@ -117,6 +117,7 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
} }
values.pPid=pPid; values.pPid=pPid;
var result:boolean=false; var result:boolean=false;
// todo 修改
await addTask(values).then(response => { await addTask(values).then(response => {
console.log('response', response) console.log('response', response)
if (response.status.success) { if (response.status.success) {