From d47a514b09cf90ca7a0e2b2b9b8282951c30fddc Mon Sep 17 00:00:00 2001 From: kuaifan Date: Tue, 31 May 2022 15:41:47 +0800 Subject: [PATCH] no message --- resources/assets/js/pages/manage/calendar.vue | 12 +++++- .../manage/components/ChatInput/index.vue | 8 +++- .../sass/pages/components/chat-input.scss | 19 ++++++++- .../sass/pages/components/dialog-wrapper.scss | 1 + .../sass/pages/components/project-panel.scss | 42 +++++++++---------- .../pages/components/project-workflow.scss | 18 ++++---- .../sass/pages/components/task-detail.scss | 24 +++++------ .../sass/pages/components/task-menu.scss | 12 +++--- .../assets/sass/pages/page-dashboard.scss | 12 +++--- resources/assets/sass/pages/page-manage.scss | 12 +++--- .../assets/sass/pages/page-messenger.scss | 12 +++++- 11 files changed, 106 insertions(+), 66 deletions(-) diff --git a/resources/assets/js/pages/manage/calendar.vue b/resources/assets/js/pages/manage/calendar.vue index ecc0152ab..32bd7c850 100644 --- a/resources/assets/js/pages/manage/calendar.vue +++ b/resources/assets/js/pages/manage/calendar.vue @@ -209,11 +209,19 @@ export default { this.calendarWeek = {daynames}; this.calendarMonth = {daynames}; this.calendarTheme = { - 'common.border': '1px solid #f4f5f5', + 'common.border': '1px solid rgba(0,0,0,0)', 'month.dayname.fontSize': '14px', - 'month.dayname.borderLeft': '1px solid #f4f5f5', + 'month.dayname.borderLeft': '1px solid rgba(0,0,0,0)', 'month.dayname.height': '50px', } + if (this.$isDesktop) { + this.calendarTheme = { + 'common.border': '1px solid #f4f5f5', + 'month.dayname.fontSize': '14px', + 'month.dayname.borderLeft': '1px solid #f4f5f5', + 'month.dayname.height': '50px', + } + } this.calendarTemplate = { titlePlaceholder: () => { return this.$L("任务描述") diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue index b6b496366..a653baf53 100755 --- a/resources/assets/js/pages/manage/components/ChatInput/index.vue +++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue @@ -278,8 +278,12 @@ export default { boxClass() { const array = []; - if (this.recordState === 'ing' && this.recordDuration > 0) { - array.push('record-ing'); + if (this.recordState === 'ing') { + if (this.recordDuration === 0) { + array.push('record-ing'); + } else { + array.push('record-progress'); + } } if (this.mentionMode) { array.push(this.mentionMode); diff --git a/resources/assets/sass/pages/components/chat-input.scss b/resources/assets/sass/pages/components/chat-input.scss index 79793e3a0..ea6bd7f69 100755 --- a/resources/assets/sass/pages/components/chat-input.scss +++ b/resources/assets/sass/pages/components/chat-input.scss @@ -6,6 +6,21 @@ width: 100%; &.record-ing { + .chat-input-wrapper { + .chat-toolbar { + > li { + &.chat-send { + &:before { + transition: all 1s ease; + transform: translate(-50%, -50%) scale(2); + } + } + } + } + } + } + + &.record-progress { .chat-input-wrapper { .ql-container { opacity: 0; @@ -14,7 +29,8 @@ > li { &.chat-send { &:before { - transform: translate(-50%, -50%) scale(1.5); + transition: all 0.3s ease; + transform: translate(-50%, -50%) scale(2.5); } } &.chat-record-recwave { @@ -139,6 +155,7 @@ left: 50%; z-index: 3; transform: translate(-50%, -50%) scale(1); + transition: all 0.3s ease; color: #ffffff; } } diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index 6c7358751..e7cdb953a 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -7,6 +7,7 @@ display: flex; flex-direction: column; background-color: #ffffff; + overflow: hidden; z-index: 1; .vue-recycle-scroller.direction-vertical:not(.page-mode) { diff --git a/resources/assets/sass/pages/components/project-panel.scss b/resources/assets/sass/pages/components/project-panel.scss index 9a8b1245c..13a161974 100644 --- a/resources/assets/sass/pages/components/project-panel.scss +++ b/resources/assets/sass/pages/components/project-panel.scss @@ -179,18 +179,18 @@ color: $flow-status-start-color; } &.progress { - background-color: rgba($flow-status-progress-color, 0.1);; - border-color: rgba($flow-status-progress-color, 0.1);; + background-color: rgba($flow-status-progress-color, 0.1); + border-color: rgba($flow-status-progress-color, 0.1); color: $flow-status-progress-color; } &.test { - background-color: rgba($flow-status-test-color, 0.1);; - border-color: rgba($flow-status-test-color, 0.1);; + background-color: rgba($flow-status-test-color, 0.1); + border-color: rgba($flow-status-test-color, 0.1); color: $flow-status-test-color; } &.end { - background-color: rgba($flow-status-end-color, 0.1);; - border-color: rgba($flow-status-end-color, 0.1);; + background-color: rgba($flow-status-end-color, 0.1); + border-color: rgba($flow-status-end-color, 0.1); color: $flow-status-end-color; } } @@ -419,18 +419,18 @@ color: $flow-status-start-color; } &.progress { - background-color: rgba($flow-status-progress-color, 0.1);; - border-color: rgba($flow-status-progress-color, 0.1);; + background-color: rgba($flow-status-progress-color, 0.1); + border-color: rgba($flow-status-progress-color, 0.1); color: $flow-status-progress-color; } &.test { - background-color: rgba($flow-status-test-color, 0.1);; - border-color: rgba($flow-status-test-color, 0.1);; + background-color: rgba($flow-status-test-color, 0.1); + border-color: rgba($flow-status-test-color, 0.1); color: $flow-status-test-color; } &.end { - background-color: rgba($flow-status-end-color, 0.1);; - border-color: rgba($flow-status-end-color, 0.1);; + background-color: rgba($flow-status-end-color, 0.1); + border-color: rgba($flow-status-end-color, 0.1); color: $flow-status-end-color; } } @@ -787,18 +787,18 @@ color: $flow-status-start-color; } &.progress { - background-color: rgba($flow-status-progress-color, 0.1);; - border-color: rgba($flow-status-progress-color, 0.1);; + background-color: rgba($flow-status-progress-color, 0.1); + border-color: rgba($flow-status-progress-color, 0.1); color: $flow-status-progress-color; } &.test { - background-color: rgba($flow-status-test-color, 0.1);; - border-color: rgba($flow-status-test-color, 0.1);; + background-color: rgba($flow-status-test-color, 0.1); + border-color: rgba($flow-status-test-color, 0.1); color: $flow-status-test-color; } &.end { - background-color: rgba($flow-status-end-color, 0.1);; - border-color: rgba($flow-status-end-color, 0.1);; + background-color: rgba($flow-status-end-color, 0.1); + border-color: rgba($flow-status-end-color, 0.1); color: $flow-status-end-color; } } @@ -1005,13 +1005,13 @@ background-color: rgba($flow-status-start-color, 0.1); } &.progress { - background-color: rgba($flow-status-progress-color, 0.1);; + background-color: rgba($flow-status-progress-color, 0.1); } &.test { - background-color: rgba($flow-status-test-color, 0.1);; + background-color: rgba($flow-status-test-color, 0.1); } &.end { - background-color: rgba($flow-status-end-color, 0.1);; + background-color: rgba($flow-status-end-color, 0.1); } } } diff --git a/resources/assets/sass/pages/components/project-workflow.scss b/resources/assets/sass/pages/components/project-workflow.scss index 657ea1f80..22b682ebe 100644 --- a/resources/assets/sass/pages/components/project-workflow.scss +++ b/resources/assets/sass/pages/components/project-workflow.scss @@ -70,18 +70,18 @@ color: $flow-status-start-color; } &.progress { - background-color: rgba($flow-status-progress-color, 0.1);; - border-color: rgba($flow-status-progress-color, 0.1);; + background-color: rgba($flow-status-progress-color, 0.1); + border-color: rgba($flow-status-progress-color, 0.1); color: $flow-status-progress-color; } &.test { - background-color: rgba($flow-status-test-color, 0.1);; - border-color: rgba($flow-status-test-color, 0.1);; + background-color: rgba($flow-status-test-color, 0.1); + border-color: rgba($flow-status-test-color, 0.1); color: $flow-status-test-color; } &.end { - background-color: rgba($flow-status-end-color, 0.1);; - border-color: rgba($flow-status-end-color, 0.1);; + background-color: rgba($flow-status-end-color, 0.1); + border-color: rgba($flow-status-end-color, 0.1); color: $flow-status-end-color; } } @@ -437,15 +437,15 @@ color: $flow-status-start-color; } &.progress { - background-color: rgba($flow-status-progress-color, 0.1);; + background-color: rgba($flow-status-progress-color, 0.1); color: $flow-status-progress-color; } &.test { - background-color: rgba($flow-status-test-color, 0.1);; + background-color: rgba($flow-status-test-color, 0.1); color: $flow-status-test-color; } &.end { - background-color: rgba($flow-status-end-color, 0.1);; + background-color: rgba($flow-status-end-color, 0.1); color: $flow-status-end-color; } diff --git a/resources/assets/sass/pages/components/task-detail.scss b/resources/assets/sass/pages/components/task-detail.scss index c5ef18d4f..6fc128254 100644 --- a/resources/assets/sass/pages/components/task-detail.scss +++ b/resources/assets/sass/pages/components/task-detail.scss @@ -75,18 +75,18 @@ color: $flow-status-start-color; } &.progress { - background-color: rgba($flow-status-progress-color, 0.1);; - border-color: rgba($flow-status-progress-color, 0.1);; + background-color: rgba($flow-status-progress-color, 0.1); + border-color: rgba($flow-status-progress-color, 0.1); color: $flow-status-progress-color; } &.test { - background-color: rgba($flow-status-test-color, 0.1);; - border-color: rgba($flow-status-test-color, 0.1);; + background-color: rgba($flow-status-test-color, 0.1); + border-color: rgba($flow-status-test-color, 0.1); color: $flow-status-test-color; } &.end { - background-color: rgba($flow-status-end-color, 0.1);; - border-color: rgba($flow-status-end-color, 0.1);; + background-color: rgba($flow-status-end-color, 0.1); + border-color: rgba($flow-status-end-color, 0.1); color: $flow-status-end-color; } } @@ -364,18 +364,18 @@ color: $flow-status-start-color; } &.progress { - background-color: rgba($flow-status-progress-color, 0.1);; - border-color: rgba($flow-status-progress-color, 0.1);; + background-color: rgba($flow-status-progress-color, 0.1); + border-color: rgba($flow-status-progress-color, 0.1); color: $flow-status-progress-color; } &.test { - background-color: rgba($flow-status-test-color, 0.1);; - border-color: rgba($flow-status-test-color, 0.1);; + background-color: rgba($flow-status-test-color, 0.1); + border-color: rgba($flow-status-test-color, 0.1); color: $flow-status-test-color; } &.end { - background-color: rgba($flow-status-end-color, 0.1);; - border-color: rgba($flow-status-end-color, 0.1);; + background-color: rgba($flow-status-end-color, 0.1); + border-color: rgba($flow-status-end-color, 0.1); color: $flow-status-end-color; } } diff --git a/resources/assets/sass/pages/components/task-menu.scss b/resources/assets/sass/pages/components/task-menu.scss index ae7187ed3..46b291269 100644 --- a/resources/assets/sass/pages/components/task-menu.scss +++ b/resources/assets/sass/pages/components/task-menu.scss @@ -87,18 +87,18 @@ color: $flow-status-start-color; } &.progress { - background-color: rgba($flow-status-progress-color, 0.1);; - border-color: rgba($flow-status-progress-color, 0.1);; + background-color: rgba($flow-status-progress-color, 0.1); + border-color: rgba($flow-status-progress-color, 0.1); color: $flow-status-progress-color; } &.test { - background-color: rgba($flow-status-test-color, 0.1);; - border-color: rgba($flow-status-test-color, 0.1);; + background-color: rgba($flow-status-test-color, 0.1); + border-color: rgba($flow-status-test-color, 0.1); color: $flow-status-test-color; } &.end { - background-color: rgba($flow-status-end-color, 0.1);; - border-color: rgba($flow-status-end-color, 0.1);; + background-color: rgba($flow-status-end-color, 0.1); + border-color: rgba($flow-status-end-color, 0.1); color: $flow-status-end-color; } } diff --git a/resources/assets/sass/pages/page-dashboard.scss b/resources/assets/sass/pages/page-dashboard.scss index a608c0e61..8bf27f22d 100644 --- a/resources/assets/sass/pages/page-dashboard.scss +++ b/resources/assets/sass/pages/page-dashboard.scss @@ -192,18 +192,18 @@ color: $flow-status-start-color; } &.progress { - background-color: rgba($flow-status-progress-color, 0.1);; - border-color: rgba($flow-status-progress-color, 0.1);; + background-color: rgba($flow-status-progress-color, 0.1); + border-color: rgba($flow-status-progress-color, 0.1); color: $flow-status-progress-color; } &.test { - background-color: rgba($flow-status-test-color, 0.1);; - border-color: rgba($flow-status-test-color, 0.1);; + background-color: rgba($flow-status-test-color, 0.1); + border-color: rgba($flow-status-test-color, 0.1); color: $flow-status-test-color; } &.end { - background-color: rgba($flow-status-end-color, 0.1);; - border-color: rgba($flow-status-end-color, 0.1);; + background-color: rgba($flow-status-end-color, 0.1); + border-color: rgba($flow-status-end-color, 0.1); color: $flow-status-end-color; } } diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss index 1dfe1b3ac..35b384432 100644 --- a/resources/assets/sass/pages/page-manage.scss +++ b/resources/assets/sass/pages/page-manage.scss @@ -363,18 +363,18 @@ color: $flow-status-start-color; } &.progress { - background-color: rgba($flow-status-progress-color, 0.1);; - border-color: rgba($flow-status-progress-color, 0.1);; + background-color: rgba($flow-status-progress-color, 0.1); + border-color: rgba($flow-status-progress-color, 0.1); color: $flow-status-progress-color; } &.test { - background-color: rgba($flow-status-test-color, 0.1);; - border-color: rgba($flow-status-test-color, 0.1);; + background-color: rgba($flow-status-test-color, 0.1); + border-color: rgba($flow-status-test-color, 0.1); color: $flow-status-test-color; } &.end { - background-color: rgba($flow-status-end-color, 0.1);; - border-color: rgba($flow-status-end-color, 0.1);; + background-color: rgba($flow-status-end-color, 0.1); + border-color: rgba($flow-status-end-color, 0.1); color: $flow-status-end-color; } } diff --git a/resources/assets/sass/pages/page-messenger.scss b/resources/assets/sass/pages/page-messenger.scss index 0055d06cf..024c7e51f 100644 --- a/resources/assets/sass/pages/page-messenger.scss +++ b/resources/assets/sass/pages/page-messenger.scss @@ -300,7 +300,17 @@ margin-bottom: 6px; height: 34px; line-height: 34px; - border-bottom: 1px solid #efefef; + position: relative; + &:after { + content: ""; + position: absolute; + bottom: 0; + right: 0; + left: 0; + height: 1px; + background-color: #f2f2f2; + transform: scaleY(0.5); + } } &.nothing, &.loading {