This commit is contained in:
1 parent
b50e5bdfa2
commit
dd6258c98b
34 files changed
+734
-87
No files matched your search
@@ -43,7 +43,7 @@
|
||||
|
||||
.log-categories {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(4, minmax(0, 1fr));
|
||||
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||
flex-shrink: 0;
|
||||
padding: 4px;
|
||||
border-radius: 10px;
|
||||
@@ -243,6 +243,14 @@
|
||||
color: var(--el-text-color-primary);
|
||||
}
|
||||
|
||||
.log-action {
|
||||
display: block;
|
||||
margin-bottom: 3px;
|
||||
overflow-wrap: anywhere;
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.log-source {
|
||||
margin-top: 4px;
|
||||
overflow: hidden;
|
||||
|
||||
@@ -31,8 +31,10 @@ export function useLogs() {
|
||||
]
|
||||
const isRuntime = computed(() => category.value === 'runtime')
|
||||
const formatTime = value => value ? new Date(value).toLocaleString('zh-CN', { hour12: false }) : '—'
|
||||
const resultLabel = value => ({ success: '成功', failure: '失败', unknown: '结果未知', accepted: '已接收' }[value] || value)
|
||||
const actionLabel = value => ({ update: '保存配置', rollback: '回滚配置', migration: '迁移配置' }[value] || value)
|
||||
const resultLabel = value => ({ success: '成功', failure: '失败', unknown: '未确认', accepted: '对端接收', pending: '待验证', started: '已开始', recorded: '状态记录', partial: '部分接收', discarded: '已丢弃', skipped: '已跳过' }[value] || value || '未记录')
|
||||
const actionLabel = value => ({ update: '保存配置', rollback: '回滚配置', migration: '迁移配置' }[value] || value || '未记录操作')
|
||||
const displayObject = item => item.payload?.object || item.payload?.stage || '未记录对象'
|
||||
const displayOutcome = item => item.payload?.outcome || '历史记录未提供结果说明'
|
||||
const displayActor = item => item.payload?.actorName || (item.actorId && item.actorId !== '0' ? item.actorId : '系统')
|
||||
const details = computed(() => detail.value?.payload || {})
|
||||
const runtimeRows = computed(() => lines.value.map((line, index) => parseRuntimeLine(line, offset.value + index + 1)))
|
||||
@@ -40,7 +42,7 @@ export function useLogs() {
|
||||
const visibleCount = computed(() => isRuntime.value ? lines.value.length : items.value.length)
|
||||
const pageRange = computed(() => visibleCount.value ? `第 ${offset.value + 1}–${offset.value + visibleCount.value} 条` : '暂无记录')
|
||||
const currentCategory = computed(() => categories.find(item => item.value === category.value)?.label)
|
||||
const resultType = value => ({ success: 'success', accepted: 'success', failure: 'danger' }[value] || 'info')
|
||||
const resultType = value => ({ success: 'success', accepted: 'primary', failure: 'danger', pending: 'warning', partial: 'warning', discarded: 'warning', started: 'primary' }[value] || 'info')
|
||||
const runtimeRowClass = ({ row }) => ['warning', 'danger'].includes(row.type) ? `log-row-${row.type}` : ''
|
||||
|
||||
function requireData(result) {
|
||||
@@ -126,6 +128,6 @@ export function useLogs() {
|
||||
hasMore, actorId, dateRange, detail, details, isRuntime,
|
||||
runtimeDetail, runtimeRows, runtimeSummary, visibleCount, pageRange,
|
||||
currentCategory, resultType, runtimeRowClass, timeParts,
|
||||
formatTime, resultLabel, actionLabel, displayActor, search, recent, next, previous
|
||||
formatTime, resultLabel, actionLabel, displayActor, displayObject, displayOutcome, search, recent, next, previous
|
||||
}
|
||||
}
|
||||
@@ -58,10 +58,16 @@
|
||||
<el-tag :type="row.type" size="small" effect="light" class="log-level-tag">{{ row.label }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="日志内容" min-width="170">
|
||||
<el-table-column label="操作与结果说明" min-width="170">
|
||||
<template #default="{ row }">
|
||||
<div class="log-message">{{ row.summary }}</div>
|
||||
<div v-if="row.sourceShort" class="log-source">{{ row.sourceShort }}</div>
|
||||
<strong class="log-action">{{ row.action }}</strong>
|
||||
<div class="log-message">{{ row.outcome }}</div>
|
||||
<div v-if="row.object" class="log-source">对象:{{ row.object }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="结果" width="92" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="resultType(row.result)" size="small" class="log-level-tag">{{ resultLabel(row.result) }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="详情" width="60" align="center">
|
||||
@@ -76,8 +82,12 @@
|
||||
<div class="log-time"><strong>{{ timeParts(row.createdAt).time }}</strong><span>{{ timeParts(row.createdAt).date }}</span></div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" min-width="125" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ actionLabel(row.action) }}</template>
|
||||
<el-table-column label="操作与结果说明" min-width="170">
|
||||
<template #default="{ row }">
|
||||
<strong class="log-action">{{ actionLabel(row.action) }}</strong>
|
||||
<div class="log-message">{{ displayOutcome(row) }}</div>
|
||||
<div class="log-source">{{ displayObject(row) }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作者" min-width="85" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ displayActor(row) }}</template>
|
||||
@@ -113,6 +123,10 @@
|
||||
<span class="runtime-detail-sequence">第 {{ runtimeDetail.sequence }} 条</span>
|
||||
</div>
|
||||
<dl class="log-detail-grid runtime-detail-meta">
|
||||
<dt>触发操作</dt><dd>{{ runtimeDetail.action }}</dd>
|
||||
<dt>操作对象</dt><dd>{{ runtimeDetail.object || '未记录' }}</dd>
|
||||
<dt>操作结果</dt><dd>{{ resultLabel(runtimeDetail.result) }}</dd>
|
||||
<dt>结果说明</dt><dd>{{ runtimeDetail.outcome }}</dd>
|
||||
<dt>代码来源</dt><dd>{{ runtimeDetail.source || '未记录' }}</dd>
|
||||
<template v-if="runtimeDetail.requestId">
|
||||
<dt>请求标识</dt><dd>{{ runtimeDetail.requestId }}</dd>
|
||||
@@ -129,15 +143,23 @@
|
||||
<el-dialog :model-value="Boolean(detail)" title="日志详情" width="min(760px, 92vw)" append-to-body @close="detail = null">
|
||||
<template v-if="detail">
|
||||
<p>{{ formatTime(detail.createdAt) }} · {{ displayActor(detail) }} · {{ actionLabel(detail.action) }}</p>
|
||||
<dl class="log-detail-grid">
|
||||
<dt>触发操作</dt><dd>{{ actionLabel(detail.action) }}</dd>
|
||||
<dt>触发来源</dt><dd>{{ details.trigger || '未记录' }}</dd>
|
||||
<dt>{{ category === 'mail' ? '处理阶段' : '操作对象' }}</dt><dd>{{ displayObject(detail) }}</dd>
|
||||
<dt>操作结果</dt><dd>{{ resultLabel(detail.result) }}</dd>
|
||||
<dt>结果说明</dt><dd>{{ displayOutcome(detail) }}</dd>
|
||||
</dl>
|
||||
<dl v-if="category === 'mail'" class="log-detail-grid">
|
||||
<dt>发件人</dt><dd>{{ details.sender || '—' }}</dd>
|
||||
<dt>收件人数</dt><dd>{{ details.recipientCount }}</dd>
|
||||
<dt>邮件大小</dt><dd>{{ details.bytes }} 字节</dd>
|
||||
<dt>结果</dt><dd>{{ resultLabel(detail.result) }}</dd>
|
||||
<dt>对端接收人数</dt><dd>{{ details.acceptedCount ?? '未记录' }}</dd>
|
||||
</dl>
|
||||
<dl v-else class="log-detail-grid">
|
||||
<dt>权限角色</dt><dd>{{ details.actorRole || '—' }}</dd>
|
||||
<dt>结果代码</dt><dd>{{ details.errorCode ?? '—' }}</dd>
|
||||
<dt>HTTP 状态</dt><dd>{{ details.httpStatus || '未记录' }}</dd>
|
||||
</dl>
|
||||
</template>
|
||||
</el-dialog>
|
||||
@@ -152,7 +174,7 @@ const {
|
||||
hasMore, actorId, dateRange, detail, details, isRuntime,
|
||||
runtimeDetail, runtimeRows, runtimeSummary, pageRange,
|
||||
currentCategory, resultType, runtimeRowClass, timeParts,
|
||||
formatTime, resultLabel, actionLabel, displayActor, search, recent, next, previous
|
||||
formatTime, resultLabel, actionLabel, displayActor, displayObject, displayOutcome, search, recent, next, previous
|
||||
} = useLogs()
|
||||
</script>
|
||||
|
||||
|
||||
@@ -53,8 +53,24 @@ export function parseRuntimeLine(line, sequence) {
|
||||
// 历史启动信息只简化摘要,详情仍保留完整消息和原始记录。
|
||||
const summary = legacyStartup ? '服务启动' : separator ? '启动分隔线' : message.trim() || '(空消息)'
|
||||
const sourceShort = source.replace(/^git\.pcux\.cn\/xuans\/Smail\//, '')
|
||||
let event = {}
|
||||
let content = summary
|
||||
const boundary = message.lastIndexOf(' @event ')
|
||||
if (boundary >= 0) {
|
||||
try {
|
||||
const parsed = JSON.parse(message.slice(boundary + 8))
|
||||
if (parsed?.logSchema === 1 && typeof parsed.action === 'string' && typeof parsed.result === 'string') {
|
||||
event = parsed
|
||||
content = message.slice(0, boundary).trim() || '(无补充说明)'
|
||||
}
|
||||
} catch {
|
||||
// 旧日志或截断记录保留原文,不能猜测结果。
|
||||
}
|
||||
}
|
||||
return {
|
||||
sequence, raw, createdAt, level, source, sourceShort, requestId, message, summary,
|
||||
action: event.action || '历史运行事件', result: event.result || 'unknown',
|
||||
object: event.object || event.section || '', outcome: event.outcome || content,
|
||||
...timeParts(createdAt), ...levels[level]
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user