diff --git a/src/App.js b/src/App.js index 91c1606..7343932 100644 --- a/src/App.js +++ b/src/App.js @@ -13,13 +13,13 @@ import {MyRootProvider} from "./components/MyRootContext"; function App() { return ( - +
- }> + }> - }> + }> {/*} />*/} }/> }> diff --git a/src/components/DetailForm/index.js b/src/components/DetailForm/index.js index dd67b1e..58bcf17 100644 --- a/src/components/DetailForm/index.js +++ b/src/components/DetailForm/index.js @@ -84,7 +84,7 @@ export default () => { const onFinish = (values) => { if (currentPath === "selectTask") { // 进入添加日志页面 - navigate("/mobile/detail/logTask") + navigate("/detail/logTask") return; } console.log("提交:", values) @@ -104,7 +104,7 @@ export default () => { key: 'back', text: '回到列表', onClick: () => { - navigate("/mobile/listTask") + navigate("/home/listTask") } }, { @@ -133,7 +133,7 @@ export default () => { key: 'back', text: '回到列表', onClick: () => { - navigate("/mobile/listTask") + navigate("/home/listTask") } } ], @@ -188,7 +188,7 @@ export default () => { showCount /> - + 未开始 @@ -198,7 +198,7 @@ export default () => { - + 紧急重要 diff --git a/src/components/DetailSearchBar/index.js b/src/components/DetailSearchBar/index.js index f233d6c..3f3ea40 100644 --- a/src/components/DetailSearchBar/index.js +++ b/src/components/DetailSearchBar/index.js @@ -93,7 +93,7 @@ const DetailSearchBar = (props) => {
{showCloseOutline &&
{ dispatch({type:UPDATE_SEARCH,search:{ - "pageSize": 20, + "pageSize": 12, "pageNumber": 1, "data": { "andList": [], diff --git a/src/components/MyRootContext/index.js b/src/components/MyRootContext/index.js index 7699aef..31dd6c8 100644 --- a/src/components/MyRootContext/index.js +++ b/src/components/MyRootContext/index.js @@ -7,7 +7,7 @@ export const MyRootContext = createContext(); export const UPDATE_SEARCH = "UPDATE_SEARCH"; // 定义初始状态和 reducer 函数 const initialState = {"search":{ - "pageSize": 20, + "pageSize": 12, "pageNumber": 1, "data": { "orSearchModel": { diff --git a/src/pages/Bottom/index.js b/src/pages/Bottom/index.js index 191029b..4370abc 100644 --- a/src/pages/Bottom/index.js +++ b/src/pages/Bottom/index.js @@ -12,25 +12,25 @@ import "./index.css" const tabs = [ { - key: '/mobile/treeTask', + key: '/home/treeTask', title: '主子任务', icon: , // badge: '1', }, { - key: '/mobile/listTask', + key: '/home/listTask', title: '列表任务', icon: , // badge: '2', }, { - key: '/mobile/calTask', + key: '/home/calTask', title: '日历任务', icon: , // badge: '3', }, { - key: '/mobile/me', + key: '/home/me', title: '我的', icon: , // badge: '4', diff --git a/src/pages/DetailSearchContext/index.js b/src/pages/DetailSearchContext/index.js index c755ee5..679cd23 100644 --- a/src/pages/DetailSearchContext/index.js +++ b/src/pages/DetailSearchContext/index.js @@ -139,7 +139,7 @@ const DetailSearchContext = () => { orSearchModel } }}) - navigate("/mobile/listTask") + navigate("/home/listTask") }} footer={ +
} \ No newline at end of file diff --git a/src/pages/TaskCount/index.js b/src/pages/TaskCount/index.js index 01b0e33..1dbd22e 100644 --- a/src/pages/TaskCount/index.js +++ b/src/pages/TaskCount/index.js @@ -4,7 +4,6 @@ import dayjs from "dayjs"; import {DATE_FORMAT} from "../../utils/timeFormatUtil"; import {getDictionary} from "../../utils/dictUtil"; import {Tag} from "antd-mobile"; -import detailSearchBar from "../../components/DetailSearchBar"; import {useNavigate} from "react-router-dom"; import {MyRootContext, UPDATE_SEARCH} from "../../components/MyRootContext"; @@ -90,7 +89,7 @@ const TaskCount = (props) => { orSearchModel } }}) - navigate("/mobile/listTask") + navigate("/home/listTask") } return ( diff --git a/src/pages/ToDoTree/index.js b/src/pages/ToDoTree/index.js index ec0d5d1..656ecb7 100644 --- a/src/pages/ToDoTree/index.js +++ b/src/pages/ToDoTree/index.js @@ -2,7 +2,7 @@ import {Fragment, useEffect, useMemo, useState} from "react"; import {Card, Cascader, CascaderView} from "antd-mobile"; import {getTaskByPid} from "../../utils"; -export default ()=>{ +export default () => { const [valueToOptions, setValueToOptions] = useState([]) const options = useMemo(() => { function generate(v) { @@ -18,8 +18,10 @@ export default ()=>{ children: generate(option.value), })) } + return generate('0') ?? [] }, [valueToOptions]) + async function fetchOptionsForValue(v, level) { if (v in valueToOptions) return // if (level >= 3) { @@ -30,7 +32,7 @@ export default ()=>{ // return // } const data = await getTaskByPid(v) - console.log("await getTaskByPid(v)",data.content) + console.log("await getTaskByPid(v)", data.content) const options = data.content.length === 0 ? null @@ -38,11 +40,20 @@ export default ()=>{ value: task.id, label: task.name, })) - console.log("await getTaskByPid(v) options",options) - setValueToOptions(prev => ({ - ...prev, - [v]: options, - })) + console.log("await getTaskByPid(v) options", options) + if (options){ + setValueToOptions(prev => ({ + ...prev, + [v]: options, + })) + }else { + setValueToOptions(prev => ({ + ...prev, + [v]: [], + })) + } + + } useEffect(() => { @@ -52,6 +63,8 @@ export default ()=>{ 任务详情 - + { + fetchOptionsForValue(value) + }}/> } \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 3ed80a0..6fc9799 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,8 +6,8 @@ import DetailSearchContext from "../pages/DetailSearchContext"; const router = [ { - key:"mobile", - path: "/mobile", + key:"home", + path: "/home", element: , children: [{ key:"treeTask", diff --git a/src/utils/index.js b/src/utils/index.js index c8ed1bb..8b34ec6 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -2,7 +2,7 @@ import {requestUtil} from "./requestUtil"; export const getTaskList = (data) => { let request = encodeURI(JSON.stringify(data)) - return requestUtil.get('/todo-server/V2/search/task_message_tree?search=' + request); + return requestUtil.get('/V2/search/task_message_tree?search=' + request); } // 根据pid获取未完成的任务 export const getTaskByPid = (pid) => {