From 3f69a3e6ddf52592c747248b1c6d1591b08d3126 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Tue, 15 Jun 2021 00:21:32 +0800 Subject: [PATCH] no message --- resources/assets/js/pages/manage.vue | 15 ++++- .../js/pages/manage/components/TaskDetail.vue | 8 +-- .../js/pages/manage/components/TaskRow.vue | 2 +- .../assets/js/pages/manage/messenger.vue | 61 ++++++++++++++++--- resources/assets/js/store/actions.js | 4 -- .../sass/pages/components/project-list.scss | 2 +- .../sass/pages/components/task-detail.scss | 4 ++ .../assets/sass/pages/page-messenger.scss | 26 ++++++++ 8 files changed, 102 insertions(+), 20 deletions(-) diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index 1a8d4b1d..ac75944b 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -169,13 +169,26 @@ export default { }, computed: { - ...mapState(['userId', 'userInfo', 'dialogMsgUnread', 'projectList', 'projectOpenTask']), + ...mapState(['userId', 'userInfo', 'dialogMsgUnread', 'projectList', 'projectOpenTask', 'projectChatShow']), }, watch: { '$route' (route) { this.curPath = route.path; }, + 'projectOpenTask._show' (show) { + if (show) { + if (this.projectChatShow) { + this._projectChatShow = true; + this.$store.dispatch("toggleBoolean", "projectChatShow"); + } + } else { + if (this._projectChatShow) { + this._projectChatShow = false; + this.$store.dispatch("toggleBoolean", "projectChatShow"); + } + } + } }, methods: { diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index 7274a559..d9d3f4e7 100644 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -267,7 +267,7 @@
  • -
    {{file.name}}
    + {{file.name}}
    {{$A.bytesToSize(file.size)}}
  • @@ -583,14 +583,14 @@ export default { openTask: { handler(data) { this.taskDetail = $A.cloneJSON(data); - this.$store.dispatch("getDialogMsgList", this.taskDetail.dialog_id); }, immediate: true, deep: true }, - 'openTask._show' (v) { - if (v) { + 'openTask._show' (show) { + if (show) { this.$nextTick(() => { + this.$store.dispatch("getDialogMsgList", this.taskDetail.dialog_id) this.$refs.input.focus() }); } else { diff --git a/resources/assets/js/pages/manage/components/TaskRow.vue b/resources/assets/js/pages/manage/components/TaskRow.vue index 19b3b830..dd37ffcb 100644 --- a/resources/assets/js/pages/manage/components/TaskRow.vue +++ b/resources/assets/js/pages/manage/components/TaskRow.vue @@ -51,7 +51,7 @@
    {{item.name}}
    -
    +
    {{item.file_num}}
    {{item.msg_num}}
    diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue index 7ca7fd12..ffe9565c 100644 --- a/resources/assets/js/pages/manage/messenger.vue +++ b/resources/assets/js/pages/manage/messenger.vue @@ -8,6 +8,12 @@
    +
    +

    {{$L('全部')}}

    +

    {{$L('项目')}}

    +

    {{$L('任务')}}

    +

    {{$L('个人')}}

    +