From 8cddc7b3a303c517ca13bedb2f169e6a77725eb4 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Wed, 12 Jan 2022 12:03:51 +0800 Subject: [PATCH 1/3] ci: drone --- .drone.yml | 44 ++++++++++++++++++++++---------------------- CHANGELOG.md | 1 + 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3d2c558..f15bae8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,36 +17,36 @@ volumes: 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: 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 + # volumes: + # - name: cache + # path: /root/.m2 commands: - npm config set registry http://registry.npm.taobao.org - npm i - - npm run build:dev + - npm run test - - name: rebuild-cache - image: drillster/drone-volume-cache - volumes: - - name: cache - path: /cache - settings: - rebuild: true - mount: - - ./node_modules + # - 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index e8bb4c5..a57621a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,6 +50,7 @@ - | 更新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) From fb5e86b6af2c4f6e12e3ce58002f41b5c11d5ca3 Mon Sep 17 00:00:00 2001 From: song Date: Wed, 12 Jan 2022 14:15:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=8F=92=E4=BB=B6=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E5=88=86=E5=BC=80=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 22 +-- CHANGELOG.md | 3 +- common/styles/theme/default.scss | 5 +- components/Plugin/Plugin.vue | 2 +- components/Render/Render.vue | 22 ++- components/TimeLine/component/TimeBox.vue | 42 ++--- pages/project/project.vue | 4 +- plugins/p-deliver-check/p-deliver-check.vue | 56 ++++--- plugins/p-deliver/p-deliver.vue | 11 +- .../p-delivery-history/p-delivery-history.vue | 12 +- .../p-delivery-history1.vue | 149 ------------------ plugins/p-manage-member/p-manage-member.vue | 11 ++ plugins/p-manage-project/p-manage-project.vue | 11 ++ plugins/p-manage-role/p-manage-role.vue | 11 ++ plugins/p-manage-task/p-manage-task.vue | 11 ++ plugins/p-subproject/p-subproject.vue | 11 +- plugins/p-subtasks/p-subtasks.vue | 11 +- plugins/p-task-countdown/p-task-countdown.vue | 11 +- .../p-task-description/p-task-description.vue | 11 ++ .../p-task-duration-delay.vue | 11 +- .../p-task-start-time-delay.vue | 11 ++ plugins/p-task-title/p-task-title.vue | 13 +- .../p-upload-deliverable.vue | 11 +- plugins/p-wbs-import/p-wbs-import.vue | 11 +- 24 files changed, 249 insertions(+), 224 deletions(-) delete mode 100644 plugins/p-delivery-history/p-delivery-history1.vue diff --git a/App.vue b/App.vue index a526b47..0368041 100644 --- a/App.vue +++ b/App.vue @@ -43,19 +43,18 @@ export default { if (token && tokenIsAvailable) { // 1.1 store里有token 且没过期直接:使用store的token return token; - } else { - // 2. 根据userId获取token - if (userId) { - try { - const { token } = await this.$store.dispatch('user/getTokenByUserId', userId); - return token; - } catch (error) { - console.error('error: ', error); - return null; - } - } else { + } + // 2. 根据userId获取token + if (userId) { + try { + const { token } = await this.$store.dispatch('user/getTokenByUserId', userId); + return token; + } catch (error) { + console.error('error: ', error); return null; } + } else { + return null; } }, @@ -166,4 +165,5 @@ export default { page { height: 100%; } + diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ae4224..fd7fe26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 1.0.0 (2022-01-11) +# 1.0.0 (2022-01-12) ### 🌟 新功能 范围|描述|commitId @@ -37,6 +37,7 @@ 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) + - | 插件接口修改 | [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) diff --git a/common/styles/theme/default.scss b/common/styles/theme/default.scss index f851f5a..038cb4a 100644 --- a/common/styles/theme/default.scss +++ b/common/styles/theme/default.scss @@ -1,7 +1,7 @@ // 默认主题文件 .theme-default { background-color: #007aff; - color: #fff; + // color: #fff; .u-card { font-size: 24px !important; color: #0f0; @@ -13,4 +13,7 @@ color: #fff !important; } } + button{ + border: none!important; + } } diff --git a/components/Plugin/Plugin.vue b/components/Plugin/Plugin.vue index d740eca..c343551 100644 --- a/components/Plugin/Plugin.vue +++ b/components/Plugin/Plugin.vue @@ -1,6 +1,6 @@