diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a21595..35b04be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - | indexedDB | [687394e](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/687394e) - | post 封装 | [da52e94](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/da52e94) - | tall插件封装 | [1bcb920](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/1bcb920) + - | ws storage | [21b3a06](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/21b3a06) 富文本插件 | 富文本插件demo测试 | [ed3d644](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/ed3d644) pinch | alloy finger实现图片的pinch放大缩小 | [de01343](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/de01343) @@ -42,6 +43,7 @@ ### 🐛 Bug 修复 范围|描述|commitId --|--|-- + - | 定期任务接口 | [aa4981c](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/aa4981c) - | 骨架屏替换 | [e9fdd71](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/e9fdd71) - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/19228d6) - | 上下滚动时间轴 | [d533a01](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/d533a01) @@ -78,13 +80,6 @@ ### chore 范围|描述|commitId --|--|-- - - | api 封装 | [8dcb8a2](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/8dcb8a2) - - | env host修改 | [a79a4a5](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/a79a4a5) - - | merge globals | [b0957cc](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/b0957cc) - - | mock | [51c24a5](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/51c24a5) - pwa 小程序 | 移除了pwa,alloyFinger添加平台判断 | [875fab4](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/875fab4) - - | uview-ui | [a9ea34b](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/a9ea34b) - 信息配置 | 配置eslint等配置 | [7421443](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/7421443) - | api 封装 | [8dcb8a2](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/8dcb8a2) - | env host修改 | [a79a4a5](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/a79a4a5) - | merge globals | [b0957cc](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/b0957cc) @@ -99,3 +94,4 @@ - | style:index | [978f272](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/978f272) - | !2 基础模板v1.1.0 | [f5e61dd](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/f5e61dd) - | init | [c0f1deb](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/c0f1deb) + diff --git a/src/components/Roles/Roles.vue b/src/components/Roles/Roles.vue index e96017f..ba8a2b8 100644 --- a/src/components/Roles/Roles.vue +++ b/src/components/Roles/Roles.vue @@ -1,25 +1,215 @@ - + diff --git a/src/components/Roles/component/RoleList.vue b/src/components/Roles/component/RoleList.vue deleted file mode 100644 index 1d2112b..0000000 --- a/src/components/Roles/component/RoleList.vue +++ /dev/null @@ -1,225 +0,0 @@ - - - - - diff --git a/src/components/TimeLine/TimeLine.vue b/src/components/TimeLine/TimeLine.vue index 94bc45f..4e20d04 100644 --- a/src/components/TimeLine/TimeLine.vue +++ b/src/components/TimeLine/TimeLine.vue @@ -8,6 +8,7 @@ @@ -34,7 +37,11 @@ export default { return { top: 0 }; }, - computed: mapState('home', ['scrollTop', 'showTips', 'visibleRoles', 'tasks']), + computed: mapState('home', ['scrollTop', 'showTips', 'visibleRoles', 'tasks', 'topEnd', 'bottomEnd']), + + mounted() { + this.setDatumPoint(); + }, methods: { ...mapMutations('home', ['setScrollTop', 'setShrink', 'setRoleId']), @@ -47,15 +54,26 @@ export default { }, // 滚动到顶部 - handleScrollTop() { - console.log('滚动到顶部'); - this.$emit('getTasks', { queryType: 0 }); + async handleScrollTop() { + if (this.topEnd) return; + const upQuery = { + timeNode: +this.tasks[0].planStart, + queryType: 0, + queryNum: 6, + }; + await this.$emit('getTasks', upQuery); }, // 滚动到底部 - handleScrollBottom() { - console.log('滚动到底部'); - this.$emit('getTasks', { queryType: 1 }); + async handleScrollBottom() { + if (this.bottomEnd) return; + const downQuery = { + timeNode: +this.tasks[this.tasks.length - 1].planStart, + queryType: 1, + queryNum: 6, + }; + console.log('downQuery: ', downQuery); + await this.$emit('getTasks', downQuery); }, // 设置基准点 @@ -71,6 +89,7 @@ export default { // } } this.top = tasksHeight - scrollHeight / 2; + console.log('this.top: ', this.top); } }, }, diff --git a/src/components/TimeLine/component/TimeBox.vue b/src/components/TimeLine/component/TimeBox.vue index f303126..1a2f3b6 100644 --- a/src/components/TimeLine/component/TimeBox.vue +++ b/src/components/TimeLine/component/TimeBox.vue @@ -4,8 +4,8 @@ - {{ $u.timeFormat(+item.planStart, 'mm-dd hh:MM') }} - + {{ +item.planStart | date('mm-dd hh:MM') }} + @@ -21,7 +21,7 @@ - + diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue index 5c2e4d5..ac2b4a4 100644 --- a/src/pages/project/project.vue +++ b/src/pages/project/project.vue @@ -2,7 +2,7 @@ <view class="container flex flex-col flex-1 overflow-hidden bg-gray-100"> - <Roles @getTasks="getTasks" /> + <Roles @getTasksByRole="getTasksByRole" /> <Globals :plugins="plugins" /> <TimeLine @getTasks="getTasks" class="flex-1 overflow-hidden" ref="child" /> </view> @@ -44,9 +44,7 @@ export default { await this.getGlobal(); // 查上下的定期任务 if (this.tasks && this.tasks.length) { - console.log('this.tasks[0].planStart: ', this.tasks[0].planStart); await this.getTasks({ timeNode: +this.tasks[0].planStart, queryType: 0, queryNum: 6 }); - console.log('this.tasks[this.tasks.length - 1].planStart: ', this.tasks[this.tasks.length - 1].planStart); await this.getTasks({ timeNode: +this.tasks[this.tasks.length - 1].planStart, queryType: 1, queryNum: 6 }); } }, @@ -98,10 +96,8 @@ export default { params.timeUnit = query.timeUnit || timeUnit; params.queryNum = query.queryNum || 3; params.queryType = query.queryType; - console.log('params: ', params); const res = await this.handleRegularTask(params); query.queryType === 0 ? this.setUpTasks(res) : this.setDownTasks(res); - this.$refs.child.setDatumPoint(); } catch (error) { console.log('error: ', error); } @@ -141,6 +137,29 @@ export default { console.log('error: ', error); } }, + + // 切换角色获取任务 + async getTasksByRole() { + try { + await this.getTasks({ queryType: 0 }); + await this.getTasks({ queryType: 1 }); + // 查上下的任务 + const upQuery = { + timeNode: +this.tasks[0].planStart, + queryType: 0, + queryNum: 6, + }; + await this.getTasks(upQuery); + const downQuery = { + timeNode: +this.tasks[this.tasks.length - 1].planStart, + queryType: 1, + queryNum: 6, + }; + await this.getTasks(downQuery); + } catch (error) { + console.log('error: ', error); + } + }, }, }; </script> diff --git a/src/store/home/mutations.js b/src/store/home/mutations.js index e8a6f85..ec844a5 100644 --- a/src/store/home/mutations.js +++ b/src/store/home/mutations.js @@ -122,6 +122,9 @@ const mutations = { * @param {Array} data 服务端返回的模板数组 */ setUpTasks(state, data) { + if (!data || !data.length) { + state.topEnd = true; + } state.tasks = [...data.concat(state.tasks)] || []; }, @@ -131,9 +134,21 @@ const mutations = { * @param {Array} data 服务端返回的模板数组 */ setDownTasks(state, data) { + if (!data || !data.length) { + state.bottomEnd = true; + } state.tasks = [...state.tasks.concat(data)] || []; }, + /** + * 清空定期任务数据 + * @param {Object} state + * @param {Array} data 服务端返回的模板数组 + */ + setTasks(state, data) { + state.tasks = data || []; + }, + /** * 设置日常任务数据 * @param {Object} state diff --git a/src/store/home/state.js b/src/store/home/state.js index aecd404..7389c48 100644 --- a/src/store/home/state.js +++ b/src/store/home/state.js @@ -30,6 +30,8 @@ const state = { { id: 11, value: '千年' }, ], tasks: [], // 定期任务 + topEnd: false, // 时间轴向上查任务到顶了 + bottomEnd: false, // 时间轴向下查任务到底了 dailyTasks: [], // 日常任务 };