{
updateSearch({
"pageSize": 20,
"pageNumber": 1,
+ "data": {
+ "andList": [],
+ "orList": []
+ }
});
setTags([]);
}}>
diff --git a/src/pages/DetailSearchContext/index.js b/src/pages/DetailSearchContext/index.js
index f1c0410..fea51bc 100644
--- a/src/pages/DetailSearchContext/index.js
+++ b/src/pages/DetailSearchContext/index.js
@@ -1,7 +1,7 @@
import {Button, Checkbox, DatePicker, Form, Input, Space, Switch, Tag} from "antd-mobile";
import ParentTask from "../../components/ParentTask";
import React, {useEffect} from "react";
-import dayjs from "dayjs";
+import dayjs, {isDayjs} from "dayjs";
import {CloseCircleFill} from "antd-mobile-icons";
import {useLocation, useNavigate, useOutletContext} from "react-router-dom";
import {getDictionary} from "../../utils/dictUtil";
@@ -33,7 +33,7 @@ const DetailSearchContext = () => {
if (!search) {
return
}
- let searchMap = new Map(search.data.map(searchObj => [searchObj.name, searchObj]));
+ let searchMap = new Map(search.data.andList.map(searchObj => [searchObj.name, searchObj]));
if (searchMap.has("pid")) {
let task = await getTaskById(searchMap.get("pid"));
// form.setFieldValue(task.name);
@@ -44,8 +44,17 @@ const DetailSearchContext = () => {
if (searchMap.has("priority")) {
form.setFieldValue("priority", searchMap.get("priority").value.split(','))
}
- if (searchMap.has("todoDay")) {
- form.setFieldValue("todoDay", searchMap.get("todoDay").value)
+ // 结束时间大于todo日，开始时间小于结束日
+ if (searchMap.has("expectedEndTime")) {
+ let value = searchMap.get("expectedEndTime").value;
+ form.setFieldValue("todoDay", dayjs(value).toDate())
+ }
+ if (searchMap.has("name")) {
+ form.setFieldValue("name", searchMap.get("name").value)
+ }
+ let orMap = new Map(search.data.orList.map(searchObj => [searchObj.name, searchObj]));
+ if (orMap.has("state") && orMap.get("state").value === "10") {
+ form.setFieldValue("allOverdueTasks", 'checked')
}
}
@@ -54,9 +63,10 @@ const DetailSearchContext = () => {
form={form}
layout='horizontal'
onFinish={(values) => {
- console.log(values)
+ console.log("Form", values)
let searchCondition = [];
- const {pidArray, name, priority, state, todoDay} = values;
+ let orList = []
+ const {pidArray, name, priority, state, todoDay, allOverdueTasks} = values;
if (pidArray && pidArray.length !== 0) {
searchCondition.push({"name": "name", "value": pidArray[pidArray.length - 1], "operateType": "="})
}
@@ -69,16 +79,33 @@ const DetailSearchContext = () => {
if (state && state.length !== 0) {
searchCondition.push({"name": "state", "value": state.join(","), "operateType": "IN"})
}
- if (todoDay !== undefined) {
- searchCondition.push({"name": "todoDay", "value": todoDay, "operateType": "IN"})
+ if (todoDay) {
+ searchCondition.push({
+ "name": "expectedStartTime",
+ "value": dayjs(todoDay).add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": "<"
+ })
+ searchCondition.push({
+ "name": "expectedEndTime",
+ "value": dayjs(todoDay).set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": ">"
+ })
}
- navigate("/home/listTask", {state: {search:{
- "pageSize": 12,
- "pageNumber": 1,
- "data":{
- "andList":searchCondition
+ if (allOverdueTasks) {
+ orList.push({"name": "state", "value": "10", "operateType": "="})
+ }
+ navigate("/home/listTask", {
+ state: {
+ search: {
+ "pageSize": 12,
+ "pageNumber": 1,
+ "data": {
+ "andList": searchCondition,
+ orList
+ }
}
- }}}
+ }
+ }
)
}}
footer={
@@ -100,8 +127,9 @@ const DetailSearchContext = () => {
{
stateList.map(stateDict =>
-
- {stateDict.itemName}
+
+ {stateDict.itemName}
)
}
@@ -113,8 +141,9 @@ const DetailSearchContext = () => {
{
priorityList.map(stateDict =>
-
- {stateDict.itemName}
+
+ {stateDict.itemName}
)
}
@@ -122,13 +151,15 @@ const DetailSearchContext = () => {
- prevValues.todoDay !== curValues.todoDay
+ shouldUpdate={(prevValues, curValues) =>{
+ console.log("prevValues,curValues",prevValues,curValues)
+ return prevValues.todoDay !== curValues.todoDay}
}
>
{({getFieldValue, setFieldsValue}) => (
{
)}
- {/*后期嵌套or*/}
- {/**/}
- {/* */}
- {/**/}
+
+
+
)
}
export default DetailSearchContext;
\ No newline at end of file
diff --git a/src/pages/Home/index.js b/src/pages/Home/index.js
index 9d4cd7a..9591746 100644
--- a/src/pages/Home/index.js
+++ b/src/pages/Home/index.js
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, {Fragment} from 'react'
import Bottom from './../Bottom/index'
import './index.css'
import {Outlet, useLocation} from 'react-router-dom'
@@ -12,21 +12,21 @@ const Home = () => {
console.log("Home", location);
const searchUrl = location?.state?.search;
const [pName, setName] = React.useState("");
- const [search, setSearch] = React.useState({
+ const [search, setSearch] = React.useState(searchUrl ? searchUrl : {
"pageSize": 20,
"pageNumber": 1,
- "data": searchUrl ? searchUrl : {
+ "data": {
"andList": [
{"name": "state", "value": "8,9", "operateType": "IN"}
,
{
"name": "expectedStartTime",
- "value": dayjs().add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0),
+ "value": dayjs().add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
"operateType": "<"
},
{
"name": "expectedEndTime",
- "value": dayjs().set('h', 0).set('m', 0).set('s', 0).set('ms', 0),
+ "value": dayjs().set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
"operateType": ">"
}
],
@@ -36,16 +36,28 @@ const Home = () => {
}
})
const updateSearch = (values) => {
- setSearch( values);
+ setSearch(values);
};
return (
-
-
-
-
+
+ {
+ location.pathname.endsWith("/calTask") ? (
+
+
+
+
+
+ ) : (
+
+
+
+
+
+ )
+ }