github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-17 11:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 通过#发送任务显示项目内已完成任务

Browse Source
This commit is contained in:
kuaifan 2023-03-17 16:15:34 +08:00
parent 70a4d3aab2
commit f1f8048acf
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -583,6 +583,9 @@ export default {
const botHtml = data.bot ? `<div class="taskfont mention-item-bot">&#xe68c;</div>` : '' const botHtml = data.bot ? `<div class="taskfont mention-item-bot">&#xe68c;</div>` : ''
return `<div class="mention-item-img${data.online ? ' online' : ''}"><img src="${data.avatar}"/><em></em></div>${botHtml}<div class="mention-item-name">${data.value}</div>`; return `<div class="mention-item-img${data.online ? ' online' : ''}"><img src="${data.avatar}"/><em></em></div>${botHtml}<div class="mention-item-name">${data.value}</div>`;
} }
if (data.tip) {
return `<div class="mention-item-name" title="${data.value}">${data.value}</div><div class="mention-item-tip">${data.tip}</div>`;
}
return `<div class="mention-item-name" title="${data.value}">${data.value}</div>`; return `<div class="mention-item-name" title="${data.value}">${data.value}</div>`;
}, },
renderLoading: () => { renderLoading: () => {
@ -1181,11 +1184,12 @@ export default {
list = list.map(item => { list = list.map(item => {
return { return {
id: item.id, id: item.id,
value: item.name value: item.name,
tip: item.complete_at ? this.$L('已完成') : null,
} }
}) }).splice(0, 100)
this.taskList.push({ this.taskList.push({
label: [{id: 0, value: this.$L('项目未完成任务'), disabled: true}], label: [{id: 0, value: this.$L('项目任务'), disabled: true}],
list, list,
}) })
} }
@ -1194,7 +1198,7 @@ export default {
if (dataA.length > 0) { if (dataA.length > 0) {
dataA = dataA.sort((a, b) => { dataA = dataA.sort((a, b) => {
return $A.Date(a.end_at || "2099-12-31 23:59:59") - $A.Date(b.end_at || "2099-12-31 23:59:59"); return $A.Date(a.end_at || "2099-12-31 23:59:59") - $A.Date(b.end_at || "2099-12-31 23:59:59");
}) }).splice(0, 100)
this.taskList.push({ this.taskList.push({
label: [{id: 0, value: this.$L('我的待完成任务'), disabled: true}], label: [{id: 0, value: this.$L('我的待完成任务'), disabled: true}],
list: dataA.map(item => { list: dataA.map(item => {
@ -1210,7 +1214,7 @@ export default {
if (dataB.length > 0) { if (dataB.length > 0) {
dataB = dataB.sort((a, b) => { dataB = dataB.sort((a, b) => {
return $A.Date(a.end_at || "2099-12-31 23:59:59") - $A.Date(b.end_at || "2099-12-31 23:59:59"); return $A.Date(a.end_at || "2099-12-31 23:59:59") - $A.Date(b.end_at || "2099-12-31 23:59:59");
}) }).splice(0, 100)
this.taskList.push({ this.taskList.push({
label: [{id: 0, value: this.$L('我协助的任务'), disabled: true}], label: [{id: 0, value: this.$L('我协助的任务'), disabled: true}],
list: dataB.map(item => { list: dataB.map(item => {
@ -1234,10 +1238,11 @@ export default {
return task.project_id == projectId return task.project_id == projectId
&& task.parent_id === 0 && task.parent_id === 0
&& !task.archived_at && !task.archived_at
&& !task.complete_at }).sort((a, b) => {
return $A.Date(b.complete_at || "2099-12-31 23:59:59") - $A.Date(a.complete_at || "2099-12-31 23:59:59")
}) })
if (tasks.length > 0) { if (tasks.length > 0) {
taskCallback(tasks); taskCallback(tasks)
} else { } else {
taskCallback([]) taskCallback([])
} }

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

@ -691,6 +691,7 @@
} }
.mention-item-name { .mention-item-name {
flex: 1;
padding: 0 8px; padding: 0 8px;
font-size: 14px; font-size: 14px;
overflow: hidden; overflow: hidden;
@ -699,7 +700,7 @@
} }
.mention-item-tip { .mention-item-tip {
flex: 1; flex-shrink: 0;
text-align: right; text-align: right;
color: #8f8f8e; color: #8f8f8e;
font-size: 12px; font-size: 12px;