From 9fbae8997f646cffd432c8bd94320a29ae0dfca9 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Tue, 11 Jan 2022 08:48:53 +0800 Subject: [PATCH 01/22] =?UTF-8?q?ci:=20=E6=B7=BB=E5=8A=A0drone.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++ CHANGELOG.md | 3 +- 2 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..8261895 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,145 @@ +kind: pipeline +type: docker +name: dev + +# 挂载的主机卷，可以映射到docker容器中 +volumes: + # maven构建缓存（宿主机目录） + - name: ssh_key + host: + path: /root/.ssh/ + - name: cache + host: + path: /var/lib/cache + - name: data + host: + path: /var/lib/data + +steps: + - name: restore-cache + image: drillster/drone-volume-cache + volumes: + - name: cache + path: /cache + settings: + restore: true + mount: + - ./node_modules + + - name: build + image: node:latest + pull: if-not-exists # default always + volumes: + - name: cache + path: /root/.m2 + commands: + - npm i + - npm run build:dev + + - name: rebuild-cache + image: drillster/drone-volume-cache + volumes: + - name: cache + path: /cache + settings: + rebuild: true + mount: + - ./node_modules + + - name: deploy-scp + image: appleboy/drone-scp + pull: if-not-exists + volumes: + - name: ssh_key + path: /root/.ssh/ + settings: + host: test.tall.wiki + port: 22 + username: root + key_path: /root/.ssh/id_rsa + rm: true # true则会删除目标目录重建 + target: /home/tall/v4.0.0 + source: dist/**/* + strip_components: 1 # 去除的目录层数，如果没有该选项，则拷贝过去是 target/xxx.jar,1代表去除target + + # - name: run-ssh + # image: appleboy/drone-ssh + # pull: if-not-exists + # volumes: + # - name: ssh_key + # path: /root/.ssh/ + # settings: + # settings: + # host: test.tall.wiki + # port: 22 + # username: root + # key_path: /root/.ssh/id_rsa + # script_stop: true # stop script after first failure + # #command_timeout: 30s # 30seconds, the maximum amount of time for the execute commands, default is 10 minutes. + # script: + # - cd /home/iacd-platform-drone + # - ./re.sh > /dev/null 2> /dev/null & + + - name: notify-email + image: drillster/drone-email + pull: if-not-exists + settings: + host: smtp.qiye.aliyun.com #例如 smtp.qq.com + port: 465 #例如QQ邮箱端口465 + username: devops@ccsens.com #邮箱用户名 + password: #邮箱密码 + from_secret: orgsecret_password_mail_devops + from: devops@ccsens.com + recipients: weizezhao@ccsens.com #收件人，多个用，隔开 + when: #执行条件 + status: + - success + - changed + - failure + + - name: notify-wechatwork + image: fifsky/drone-wechat-work + pull: if-not-exists + settings: + url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=b2b93e9a-128b-41d4-8dce-12004e3f48b9 + msgtype: markdown + content: | + {{if eq .Status "success" }} + #### 🎉 ${DRONE_REPO} 构建成功 + > Commit: [${DRONE_COMMIT_MESSAGE}](${DRONE_COMMIT_LINK}) + > Author: ${DRONE_COMMIT_AUTHOR} + > [点击查看](${DRONE_BUILD_LINK}) + {{else}} + #### ❌ ${DRONE_REPO} 构建失败 + > Commit: [${DRONE_COMMIT_MESSAGE}](${DRONE_COMMIT_LINK}) + > Author: ${DRONE_COMMIT_AUTHOR} + > 请立即修复!!! + > [点击查看](${DRONE_BUILD_LINK}) + {{end}} + when: + status: + - failure + - success + + # - name: notify-dingtalk + # image: lddsb/drone-dingtalk-message + # environment: + # PASSWORD: + # from_secret: password_mail_devops + # settings: + # token: your-dingtalk-robot-access-token + # type: markdown + # message_color: true + # message_pic: true + # sha_link: true + + # -name: notify-slack + # image: plugins/slack + # webhook: https://hooks.slack.com/ www.dijiuyy.com services/xxx/xxx/xxx + # channel: dev + # template: > + # {{#success build.status}} + # build {{build.number}} succeeded. Good job. + # {{else}} + # build {{build.number}} failed. Fix me please. + # {{/success}} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 5952d66..48fdbda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 1.0.0 (2022-01-10) +# 1.0.0 (2022-01-11) ### 🌟 新功能 范围|描述|commitId @@ -6,6 +6,7 @@ - | 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) - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) From f5b52e355d96a2f8028f7d4c2c731df851c3d8fe Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Tue, 11 Jan 2022 08:56:05 +0800 Subject: [PATCH 02/22] =?UTF-8?q?ci:=20=E4=BF=AE=E6=94=B9.drone.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 59 ++++++++++++++++---------------- CHANGELOG.md | 95 ++++++++++++++++++++++++++-------------------------- 2 files changed, 79 insertions(+), 75 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8261895..406b920 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,3 +1,4 @@ +--- kind: pipeline type: docker name: dev @@ -24,14 +25,14 @@ steps: settings: restore: true mount: - - ./node_modules - + - ./node_modules + - name: build image: node:latest pull: if-not-exists # default always volumes: - - name: cache - path: /root/.m2 + - name: cache + path: /root/.m2 commands: - npm i - npm run build:dev @@ -44,24 +45,24 @@ steps: settings: rebuild: true mount: - - ./node_modules + - ./node_modules - name: deploy-scp image: appleboy/drone-scp pull: if-not-exists volumes: - - name: ssh_key - path: /root/.ssh/ + - name: ssh_key + path: /root/.ssh/ settings: - host: test.tall.wiki - port: 22 - username: root - key_path: /root/.ssh/id_rsa - rm: true # true则会删除目标目录重建 - target: /home/tall/v4.0.0 - source: dist/**/* - strip_components: 1 # 去除的目录层数，如果没有该选项，则拷贝过去是 target/xxx.jar,1代表去除target - + host: test.tall.wiki + port: 22 + username: root + key_path: /root/.ssh/id_rsa + rm: true # true则会删除目标目录重建 + target: /home/tall/v4.0.0 + source: dist/**/* + strip_components: 1 # 去除的目录层数，如果没有该选项，则拷贝过去是 target/xxx.jar,1代表去除target + # - name: run-ssh # image: appleboy/drone-ssh # pull: if-not-exists @@ -79,23 +80,23 @@ steps: # script: # - cd /home/iacd-platform-drone # - ./re.sh > /dev/null 2> /dev/null & - + - name: notify-email image: drillster/drone-email pull: if-not-exists settings: - host: smtp.qiye.aliyun.com #例如 smtp.qq.com - port: 465 #例如QQ邮箱端口465 - username: devops@ccsens.com #邮箱用户名 - password: #邮箱密码 + host: smtp.qiye.aliyun.com #例如 smtp.qq.com + port: 465 #例如QQ邮箱端口465 + username: devops@ccsens.com #邮箱用户名 + password: #邮箱密码 from_secret: orgsecret_password_mail_devops from: devops@ccsens.com - recipients: weizezhao@ccsens.com #收件人，多个用，隔开 - when: #执行条件 - status: - - success - - changed - - failure + recipients: weizezhao@ccsens.com #收件人，多个用，隔开 + when: #执行条件 + status: + - success + - changed + - failure - name: notify-wechatwork image: fifsky/drone-wechat-work @@ -121,6 +122,8 @@ steps: - failure - success +trigger: + branch: develop # - name: notify-dingtalk # image: lddsb/drone-dingtalk-message # environment: @@ -142,4 +145,4 @@ steps: # build {{build.number}} succeeded. Good job. # {{else}} # build {{build.number}} failed. Fix me please. - # {{/success}} \ No newline at end of file + # {{/success}} diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b787c5..9f3f357 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,67 +1,68 @@ # 1.0.0 (2022-01-11) ### 🌟 新功能 +范围|描述|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) + - | 日历页添加 | [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) + - | 项目操作面板 | [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) | -| - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) | -| - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e) | -| - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc) | -| - | 日历页首页 | [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) | -| - | 时间轴接口 | [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) | -| - | 使用 uview 完成 api 请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) | -| - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) | -| - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) | -| - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5) | -| - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e) | -| - | 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) | ### 🎨 代码样式 +范围|描述|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) -| 范围 | 描述 | commitId | -| ---- | ----------------------- | ------------------------------------------------------------------------ | -| - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87) | -| - | calender 格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b) | ### 🐛 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) + - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce) + + +### 📦 持续集成 +范围|描述|commitId +--|--|-- + - | 添加drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89) -| 范围 | 描述 | commitId | -| ---------- | ------------------------------ | ------------------------------------------------------------------------ | -| - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce) | -| 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) | ### 🔨 代码重构 +范围|描述|commitId +--|--|-- + - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87) + - | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df) -| 范围 | 描述 | commitId | -| ---- | ---------------------- | ------------------------------------------------------------------------ | -| - | 重构 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) | From 902caccfec48b2d20c816ea70bb582e3a79e5077 Mon Sep 17 00:00:00 2001 From: xuesinan <1404152492@qq.com> Date: Tue, 11 Jan 2022 09:32:14 +0800 Subject: [PATCH 03/22] =?UTF-8?q?fix:=20defineExpose,=20defineEmits?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E5=BC=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 ++- components/TimeLine/TimeLine.vue | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 749d313..53f6d81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 1.0.0 (2022-01-10) +# 1.0.0 (2022-01-11) ### 🌟 新功能 范围|描述|commitId @@ -9,6 +9,7 @@ - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) - | 时间轴接口 | [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) + - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380) - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) diff --git a/components/TimeLine/TimeLine.vue b/components/TimeLine/TimeLine.vue index 2b308d9..489c680 100644 --- a/components/TimeLine/TimeLine.vue +++ b/components/TimeLine/TimeLine.vue @@ -22,7 +22,7 @@ diff --git a/pages/user/login.vue b/pages/user/login.vue index 48d48ea..2f375cc 100644 --- a/pages/user/login.vue +++ b/pages/user/login.vue @@ -1,8 +1,132 @@ - - diff --git a/pages/user/rigister.vue b/pages/user/rigister.vue new file mode 100644 index 0000000..48d48ea --- /dev/null +++ b/pages/user/rigister.vue @@ -0,0 +1,8 @@ + + + + + From 98abdf6ae5498827da2c1ef41bbc54e7ecfbea3a Mon Sep 17 00:00:00 2001 From: song Date: Tue, 11 Jan 2022 17:36:52 +0800 Subject: [PATCH 05/22] =?UTF-8?q?fix:=20=E6=97=B6=E9=97=B4=E8=BD=B4?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + apis/plugin.js | 10 + apis/wbs.js | 2 +- common/styles/tailwind.scss | 12 + common/styles/theme/default.scss | 10 +- common/styles/theme/test.scss | 3 + components/ChooseChecker/ChooseChecker.vue | 89 ++++++ components/Globals/Globals.vue | 5 +- components/Plugin/Plugin.vue | 104 +------ components/Render/Render.vue | 104 +++++++ components/TimeLine/component/TimeBox.vue | 30 +- components/Tips/Tips.vue | 3 +- components/Title/Title.vue | 2 + components/Upload/Upload.vue | 5 +- components/uni-popup/message.js | 22 ++ components/uni-popup/popup.js | 23 ++ components/uni-popup/uni-popup-dialog.vue | 246 +++++++++++++++ components/uni-popup/uni-popup-message.vue | 115 +++++++ components/uni-popup/uni-popup-share.vue | 171 +++++++++++ components/uni-popup/uni-popup.vue | 289 ++++++++++++++++++ config/plugin.js | 97 ++++++ main.js | 5 + pages/index/index.vue | 22 +- plugins/p-deliver-check/p-deliver-check.vue | 62 ++++ .../p-delivery-history/p-delivery-history.vue | 131 ++++++++ .../p-delivery-history1.vue | 149 +++++++++ plugins/p-manage-member/p-manage-member.vue | 6 + plugins/p-manage-project/p-manage-project.vue | 6 + plugins/p-manage-role/p-manage-role.vue | 6 + plugins/p-manage-task/p-manage-task.vue | 6 + plugins/p-subproject/p-subproject.vue | 54 ++++ plugins/p-subtasks/p-subtasks.vue | 31 ++ plugins/p-task-countdown/p-task-countdown.vue | 10 + .../p-task-description/p-task-description.vue | 11 + .../p-task-duration-delay.vue | 23 ++ .../p-task-start-time-delay.vue | 18 ++ plugins/p-task-title/p-task-title.vue | 2 + .../p-upload-deliverable.vue | 90 ++++++ plugins/p-wbs-import/p-wbs-import.vue | 71 +++++ store/task/actions.js | 4 + store/task/mutations.js | 9 + store/task/state.js | 1 + utils/cacheAndRequest.js | 2 - utils/upload.js | 2 +- 44 files changed, 1935 insertions(+), 129 deletions(-) create mode 100644 apis/plugin.js create mode 100644 components/ChooseChecker/ChooseChecker.vue create mode 100644 components/Render/Render.vue create mode 100644 components/uni-popup/message.js create mode 100644 components/uni-popup/popup.js create mode 100644 components/uni-popup/uni-popup-dialog.vue create mode 100644 components/uni-popup/uni-popup-message.vue create mode 100644 components/uni-popup/uni-popup-share.vue create mode 100644 components/uni-popup/uni-popup.vue create mode 100644 config/plugin.js create mode 100644 plugins/p-deliver-check/p-deliver-check.vue create mode 100644 plugins/p-delivery-history/p-delivery-history.vue create mode 100644 plugins/p-delivery-history/p-delivery-history1.vue create mode 100644 plugins/p-manage-member/p-manage-member.vue create mode 100644 plugins/p-manage-project/p-manage-project.vue create mode 100644 plugins/p-manage-role/p-manage-role.vue create mode 100644 plugins/p-manage-task/p-manage-task.vue create mode 100644 plugins/p-subproject/p-subproject.vue create mode 100644 plugins/p-subtasks/p-subtasks.vue create mode 100644 plugins/p-task-countdown/p-task-countdown.vue create mode 100644 plugins/p-task-description/p-task-description.vue create mode 100644 plugins/p-task-duration-delay/p-task-duration-delay.vue create mode 100644 plugins/p-task-start-time-delay/p-task-start-time-delay.vue create mode 100644 plugins/p-upload-deliverable/p-upload-deliverable.vue create mode 100644 plugins/p-wbs-import/p-wbs-import.vue diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f3f357..e21f35a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ ### 📦 持续集成 范围|描述|commitId --|--|-- + - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3) - | 添加drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89) diff --git a/apis/plugin.js b/apis/plugin.js new file mode 100644 index 0000000..7d18f99 --- /dev/null +++ b/apis/plugin.js @@ -0,0 +1,10 @@ +import Config from '@/common/js/config.js' + +const apiUrl = Config.apiUrl; +const defaultwbs = `${apiUrl}`; + +export function setupPlugin(app) { + uni.$u.api = { ...uni.$u.api } || {}; + // 获取插件信息 + uni.$u.api.getOtherPlugin = param => uni.$u.post(`${defaultwbs}/pluginshop/plugin/query?pluginId=${param.pluginId}&styleType=${param.styleType}`); +}; diff --git a/apis/wbs.js b/apis/wbs.js index 2816f08..d3d0a20 100644 --- a/apis/wbs.js +++ b/apis/wbs.js @@ -3,5 +3,5 @@ import Config from "@/common/js/config.js" export function setupWbs(app) { uni.$u.api = { ...uni.$u.api } || {}; // 导入wbs - uni.$u.api.import = formData => this.$upload.chooseAndUpload(`${Config.apiUrl}/wbs`, formData); + uni.$u.api.import = formData => uni.$upload.chooseAndUpload(`${Config.apiUrl}/wbs`, formData); } \ No newline at end of file diff --git a/common/styles/tailwind.scss b/common/styles/tailwind.scss index 62fc09b..aff246f 100644 --- a/common/styles/tailwind.scss +++ b/common/styles/tailwind.scss @@ -2425,6 +2425,18 @@ grid-auto-flow: column dense; } +.gap-1{ + gap: 0.25rem; +} + +.gap-2{ + gap: 0.5rem; +} + +.gap-3{ + gap: 0.75rem; +} + .auto-rows-auto { grid-auto-rows: auto; } diff --git a/common/styles/theme/default.scss b/common/styles/theme/default.scss index 29733e9..f851f5a 100644 --- a/common/styles/theme/default.scss +++ b/common/styles/theme/default.scss @@ -1,8 +1,16 @@ // 默认主题文件 .theme-default { - background-color: #333; + background-color: #007aff; + color: #fff; .u-card { font-size: 24px !important; color: #0f0; } + .u-navbar { + background-color: #007aff !important; + color: #fff; + .uicon-nav-back { + color: #fff !important; + } + } } diff --git a/common/styles/theme/test.scss b/common/styles/theme/test.scss index e29dddc..33db59c 100644 --- a/common/styles/theme/test.scss +++ b/common/styles/theme/test.scss @@ -5,4 +5,7 @@ font-size: 24px !important; background-color: #ff0 !important; } + .u-navbar { + background-color: #ff0 !important; + } } diff --git a/components/ChooseChecker/ChooseChecker.vue b/components/ChooseChecker/ChooseChecker.vue new file mode 100644 index 0000000..e4bbe93 --- /dev/null +++ b/components/ChooseChecker/ChooseChecker.vue @@ -0,0 +1,89 @@ + + + diff --git a/components/Globals/Globals.vue b/components/Globals/Globals.vue index e8d5f9c..07c37c9 100644 --- a/components/Globals/Globals.vue +++ b/components/Globals/Globals.vue @@ -11,8 +11,7 @@ > diff --git a/plugins/p-upload-deliverable/p-upload-deliverable.vue b/plugins/p-upload-deliverable/p-upload-deliverable.vue new file mode 100644 index 0000000..a9f6053 --- /dev/null +++ b/plugins/p-upload-deliverable/p-upload-deliverable.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/plugins/p-wbs-import/p-wbs-import.vue b/plugins/p-wbs-import/p-wbs-import.vue new file mode 100644 index 0000000..bbdedb4 --- /dev/null +++ b/plugins/p-wbs-import/p-wbs-import.vue @@ -0,0 +1,71 @@ + + + diff --git a/store/task/actions.js b/store/task/actions.js index 2ff1f56..15a5909 100644 --- a/store/task/actions.js +++ b/store/task/actions.js @@ -5,7 +5,9 @@ const actions = { * @param {string} roleId 角色id */ getPermanent({ commit }, param) { + commit('setShowGlobalSkeleton', true); uni.$catchReq.getPermanent(param, (err, data) => { + commit('setShowGlobalSkeleton', false); if (err) { console.error('err: ', err); } else { @@ -20,7 +22,9 @@ const actions = { * @param {object} param 请求参数 roleId, timeNode, timeUnit */ getGlobal({ commit }, param) { + commit('setShowGlobalSkeleton', true); uni.$catchReq.getGlobal(param, (err, data) => { + commit('setShowGlobalSkeleton', false); if (err) { console.error('err: ', err); } else { diff --git a/store/task/mutations.js b/store/task/mutations.js index 01d9dd7..af17063 100644 --- a/store/task/mutations.js +++ b/store/task/mutations.js @@ -225,6 +225,15 @@ const mutations = { state.showSkeleton = show; }, + /** + * 设置日常任务骨架屏是否显示 + * @param {Object} state + * @param {Boolean} show + */ + setShowGlobalSkeleton(state, show) { + state.showGlobalSkeleton = show; + }, + /** * 是否设置时间轴自动滚动的位置 * @param {Object} state diff --git a/store/task/state.js b/store/task/state.js index 023378d..ae3cca5 100644 --- a/store/task/state.js +++ b/store/task/state.js @@ -18,6 +18,7 @@ const state = { dailyTasks: [], // 日常任务 tasks: [], // 所有的定期任务 showSkeleton: false, // 定期任务骨架屏 + showGlobalSkeleton: false, // 日常任务骨架屏 newProjectInfo: {}, showScrollTo: false, // 是否可以设置时间轴自动滚动的位置 }; diff --git a/utils/cacheAndRequest.js b/utils/cacheAndRequest.js index f04baa7..cb0598a 100644 --- a/utils/cacheAndRequest.js +++ b/utils/cacheAndRequest.js @@ -83,7 +83,6 @@ export default { uni.$cache .getStorageRegularTask(params) .then(data => { - console.log('cache data: ', data); !remote && fn(null, data); }) .catch(err => !remote && fn(err)); @@ -93,7 +92,6 @@ export default { uni.$u.api .getRegularTask(params) .then(data => { - console.log('api data: ', uni.$u.deepClone(data)); remote = true; fn(null, uni.$u.deepClone(data)); diff --git a/utils/upload.js b/utils/upload.js index 91139d3..60e4d25 100644 --- a/utils/upload.js +++ b/utils/upload.js @@ -55,8 +55,8 @@ export default { */ chooseAndUpload(url, formData = {}, extension = ['.xls', '.xlsx'], name = 'param') { uni.hideLoading(); - clearTimeout(timer); let timer = null; + clearTimeout(timer); return new Promise((resolve, reject) => { const token = uni.$storage.getStorageSync('anyringToken'); if (!token) { From dcb00798437469c6a5fe001208e68317de8e9555 Mon Sep 17 00:00:00 2001 From: song Date: Tue, 11 Jan 2022 17:40:54 +0800 Subject: [PATCH 06/22] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3warning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 33 ++++++++++--------- components/ChooseChecker/ChooseChecker.vue | 2 +- components/Plugin/Plugin.vue | 2 +- components/Render/Render.vue | 2 +- components/TimeLine/component/TimeBox.vue | 2 ++ components/Tips/Tips.vue | 2 +- .../p-delivery-history/p-delivery-history.vue | 2 +- plugins/p-subproject/p-subproject.vue | 2 +- plugins/p-subtasks/p-subtasks.vue | 2 +- .../p-task-description/p-task-description.vue | 2 -- .../p-task-duration-delay.vue | 2 +- .../p-task-start-time-delay.vue | 2 +- plugins/p-task-title/p-task-title.vue | 2 -- .../p-upload-deliverable.vue | 2 +- plugins/p-wbs-import/p-wbs-import.vue | 4 +-- 15 files changed, 31 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff02d4a..b8911e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,39 +3,41 @@ ### 🌟 新功能 范围|描述|commitId --|--|-- - - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e) - - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc) - - | 日历页首页 | [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) - - | 时间轴接口 | [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) - - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380) - - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) - - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) - - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) - - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5) - - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e) - | 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) + - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b) + - | 日历页添加 | [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) + - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) ### 🎨 代码样式 范围|描述|commitId --|--|-- - - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87) - | 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 --|--|-- - - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce) 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) + - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6) ### 📦 持续集成 @@ -43,14 +45,13 @@ --|--|-- - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3) - | 添加drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89) - - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3) ### 🔨 代码重构 范围|描述|commitId --|--|-- - - | 重构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) + - | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df) ### 🚀 性能优化 diff --git a/components/ChooseChecker/ChooseChecker.vue b/components/ChooseChecker/ChooseChecker.vue index e4bbe93..f57d375 100644 --- a/components/ChooseChecker/ChooseChecker.vue +++ b/components/ChooseChecker/ChooseChecker.vue @@ -35,7 +35,7 @@ diff --git a/plugins/p-task-duration-delay/p-task-duration-delay.vue b/plugins/p-task-duration-delay/p-task-duration-delay.vue index 0bab35d..ab9aba4 100644 --- a/plugins/p-task-duration-delay/p-task-duration-delay.vue +++ b/plugins/p-task-duration-delay/p-task-duration-delay.vue @@ -13,7 +13,7 @@ diff --git a/plugins/p-upload-deliverable/p-upload-deliverable.vue b/plugins/p-upload-deliverable/p-upload-deliverable.vue index a9f6053..951ab3f 100644 --- a/plugins/p-upload-deliverable/p-upload-deliverable.vue +++ b/plugins/p-upload-deliverable/p-upload-deliverable.vue @@ -17,7 +17,7 @@ + + diff --git a/components/TimeLine/component/TimeBox.vue b/components/TimeLine/component/TimeBox.vue index e82a89b..b40e172 100644 --- a/components/TimeLine/component/TimeBox.vue +++ b/components/TimeLine/component/TimeBox.vue @@ -15,13 +15,14 @@ - + + - -