github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-01-12 08:58:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2022-05-26 09:02:42 +08:00
parent 1d8b4ba83f
commit 173f5c84db
7 changed files with 59 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/UsersController.php
View File

@ -249,7 +249,7 @@ class UsersController extends AbstractController
$userimg = is_array($userimg) ? $userimg[0]['path'] : $userimg;
$user->userimg = Base::unFillUrl($userimg);
} else {
$user->userimg = $user->getUserimgAttribute(null);
$user->userimg = Base::unFillUrl($user->getUserimgAttribute(null));
}
}
//昵称

46
resources/assets/js/directives/longpress.js vendored Executable file
View File

@ -0,0 +1,46 @@
const isSupportTouch = "ontouchend" in document;
export default {
bind (el, binding) {
if (!isSupportTouch) {
return
}
let timer = 0;
el.__touchLongpressDown__ = e => {
timer = setTimeout(_ => {
timer = 0
if (binding.expression) {
binding.value(e, el)
}
}, 600)
};
el.__touchLongpressMove__ = _ => {
if (timer) {
clearTimeout(timer)
timer = 0
}
};
el.__touchLongpressUp__ = _ => {
if (timer) {
clearTimeout(timer)
timer = 0
}
};
el.addEventListener('touchstart', el.__touchLongpressDown__);
el.addEventListener('touchmove', el.__touchLongpressMove__);
el.addEventListener('touchend', el.__touchLongpressUp__);
},
update () {
},
unbind (el) {
if (!isSupportTouch) {
return
}
el.removeEventListener('touchstart', el.__touchLongpressDown__);
el.removeEventListener('touchmove', el.__touchLongpressMove__);
el.removeEventListener('touchend', el.__touchLongpressUp__);
delete el.__touchLongpressDown__;
delete el.__touchLongpressMove__;
delete el.__touchLongpressUp__;
}
};

12
resources/assets/js/pages/manage/components/ChatInput/index.vue
View File

@ -40,12 +40,12 @@
</div>
</EPopover>
<ETooltip placement="top" :disabled="!$isDesktop" :content="$L('发送')">
<div class="chat-send" :class="[value ? '' : 'disabled']" v-touchmouse="send">
<Loading v-if="loading"/>
<Icon v-else type="md-send"/>
</div>
</ETooltip>
<div class="chat-send" :class="[value ? '' : 'disabled']" v-touchmouse="send">
<Loading v-if="loading"/>
<ETooltip v-else placement="top" :disabled="!$isDesktop" :content="$L('发送')">
<Icon type="md-send"/>
</ETooltip>
</div>
<slot name="toolbarAfter"/>
</div>

2
resources/assets/js/pages/manage/components/DialogWrapper.vue
View File

@ -92,7 +92,7 @@
<div class="dialog-avatar">
<UserAvatar :userid="item.userid" :tooltipDisabled="item.userid == userId" :size="30"/>
</div>
<DialogView :msg-data="item" :dialog-type="dialogData.type" :hidden-percentage="dialogData.dialog_user.userid == userId"/>
<DialogView :msg-data="item" :dialog-type="dialogData.type" :hidden-percentage="dialogData.dialog_user && dialogData.dialog_user.userid == userId"/>
</DynamicScrollerItem>
</template>
</DynamicScroller>

2
resources/assets/js/pages/manage/messenger.vue
View File

@ -33,7 +33,7 @@
<ul
v-if="tabActive==='dialog'"
ref="dialogWrapper"
class="dialog" >
class="dialog">
<li v-if="dialogList.length === 0" class="nothing">
{{$L(dialogKey ? `没有任何与"${dialogKey}"相关的会话` : `没有任何会话`)}}
</li>

2
resources/assets/sass/pages/components/chat-input.scss vendored
View File

@ -253,8 +253,8 @@
z-index: 2;
display: flex;
align-items: center;
height: 100%;
color: #ffffff;
line-height: 28px;
transition: all 0.3s;
}
&:after {

3
resources/assets/sass/scrollbar.scss vendored
View File

@ -43,3 +43,6 @@
display: none;
}
}
.overlay-hidden {
overflow: hidden !important;
}