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-07-13 21:39:05 +08:00
parent b6598a2b40
commit 774353c5fe
7 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/build/421.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/build/710.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/hash
View File

@ -1 +1 @@
e93ea29a9d688c12 b31c454965502e13

26
resources/assets/js/pages/manage/components/TaskDetail.vue
View File

@ -418,7 +418,8 @@
</div> </div>
</div> </div>
<div class="menu"> <div class="menu">
<div v-if="navActive=='dialog' && taskDetail.msg_num > 0" class="menu-item" @click.stop="onSend"> <div v-if="navActive=='dialog' && taskDetail.msg_num > 0" class="menu-item" @click.stop="onSend('open')">
<div v-if="openLoad > 0" class="menu-load"><Loading/></div>
{{$L('任务聊天')}} {{$L('任务聊天')}}
<em>({{taskDetail.msg_num > 99 ? '99+' : taskDetail.msg_num}})</em> <em>({{taskDetail.msg_num > 99 ? '99+' : taskDetail.msg_num}})</em>
<i class="taskfont">&#xe703;</i> <i class="taskfont">&#xe703;</i>
@ -531,6 +532,7 @@ export default {
logLoadIng: false, logLoadIng: false,
sendLoad: 0, sendLoad: 0,
openLoad: 0,
taskPlugins: [ taskPlugins: [
'advlist autolink lists link image charmap print preview hr anchor pagebreak', 'advlist autolink lists link image charmap print preview hr anchor pagebreak',
@ -1212,11 +1214,15 @@ export default {
this.$refs.upload.handleClick() this.$refs.upload.handleClick()
}, },
msgDialog(msgText = null) { msgDialog(msgText = null, onlyOpen = false) {
if (this.sendLoad > 0) { if (this.sendLoad > 0 || this.openLoad > 0) {
return; return;
} }
this.sendLoad++; if (onlyOpen === true) {
this.openLoad++;
} else {
this.sendLoad++;
}
// //
this.$store.dispatch("call", { this.$store.dispatch("call", {
url: 'project/task/dialog', url: 'project/task/dialog',
@ -1260,7 +1266,11 @@ export default {
}).catch(({msg}) => { }).catch(({msg}) => {
$A.modalError(msg); $A.modalError(msg);
}).finally(_ => { }).finally(_ => {
this.sendLoad--; if (onlyOpen === true) {
this.openLoad--;
} else {
this.sendLoad--;
}
}); });
}, },
@ -1316,7 +1326,11 @@ export default {
onSend(msgText) { onSend(msgText) {
this.$refs.chatInput && this.$refs.chatInput.hidePopover(); this.$refs.chatInput && this.$refs.chatInput.hidePopover();
this.msgDialog(msgText); if (msgText === 'open') {
this.msgDialog(null, true);
} else {
this.msgDialog(msgText);
}
}, },
deleteFile(file) { deleteFile(file) {

8
resources/assets/sass/pages/components/task-detail.scss vendored
View File

@ -561,12 +561,18 @@
display: flex; display: flex;
align-items: center; align-items: center;
line-height: 24px; line-height: 24px;
.menu-load {
margin-right: 8px;
width: 14px;
height: 14px;
display: flex;
}
> em { > em {
font-style: normal; font-style: normal;
padding-left: 1px; padding-left: 1px;
} }
> i { > i {
padding-left: 4px; margin-left: 4px;
font-size: 14px; font-size: 14px;
} }
} }

2
resources/mobile

@ -1 +1 @@
Subproject commit a6bf5af5ed32da64454157bc4a3f9c6d88cd8abd Subproject commit c0dc440b2fb4e1b4db520ad37c81c169d491535c