优化收件箱发件人显示、支持24小时制时间并更新版本号为V2.10.2
This commit is contained in:
1 parent
9ba523abda
commit
77149133c4
3 files changed
+35
-10
No files matched your search
@@ -173,15 +173,39 @@ export function usePage() {
|
|||||||
router.push("/detail/" + row.id)
|
router.push("/detail/" + row.id)
|
||||||
}
|
}
|
||||||
|
|
||||||
const formatShortDate = (dateStr) => {
|
const cleanSenderText = (text) => {
|
||||||
if (!dateStr) return "";
|
if (!text) return String();
|
||||||
const d = new Date(dateStr);
|
return String(text).replace(/[\u200B-\u200D\u2060-\u206F\uFEFF]/g, String()).trim();
|
||||||
const now = new Date();
|
};
|
||||||
if (d.toDateString() === now.toDateString()) {
|
|
||||||
return d.toLocaleTimeString([], {hour: '2-digit', minute:'2-digit'});
|
const formatSender = (sender) => {
|
||||||
|
if (!sender) return String();
|
||||||
|
const cleanName = cleanSenderText(sender.Name);
|
||||||
|
if (cleanName) {
|
||||||
|
return cleanName;
|
||||||
}
|
}
|
||||||
return d.toLocaleDateString([], {month: 'short', day: 'numeric'});
|
return sender.EmailAddress || String();
|
||||||
}
|
};
|
||||||
|
|
||||||
|
const formatShortDate = (dateStr) => {
|
||||||
|
if (!dateStr) return String();
|
||||||
|
const d = new Date(dateStr);
|
||||||
|
if (isNaN(d.getTime())) return dateStr;
|
||||||
|
const now = new Date();
|
||||||
|
const pad = (n) => String(n).padStart(2, '0');
|
||||||
|
const hours = pad(d.getHours());
|
||||||
|
const minutes = pad(d.getMinutes());
|
||||||
|
const timeStr = hours + ':' + minutes;
|
||||||
|
if (d.toDateString() === now.toDateString()) {
|
||||||
|
return timeStr;
|
||||||
|
}
|
||||||
|
const month = pad(d.getMonth() + 1);
|
||||||
|
const date = pad(d.getDate());
|
||||||
|
if (d.getFullYear() === now.getFullYear()) {
|
||||||
|
return month + '-' + date + ' ' + timeStr;
|
||||||
|
}
|
||||||
|
return d.getFullYear() + '-' + month + '-' + date + ' ' + timeStr;
|
||||||
|
};
|
||||||
|
|
||||||
const selectionChange = (rows) => {
|
const selectionChange = (rows) => {
|
||||||
selectedRows.value = rows
|
selectedRows.value = rows
|
||||||
@@ -340,6 +364,7 @@ export function usePage() {
|
|||||||
updateGroupList,
|
updateGroupList,
|
||||||
rowClick,
|
rowClick,
|
||||||
formatShortDate,
|
formatShortDate,
|
||||||
|
formatSender,
|
||||||
selectionChange,
|
selectionChange,
|
||||||
selectAll,
|
selectAll,
|
||||||
invertSelection,
|
invertSelection,
|
||||||
|
|||||||
@@ -67,7 +67,7 @@
|
|||||||
<div class="mail-row-content" :class="{'is-unread': !scope.row.is_read}">
|
<div class="mail-row-content" :class="{'is-unread': !scope.row.is_read}">
|
||||||
<div class="mail-main-info">
|
<div class="mail-main-info">
|
||||||
<div class="mail-sender">
|
<div class="mail-sender">
|
||||||
{{ scope.row.sender.Name !== '' ? scope.row.sender.Name : scope.row.sender.EmailAddress }}
|
{{ formatSender(scope.row.sender) }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 高辨识度安全与发送状态标签 -->
|
<!-- 高辨识度安全与发送状态标签 -->
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
<el-icon><Setting /></el-icon>
|
<el-icon><Setting /></el-icon>
|
||||||
<span class="settings-label">{{ lang.settings }}</span>
|
<span class="settings-label">{{ lang.settings }}</span>
|
||||||
</div>
|
</div>
|
||||||
<span class="app-version-badge">V2.10.1</span>
|
<span class="app-version-badge">V2.10.2</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in new issue
Block a user