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

no message

Browse Source
This commit is contained in:
kuaifan 2022-11-20 19:34:27 +08:00
parent 0cc1469589
commit bbd19045bc
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/nginx/default.conf
View File

@ -57,6 +57,7 @@ server {
proxy_set_header Connection $connection_upgrade; proxy_set_header Connection $connection_upgrade;
proxy_read_timeout 3600s; proxy_read_timeout 3600s;
proxy_send_timeout 3600s; proxy_send_timeout 3600s;
proxy_connect_timeout 3600s;
proxy_pass http://service; proxy_pass http://service;
} }
@ -111,6 +112,7 @@ server {
proxy_set_header Connection $connection_upgrade; proxy_set_header Connection $connection_upgrade;
proxy_read_timeout 3600s; proxy_read_timeout 3600s;
proxy_send_timeout 3600s; proxy_send_timeout 3600s;
proxy_connect_timeout 3600s;
proxy_pass http://office/; proxy_pass http://office/;
} }

12
resources/assets/js/components/UserAvatar.vue
View File

@ -13,7 +13,7 @@
<p v-if="user.delete_at"><strong>{{$L('删除时间')}}: {{user.delete_at}}</strong></p> <p v-if="user.delete_at"><strong>{{$L('删除时间')}}: {{user.delete_at}}</strong></p>
<p v-else-if="user.disable_at"><strong>{{$L('离职时间')}}: {{user.disable_at}}</strong></p> <p v-else-if="user.disable_at"><strong>{{$L('离职时间')}}: {{user.disable_at}}</strong></p>
<slot name="end"/> <slot name="end"/>
<div v-if="userId != userid && showIconMenu" class="avatar-icons"> <div v-if="showMenu" class="avatar-icons">
<Icon type="ios-chatbubbles" @click="openDialog"/> <Icon type="ios-chatbubbles" @click="openDialog"/>
</div> </div>
</div> </div>
@ -181,6 +181,16 @@
return !$A.rightExists(userimg, '/avatar.png'); return !$A.rightExists(userimg, '/avatar.png');
}, },
showMenu() {
if (this.userId == this.userid) {
return false
}
if (this.user.delete_at || this.user.disable_at) {
return false
}
return this.showIconMenu
},
isDefault() { isDefault() {
const {userimg} = this.user const {userimg} = this.user
return $A.strExists(userimg, '/avatar'); return $A.strExists(userimg, '/avatar');

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

@ -24,7 +24,7 @@
<div class="dialog-avatar"> <div class="dialog-avatar">
<UserAvatar <UserAvatar
:userid="source.userid" :userid="source.userid"
:tooltipDisabled="source.userid == userId" :tooltipDisabled="source.userid == userId || dialogData.type != 'group'"
:show-icon-menu="dialogData.type == 'group'" :show-icon-menu="dialogData.type == 'group'"
:open-delay="100" :open-delay="100"
:size="30"/> :size="30"/>

8
resources/assets/sass/components/user-avatar.scss vendored
View File

@ -52,10 +52,14 @@
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGNsYXNzPSJpb25pY29uIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiI+PHRpdGxlPkJhbjwvdGl0bGU+PGNpcmNsZSBmaWxsPSJub25lIiBzdHJva2U9IiNFRDQwMTQiIHN0cm9rZS1taXRlcmxpbWl0PSIxMCIgc3Ryb2tlLXdpZHRoPSI0OCIgY3g9IjI1NiIgY3k9IjI1NiIgcj0iMjAwIi8+PHBhdGggc3Ryb2tlPSIjRUQ0MDE0IiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIHN0cm9rZS13aWR0aD0iNDgiIGQ9Ik0xMTQuNTggMTE0LjU4bDI4Mi44NCAyODIuODQiLz48L3N2Zz4="); background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGNsYXNzPSJpb25pY29uIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiI+PHRpdGxlPkJhbjwvdGl0bGU+PGNpcmNsZSBmaWxsPSJub25lIiBzdHJva2U9IiNjY2NjY2MiIHN0cm9rZS1taXRlcmxpbWl0PSIxMCIgc3Ryb2tlLXdpZHRoPSI0OCIgY3g9IjI1NiIgY3k9IjI1NiIgcj0iMjAwIi8+PHBhdGggc3Ryb2tlPSIjY2NjY2NjIiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIHN0cm9rZS13aWR0aD0iNDgiIGQ9Ik0xMTQuNTggMTE0LjU4bDI4Mi44NCAyODIuODQiLz48L3N2Zz4=");
background-color: rgba(237, 64, 20, 0.2); background-color: rgba(255, 255, 255, 0.5);
opacity: 0.8;
border-radius: 50%; border-radius: 50%;
} }
> em {
background-color: #cccccc;
}
} }
&.deleted { &.deleted {
&:after { &:after {