diff --git a/language/original-api.txt b/language/original-api.txt index 2684aba44..329ad36e9 100644 --- a/language/original-api.txt +++ b/language/original-api.txt @@ -694,3 +694,18 @@ webhook地址最长仅支持255个字符。 (*)时 (*)分 小时 + +外出 +请假 +加班 +离职申请 +录用申请 +年假 +事假 +病假 +调休 +产假 +陪产假 +婚假 +丧假 +哺乳假 diff --git a/language/original-web.txt b/language/original-web.txt index aebc56845..b2ee22218 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -1753,3 +1753,5 @@ WiFi签到延迟时长为±1分钟。 你确定要还原归档子任务【(*)】吗? 请使用(*)移动端扫描二维码。 + +没有找到相关消息 diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index d33682127..667ffa156 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -1295,6 +1295,9 @@ export default { if (this.searchKey !== key) { return } + if (data.data.length === 0) { + $A.messageWarning('没有找到相关消息') + } this.searchResult = data.data this.searchLocation = this.searchResult.length }).finally(_ => { @@ -1454,6 +1457,7 @@ export default { this.msgNew = 0 this.msgType = '' + this.searchKey = '' this.unreadOne = 0 this.scrollTail = 0 this.scrollOffset = 0 diff --git a/resources/assets/sass/pages/page-approve.scss b/resources/assets/sass/pages/page-approve.scss index 9d2b3e48a..2761c481f 100644 --- a/resources/assets/sass/pages/page-approve.scss +++ b/resources/assets/sass/pages/page-approve.scss @@ -22,6 +22,7 @@ .approve-nav { flex: 1; + width: 0; display: flex; align-items: center; @@ -29,6 +30,9 @@ color: $primary-title-color; font-size: 28px; font-weight: 600; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } } }