From 215e074f3e35de393241819909aa9261ed16ab72 Mon Sep 17 00:00:00 2001 From: lucky Date: Thu, 22 Jul 2021 14:56:28 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 107 +++++++++--------- src/apis/project.js | 11 +- src/apis/role.js | 10 ++ src/apis/task.js | 3 +- src/components/Globals/Globals.vue | 20 +--- src/components/TimeLine/TimeLine.vue | 56 ++++----- src/components/TimeLine/component/TimeBox.vue | 51 +++------ src/config/plugin.js | 16 +-- src/main.js | 2 + src/pages.json | 3 +- src/pages/project/project.vue | 66 +++++++++-- .../TaskDescription/TaskDescription.vue | 23 ---- .../TaskDurationDelay/TaskDurationDelay.vue | 23 ---- src/plugins/TaskTitle copy/TaskTitle.vue | 23 ---- src/plugins/TaskTitle/TaskTitle.vue | 26 ----- src/plugins/p-deliverable/p-deliverable.vue | 19 ++++ src/plugins/p-subproject/p-subproject.vue | 19 ++++ src/plugins/p-subtasks/p-subtasks.vue | 19 ++++ .../p-task-countdown/p-task-countdown.vue | 19 ++++ .../p-task-description/p-task-description.vue | 19 ++++ .../p-task-duration-delay.vue | 18 +++ .../p-task-start-time-delay.vue | 19 ++++ src/plugins/p-task-title/p-task-title.vue | 19 ++++ src/store/home/actions.js | 14 +-- src/store/home/mutations.js | 18 ++- src/store/home/state.js | 1 + src/store/user/actions.js | 9 +- src/utils/request.js | 1 - 28 files changed, 360 insertions(+), 274 deletions(-) delete mode 100644 src/plugins/TaskDescription/TaskDescription.vue delete mode 100644 src/plugins/TaskDurationDelay/TaskDurationDelay.vue delete mode 100644 src/plugins/TaskTitle copy/TaskTitle.vue delete mode 100644 src/plugins/TaskTitle/TaskTitle.vue create mode 100644 src/plugins/p-deliverable/p-deliverable.vue create mode 100644 src/plugins/p-subproject/p-subproject.vue create mode 100644 src/plugins/p-subtasks/p-subtasks.vue create mode 100644 src/plugins/p-task-countdown/p-task-countdown.vue create mode 100644 src/plugins/p-task-description/p-task-description.vue create mode 100644 src/plugins/p-task-duration-delay/p-task-duration-delay.vue create mode 100644 src/plugins/p-task-start-time-delay/p-task-start-time-delay.vue create mode 100644 src/plugins/p-task-title/p-task-title.vue diff --git a/CHANGELOG.md b/CHANGELOG.md index e663dc2..e6a71a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,91 +3,92 @@ ### 🌟 新功能 范围|描述|commitId --|--|-- - - | db store | [6414c4f](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/6414c4f) - - | indexedDB | [687394e](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/687394e) - - | post 封装 | [da52e94](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/da52e94) - - | tall插件封装 | [1bcb920](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/1bcb920) - - | 存token | [b8a178d](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/b8a178d) - - | 提交到本地 | [9cbe411](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/9cbe411) - - | 插件数据获取 | [5b91bdc](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/5b91bdc) - - | 时间基准线，默认插件 | [a33ba1e](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/a33ba1e) - - | 时间轴修改状态时提示框增加 | [e841392](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/e841392) - - | 时间轴界面 | [33927e9](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/33927e9) - - | 标题栏变化 | [c0fcd9d](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/c0fcd9d) - - | 标题栏角色栏全局任务组件新建 | [0500cb4](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/0500cb4) - - | 模拟接口测试 | [69e7931](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/69e7931) - - | 添加时间轴上下滚动 | [2b81bbc](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/2b81bbc) - - | 角色栏实现 | [94cd671](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/94cd671) - - | 配置默认插件接口 | [f0c177d](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/f0c177d) - pinch | alloy finger实现图片的pinch放大缩小 | [de01343](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/de01343) - 富文本插件 | 富文本插件demo测试 | [ed3d644](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/ed3d644) + - | 标题栏变化 | [c0fcd9d](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/c0fcd9d) + - | 标题栏角色栏全局任务组件新建 | [0500cb4](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/0500cb4) + - | 插件数据获取 | [5b91bdc](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/5b91bdc) + - | 存token | [b8a178d](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/b8a178d) + - | 角色栏实现 | [94cd671](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/94cd671) + - | 模拟接口测试 | [69e7931](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/69e7931) + - | 配置默认插件接口 | [f0c177d](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/f0c177d) + - | 时间基准线，默认插件 | [a33ba1e](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/a33ba1e) + - | 时间轴界面 | [33927e9](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/33927e9) + - | 时间轴修改状态时提示框增加 | [e841392](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/e841392) + - | 提交到本地 | [9cbe411](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/9cbe411) + - | 添加时间轴上下滚动 | [2b81bbc](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/2b81bbc) + - | db store | [6414c4f](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/6414c4f) + - | 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) + 富文本插件 | 富文本插件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) ### 🎨 代码样式 范围|描述|commitId --|--|-- - - | 代码格式细节调整 | [cb2532b](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/cb2532b) - - | 任务快捷方式图标增加 | [4aba872](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/4aba872) - - | 修改角色样式 | [73e268e](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/73e268e) - - | 删除插件携带的多余文件 | [0f392bb](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/0f392bb) - - | 图标修改 | [54bca09](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/54bca09) - - | 无基本变化 | [21ac4bb](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/21ac4bb) - - | 日常任务修改 | [dfa7ee2](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/dfa7ee2) - - | 更新代码 | [8c27e68](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/8c27e68) - - | 更新代码 | [1f40a76](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/1f40a76) - - | 添加插件数据 | [2f11b42](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/2f11b42) - - | 组件新建 | [89c0035](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/89c0035) + - | 代码格式细节调整 | [cb2532b](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/cb2532b) + - | 更新代码 | [8c27e68](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/8c27e68) + - | 更新代码 | [1f40a76](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/1f40a76) + - | 任务快捷方式图标增加 | [4aba872](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/4aba872) + - | 日常任务修改 | [dfa7ee2](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/dfa7ee2) + - | 删除插件携带的多余文件 | [0f392bb](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/0f392bb) + - | 添加插件数据 | [2f11b42](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/2f11b42) + - | 图标修改 | [54bca09](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/54bca09) + - | 无基本变化 | [21ac4bb](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/21ac4bb) + - | 修改角色样式 | [73e268e](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/73e268e) + - | 组件新建 | [89c0035](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/89c0035) ### 🐛 Bug 修复 范围|描述|commitId --|--|-- - - | 上下滚动时间轴 | [d533a01](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/d533a01) - - | 修改main | [749ae9a](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/749ae9a) - - | 修改角色栏组件 | [a54c601](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/a54c601) - - | 提示信息显示bug及日常任务收缩问题 | [f2f06c5](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/f2f06c5) - - | 时间轴上下滑动 | [4d0ae46](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/4d0ae46) - - | 时间轴上下滚动数据加载bug修改 | [e82ede4](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/e82ede4) - - | 角色栏修改 | [19228d6](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/19228d6) - - | 骨架屏替换 | [e9fdd71](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/e9fdd71) + - | 骨架屏替换 | [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) + - | 时间轴上下滚动数据加载bug修改 | [e82ede4](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/e82ede4) + - | 时间轴上下滑动 | [4d0ae46](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/4d0ae46) + - | 提示信息显示bug及日常任务收缩问题 | [f2f06c5](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/f2f06c5) + - | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/a54c601) + - | 修改main | [749ae9a](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/749ae9a) ### 📝 文档 范围|描述|commitId --|--|-- - - | README.md | [ab0eb05](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/ab0eb05) + - | README.md | [ab0eb05](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/ab0eb05) ### 🔨 代码重构 范围|描述|commitId --|--|-- - template | eslint prettier sass uview tailwindcss | [9c966a1](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/9c966a1) + template | eslint prettier sass uview tailwindcss | [9c966a1](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/9c966a1) ### 🚀 性能优化 范围|描述|commitId --|--|-- - - | 组件文件夹新建 | [22bfe7b](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/22bfe7b) - - | 组件文件夹新建 | [17bb8c9](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/17bb8c9) - - | 组件文件夹新建 | [1421504](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/1421504) - - | 角色栏文字颜色修改 | [215c6b3](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/215c6b3) - - | 解决警告 | [c932b09](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/c932b09) + - | 角色栏文字颜色修改 | [215c6b3](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/215c6b3) + - | 解决警告 | [c932b09](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/c932b09) + - | 组件文件夹新建 | [22bfe7b](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/22bfe7b) + - | 组件文件夹新建 | [17bb8c9](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/17bb8c9) + - | 组件文件夹新建 | [1421504](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/1421504) ### 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) - - | 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) + - | mock | [51c24a5](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/51c24a5) + pwa 小程序 | 移除了pwa，alloyFinger添加平台判断 | [875fab4](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/875fab4) + - | uview-ui | [a9ea34b](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/a9ea34b) + 信息配置 | 配置eslint等配置 | [7421443](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/7421443) 范围|描述|commitId --|--|-- - - | style:index | [978f272](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/978f272) - - | !2 基础模板v1.1.0 | [f5e61dd](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/f5e61dd) - - | init | [c0f1deb](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/c0f1deb) + - | 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/apis/project.js b/src/apis/project.js index 5e95104..2aa7a8d 100644 --- a/src/apis/project.js +++ b/src/apis/project.js @@ -1,17 +1,10 @@ const apiUrl = process.env.VUE_APP_API_URL; -const tall = `${apiUrl}/defaultwbs`; -const project = `${tall}/project`; -const role = `${tall}/role`; -const task = `${tall}/task`; +const tall = `${apiUrl}/defaultwbs/project`; const install = (Vue, vm) => { vm.$u.api = { ...vm.$u.api } || {}; //根据id获取项目信息 - vm.$u.api.findProjectById = params => vm.$u.post(`${project}/findProjectById`, params); - //查询角色栏展示的角色 - vm.$u.api.findShowRoles = params => vm.$u.post(`${role}/show`, params); - //根据时间基准点和角色查找定期任务 - vm.$u.api.getRegularTask = params => vm.$u.post(`${task}/regular`, params); + vm.$u.api.findProjectById = param => vm.$u.post(`${tall}/findProjectById`, param); }; export default { install }; diff --git a/src/apis/role.js b/src/apis/role.js index e69de29..d741a2d 100644 --- a/src/apis/role.js +++ b/src/apis/role.js @@ -0,0 +1,10 @@ +const apiUrl = process.env.VUE_APP_API_URL; +const tall = `${apiUrl}/defaultwbs/role`; + +const install = (Vue, vm) => { + vm.$u.api = { ...vm.$u.api } || {}; + //根据时间基准点和角色查找定期任务 + vm.$u.api.findShowRole = param => vm.$u.post(`${tall}/show`, param); +}; + +export default { install }; diff --git a/src/apis/task.js b/src/apis/task.js index 97126ef..a097752 100644 --- a/src/apis/task.js +++ b/src/apis/task.js @@ -5,7 +5,8 @@ const install = (Vue, vm) => { vm.$u.api = { ...vm.$u.api } || {}; vm.$u.api.getGlobal = param => vm.$u.post(`${tall}/global`, param); vm.$u.api.getPermanent = param => vm.$u.post(`${tall}/permanent`, param); - vm.$u.api.getERegular = param => vm.$u.post(`${tall}/regular`, param); + //根据时间基准点和角色查找定期任务 + vm.$u.api.getRegularTask = param => vm.$u.post(`${tall}/regular`, param); }; export default { install }; diff --git a/src/components/Globals/Globals.vue b/src/components/Globals/Globals.vue index 5afec3c..d8c338c 100644 --- a/src/components/Globals/Globals.vue +++ b/src/components/Globals/Globals.vue @@ -7,11 +7,11 @@ @@ -28,28 +28,16 @@ import Skeleton from '@/components/Skeleton/Skeleton'; export default { name: 'Global', components: { Skeleton }, + props: { plugins: { type: Array, default: () => [] } }, data() { return { loading: true, pluginId: 0, styleType: 0, task: null, - plugins: [], }; }, - async created() { - const permanent = await this.$u.api.getPermanent({ roleId: 0 }); - const res = await this.$u.api.getGlobal({ - roleId: 0, - timeNode: new Date().getTime(), - timeUnit: 7, - }); - for (let item of res.plugins) { - this.plugins.push(...item); - } - this.task = res; - console.log('permanent', permanent); - }, + mounted() { setTimeout(() => (this.loading = false), 5000); }, diff --git a/src/components/TimeLine/TimeLine.vue b/src/components/TimeLine/TimeLine.vue index f6e3815..f253bfb 100644 --- a/src/components/TimeLine/TimeLine.vue +++ b/src/components/TimeLine/TimeLine.vue @@ -19,7 +19,7 @@ id="scroll" > - + @@ -31,35 +31,22 @@ export default { name: 'TimeLine', components: { TimeBox }, data() { - return { - top: 0, - list1: [ - { - state: 0, - TaskPanel: { height: '100' }, - }, - { - state: 1, - TaskPanel: { height: '100' }, - }, - { - state: 2, - TaskPanel: { height: '100' }, - }, - ], - }; + return { top: 0 }; }, - computed: mapState('home', ['scrollTop', 'showTips', 'visibleRoles']), + computed: mapState('home', ['scrollTop', 'showTips', 'visibleRoles', 'tasks']), mounted() { - let tasksHeight = 0; - const scrollHeight = document.getElementById('scroll').clientHeight; - for (let i = 0; i < this.list1.length; i++) { - tasksHeight += this.list1[i].TaskPanel.height - 0 + 42; - } - this.top = tasksHeight - scrollHeight / 2; - console.log('this.top: ', this.top); + // 设置默认基准点 + // let tasksHeight = 0; + // const scrollHeight = document.getElementById('scroll').clientHeight; + // if (this.visibleRoles && this.visibleRoles.length) { + // for (let i = 0; i < 3; i++) { + // tasksHeight += this.visibleRoles[i].panel.height - 0 + 42; + // } + // this.top = tasksHeight - scrollHeight / 2; + // } + // console.log('this.top: ', this.top); }, methods: { @@ -75,13 +62,26 @@ export default { // 滚动到顶部 handleScrollTop() { console.log('滚动到顶部'); - this.$refs.child.addTopList(); + this.$emit('getTasks', 0); }, // 滚动到底部 handleScrollBottom() { console.log('滚动到底部'); - this.$refs.child.addBottomList(); + this.$emit('getTasks', 0); + }, + + // 设置基准点 + setDatumPoint() { + const { tasks } = this; + if (tasks && tasks.length) { + let tasksHeight = 0; + const scrollHeight = document.getElementById('scroll').clientHeight; + for (let i = 0; i < 3; i++) { + tasksHeight += +tasks[i].panel.height + 42; + } + this.top = tasksHeight - scrollHeight / 2; + } }, }, }; diff --git a/src/components/TimeLine/component/TimeBox.vue b/src/components/TimeLine/component/TimeBox.vue index af456ee..2d9bb43 100644 --- a/src/components/TimeLine/component/TimeBox.vue +++ b/src/components/TimeLine/component/TimeBox.vue @@ -27,11 +27,19 @@ - + >--> + + + + + + + +