perf: 支持转发给最近聊天

This commit is contained in:
kuaifan 2022-07-12 12:11:09 +08:00
parent fcbbd2b64c
commit 0bf98ec9f8
4 changed files with 141 additions and 17 deletions

View File

@ -934,7 +934,8 @@ class DialogController extends AbstractController
* @apiName msg__forward * @apiName msg__forward
* *
* @apiParam {Number} msg_id 消息ID * @apiParam {Number} msg_id 消息ID
* @apiParam {Array} userids 转发给的成员 * @apiParam {Array} dialogids 转发给的对话ID
* @apiParam {Array} userids 转发给的成员ID
* *
* @apiSuccess {Number} ret 返回状态码1正确、0错误 * @apiSuccess {Number} ret 返回状态码1正确、0错误
* @apiSuccess {String} msg 返回信息(错误描述) * @apiSuccess {String} msg 返回信息(错误描述)
@ -945,10 +946,11 @@ class DialogController extends AbstractController
$user = User::auth(); $user = User::auth();
// //
$msg_id = intval(Request::input("msg_id")); $msg_id = intval(Request::input("msg_id"));
$dialogids = Request::input('dialogids');
$userids = Request::input('userids'); $userids = Request::input('userids');
// //
if (empty($userids)) { if (empty($dialogids) && empty($userids)) {
return Base::retError("请选择转发成员"); return Base::retError("请选择转发对话或成员");
} }
// //
$msg = WebSocketDialogMsg::whereId($msg_id)->first(); $msg = WebSocketDialogMsg::whereId($msg_id)->first();
@ -957,7 +959,7 @@ class DialogController extends AbstractController
} }
WebSocketDialog::checkDialog($msg->dialog_id); WebSocketDialog::checkDialog($msg->dialog_id);
// //
return $msg->forwardMsg($userids, $user->userid); return $msg->forwardMsg($dialogids, $userids, $user->userid);
} }
/** /**

View File

@ -365,26 +365,45 @@ class WebSocketDialogMsg extends AbstractModel
/** /**
* 转发消息 * 转发消息
* @param $userids * @param array|int $dialogids
* @param array|int $userids
* @param int $sender 发送的会员ID * @param int $sender 发送的会员ID
* @return mixed * @return mixed
*/ */
public function forwardMsg($userids, $sender) public function forwardMsg($dialogids, $userids, $sender)
{ {
return AbstractModel::transaction(function() use ($sender, $userids) { return AbstractModel::transaction(function() use ($dialogids, $sender, $userids) {
$msgs = []; $msgs = [];
$already = [];
if ($dialogids) {
if (!is_array($dialogids)) {
$dialogids = [$dialogids];
}
foreach ($dialogids as $dialogid) {
$res = self::sendMsg(null, $dialogid, $this->type, $this->getOriginal('msg'), $sender);
if (Base::isSuccess($res)) {
$msgs[] = $res['data'];
$already[] = $dialogid;
}
}
}
if ($userids) {
if (!is_array($userids)) {
$userids = [$userids];
}
foreach ($userids as $userid) { foreach ($userids as $userid) {
if (!User::whereUserid($userid)->exists()) { if (!User::whereUserid($userid)->exists()) {
continue; continue;
} }
$dialog = WebSocketDialog::checkUserDialog($sender, $userid); $dialog = WebSocketDialog::checkUserDialog($sender, $userid);
if ($dialog) { if ($dialog && !in_array($dialog->id, $already)) {
$res = self::sendMsg(null, $dialog->id, $this->type, $this->getOriginal('msg'), $sender); $res = self::sendMsg(null, $dialog->id, $this->type, $this->getOriginal('msg'), $sender);
if (Base::isSuccess($res)) { if (Base::isSuccess($res)) {
$msgs[] = $res['data']; $msgs[] = $res['data'];
} }
} }
} }
}
return Base::retSuccess('转发成功', [ return Base::retSuccess('转发成功', [
'msgs' => $msgs 'msgs' => $msgs
]); ]);

View File

@ -271,8 +271,38 @@
:title="$L('转发')" :title="$L('转发')"
:mask-closable="false"> :mask-closable="false">
<Form ref="forwardForm" :model="forwardData" label-width="auto" @submit.native.prevent> <Form ref="forwardForm" :model="forwardData" label-width="auto" @submit.native.prevent>
<FormItem prop="userids" :label="$L('转发给')"> <FormItem prop="dialogids" :label="$L('最近聊天')">
<UserInput v-model="forwardData.userids" :multiple-max="20" :placeholder="$L('选择转发成员')"/> <Select
v-model="forwardData.dialogids"
:placeholder="$L('选择转发对话')"
:multiple-max="20"
multiple
filterable
transfer-class-name="dialog-wrapper-forward">
<div slot="drop-prepend" class="forward-drop-prepend">{{$L('最多只能选择20个')}}</div>
<Option
v-for="(dialog, key) in dialogList"
:value="dialog.id"
:key="key"
:key-value="dialog.name"
:label="dialog.name">
<div class="forward-option">
<div class="forward-avatar">
<template v-if="dialog.type=='group'">
<i v-if="dialog.group_type=='project'" class="taskfont icon-avatar project">&#xe6f9;</i>
<i v-else-if="dialog.group_type=='task'" class="taskfont icon-avatar task">&#xe6f4;</i>
<Icon v-else class="icon-avatar" type="ios-people" />
</template>
<div v-else-if="dialog.dialog_user" class="user-avatar"><UserAvatar :userid="dialog.dialog_user.userid" :size="26"/></div>
<Icon v-else class="icon-avatar" type="md-person" />
</div>
<div class="forward-name">{{ dialog.name }}</div>
</div>
</Option>
</Select>
</FormItem>
<FormItem prop="userids" :label="$L('团队成员')">
<UserInput v-model="forwardData.userids" :multiple-max="20" :placeholder="`(${$L('或')}) ${$L('选择转发成员')}`"/>
</FormItem> </FormItem>
</Form> </Form>
<div slot="footer" class="adaption"> <div slot="footer" class="adaption">
@ -426,6 +456,7 @@ export default {
forwardShow: false, forwardShow: false,
forwardLoad: false, forwardLoad: false,
forwardData: { forwardData: {
dialogids: [],
userids: [], userids: [],
}, },
@ -506,6 +537,20 @@ export default {
return this.cacheDialogs.find(({id}) => id == this.dialogId) || {}; return this.cacheDialogs.find(({id}) => id == this.dialogId) || {};
}, },
dialogList() {
return this.cacheDialogs.filter(dialog => {
return !(dialog.name === undefined || dialog.dialog_delete === 1);
}).sort((a, b) => {
if (a.top_at || b.top_at) {
return $A.Date(b.top_at) - $A.Date(a.top_at);
}
if (a.todo_num > 0 || b.todo_num > 0) {
return b.todo_num - a.todo_num;
}
return $A.Date(b.last_at) - $A.Date(a.last_at);
});
},
dialogMsgList() { dialogMsgList() {
if (!this.isReady) { if (!this.isReady) {
return []; return [];
@ -1417,13 +1462,14 @@ export default {
onForward(type) { onForward(type) {
if (type === 'open') { if (type === 'open') {
this.forwardData = { this.forwardData = {
dialogids: [],
userids: [], userids: [],
msg_id: this.operateItem.id msg_id: this.operateItem.id
}; };
this.forwardShow = true; this.forwardShow = true;
} else if (type === 'submit') { } else if (type === 'submit') {
if ($A.arrayLength(this.forwardData.userids) === 0) { if ($A.arrayLength(this.forwardData.dialogids) === 0 && $A.arrayLength(this.forwardData.userids) === 0) {
$A.messageWarning("请选择转发成员"); $A.messageWarning("请选择转发对话或成员");
return return
} }
this.forwardLoad = true; this.forwardLoad = true;

View File

@ -1367,6 +1367,63 @@
overflow: hidden !important; overflow: hidden !important;
} }
.dialog-wrapper-forward {
.forward-option {
max-width: 100%;
display: flex;
align-items: center;
.forward-avatar {
display: flex;
align-items: center;
.icon-avatar {
width: 26px;
height: 26px;
flex-grow: 0;
flex-shrink: 0;
display: flex;
align-items: center;
justify-content: center;
border-radius: 50%;
font-size: 18px;
background-color: #61B2F9;
color: #ffffff;
&.project {
background-color: #6E99EB;
}
&.task {
background-color: #9B96DF;
font-size: 16px;
}
}
}
.forward-name {
margin-left: 10px;
flex: 1;
width: 0;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
}
.ivu-select-item {
&.ivu-select-item-selected {
&:after {
top: 8px;
}
}
}
.forward-drop-prepend {
text-align: center;
color: #c5c8ce;
line-height: 20px;
padding-bottom: 5px;
font-size: 12px;
border-bottom: 1px solid #f1f1f1;
margin-bottom: 5px;
}
}
@media (max-width: 768px) { @media (max-width: 768px) {
.dialog-wrapper { .dialog-wrapper {
background-color: #f8f8f8; background-color: #f8f8f8;