mirror of
https://github.com/kuaifan/dootask.git
synced 2026-03-02 15:07:11 +00:00
no message
This commit is contained in:
kuaifan
parent
9aac2c1549
commit
93996d7378
@ -1098,11 +1098,8 @@ class FileController extends AbstractController
|
||||
$refresh = Request::input('refresh', 'no');
|
||||
//
|
||||
$file = File::permissionFind($id);
|
||||
if ($file->type == 'folder') {
|
||||
return Base::retError('文件夹暂不支持此功能');
|
||||
}
|
||||
$fileLink = $file->getShareLink($user->userid, $refresh == 'yes');
|
||||
//
|
||||
$data = FileLink::generateLink($file->id, $user->userid, $refresh == 'yes');
|
||||
return Base::retSuccess('success', $data);
|
||||
return Base::retSuccess('success', $fileLink);
|
||||
}
|
||||
}
|
||||
|
||||
@ -290,6 +290,29 @@ class File extends AbstractModel
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取文件分享链接
|
||||
* @param $userid
|
||||
* @param $refresh
|
||||
* @return array
|
||||
*/
|
||||
public function getShareLink($userid, $refresh = false)
|
||||
{
|
||||
if ($this->type == 'folder') {
|
||||
throw new ApiException('文件夹不支持分享');
|
||||
}
|
||||
return FileLink::generateLink($this->id, $userid, $refresh);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取文件名称加后缀
|
||||
* @return string|null
|
||||
*/
|
||||
public function getNameAndExt()
|
||||
{
|
||||
return $this->ext ? "{$this->name}.{$this->ext}" : $this->name;
|
||||
}
|
||||
|
||||
/**
|
||||
* 推送消息
|
||||
* @param $action
|
||||
|
||||
@ -660,7 +660,7 @@ class WebSocketDialogMsg extends AbstractModel
|
||||
if ($file->type == 'folder') {
|
||||
throw new ApiException('文件夹不支持分享');
|
||||
}
|
||||
$fileLink = FileLink::generateLink($file->id, User::userid());
|
||||
$fileLink = $file->getShareLink(User::userid());
|
||||
$keyId = $fileLink['code'];
|
||||
} else {
|
||||
preg_match("/\/single\/file\/(.*?)$/i", $keyId, $match);
|
||||
|
||||
78
resources/assets/js/pages/manage/components/DialogSelect.vue
Normal file
78
resources/assets/js/pages/manage/components/DialogSelect.vue
Normal file
@ -0,0 +1,78 @@
|
||||
<template>
|
||||
<Form ref="forwardForm" :model="value" label-width="auto" @submit.native.prevent>
|
||||
<FormItem prop="dialogids" :label="$L('最近聊天')">
|
||||
<Select
|
||||
v-model="value.dialogids"
|
||||
:placeholder="$L('选择转发最近聊天')"
|
||||
:multiple-max="20"
|
||||
multiple
|
||||
filterable
|
||||
class="dialog-wrapper-dialogids"
|
||||
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=='department'" class="taskfont icon-avatar department"></i>
|
||||
<i v-else-if="dialog.group_type=='project'" class="taskfont icon-avatar project"></i>
|
||||
<i v-else-if="dialog.group_type=='task'" class="taskfont icon-avatar task"></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="value.userids" :multiple-max="20" :placeholder="`(${$L('或')}) ${$L('选择转发指定成员')}`"/>
|
||||
</FormItem>
|
||||
</Form>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import UserInput from "../../../components/UserInput";
|
||||
import {mapState} from "vuex";
|
||||
|
||||
export default {
|
||||
name: "DialogSelect",
|
||||
components: {UserInput},
|
||||
props: {
|
||||
value: {
|
||||
type: Object,
|
||||
default: () => {
|
||||
return {};
|
||||
}
|
||||
},
|
||||
},
|
||||
|
||||
computed: {
|
||||
...mapState([
|
||||
'cacheDialogs',
|
||||
]),
|
||||
|
||||
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);
|
||||
});
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -293,43 +293,7 @@
|
||||
v-model="forwardShow"
|
||||
:title="$L('转发')"
|
||||
:mask-closable="false">
|
||||
<Form ref="forwardForm" :model="forwardData" label-width="auto" @submit.native.prevent>
|
||||
<FormItem prop="dialogids" :label="$L('最近聊天')">
|
||||
<Select
|
||||
v-model="forwardData.dialogids"
|
||||
:placeholder="$L('选择转发最近聊天')"
|
||||
:multiple-max="20"
|
||||
multiple
|
||||
filterable
|
||||
class="dialog-wrapper-dialogids"
|
||||
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=='department'" class="taskfont icon-avatar department"></i>
|
||||
<i v-else-if="dialog.group_type=='project'" class="taskfont icon-avatar project"></i>
|
||||
<i v-else-if="dialog.group_type=='task'" class="taskfont icon-avatar task"></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>
|
||||
</Form>
|
||||
<DialogSelect v-model="forwardData"/>
|
||||
<div slot="footer" class="adaption">
|
||||
<Button type="default" @click="forwardShow=false">{{$L('取消')}}</Button>
|
||||
<Button type="primary" :loading="forwardLoad" @click="onForward('submit')">{{$L('转发')}}</Button>
|
||||
@ -446,10 +410,12 @@ import ChatInput from "./ChatInput";
|
||||
|
||||
import VirtualList from 'vue-virtual-scroll-list-hi'
|
||||
import {Store} from "le5le-store";
|
||||
import DialogSelect from "./DialogSelect";
|
||||
|
||||
export default {
|
||||
name: "DialogWrapper",
|
||||
components: {
|
||||
DialogSelect,
|
||||
DialogRespond,
|
||||
DialogItem,
|
||||
VirtualList,
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
@import "chat-input";
|
||||
@import "dialog-group-info";
|
||||
@import "dialog-respond";
|
||||
@import "dialog-select";
|
||||
@import "dialog-wrapper";
|
||||
@import "file-content";
|
||||
@import "meeting-manager";
|
||||
|
||||
64
resources/assets/sass/pages/components/dialog-select.scss
vendored
Normal file
64
resources/assets/sass/pages/components/dialog-select.scss
vendored
Normal file
@ -0,0 +1,64 @@
|
||||
.dialog-wrapper-dialogids {
|
||||
.ivu-select-arrow {
|
||||
display: none !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;
|
||||
&.department {
|
||||
background-color: #5BC7B0;
|
||||
}
|
||||
&.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;
|
||||
}
|
||||
}
|
||||
@ -1416,71 +1416,6 @@
|
||||
overflow: hidden !important;
|
||||
}
|
||||
|
||||
.dialog-wrapper-dialogids {
|
||||
.ivu-select-arrow {
|
||||
display: none !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;
|
||||
&.department {
|
||||
background-color: #5BC7B0;
|
||||
}
|
||||
&.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) {
|
||||
.dialog-wrapper {
|
||||
background-color: #f8f8f8;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user