no message

This commit is contained in:
kuaifan 2021-06-05 23:24:29 +08:00
parent 11a86c0cdd
commit c6285c57c8
9 changed files with 69 additions and 52 deletions

View File

@ -19,7 +19,7 @@
import {mapState} from "vuex"; import {mapState} from "vuex";
export default { export default {
name: 'MessageUpload', name: 'DialogUpload',
props: { props: {
maxSize: { maxSize: {
type: Number, type: Number,

View File

@ -1,12 +1,12 @@
<template> <template>
<div class="message-view" :data-id="msgData.id"> <div class="dialog-view" :data-id="msgData.id">
<!--文本--> <!--文本-->
<div v-if="msgData.type === 'text'" class="message-content" v-html="textMsg(msgInfo.text)"></div> <div v-if="msgData.type === 'text'" class="dialog-content" v-html="textMsg(msgInfo.text)"></div>
<!--等待--> <!--等待-->
<div v-else-if="msgData.type === 'loading'" class="message-content loading"><Loading/></div> <div v-else-if="msgData.type === 'loading'" class="dialog-content loading"><Loading/></div>
<!--文件--> <!--文件-->
<div v-else-if="msgData.type === 'file'" :class="['message-content', msgInfo.type]"> <div v-else-if="msgData.type === 'file'" :class="['dialog-content', msgInfo.type]">
<a :href="msgInfo.url" target="_blank"> <a :href="msgInfo.url" target="_blank">
<img v-if="msgInfo.type === 'img'" class="file-img" :style="imageStyle(msgInfo)" :src="msgInfo.thumb"/> <img v-if="msgInfo.type === 'img'" class="file-img" :style="imageStyle(msgInfo)" :src="msgInfo.thumb"/>
<div v-else class="file-box"> <div v-else class="file-box">
@ -19,10 +19,10 @@
</a> </a>
</div> </div>
<!--未知--> <!--未知-->
<div v-else class="message-content unknown">{{$L("未知的消息类型")}}</div> <div v-else class="dialog-content unknown">{{$L("未知的消息类型")}}</div>
<!--时间/阅读--> <!--时间/阅读-->
<div v-if="msgData.created_at" class="message-foot"> <div v-if="msgData.created_at" class="dialog-foot">
<div class="time">{{formatTime(msgData.created_at)}}</div> <div class="time">{{formatTime(msgData.created_at)}}</div>
<Poptip <Poptip
v-if="msgData.send > 1 || dialogType == 'group'" v-if="msgData.send > 1 || dialogType == 'group'"
@ -32,7 +32,7 @@
:width="360" :width="360"
:offset="8" :offset="8"
@on-popper-show="popperShow"> @on-popper-show="popperShow">
<div slot="content" class="message-readbox"> <div slot="content" class="dialog-readbox">
<ul class="read"> <ul class="read">
<li class="read-title"><em>{{readList.length}}</em>{{$L('已读')}}</li> <li class="read-title"><em>{{readList.length}}</em>{{$L('已读')}}</li>
<li v-for="item in readList"><UserAvatar :userid="item.userid" :size="26" show-name/></li> <li v-for="item in readList"><UserAvatar :userid="item.userid" :size="26" show-name/></li>
@ -47,7 +47,7 @@
<Icon v-else-if="msgData.percentage === 100" class="done" type="md-done-all"/> <Icon v-else-if="msgData.percentage === 100" class="done" type="md-done-all"/>
<Icon v-else class="done" type="md-checkmark"/> <Icon v-else class="done" type="md-checkmark"/>
</div> </div>
<div v-else class="message-foot"><Loading/></div> <div v-else class="dialog-foot"><Loading/></div>
</div> </div>
</template> </template>
@ -57,7 +57,7 @@ import {mapState} from "vuex";
import WCircle from "../../../components/WCircle"; import WCircle from "../../../components/WCircle";
export default { export default {
name: "MessageView", name: "DialogView",
components: {WCircle}, components: {WCircle},
props: { props: {
msgData: { msgData: {

View File

@ -1,11 +1,11 @@
<template> <template>
<div <div
v-if="$store.state.projectChatShow" v-if="$store.state.projectChatShow"
class="project-message" class="project-dialog"
@drop.prevent="chatPasteDrag($event, 'drag')" @drop.prevent="chatPasteDrag($event, 'drag')"
@dragover.prevent="chatDragOver(true)" @dragover.prevent="chatDragOver(true)"
@dragleave.prevent="chatDragOver(false)"> @dragleave.prevent="chatDragOver(false)">
<div class="group-member"> <div class="dialog-user">
<div class="member-head"> <div class="member-head">
<div class="member-title">{{$L('项目成员')}}<span>({{projectDetail.project_user.length}})</span></div> <div class="member-title">{{$L('项目成员')}}<span>({{projectDetail.project_user.length}})</span></div>
<div class="member-view-all" @click="memberShowAll=!memberShowAll">{{$L('查看所有')}}</div> <div class="member-view-all" @click="memberShowAll=!memberShowAll">{{$L('查看所有')}}</div>
@ -16,26 +16,26 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="group-title">{{$L('群聊')}}</div> <div class="dialog-title">{{$L('群聊')}}</div>
<ScrollerY ref="groupChat" class="group-chat message-scroller" @on-scroll="chatScroll"> <ScrollerY class="dialog-chat dialog-scroller" @on-scroll="chatScroll">
<div ref="manageList" class="message-list"> <div ref="manageList" class="dialog-list">
<ul> <ul>
<li v-if="dialogLoad > 0" class="loading"><Loading/></li> <li v-if="dialogLoad > 0" class="loading"><Loading/></li>
<li v-else-if="dialogList.length === 0" class="nothing">{{$L('暂无消息')}}</li> <li v-else-if="dialogList.length === 0" class="nothing">{{$L('暂无消息')}}</li>
<li v-for="(item, key) in dialogList" :key="key" :class="{self:item.userid == userId}"> <li v-for="(item, key) in dialogList" :key="key" :class="{self:item.userid == userId}">
<div class="message-avatar"> <div class="dialog-avatar">
<UserAvatar :userid="item.userid" :size="30"/> <UserAvatar :userid="item.userid" :size="30"/>
</div> </div>
<MessageView :msg-data="item" dialog-type="group"/> <DialogView :msg-data="item" dialog-type="group"/>
</li> </li>
<li ref="bottom" class="bottom"></li> <li ref="bottom" class="bottom"></li>
</ul> </ul>
</div> </div>
</ScrollerY> </ScrollerY>
<div :class="['group-footer', msgNew > 0 ? 'newmsg' : '']"> <div :class="['dialog-footer', msgNew > 0 ? 'newmsg' : '']">
<div class="group-newmsg" @click="goNewBottom">{{$L('' + msgNew + '条新消息')}}</div> <div class="dialog-newmsg" @click="goNewBottom">{{$L('' + msgNew + '条新消息')}}</div>
<DragInput class="group-input" v-model="msgText" type="textarea" :rows="1" :autosize="{ minRows: 1, maxRows: 3 }" :maxlength="255" @on-keydown="chatKeydown" @on-input-paste="pasteDrag" :placeholder="$L('输入消息...')" /> <DragInput class="dialog-input" v-model="msgText" type="textarea" :rows="1" :autosize="{ minRows: 1, maxRows: 3 }" :maxlength="255" @on-keydown="chatKeydown" @on-input-paste="pasteDrag" :placeholder="$L('输入消息...')" />
<MessageUpload <DialogUpload
ref="chatUpload" ref="chatUpload"
class="chat-upload" class="chat-upload"
@on-progress="chatFile('progress', $event)" @on-progress="chatFile('progress', $event)"
@ -50,9 +50,9 @@
<style lang="scss"> <style lang="scss">
:global { :global {
.project-message { .project-dialog {
.group-footer { .dialog-footer {
.group-input { .dialog-input {
background-color: #F4F5F7; background-color: #F4F5F7;
padding: 10px 12px; padding: 10px 12px;
border-radius: 10px; border-radius: 10px;
@ -71,12 +71,12 @@
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
:global { :global {
.project-message { .project-dialog {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-color: #ffffff; background-color: #ffffff;
z-index: 1; z-index: 1;
.group-member { .dialog-user {
margin-top: 36px; margin-top: 36px;
padding: 0 32px; padding: 0 32px;
.member-head { .member-head {
@ -119,24 +119,24 @@
} }
} }
} }
.group-title { .dialog-title {
padding: 0 32px; padding: 0 32px;
margin-top: 20px; margin-top: 20px;
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
} }
.group-chat { .dialog-chat {
flex: 1; flex: 1;
padding: 0 32px; padding: 0 32px;
margin-top: 18px; margin-top: 18px;
} }
.group-footer { .dialog-footer {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: flex-end; align-items: flex-end;
padding: 0 28px; padding: 0 28px;
margin-bottom: 20px; margin-bottom: 20px;
.group-newmsg { .dialog-newmsg {
display: none; display: none;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
@ -158,7 +158,7 @@
} }
&.newmsg { &.newmsg {
margin-top: -50px; margin-top: -50px;
.group-newmsg { .dialog-newmsg {
display: block; display: block;
} }
} }
@ -198,12 +198,12 @@
import DragInput from "../../../components/DragInput"; import DragInput from "../../../components/DragInput";
import ScrollerY from "../../../components/ScrollerY"; import ScrollerY from "../../../components/ScrollerY";
import {mapState} from "vuex"; import {mapState} from "vuex";
import MessageView from "./message-view"; import DialogView from "./DialogView";
import MessageUpload from "./message-upload"; import DialogUpload from "./DialogUpload";
export default { export default {
name: "ProjectMessage", name: "ProjectDialog",
components: {MessageUpload, MessageView, ScrollerY, DragInput}, components: {DialogUpload, DialogView, ScrollerY, DragInput},
data() { data() {
return { return {
autoBottom: true, autoBottom: true,

View File

@ -826,8 +826,8 @@
</style> </style>
<script> <script>
import TaskPriority from "./task-priority"; import TaskPriority from "./TaskPriority";
import TaskAdd from "./task-add"; import TaskAdd from "./TaskAdd";
import {mapState} from "vuex"; import {mapState} from "vuex";
import UserInput from "../../../components/UserInput"; import UserInput from "../../../components/UserInput";
export default { export default {

View File

@ -0,0 +1,17 @@
<template>
<div class="calendar">
<PageTitle>{{$L('Calendar')}}</PageTitle>
</div>
</template>
<script>
export default {
data() {
return {}
},
mounted() {
},
}
</script>

View File

@ -2,7 +2,7 @@
<div class="project-detail"> <div class="project-detail">
<PageTitle>{{ $L('项目面板') }}</PageTitle> <PageTitle>{{ $L('项目面板') }}</PageTitle>
<ProjectList/> <ProjectList/>
<ProjectMessage/> <ProjectDialog/>
</div> </div>
</template> </template>
@ -17,7 +17,7 @@
height: 100%; height: 100%;
background-color: #fafafa; background-color: #fafafa;
} }
.project-message { .project-dialog {
position: relative; position: relative;
height: 100%; height: 100%;
width: 35%; width: 35%;
@ -39,10 +39,10 @@
</style> </style>
<script> <script>
import ProjectList from "./components/project-list"; import ProjectList from "./components/ProjectList";
import ProjectMessage from "./components/project-message"; import ProjectDialog from "./components/ProjectDialog";
export default { export default {
components: {ProjectMessage, ProjectList}, components: {ProjectDialog, ProjectList},
data() { data() {
return { return {
project_id: 0, project_id: 0,

View File

@ -686,10 +686,10 @@ body {
} }
} }
.message-scroller { .dialog-scroller {
position: relative; position: relative;
overflow: auto; overflow: auto;
.message-list { .dialog-list {
> ul { > ul {
> li { > li {
display: flex; display: flex;
@ -697,18 +697,18 @@ body {
align-items: flex-end; align-items: flex-end;
list-style: none; list-style: none;
margin-bottom: 16px; margin-bottom: 16px;
.message-avatar { .dialog-avatar {
position: relative; position: relative;
margin-bottom: 20px; margin-bottom: 20px;
flex-shrink: 0; flex-shrink: 0;
} }
.message-view { .dialog-view {
max-width: 70%; max-width: 70%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: flex-start; align-items: flex-start;
margin: 0 0 0 8px; margin: 0 0 0 8px;
.message-content { .dialog-content {
color: #333333; color: #333333;
background-color: #F4F5F7; background-color: #F4F5F7;
padding: 8px; padding: 8px;
@ -773,7 +773,7 @@ body {
text-decoration: underline; text-decoration: underline;
} }
} }
.message-foot { .dialog-foot {
display: flex; display: flex;
align-items: center; align-items: center;
padding-top: 4px; padding-top: 4px;
@ -825,10 +825,10 @@ body {
} }
&.self { &.self {
flex-direction: row-reverse; flex-direction: row-reverse;
.message-view { .dialog-view {
align-items: flex-end; align-items: flex-end;
margin: 0 8px 0 0; margin: 0 8px 0 0;
.message-content { .dialog-content {
color: #ffffff; color: #ffffff;
background-color: #2d8cf0; background-color: #2d8cf0;
border-radius: 6px 6px 0 6px; border-radius: 6px 6px 0 6px;
@ -840,7 +840,7 @@ body {
background-color: transparent; background-color: transparent;
} }
} }
.message-foot { .dialog-foot {
.done { .done {
display: inline-block; display: inline-block;
} }
@ -855,7 +855,7 @@ body {
} }
} }
.message-readbox { .dialog-readbox {
display: flex; display: flex;
position: relative; position: relative;
.read, .read,