This commit is contained in:
kuaifan 2022-07-08 16:34:42 +08:00
parent 6e03415847
commit a5d0cae884
24 changed files with 34 additions and 22 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "DooTask", "name": "DooTask",
"version": "0.18.88", "version": "0.18.98",
"description": "DooTask is task management system.", "description": "DooTask is task management system.",
"scripts": { "scripts": {
"start": "./cmd dev", "start": "./cmd dev",

2
public/js/app.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

1
public/js/build/124.js vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
public/js/build/257.js vendored Normal file

File diff suppressed because one or more lines are too long

View File

@ -8,7 +8,7 @@
/*! /*!
* The buffer module from node.js, for the browser. * The buffer module from node.js, for the browser.
* *
* @author Feross Aboukhadijeh <https://feross.org> * @author Feross Aboukhadijeh <http://feross.org>
* @license MIT * @license MIT
*/ */

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
public/js/build/588.js vendored Normal file

File diff suppressed because one or more lines are too long

View File

@ -8,7 +8,7 @@
/*! /*!
* The buffer module from node.js, for the browser. * The buffer module from node.js, for the browser.
* *
* @author Feross Aboukhadijeh <https://feross.org> * @author Feross Aboukhadijeh <http://feross.org>
* @license MIT * @license MIT
*/ */

1
public/js/build/594.js vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -8,7 +8,7 @@
/*! /*!
* The buffer module from node.js, for the browser. * The buffer module from node.js, for the browser.
* *
* @author Feross Aboukhadijeh <https://feross.org> * @author Feross Aboukhadijeh <http://feross.org>
* @license MIT * @license MIT
*/ */

File diff suppressed because one or more lines are too long

View File

@ -8,7 +8,7 @@
/*! /*!
* The buffer module from node.js, for the browser. * The buffer module from node.js, for the browser.
* *
* @author Feross Aboukhadijeh <https://feross.org> * @author Feross Aboukhadijeh <http://feross.org>
* @license MIT * @license MIT
*/ */

View File

@ -1 +1 @@
371a240e26529984 69210b0340528491

View File

@ -115,7 +115,11 @@ export default {
msgTodoTotal() { msgTodoTotal() {
let todoNum = this.cacheDialogs.reduce((total, current) => total + (current.todo_num || 0), 0) let todoNum = this.cacheDialogs.reduce((total, current) => total + (current.todo_num || 0), 0)
if (todoNum > 0) { if (todoNum > 0) {
if (todoNum > 99) todoNum = "99+" if (todoNum > 99) {
todoNum = "99+"
} else if (todoNum === 1) {
todoNum = ""
}
return `${this.$L("待办")}${todoNum}` return `${this.$L("待办")}${todoNum}`
} }
return null; return null;

View File

@ -545,7 +545,11 @@ export default {
msgTodoTotal() { msgTodoTotal() {
let todoNum = this.cacheDialogs.reduce((total, current) => total + (current.todo_num || 0), 0) let todoNum = this.cacheDialogs.reduce((total, current) => total + (current.todo_num || 0), 0)
if (todoNum > 0) { if (todoNum > 0) {
if (todoNum > 9) todoNum = "9+" if (todoNum > 99) {
todoNum = "99+"
} else if (todoNum === 1) {
todoNum = ""
}
return `${this.$L("待办")}${todoNum}` return `${this.$L("待办")}${todoNum}`
} }
return null; return null;

View File

@ -60,7 +60,7 @@
<Icon v-else class="icon-avatar" type="md-person" /> <Icon v-else class="icon-avatar" type="md-person" />
<div class="dialog-box"> <div class="dialog-box">
<div class="dialog-title"> <div class="dialog-title">
<div v-if="dialog.todo_num" class="todo">[{{$L('待办')}}{{dialog.todo_num > 99 ? '99+' : dialog.todo_num}}]</div> <div v-if="dialog.todo_num" class="todo">[{{$L('待办')}}{{formatTodoNum(dialog.todo_num)}}]</div>
<div v-if="$A.getDialogMention(dialog) > 0" class="mention">[@{{$A.getDialogMention(dialog)}}]</div> <div v-if="$A.getDialogMention(dialog) > 0" class="mention">[@{{$A.getDialogMention(dialog)}}]</div>
<template v-for="tag in $A.dialogTags(dialog)" v-if="tag.color != 'success'"> <template v-for="tag in $A.dialogTags(dialog)" v-if="tag.color != 'success'">
<Tag :color="tag.color" :fade="false" @on-click="openDialog(dialog.id)">{{$L(tag.text)}}</Tag> <Tag :color="tag.color" :fade="false" @on-click="openDialog(dialog.id)">{{$L(tag.text)}}</Tag>
@ -603,6 +603,10 @@ export default {
} }
}, },
formatTodoNum(num) {
return num > 99 ? '99+' : (num > 1 ? num : '')
},
formatMsgEmojiDesc(data) { formatMsgEmojiDesc(data) {
if ($A.isJson(data) && $A.arrayLength(data.emoji) > 0) { if ($A.isJson(data) && $A.arrayLength(data.emoji) > 0) {
return data.emoji[0].symbol; return data.emoji[0].symbol;

@ -1 +1 @@
Subproject commit d9ee16f29813fc20c5cf773b794907bc50f416f0 Subproject commit 6880ae1a336eb8463bd95068296738f3265581ab