From 5f4d47b14bfaec0caf4d68021cf8f3309bd3dae2 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Fri, 14 Jan 2022 11:29:15 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BA=A4=E4=BB=98=E7=89=A9?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=BB=A3=E7=A0=81=E5=AE=A1=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 134 ++++++++++++++-------------- apis/mock.js | 17 ++++ apis/plugin.js | 7 +- main.js | 8 +- pages/project/project.vue | 2 +- plugins/p-deliver/p-deliver.vue | 149 +++++++++++--------------------- 6 files changed, 144 insertions(+), 173 deletions(-) create mode 100644 apis/mock.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ad27d4..7f4b122 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,91 +1,89 @@ # 1.0.0 (2022-01-14) -# 1.0.0 (2022-01-12) - ### 🌟 新功能 +范围|描述|commitId +--|--|-- + - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) + - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de) + project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff) + theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758) + - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad) + - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) + - | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da) + - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b) + - | 插件的填写与提交，修改与删除 | [d461252](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d461252) + - | 插件面板分开显示 | [fb5e86b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb5e86b) + - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) + - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6) + - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380) + - | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005) + - | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75) + - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc) + - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) + - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e) + - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e) + - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5) + - | 项目列表新 | [88cf48d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/88cf48d) + - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) -| 范围 | 描述 | commitId | -| ------- | ---------------------------- | ------------------------------------------------------------------------ | -| - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) | -| - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de) | -| project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff) | -| theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758) | -| - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad) | -| - | 使用 uview 完成 api 请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) | -| - | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da) | -| - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b) | -| - | 插件的填写与提交，修改与删除 | [d461252](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d461252) | -| - | 插件面板分开显示 | [fb5e86b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb5e86b) | -| - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) | -| - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6) | -| - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380) | -| - | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005) | -| - | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75) | -| - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc) | -| - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) | -| - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e) | -| - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e) | -| - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5) | -| - | 项目列表新 | [88cf48d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/88cf48d) | -| - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) | ### 🎨 代码样式 +范围|描述|commitId +--|--|-- + - | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b) + - | 交付物相关细节调整 | [87ae00d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/87ae00d) + - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87) -| 范围 | 描述 | commitId | -| ---- | ----------------------- | ------------------------------------------------------------------------ | -| - | calender 格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b) | -| - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87) | ### 🐛 Bug 修复 +范围|描述|commitId +--|--|-- + app.vue | 修复获取token报错的问题 | [9120d54](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9120d54) + createTask | 修复createTask v-model的问题 | [b20d3f0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b20d3f0) + - | defineExpose, defineEmits不需要引入 | [902cacc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/902cacc) + - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce) + - | 删除多余的引入 | [050b12a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/050b12a) + - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90) + - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6) + - | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079) -| 范围 | 描述 | commitId | -| ---------- | ------------------------------------ | ------------------------------------------------------------------------ | -| app.vue | 修复获取 token 报错的问题 | [9120d54](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9120d54) | -| createTask | 修复 createTask v-model 的问题 | [b20d3f0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b20d3f0) | -| - | defineExpose, defineEmits 不需要引入 | [902cacc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/902cacc) | -| - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce) | -| - | 删除多余的引入 | [050b12a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/050b12a) | -| - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90) | -| - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6) | -| - | 解决 warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079) | ### 📦 持续集成 +范围|描述|commitId +--|--|-- + - | ci update | [d38262e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d38262e) + - | drone | [8cddc7b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8cddc7b) + - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3) + - | 更新drone.yml | [63ec5a3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/63ec5a3) + - | 更新drone.yml | [a57d598](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a57d598) + - | 测试ci | [6ab95f8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6ab95f8) + - | 测试ci' | [d25f2a7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d25f2a7) + - | 添加drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89) -| 范围 | 描述 | commitId | -| ---- | -------------- | ------------------------------------------------------------------------ | -| - | ci update | [d38262e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d38262e) | -| - | drone | [8cddc7b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8cddc7b) | -| - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3) | -| - | 更新 drone.yml | [63ec5a3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/63ec5a3) | -| - | 更新 drone.yml | [a57d598](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a57d598) | -| - | 测试 ci | [6ab95f8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6ab95f8) | -| - | 测试 ci' | [d25f2a7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d25f2a7) | -| - | 添加 drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89) | ### 🔨 代码重构 +范围|描述|commitId +--|--|-- + - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87) + - | 修改插件名的输入框和查看历史记录 | [99fb88e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/99fb88e) + - | 原有功能提交别的分支 | [eb02b72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/eb02b72) + - | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df) + - | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98) -| 范围 | 描述 | commitId | -| ---- | ---------------------- | ------------------------------------------------------------------------ | -| - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87) | -| - | 原有功能提交别的分支 | [eb02b72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/eb02b72) | -| - | 重构 project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df) | -| - | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98) | -| - | 原有功能提交别的分支 | [eb02b72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/eb02b72) | -| - | 重构 project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df) | -| - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87) | ### 🚀 性能优化 +范围|描述|commitId +--|--|-- + - | 更新代码 | [0dd443b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0dd443b) -| 范围 | 描述 | commitId | -| ---- | -------- | ------------------------------------------------------------------------ | -| - | 更新代码 | [0dd443b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0dd443b) | ### chore +范围|描述|commitId +--|--|-- + - | editorconfig update | [0c08089](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0c08089) + -| 范围 | 描述 | commitId | -| ---- | ------------------- | ------------------------------------------------------------------------ | -| - | editorconfig update | [0c08089](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0c08089) | +范围|描述|commitId +--|--|-- + - | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49) -| 范围 | 描述 | commitId | -| ---- | -------------- | ------------------------------------------------------------------------ | -| - | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49) | diff --git a/apis/mock.js b/apis/mock.js new file mode 100644 index 0000000..a832d61 --- /dev/null +++ b/apis/mock.js @@ -0,0 +1,17 @@ +import Config from '@/common/js/config.js'; + +const apiUrl = Config.apiUrl; +const defaultwbs = `${apiUrl}/defaultwbs`; + +export function setupMock(app) { + uni.$u.api = { ...uni.$u.api } || {}; + + // 删除交付物 + uni.$u.api.deleteDeliver = param => { + return new Promise((resolve, reject) => { + setTimeout(() => { + resolve(); + }, 100); + }); + }; +} diff --git a/apis/plugin.js b/apis/plugin.js index e881ec5..61267de 100644 --- a/apis/plugin.js +++ b/apis/plugin.js @@ -1,4 +1,4 @@ -import Config from '@/common/js/config.js' +import Config from '@/common/js/config.js'; const apiUrl = Config.apiUrl; const defaultwbs = `${apiUrl}/defaultwbs`; @@ -6,7 +6,8 @@ const defaultwbs = `${apiUrl}/defaultwbs`; export function setupPlugin(app) { uni.$u.api = { ...uni.$u.api } || {}; // 获取插件信息 - uni.$u.api.getOtherPlugin = param => uni.$u.post(`${apiUrl}/pluginshop/plugin/query?pluginId=${param.pluginId}&styleType=${param.styleType}`); + uni.$u.api.getOtherPlugin = param => + uni.$u.post(`${apiUrl}/pluginshop/plugin/query?pluginId=${param.pluginId}&styleType=${param.styleType}`); // 查询子任务 uni.$u.api.findSonTask = param => uni.$u.post(`${defaultwbs}/task/findSonTask`, param); @@ -18,4 +19,4 @@ export function setupPlugin(app) { uni.$u.api.queryDeliverOfTask = param => uni.$u.post(`${defaultwbs}/deliver/queryDeliverOfTask`, param); // 检查交付物 uni.$u.api.checkDeliver = param => uni.$u.post(`${defaultwbs}/deliver/checkDeliver`, param); -}; +} diff --git a/main.js b/main.js index 8f37209..81093ad 100644 --- a/main.js +++ b/main.js @@ -2,21 +2,22 @@ import App from './App'; import cache from '@/utils/cache.js'; import cacheAndRequest from '@/utils/cacheAndRequest.js'; import { createSSRApp } from 'vue'; +import pluginConfig from '@/config/plugin'; import { setupDayjs } from '@/utils/dayjs.js'; import { setupHttp } from '@/utils/request.js'; +import { setupMock } from '@/apis/mock.js'; +import { setupPlugin } from '@/apis/plugin.js'; import { setupProject } from '@/apis/project.js'; import { setupRole } from '@/apis/role.js'; import { setupTall } from '@/apis/tall.js'; import { setupTask } from '@/apis/task.js'; import { setupWbs } from '@/apis/wbs.js'; -import { setupPlugin } from '@/apis/plugin.js'; import storage from '@/utils/storage.js'; import store from './store'; import task from '@/utils/task.js'; +import taskConfig from '@/config/task'; import time from '@/utils/time.js'; import timeConfig from '@/config/time'; -import taskConfig from '@/config/task'; -import pluginConfig from '@/config/plugin'; import uView from './uni_modules/vk-uview-ui'; // 引入 uView UI import ui from '@/utils/ui.js'; import upload from '@/utils/upload.js'; @@ -56,6 +57,7 @@ export function createApp() { setupTask(app); setupWbs(app); setupPlugin(app); + setupMock(app); // mock DEBUG: return { app, diff --git a/pages/project/project.vue b/pages/project/project.vue index dfad4ee..9b51304 100644 --- a/pages/project/project.vue +++ b/pages/project/project.vue @@ -12,7 +12,7 @@ - + diff --git a/plugins/p-deliver/p-deliver.vue b/plugins/p-deliver/p-deliver.vue index aa1714b..dcba24b 100644 --- a/plugins/p-deliver/p-deliver.vue +++ b/plugins/p-deliver/p-deliver.vue @@ -1,57 +1,56 @@