diff --git a/CHANGELOG.md b/CHANGELOG.md index b320afe..20f0075 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 1.0.0 (2022-02-16) +# 1.0.0 (2022-02-17) ### 🌟 新功能 范围|描述|commitId @@ -31,6 +31,7 @@ - | 获取手机唯一码 | [3f60cf8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3f60cf8) - | 将时间轴改成swiper滑动 | [12384f9](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12384f9) - | 解决时间轴日常任务不显示问题 | [c532a93](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c532a93) + - | 刻度模式时间轴 | [a9bc53a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a9bc53a) - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6) - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) - | 设置项目域名 | [1a835f1](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1a835f1) diff --git a/components/Plugin/Plugin.vue b/components/Plugin/Plugin.vue index e933ebe..25c6e8a 100644 --- a/components/Plugin/Plugin.vue +++ b/components/Plugin/Plugin.vue @@ -28,7 +28,7 @@ - + /> --> @@ -70,9 +70,9 @@ const isMine = computed(() => store.getters['role/isMine']); // return target.component; // }); -if (props.pluginId === '5') { - store.dispatch('role/getAllMembers', { projectId: projectId.value }); -} +// if (props.pluginId === '5') { +// store.dispatch('role/getAllMembers', { projectId: projectId.value }); +// } // 点击时存储 storage async function setStorage() { diff --git a/components/TimeLine/TimeLine.vue b/components/TimeLine/TimeLine.vue index 16a658c..837addd 100644 --- a/components/TimeLine/TimeLine.vue +++ b/components/TimeLine/TimeLine.vue @@ -13,19 +13,13 @@ @scrolltoupper="handleScrollTop" id="scroll" > - - - - - diff --git a/hooks/project/useGetTasks - 副本.js b/hooks/project/useGetTasks - 副本.js new file mode 100644 index 0000000..032d147 --- /dev/null +++ b/hooks/project/useGetTasks - 副本.js @@ -0,0 +1,263 @@ +import { computed, nextTick, watch } from 'vue'; +import { useStore } from 'vuex'; +import { flatten } from 'lodash'; +import dayjs from 'dayjs'; +export default function useGetTasks() { + const store = useStore(); + const tasks = computed(() => store.state.task.tasks); + const basicTasks = computed(() => store.state.task.basicTasks); + const upBasicTasks = computed(() => store.state.task.upBasicTasks); + const nextPage = computed(() => store.state.task.nextPage); // 下一页 + const upNextPage = computed(() => store.state.task.upNextPage); // 下一页 + // const lastPage = computed(() => store.state.task.lastPage); // 最后一页 + const roleId = computed(() => store.state.role.roleId); + const timeNode = computed(() => store.state.task.timeNode); + const timeUnit = computed(() => store.state.task.timeUnit); + const visibleRoles = computed(() => store.state.role.visibleRoles); + const allTasks = computed(() => store.state.task.allTasks); + const roleIndex = computed(() => store.state.role.roleIndex); + + const projectId = computed(() => store.getters['project/projectId']); + const timeGranularity = computed(() => store.getters['task/timeGranularity']); + + // 初始化 定期任务 + async function initPlanTasks() { + await getTasks({}); // 获取初始数据 + } + + /** + * 根据时间基准点和角色查找定期任务 + * @param {object} query + * @param {string} query.roleId 角色id + * @param {string} query.timeNode 时间基准点 默认当前 + * @param {string} query.timeUnit 时间颗粒度 默认天 + * @param {string} query.queryNum 查找颗粒度数量 默认3个 + * @param {number} query.queryType 0向上查找 1向下查找(默认) 下查包含自己，上查不包含 + */ + function getTasks(query) { + store.commit('task/setShowSkeleton', false); + + const params = { + roleId: roleId.value, + timeUnit: query.timeUnit || timeUnit.value, + queryType: query.queryType === 0 ? 0 : 1, + pageNum: query.pageNum || 1, + pageSize: query.pageSize || uni.$taskConfig.pageCount + } + + uni.$catchReq.getTaskByNum(params, (err, data) => { + store.commit('task/setShowSkeleton', false); + if (err) { + // TODO: 提示错误 + console.error('err: ', err); + } else { + store.commit('task/setShowScrollTo', true); + + if (params.queryType === 0) { + // 将接口返回的数据存储到store + let lists = [...upBasicTasks.value, ...data.list]; + store.commit('task/setUpBasicTask', lists); + store.commit('task/setUpNextPage', data.nextPage); // 下一页 + } else { + let lists = [...basicTasks.value, ...data.list]; + store.commit('task/setBasicTask', lists); + store.commit('task/setNextPage', data.nextPage); // 下一页 + } + + // 刻度模式数据处理 + renderTask(params); + } + }); + } + + // 刻度模式数据处理 + function renderTask(params) { + params.queryType === 0 ? setPrevPlaceholderTasks() : setNextPlaceholderTasks(); + tasksData(params); + } + + /** + * 刻度模式数据处理 + * 大于等于15天，真实数据的时间跨度 + * 或大于等于15条，真实数据的数量 + * 不用重新加载数据 + * @param {Object} params + */ + function tasksData(params) { + let oldTasks = tasks.value; + let realTasks = params.queryType === 0 ? upBasicTasks.value : basicTasks.value; + // 下一页的值 + let next = params.queryType === 0 ? upNextPage.value : nextPage.value; + + // 真实数据是否>=15条 || 是否>=15天 + let term = tremFilter(params); + + if (term || next === 0) { + // 过滤真实数据中在tasks时间段中的数据，并将最后的数据存储到tasksArr数组中 + let tasksArr = [], taskLen = 0, lastIndex = 0; + oldTasks.forEach((task, index) => { + const oldArr = oldTasks.filter(item => dayjs(+item.planStart).isSame(+task.planStart, timeGranularity.value)); + const arr = realTasks.filter(item => dayjs(+item.planStart).isSame(+task.planStart, timeGranularity.value)); + + if (arr && arr.length) { + if (task.detailId) { + tasksArr = [...arr]; + lastIndex = index; + } else { + taskLen += arr.length; // 在时间刻度内的数据量 + oldTasks.splice(index, 1, [...arr]); // 这里加入的数据是array类型的, [{},{},[],[],{}] + } + } + }) + + // 数据与上一页最后一个数据时间节点相同 + if (lastIndex) { + taskLen += tasksArr.length; + oldTasks.splice(lastIndex, 0, [...tasksArr]); + } + + oldTasks = flatten(oldTasks); // 1维拍平 + + if (taskLen === params.pageSize) { + // 如果真实任务所有数据都在tasks时间段中，则将所有任务显示，并且从最后一个真实任务的时间截止，存储到tasks中 + let len = 0; + oldTasks.forEach((item, index) => { + if (item.id === realTasks[realTasks.length - 1].id) { + len = index; + } + }) + + oldTasks = oldTasks.slice(0, len + 1); + params.queryType === 0 ? store.commit('task/setUpBasicTask', []) : store.commit('task/setBasicTask', []); + } else { + // 只有一部分真实数据展示，展示tasks时间段加时间段内的真实数据 + params.queryType === 0 ? store.commit('task/setUpBasicTask', realTasks.slice(taskLen)) : store.commit('task/setBasicTask', realTasks.slice(taskLen)); + } + + store.commit('task/clearTasks'); + params.queryType === 0 ? store.commit('task/setUpTasks', oldTasks) : store.commit('task/setDownTasks', oldTasks); + } else { + if (next > 0) { + getTasks({pageNum: params.pageNum, queryType: params.queryType}); + } + } + } + + /** + * 数据筛选条件 + * 大于等于15天，真实数据的时间跨度，且大于等于15条，真实数据的数量，不用重新加载数据 + */ + function tremFilter(params) { + let time1 = 0, time2 = 0; + let realTasks = basicTasks.value; + + if (realTasks.length > 0) { + // 真实数据第一条数据加上15天后的时间 + time1 = dayjs(+realTasks[0].planStart).add(params.pageSize, timeGranularity.value); + // 真实数据最后一条数据的时间 + time2 = dayjs(realTasks[realTasks.length - 1].planStart, timeGranularity.value); + } + + let result1 = false, result2 = false; + // 判断真实任务的时间跨度是否在15天之内 + if (time1 > 0 && time2 > 0) { + // 两个时间是否相等 + result1 = dayjs(time1).isSame(time2, timeGranularity.value); + // time1是否大于time2 + result2 = dayjs(time1).isAfter(time2, timeGranularity.value); + } + + let term1 = realTasks.length >= params.pageSize; // 大于等于15条，真实数据的数量 + // 大于等于15天，真实数据的时间跨度 + let term2 = result1 || result2; + + return term1 || term2; + } + + /** + * 用拿到的新数据 替换 时间刻度/旧数据 + * 先对比 新旧数据的 始末时间 补齐刻度 + * 再遍历对比 用任务替换刻度 + * @param {array} data 服务端返回的新数据 上边已经处理过空值 + * @param {number} type 0 -> 向上 1->向下 + */ + // function replacePrevData(data, type) { + // const obj = { tasks: tasks.value, data, timeGranularity: timeGranularity.value }; + // let oldTasks = fillPlaceholderTask(obj); // 已经上下补齐时间刻度的 + // console.log('oldTasks', oldTasks) + // // 遍历对比 用任务替换刻度 + // // TODO: tasks越来越多 遍历越来越多 需要优化 + // oldTasks.forEach((taskItem, index) => { + // const arr = data.filter(dataItem => dayjs(+dataItem.planStart).isSame(+taskItem.planStart, timeGranularity.value)); + // if (arr && arr.length) { + // oldTasks.splice(index, 1, [...arr]); // 这里加入的数据是array类型的, [{},{},[],[],{}] + // } + // }); + + // oldTasks = flatten(oldTasks); // 1维拍平 + + // store.commit('task/clearTasks'); + // type === 0 ? store.commit('task/setUpTasks', oldTasks) : store.commit('task/setDownTasks', oldTasks); + // } + + /** + * 超出旧数据上、下限 补齐时间刻度到新数据的起始时间颗粒度 + */ + // function fillPlaceholderTask(obj) { + // const { prev, next } = uni.$task.computeFillPlaceholderTaskCount(obj); + // if (prev) { + // const newTasks = uni.$task.setPlaceholderTasks(+obj.tasks[0].planStart, true, obj.timeGranularity, prev); + // store.commit('task/setUpTasks', newTasks); + // } + // if (next) { + // const newTasks = uni.$task.setPlaceholderTasks(+obj.tasks[obj.tasks.length - 1].planStart, false, obj.timeGranularity, next); + // store.commit('task/setDownTasks', newTasks); + // } + // return tasks.value; + // } + + // 设置时间轴向上的空数据 + function setPrevPlaceholderTasks() { + store.commit('task/setTopEnd', true); + let startTime = ''; + if (!tasks.value || !tasks.value.length) { + startTime = Date.now(); // 没有任务就应该是时间基准点 + } else { + startTime = tasks.value[0].planStart - 0; // 有任务就是第一个任务的计划开始时间 + } + const placeholderTasks = uni.$task.setPlaceholderTasks(startTime, true, timeGranularity.value); + store.commit('task/setUpTasks', placeholderTasks); + } + + // 设置时间轴向下的空数据 + function setNextPlaceholderTasks() { + // store.commit('task/setBottomEnd', true); + let startTime = ''; + if (!tasks.value || !tasks.value.length) { + startTime = Date.now(); + } else { + startTime = dayjs(+tasks.value[tasks.value.length - 1].planStart).add(1, timeGranularity.value); + } + const initData = uni.$task.setPlaceholderTasks(startTime, false, timeGranularity.value); + store.commit('task/setDownTasks', initData); + } + + /** + * 当日常任务发生变化时 + * 将新获取到的日常任务放在allTasks里 + */ + watch(tasks, newValue => { + // console.log('newValue----->tasks: ', tasks.value); + // 添加到allTasks里 + const index = visibleRoles.value.findIndex(role => role.id === roleId.value); + const arr = [...allTasks.value]; + arr[index].task = [...newValue]; + store.commit('task/setAllTasks', arr); + }); + + return { + initPlanTasks, + getTasks, + renderTask + }; +} diff --git a/hooks/project/useGetTasks.js b/hooks/project/useGetTasks.js index 45bd8d2..71613da 100644 --- a/hooks/project/useGetTasks.js +++ b/hooks/project/useGetTasks.js @@ -5,11 +5,12 @@ import dayjs from 'dayjs'; export default function useGetTasks() { const store = useStore(); const tasks = computed(() => store.state.task.tasks); - const basicTasks = computed(() => store.state.task.basicTasks); - const upBasicTasks = computed(() => store.state.task.upBasicTasks); - const nextPage = computed(() => store.state.task.nextPage); // 下一页 + const timeLineType = computed(() => store.state.task.timeLineType); // 时间轴模式 + const realTasks = computed(() => store.state.task.realTasks); // 真实任务 + const downNextPage = computed(() => store.state.task.downNextPage); // 下一页 const upNextPage = computed(() => store.state.task.upNextPage); // 下一页 - // const lastPage = computed(() => store.state.task.lastPage); // 最后一页 + const currUpTimeNode = computed(() => store.state.task.currUpTimeNode); // 当前查询的时间 + const currDownTimeNode = computed(() => store.state.task.currDownTimeNode); // 当前查询的时间 const roleId = computed(() => store.state.role.roleId); const timeNode = computed(() => store.state.task.timeNode); const timeUnit = computed(() => store.state.task.timeUnit); @@ -32,11 +33,10 @@ export default function useGetTasks() { function generateGetTaskParam(query) { return { roleId: roleId.value, - timeNode: query.timeNode || timeNode.value, timeUnit: query.timeUnit || timeUnit.value, - queryNum: query.queryNum || 3, - queryType: query.queryType, - projectId: projectId.value, + queryType: query.queryType === 0 ? 0 : 1, + pageNum: query.pageNum || 1, + pageSize: query.pageSize || uni.$taskConfig.pageCount }; } @@ -51,15 +51,8 @@ export default function useGetTasks() { */ function getTasks(query) { store.commit('task/setShowSkeleton', false); - // const params = generateGetTaskParam(query); - const params = { - roleId: roleId.value, - timeUnit: query.timeUnit || timeUnit.value, - queryType: query.queryType === 0 ? 0 : 1, - pageNum: query.pageNum || 1, - pageSize: query.pageSize || uni.$taskConfig.pageCount - } + const params = generateGetTaskParam(query); uni.$catchReq.getTaskByNum(params, (err, data) => { store.commit('task/setShowSkeleton', false); if (err) { @@ -68,27 +61,70 @@ export default function useGetTasks() { } else { store.commit('task/setShowScrollTo', true); - if (params.queryType === 0) { - // 将接口返回的数据存储到store - let lists = [...upBasicTasks.value, ...data.list]; - store.commit('task/setUpBasicTask', lists); - store.commit('task/setUpNextPage', data.nextPage); // 下一页 - } else { - let lists = [...basicTasks.value, ...data.list]; - store.commit('task/setBasicTask', lists); - store.commit('task/setNextPage', data.nextPage); // 下一页 - } + params.queryType === 0 ? store.commit('task/setUpRealTasks', data.list) : store.commit('task/setDownRealTasks', data.list); + params.queryType === 0 ? store.commit('task/setUpNextPage', data.nextPage) : store.commit('task/setDownNextPage', data.nextPage); // 下一页 - // 刻度模式数据处理 - renderTask(params); + // 数据处理 + dataRender(params); } }); } + function dataRender(params) { + timeLineType.value === 1 ? renderScaleTask(params) : renderConTask(params); + } + + async function renderConTask(params) { + let nextPage = params.queryType === 0 ? upNextPage.value : downNextPage.value; // 下一页的值 + let showTasks = tasks.value; + let centerData = await showTaskId(params, showTasks, realTasks.value) || []; + + if (centerData.length < 15 && nextPage > 0) { + getTasks({pageNum: nextPage, queryType: params.queryType}); + } else { + if (params.queryType === 0) { + showTasks = [...centerData, ...showTasks]; + } else { + showTasks = [...showTasks, ...centerData]; + } + } + + if (showTasks.length < 15 && nextPage === 0 && params.queryType === 1) { + getTasks({pageNum: 1, queryType: 0}); + } + + store.commit('task/clearTasks'); + params.queryType === 0 ? store.commit('task/setUpTasks', showTasks) : store.commit('task/setDownTasks', showTasks); + } + // 刻度模式数据处理 - function renderTask(params) { + async function renderScaleTask(params) { params.queryType === 0 ? setPrevPlaceholderTasks() : setNextPlaceholderTasks(); - tasksData(params); + let centerData = await showTaskId(params, tasks.value, realTasks.value) || []; + tasksData(params, centerData, realTasks.value); + } + + // 已显示的任务第一个id和最后一个id + function showTaskId(params, showTasks, realTasks) { + const firstDetailIndex = showTasks.findIndex(task => task.detailId); + const firstId = firstDetailIndex === -1 ? 0 : showTasks[firstDetailIndex].id; + let lastDetailIndex = -1; + showTasks.forEach((item, index) => { + if (item.detailId) { + lastDetailIndex = index; + } + }) + const lastId = lastDetailIndex === -1 ? 0 : showTasks[lastDetailIndex].id; + + let centerData = params.queryType === 0 ? [] : realTasks.slice(0, params.pageSize); + realTasks.forEach((item, index) => { + if (params.queryType === 1 && item.id === lastId) { + centerData = realTasks.slice(index + 1, index + 1 + params.pageSize) || []; + } else if (params.queryType === 0 && item.id === firstId) { + centerData = realTasks.slice(index - params.pageSize, index) || []; + } + }) + return centerData; } /** @@ -98,139 +134,90 @@ export default function useGetTasks() { * 不用重新加载数据 * @param {Object} params */ - function tasksData(params) { - let oldTasks = tasks.value; - let realTasks = params.queryType === 0 ? upBasicTasks.value : basicTasks.value; - // 下一页的值 - let next = params.queryType === 0 ? upNextPage.value : nextPage.value; + function tasksData(params, centerData, realTasks) { + let param = generateGetTaskParam(params); + let showTasks = tasks.value; // 显示的数据 + let nextPage = param.queryType === 0 ? upNextPage.value : downNextPage.value; // 下一页的值 - // 真实数据是否>=15条 || 是否>=15天 - let term = tremFilter(params); + // 判断条件 + let isAccordTerm1 = false, isAccordTerm2 = false; + if (centerData.length > 0) { + // 1.数据数量>=15条 + isAccordTerm1 = centerData.length >= param.pageSize; - if (term || next === 0) { - // 过滤真实数据中在tasks时间段中的数据，并将最后的数据存储到tasksArr数组中 - let tasksArr = [], taskLen = 0, lastIndex = 0; - oldTasks.forEach((task, index) => { - const oldArr = oldTasks.filter(item => dayjs(+item.planStart).isSame(+task.planStart, timeGranularity.value)); - const arr = realTasks.filter(item => dayjs(+item.planStart).isSame(+task.planStart, timeGranularity.value)); + // 2.数据最后一条数据时间>=当前查询的时间 + if (param.queryType === 0) { + let firstData = dayjs(centerData[0].planStart).add(param.pageSize, timeGranularity.value); + isAccordTerm2 = dayjs(+firstData).isBefore(+currUpTimeNode.value, timeGranularity.value) || dayjs(+firstData).isSame(+currUpTimeNode.value, timeGranularity.value); + } else { + let lastData = dayjs(centerData[centerData.length - 1].planStart).subtract(param.pageSize, timeGranularity.value); + isAccordTerm2 = dayjs(+lastData).isAfter(+currDownTimeNode.value, timeGranularity.value) || dayjs(+lastData).isSame(+currDownTimeNode.value, timeGranularity.value); + } + } + // 3.下一页===0 + // 不需要添加新数据 + if (!isAccordTerm1 && !isAccordTerm2 && nextPage > 0) { + getTasks({pageNum: nextPage, queryType: param.queryType}); + } else { + let tasksArr = [], isReplace = false, firstIndex = -1, selctedIndex = -1, replaceTime = 0; + showTasks.forEach((task, index) => { + const arr = centerData.filter(item => dayjs(+item.planStart).isSame(+task.planStart, timeGranularity.value)); if (arr && arr.length) { if (task.detailId) { - tasksArr = [...arr]; - lastIndex = index; + // 新数据与旧数据时间有重叠 + if (param.queryType === 1) { + selctedIndex = index; + tasksArr = [...arr]; + } else { + firstIndex = showTasks.findIndex(data => dayjs(+data.planStart).isSame(+task.planStart, timeGranularity.value)); + } } else { - taskLen += arr.length; // 在时间刻度内的数据量 - oldTasks.splice(index, 1, [...arr]); // 这里加入的数据是array类型的, [{},{},[],[],{}] + showTasks.splice(index, 1, [...arr]); } } }) - // 数据与上一页最后一个数据时间节点相同 - if (lastIndex) { - taskLen += tasksArr.length; - oldTasks.splice(lastIndex, 0, [...tasksArr]); + if (selctedIndex) { + showTasks.splice(selctedIndex + 1, 0, [...tasksArr]) + } + + if (firstIndex) { + showTasks.splice(firstIndex, 0, [...tasksArr]) } - oldTasks = flatten(oldTasks); // 1维拍平 + showTasks.forEach((task, index) => { + const arr = centerData.filter(item => dayjs(+item.planStart).isSame(+task.planStart, timeGranularity.value)); + if (arr && arr.length) { + if (!task.detailId) { // 新数据与旧数据时间有重叠 + showTasks.splice(index, 1, [...arr]); // 这里加入的数据是array类型的, [{},{},[],[],{}] + } + } + }) + + showTasks = flatten(showTasks); // 1维拍平 - if (taskLen === params.pageSize) { - // 如果真实任务所有数据都在tasks时间段中，则将所有任务显示，并且从最后一个真实任务的时间截止，存储到tasks中 + if (isAccordTerm1 && !isAccordTerm2) { let len = 0; - oldTasks.forEach((item, index) => { - if (item.id === realTasks[realTasks.length - 1].id) { + let data = param.queryType === 0 ? centerData[0] : centerData[centerData.length - 1]; + showTasks.forEach((item, index) => { + if (item.id === data.id) { len = index; } }) - oldTasks = oldTasks.slice(0, len + 1); - params.queryType === 0 ? store.commit('task/setUpBasicTask', []) : store.commit('task/setBasicTask', []); - } else { - // 只有一部分真实数据展示，展示tasks时间段加时间段内的真实数据 - params.queryType === 0 ? store.commit('task/setUpBasicTask', realTasks.slice(taskLen)) : store.commit('task/setBasicTask', realTasks.slice(taskLen)); + showTasks = param.queryType === 0 ? showTasks.slice(len) : showTasks.slice(0, len + 1); } - store.commit('task/clearTasks'); - params.queryType === 0 ? store.commit('task/setUpTasks', oldTasks) : store.commit('task/setDownTasks', oldTasks); - } else { - if (next > 0) { - getTasks({pageNum: params.pageNum, queryType: params.queryType}); + if (showTasks.length > 80) { + showTasks = param.queryType === 0 ? showTasks.slice(0, 80) : showTasks.slice(showTasks.length - 80); } } - } - - /** - * 数据筛选条件 - * 大于等于15天，真实数据的时间跨度，且大于等于15条，真实数据的数量，不用重新加载数据 - */ - function tremFilter(params) { - let time1 = 0, time2 = 0; - let realTasks = basicTasks.value; - if (realTasks.length > 0) { - // 真实数据第一条数据加上15天后的时间 - time1 = dayjs(+realTasks[0].planStart).add(params.pageSize, timeGranularity.value); - // 真实数据最后一条数据的时间 - time2 = dayjs(realTasks[realTasks.length - 1].planStart, timeGranularity.value); - } - - let result1 = false, result2 = false; - // 判断真实任务的时间跨度是否在15天之内 - if (time1 > 0 && time2 > 0) { - // 两个时间是否相等 - result1 = dayjs(time1).isSame(time2, timeGranularity.value); - // time1是否大于time2 - result2 = dayjs(time1).isAfter(time2, timeGranularity.value); - } - - let term1 = realTasks.length >= params.pageSize; // 大于等于15条，真实数据的数量 - // 大于等于15天，真实数据的时间跨度 - let term2 = result1 || result2; - - return term1 || term2; + store.commit('task/clearTasks'); + param.queryType === 0 ? store.commit('task/setUpTasks', showTasks) : store.commit('task/setDownTasks', showTasks); } - /** - * 用拿到的新数据 替换 时间刻度/旧数据 - * 先对比 新旧数据的 始末时间 补齐刻度 - * 再遍历对比 用任务替换刻度 - * @param {array} data 服务端返回的新数据 上边已经处理过空值 - * @param {number} type 0 -> 向上 1->向下 - */ - // function replacePrevData(data, type) { - // const obj = { tasks: tasks.value, data, timeGranularity: timeGranularity.value }; - // let oldTasks = fillPlaceholderTask(obj); // 已经上下补齐时间刻度的 - // console.log('oldTasks', oldTasks) - // // 遍历对比 用任务替换刻度 - // // TODO: tasks越来越多 遍历越来越多 需要优化 - // oldTasks.forEach((taskItem, index) => { - // const arr = data.filter(dataItem => dayjs(+dataItem.planStart).isSame(+taskItem.planStart, timeGranularity.value)); - // if (arr && arr.length) { - // oldTasks.splice(index, 1, [...arr]); // 这里加入的数据是array类型的, [{},{},[],[],{}] - // } - // }); - - // oldTasks = flatten(oldTasks); // 1维拍平 - - // store.commit('task/clearTasks'); - // type === 0 ? store.commit('task/setUpTasks', oldTasks) : store.commit('task/setDownTasks', oldTasks); - // } - - /** - * 超出旧数据上、下限 补齐时间刻度到新数据的起始时间颗粒度 - */ - // function fillPlaceholderTask(obj) { - // const { prev, next } = uni.$task.computeFillPlaceholderTaskCount(obj); - // if (prev) { - // const newTasks = uni.$task.setPlaceholderTasks(+obj.tasks[0].planStart, true, obj.timeGranularity, prev); - // store.commit('task/setUpTasks', newTasks); - // } - // if (next) { - // const newTasks = uni.$task.setPlaceholderTasks(+obj.tasks[obj.tasks.length - 1].planStart, false, obj.timeGranularity, next); - // store.commit('task/setDownTasks', newTasks); - // } - // return tasks.value; - // } - // 设置时间轴向上的空数据 function setPrevPlaceholderTasks() { store.commit('task/setTopEnd', true); @@ -241,6 +228,7 @@ export default function useGetTasks() { startTime = tasks.value[0].planStart - 0; // 有任务就是第一个任务的计划开始时间 } const placeholderTasks = uni.$task.setPlaceholderTasks(startTime, true, timeGranularity.value); + store.commit('task/setCurrUpTimeNode', startTime); store.commit('task/setUpTasks', placeholderTasks); } @@ -251,9 +239,10 @@ export default function useGetTasks() { if (!tasks.value || !tasks.value.length) { startTime = Date.now(); } else { - startTime = dayjs(+tasks.value[tasks.value.length - 1].planStart).add(1, timeGranularity.value); + startTime = dayjs(+tasks.value[tasks.value.length - 1].planStart).add(1, timeGranularity.value).valueOf(); } const initData = uni.$task.setPlaceholderTasks(startTime, false, timeGranularity.value); + store.commit('task/setCurrDownTimeNode', startTime); store.commit('task/setDownTasks', initData); } @@ -273,6 +262,6 @@ export default function useGetTasks() { return { initPlanTasks, getTasks, - renderTask + dataRender }; } diff --git a/hooks/project/useInit.js b/hooks/project/useInit.js index 0239ab9..bb6d913 100644 --- a/hooks/project/useInit.js +++ b/hooks/project/useInit.js @@ -94,7 +94,7 @@ export default function useInit() { // 根据项目id获取角色列表 getRoles(params); // 根据项目id获取成员列表 - store.dispatch('role/getAllMembers', { projectId: options.p }); + // store.dispatch('role/getAllMembers', { projectId: options.p }); } } diff --git a/pages/project/project.vue b/pages/project/project.vue index ea26fd8..be8b8ac 100644 --- a/pages/project/project.vue +++ b/pages/project/project.vue @@ -27,6 +27,8 @@ + + {{timeLineType === 1 ? '切换到任务模式' : '切换到时间轴模式'}} @@ -54,6 +56,7 @@ const allTasks = computed(() => store.state.task.allTasks); // 所有任务 const globals = computed(() => store.getters['task/globals']); // 所有的日常任务 永久 + 可变 日常任务 const timeGranularity = computed(() => store.getters['task/timeGranularity']); // 计算颗粒度 对应的 dayjs add 的单位 const height = ref(null); // 页面高度 +const timeLineType = computed(() => store.state.task.timeLineType); // 时间轴模式 onMounted(() => { const system = uni.getSystemInfoSync(); @@ -217,6 +220,17 @@ function setScrollPosition() { } } } + + +function changeModal() { + store.commit('task/clearTasks'); // 清空定期任务 + store.commit('task/clearRealTasks'); // 清空真实任务数据 + store.commit('task/setUpNextPage', 1); + store.commit('task/setDownNextPage', 1); + store.commit('task/setTimeLineType', timeLineType.value === 1 ? 2 : 1); + let params = { pageNum: 1 }; + getTasksHook.getTasks(params); +}