From 9c81ff199c811886c99d072306e4ed1e0a25c76e Mon Sep 17 00:00:00 2001 From: 1708-huayu <57060237+1708-huayu@users.noreply.github.com> Date: Tue, 14 Jan 2025 19:47:19 +0800 Subject: [PATCH] feat:backup --- src/assets/images/nav-1.png | Bin 6064 -> 0 bytes src/assets/images/nav-2.png | Bin 6529 -> 0 bytes src/assets/images/nav-3.png | Bin 6576 -> 0 bytes src/assets/images/nav-4.png | Bin 6086 -> 0 bytes src/components/DetailForm/index.js | 6 +- src/components/DetailSearchBar/index.js | 2 +- src/pages/Bottom/index.js | 12 +-- src/pages/DetailSearchContext/index.js | 43 ++++++----- src/pages/Home/index.js | 94 ++++++++++++------------ src/pages/ToDoList/index.js | 43 +++++++---- src/utils/requestUtil.js | 17 ++++- src/utils/timeFormatUtil.js | 20 ++++- 12 files changed, 147 insertions(+), 90 deletions(-) delete mode 100644 src/assets/images/nav-1.png delete mode 100644 src/assets/images/nav-2.png delete mode 100644 src/assets/images/nav-3.png delete mode 100644 src/assets/images/nav-4.png diff --git a/src/assets/images/nav-1.png b/src/assets/images/nav-1.png deleted file mode 100644 index 74b7ecf0cc6e77289b2457e125484e75e5222e9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6064 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 { // 获取form引用 const [form] = Form.useForm(); useEffect(() => { + + if (location.pathname.endsWith("addTask")) { setTitle("添加任务"); setCurrentPath("addTask"); @@ -186,7 +188,7 @@ export default () => { showCount /> - + 未开始 @@ -196,7 +198,7 @@ export default () => { - + 紧急重要 diff --git a/src/components/DetailSearchBar/index.js b/src/components/DetailSearchBar/index.js index d22af3c..74d4448 100644 --- a/src/components/DetailSearchBar/index.js +++ b/src/components/DetailSearchBar/index.js @@ -18,7 +18,7 @@ const DetailSearchBar = (props) => { (search.data.andList?.length > 0 || search.data.orList?.length > 0) useEffect(() => { initSearch(); - }, []); + }, [search]); const initSearch = async () => { if (search && search.data) { diff --git a/src/pages/Bottom/index.js b/src/pages/Bottom/index.js index 39e5c36..191029b 100644 --- a/src/pages/Bottom/index.js +++ b/src/pages/Bottom/index.js @@ -3,7 +3,7 @@ import {TabBar, FloatingBubble, Toast} from 'antd-mobile' import WidthUseNavigate from './../WidthUseNavigate/index' import { AppOutline, - MessageOutline, + CalendarOutline, UnorderedListOutline, UserOutline, AddOutline, @@ -15,25 +15,25 @@ const tabs = [ key: '/mobile/treeTask', title: '主子任务', icon: , - badge: '1', + // badge: '1', }, { key: '/mobile/listTask', title: '列表任务', icon: , - badge: '2', + // badge: '2', }, { key: '/mobile/calTask', title: '日历任务', - icon: , - badge: '3', + icon: , + // badge: '3', }, { key: '/mobile/me', title: '我的', icon: , - badge: '4', + // badge: '4', }, ] class BottomInner extends React.Component { diff --git a/src/pages/DetailSearchContext/index.js b/src/pages/DetailSearchContext/index.js index 5f22e9f..ff3afbb 100644 --- a/src/pages/DetailSearchContext/index.js +++ b/src/pages/DetailSearchContext/index.js @@ -32,31 +32,34 @@ const DetailSearchContext = () => { if (!search) { return } - let searchMap = new Map( - search.data?.orSearchModel?.andList.map(searchObj => [searchObj.name, searchObj])); - if (searchMap.has("pid")) { + if (search.data && search.data.orSearchModel && search.data.orSearchModel.andList) { + let searchMap = new Map( + search.data.orSearchModel.andList.map(searchObj => [searchObj.name, searchObj])); + if (searchMap.has("pid")) { - // form.setFieldValue(task.name); - } - if (searchMap.has("state")) { - form.setFieldValue("state", searchMap.get("state").value.split(',')) - } - if (searchMap.has("priority")) { - form.setFieldValue("priority", searchMap.get("priority").value.split(',')) + // form.setFieldValue(task.name); + } + if (searchMap.has("state")) { + form.setFieldValue("state", searchMap.get("state").value.split(',')) + } + if (searchMap.has("priority")) { + form.setFieldValue("priority", searchMap.get("priority").value.split(',')) + } + if (searchMap.has("name")) { + form.setFieldValue("name", searchMap.get("name").value) + } } // 结束时间大于todo日，开始时间小于结束日 - search.data.orSearchModel?.andSearchModel?.andList?.forEach((searchObj) => { + search.data?.orSearchModel?.andSearchModel?.andList?.forEach((searchObj) => { if (searchObj.name === "expectedEndTime") { form.setFieldValue("todoDay", dayjs(searchObj.value).toDate()) } }) - - if (searchMap.has("name")) { - form.setFieldValue("name", searchMap.get("name").value) - } - let orMap = new Map(search.data.andList.map(searchObj => [searchObj.name, searchObj])); - if (orMap.has("state") && orMap.get("state").value === "10") { - form.setFieldValue("allOverdueTasks", 'checked') + if (search.data && search.data.andList) { + let orMap = new Map(search.data.andList.map(searchObj => [searchObj.name, searchObj])); + if (orMap.has("state") && orMap.get("state").value === "10") { + form.setFieldValue("allOverdueTasks", 'checked') + } } } @@ -67,9 +70,9 @@ const DetailSearchContext = () => { onFinish={(values) => { console.log("Form", values) let andList = [] - let searchCondition =[] + let searchCondition = [] let andSearchModel = {} - let orSearchModel = {"andList":searchCondition,andSearchModel} + let orSearchModel = {"andList": searchCondition, andSearchModel} const {pidArray, name, priority, state, todoDay, allOverdueTasks} = values; if (pidArray && pidArray.length !== 0) { diff --git a/src/pages/Home/index.js b/src/pages/Home/index.js index afcf227..31d3c6b 100644 --- a/src/pages/Home/index.js +++ b/src/pages/Home/index.js @@ -1,9 +1,10 @@ -import React, {Fragment} from 'react' +import React, {Fragment, useEffect} from 'react' import Bottom from './../Bottom/index' import './index.css' import {Outlet, useLocation} from 'react-router-dom' import DetailSearchBar from "../../components/DetailSearchBar"; import dayjs from "dayjs"; +import {dayStartUtcFormat, nextDayStartUtcFormat} from "../../utils/timeFormatUtil"; const Home = () => { @@ -12,75 +13,78 @@ const Home = () => { console.log("Home", location); const searchUrl = location?.state?.search; const [pName, setName] = React.useState(""); - const [search, setSearch] = React.useState(searchUrl ? searchUrl : { - "pageSize": 20, - "pageNumber": 1, - "data": { - "orSearchModel": { - "andList": [ - {"name": "state", "value": "8,9", "operateType": "IN"}, - ], - "andSearchModel": { + const [search, setSearch] = React.useState() + const updateSearch = (values) => { + setSearch(values); + }; + useEffect(() => { + setSearch(searchUrl ? searchUrl : { + "pageSize": 20, + "pageNumber": 1, + "data": { + "orSearchModel": { "andList": [ - { - "name": "expectedStartTime", - "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).format(), - "operateType": ">" - } + {"name": "state", "value": "8,9", "operateType": "IN"}, ], - "orSearchModel": { + "andSearchModel": { "andList": [ { "name": "expectedStartTime", - "value": dayjs().add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(), + "value": nextDayStartUtcFormat(dayjs()), "operateType": "<" }, - { - "name": "expectedStartTime", - "value": dayjs().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).format(), - "operateType": "NULL" + "value": dayStartUtcFormat(dayjs()), + "operateType": ">" } ], "orSearchModel": { "andList": [ { - "name": "expectedEndTime", - "value": dayjs().add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(), + "name": "expectedStartTime", + "value": nextDayStartUtcFormat(dayjs()), "operateType": "<" }, { - "name": "expectedEndTime", - "value": dayjs().set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(), + "name": "expectedStartTime", + "value": dayStartUtcFormat(dayjs()), "operateType": ">" }, { - "name": "expectedStartTime", - "value": dayjs().set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(), + "name": "expectedEndTime", + "value": dayStartUtcFormat(dayjs()), "operateType": "NULL" } ], + "orSearchModel": { + "andList": [ + { + "name": "expectedEndTime", + "value": nextDayStartUtcFormat(dayjs()), + "operateType": "<" + }, + { + "name": "expectedEndTime", + "value": dayStartUtcFormat(dayjs()), + "operateType": ">" + }, + { + "name": "expectedStartTime", + "value": dayStartUtcFormat(dayjs()), + "operateType": "NULL" + } + ], + } } - } + }, }, - }, - "andList": [ - {"name": "state", "value": "10", "operateType": "="} - ] - } - }) - const updateSearch = (values) => { - setSearch(values); - }; + "andList": [ + {"name": "state", "value": "10", "operateType": "="} + ] + } + }) + },[searchUrl]) return (
diff --git a/src/pages/ToDoList/index.js b/src/pages/ToDoList/index.js index 344434c..13b2058 100644 --- a/src/pages/ToDoList/index.js +++ b/src/pages/ToDoList/index.js @@ -4,7 +4,7 @@ import {deleteTaskById, getTaskList, updateTaskStateById} from "../../utils"; import "./index.css" import {useLocation, useNavigate, useOutletContext} from "react-router-dom"; import dayjs from "dayjs"; -import {DATE_TIME_FORMAT} from "../../utils/timeFormatUtil"; +import {DATE_TIME_FORMAT, DATE_TIME_FORMAT_SIMPLE} from "../../utils/timeFormatUtil"; import {getDictionary} from "../../utils/dictUtil"; const reorder = ( @@ -26,23 +26,27 @@ const ToDoList = () => { const [priorityMap, setPriorityMap] = useState([]); const [stateMap, setStateMap] = useState([]) const navigate = useNavigate(); - let loading = false; + let loading = true; const location = useLocation(); const {search: outletSearch} = useOutletContext() const search = location.state ? location.state.search : outletSearch; console.log("ToDoList.search", location, outletSearch) - + console.log("ToDoList测试下从添加任务过来条件都没有了，",search,outletSearch) const loadMore = async () => { if (loading) { return } loading = true; console.log("loadMore", loading) - await getTaskList({...search, "pageNumber": pageNumber + 1}).then(result => { - setTaskList(val => [...val, ...result.content]) - setHasMore(result.page.number < result.page.totalPages) - }) - setPageNumber(pageNumber + 1) + const taskRes = await getTaskList({...search, "pageNumber": pageNumber + 1}); + setTaskList(val => [...val, ...taskRes.connect]) + if (taskRes.page.number < taskRes.page.totalPages){ + setHasMore(true) + setPageNumber(pageNumber + 1) + }else { + setHasMore(false) + setPageNumber(1) + } loading = false; } /** @@ -61,11 +65,17 @@ const ToDoList = () => { }) getTaskList({...search, "pageNumber": pageNumber}).then(result => { setTaskList(result.content) - setHasMore(result.page.number < result.page.totalPages) + if (result.page.number < result.page.totalPages){ + setHasMore(true) + setPageNumber(pageNumber + 1) + }else { + setHasMore(false) + setPageNumber(1) + } loading = false; }) - }, []) + }, [useOutletContext()]) const ref = useRef(null) return ( @@ -75,8 +85,13 @@ const ToDoList = () => { console.log("refresh") getTaskList({...search, "pageNumber": 1}).then(result => { setTaskList(result.content) - setPageNumber(1) - setHasMore(result.page.number < result.page.totalPages) + if (result.page.number < result.page.totalPages){ + setHasMore(true) + setPageNumber(pageNumber + 1) + }else { + setHasMore(false) + setPageNumber(1) + } }) }} > @@ -187,9 +202,9 @@ const ToDoList = () => { {item.expectedEndTime && (stateMap.get(item.state)?.jsonValue?.color ? ( - 结束时间:{dayjs(item.expectedEndTime).format(DATE_TIME_FORMAT)}) : + {dayjs(item.expectedEndTime).format(DATE_TIME_FORMAT_SIMPLE)}) : ( - 结束时间:{dayjs(item.expectedEndTime).format(DATE_TIME_FORMAT)})) + {dayjs(item.expectedEndTime).format(DATE_TIME_FORMAT_SIMPLE)})) }
} description={item.description} diff --git a/src/utils/requestUtil.js b/src/utils/requestUtil.js index a13fdd8..91c8c0e 100644 --- a/src/utils/requestUtil.js +++ b/src/utils/requestUtil.js @@ -1,5 +1,6 @@ import axios from "axios"; import Cookies from "js-cookie"; +import {Toast} from "antd-mobile"; export const requestUtil = axios.create({ baseURL: 'http://www.huaruyu.com/', @@ -24,11 +25,25 @@ requestUtil.interceptors.response.use(function (response) { // 对响应数据做点什么 console.log("response",response); if (response.data.status.code !== 200){ - + Toast.show({ + content: 'response.data.status.message', + afterClose: () => { + console.log('after') + }, + }) } return response.data.data; }, function (error) { // 超出 2xx 范围的状态码都会触发该函数。 // 对响应错误做点什么 + Toast.show({ + content: error.toString(), + afterClose: () => { + console.log('after') + }, + }) + if (error.response.status >= 400 && error.response.status <= 500) { + window.location.href = '/login'; + } return Promise.reject(error); }); \ No newline at end of file diff --git a/src/utils/timeFormatUtil.js b/src/utils/timeFormatUtil.js index c4e8427..b6f9ae2 100644 --- a/src/utils/timeFormatUtil.js +++ b/src/utils/timeFormatUtil.js @@ -1,5 +1,23 @@ +import dayjs from "dayjs"; + const DATE_FORMAT = "YYYY-MM-DD" // 到秒没啥意义 const DATE_TIME_FORMAT = "YYYY-MM-DD HH:mm" -export {DATE_TIME_FORMAT,DATE_FORMAT} \ No newline at end of file +const DATE_TIME_FORMAT_SIMPLE = "MM-DD HH:mm" + +function dayStartUtcFormat(dayjs) { + if (dayjs) { + return dayjs.set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format() + } + return null; +} + +function nextDayStartUtcFormat(dayjs) { + if (dayjs) { + return dayjs.add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format() + } + return null +} + +export {DATE_TIME_FORMAT, DATE_FORMAT,DATE_TIME_FORMAT_SIMPLE,dayStartUtcFormat,nextDayStartUtcFormat} \ No newline at end of file