huayu-web
/
assistant-todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:设置查询范围

This commit is contained in:
shixiaohua 2024-05-31 14:36:21 +08:00
parent 6cca06d4be
commit 73a402c840
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui/task/calendar/CalShow.tsx
View File

@ -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()<rangeLet[0].valueOf()){
@ -254,7 +254,7 @@ const CalShow: React.FC = () => {
}
}
// 为周的时候类型为数组，周一到周日七天
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})
}

2
src/ui/task/project/DetailModelForm.tsx
View File

@ -167,7 +167,7 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (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) {