diff --git a/resources/assets/js/functions/web.js b/resources/assets/js/functions/web.js index 437b7a7c..9bb74b1b 100755 --- a/resources/assets/js/functions/web.js +++ b/resources/assets/js/functions/web.js @@ -596,6 +596,7 @@ twitterwidget, .sr-reader, .no-dark-mode, + .no-dark-mode-before:before, .sr-backdrop { ${this.utils.reverseFilter} } diff --git a/resources/assets/js/pages/manage/calendar.vue b/resources/assets/js/pages/manage/calendar.vue index 1b802b45..9c427fd7 100644 --- a/resources/assets/js/pages/manage/calendar.vue +++ b/resources/assets/js/pages/manage/calendar.vue @@ -88,7 +88,7 @@ export default { }, computed: { - ...mapState(['userId', 'cacheTasks', 'taskCompleteTemps', 'wsOpenNum']), + ...mapState(['userId', 'cacheTasks', 'taskCompleteTemps', 'wsOpenNum', 'themeIsDark']), ...mapGetters(['transforTasks']), @@ -134,7 +134,11 @@ export default { _time: data._time, }; if (data.p_name) { - task.priority = '' + data.p_name + ''; + let priorityStyle = `background-color:${data.p_color}`; + if (this.themeIsDark) { + priorityStyle = `color:${data.p_color};border:1px solid ${data.p_color};padding:1px 3px;`; + } + task.priority = `${data.p_name}`; } if (data.sub_my && data.sub_my.length > 0) { task.title = `[+${data.sub_my.length}] ${task.title}` @@ -153,7 +157,7 @@ export default { task.title = `[${this.$L('超期')}] ${task.title}` task.color = "#f56c6c" task.bgColor = data.color || "#fef0f0" - task.priority+= '' + this.$L('超期未完成') + ''; + task.priority+= `${this.$L('超期未完成')}`; } if (!task.borderColor) { task.borderColor = task.bgColor; diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue index 60c1a855..fb091790 100644 --- a/resources/assets/js/pages/manage/file.vue +++ b/resources/assets/js/pages/manage/file.vue @@ -65,18 +65,18 @@