* feat(frontend): 前端界面优化与使用统计功能增强
主要改动:
1. 表格布局统一优化
- 新增 TablePageLayout 通用布局组件
- 统一所有管理页面的表格样式和交互
- 优化 DataTable、Pagination、Select 等通用组件
2. 使用统计功能增强
- 管理端: 添加完整的筛选和显示功能
- 用户端: 完善 API Key 列显示
- 后端: 优化使用统计数据结构和查询
3. 账户组件优化
- 优化 AccountStatsModal、AccountUsageCell 等组件
- 统一进度条和统计显示样式
4. 其他改进
- 完善中英文国际化
- 统一页面样式和交互体验
- 优化各视图页面的响应式布局
* fix(test): 修复 stubUsageLogRepo.ListWithFilters 测试 stub
测试用例 GET /api/v1/usage 返回 500 是因为 stub 方法未实现,
现在正确返回基于 UserID 过滤的日志数据。
* feat(frontend): 统一日期时间显示格式
**主要改动**:
1. 增强 utils/format.ts:
- 新增 formatDateOnly() - 格式: YYYY-MM-DD
- 新增 formatDateTime() - 格式: YYYY-MM-DD HH:mm:ss
2. 全局替换视图中的格式化函数:
- 移除各视图中的自定义 formatDate 函数
- 统一导入使用 @/utils/format 中的函数
- created_at/updated_at 使用 formatDateTime
- expires_at 使用 formatDateOnly
3. 受影响的视图 (8个):
- frontend/src/views/user/KeysView.vue
- frontend/src/views/user/DashboardView.vue
- frontend/src/views/user/UsageView.vue
- frontend/src/views/user/RedeemView.vue
- frontend/src/views/admin/UsersView.vue
- frontend/src/views/admin/UsageView.vue
- frontend/src/views/admin/RedeemView.vue
- frontend/src/views/admin/SubscriptionsView.vue
**效果**:
- 日期统一显示为 YYYY-MM-DD
- 时间统一显示为 YYYY-MM-DD HH:mm:ss
- 提升可维护性,避免格式不一致
* fix(frontend): 补充遗漏的时间格式化统一
**补充修复**(基于 code review 发现的遗漏):
1. 增强 utils/format.ts:
- 新增 formatTime() - 格式: HH:mm
2. 修复 4 个遗漏的文件:
- src/views/admin/UsersView.vue
* 删除 formatExpiresAt(),改用 formatDateTime()
* 修复订阅过期时间 tooltip 显示格式不一致问题
- src/views/user/ProfileView.vue
* 删除 formatMemberSince(),改用 formatDate(date, 'YYYY-MM')
* 统一会员起始时间显示格式
- src/views/user/SubscriptionsView.vue
* 修改 formatExpirationDate() 使用 formatDateOnly()
* 保留天数计算逻辑
- src/components/account/AccountStatusIndicator.vue
* 删除本地 formatTime(),改用 utils/format 中的统一函数
* 修复 rate limit 和 overload 重置时间显示
**验证**:
- TypeScript 类型检查通过 ✓
- 前端构建成功 ✓
- 所有剩余的 toLocaleString() 都是数字格式化,属于正确用法 ✓
**效果**:
- 订阅过期时间统一为 YYYY-MM-DD HH:mm:ss
- 会员起始时间统一为 YYYY-MM
- 重置时间统一为 HH:mm
- 消除所有不规范的原生 locale 方法调用
299 lines
9.4 KiB
Vue
299 lines
9.4 KiB
Vue
<template>
|
|
<div v-if="showUsageWindows">
|
|
<!-- Anthropic OAuth and Setup Token accounts: fetch real usage data -->
|
|
<template
|
|
v-if="
|
|
account.platform === 'anthropic' &&
|
|
(account.type === 'oauth' || account.type === 'setup-token')
|
|
"
|
|
>
|
|
<!-- Loading state -->
|
|
<div v-if="loading" class="space-y-1.5">
|
|
<!-- OAuth: 3 rows, Setup Token: 1 row -->
|
|
<div class="flex items-center gap-1">
|
|
<div class="h-3 w-[32px] animate-pulse rounded bg-gray-200 dark:bg-gray-700"></div>
|
|
<div class="h-1.5 w-8 animate-pulse rounded-full bg-gray-200 dark:bg-gray-700"></div>
|
|
<div class="h-3 w-[32px] animate-pulse rounded bg-gray-200 dark:bg-gray-700"></div>
|
|
</div>
|
|
<template v-if="account.type === 'oauth'">
|
|
<div class="flex items-center gap-1">
|
|
<div class="h-3 w-[32px] animate-pulse rounded bg-gray-200 dark:bg-gray-700"></div>
|
|
<div class="h-1.5 w-8 animate-pulse rounded-full bg-gray-200 dark:bg-gray-700"></div>
|
|
<div class="h-3 w-[32px] animate-pulse rounded bg-gray-200 dark:bg-gray-700"></div>
|
|
</div>
|
|
<div class="flex items-center gap-1">
|
|
<div class="h-3 w-[32px] animate-pulse rounded bg-gray-200 dark:bg-gray-700"></div>
|
|
<div class="h-1.5 w-8 animate-pulse rounded-full bg-gray-200 dark:bg-gray-700"></div>
|
|
<div class="h-3 w-[32px] animate-pulse rounded bg-gray-200 dark:bg-gray-700"></div>
|
|
</div>
|
|
</template>
|
|
</div>
|
|
|
|
<!-- Error state -->
|
|
<div v-else-if="error" class="text-xs text-red-500">
|
|
{{ error }}
|
|
</div>
|
|
|
|
<!-- Usage data -->
|
|
<div v-else-if="usageInfo" class="space-y-1">
|
|
<!-- 5h Window -->
|
|
<UsageProgressBar
|
|
v-if="usageInfo.five_hour"
|
|
label="5h"
|
|
:utilization="usageInfo.five_hour.utilization"
|
|
:resets-at="usageInfo.five_hour.resets_at"
|
|
:window-stats="usageInfo.five_hour.window_stats"
|
|
color="indigo"
|
|
/>
|
|
|
|
<!-- 7d Window (OAuth only) -->
|
|
<UsageProgressBar
|
|
v-if="usageInfo.seven_day"
|
|
label="7d"
|
|
:utilization="usageInfo.seven_day.utilization"
|
|
:resets-at="usageInfo.seven_day.resets_at"
|
|
color="emerald"
|
|
/>
|
|
|
|
<!-- 7d Sonnet Window (OAuth only) -->
|
|
<UsageProgressBar
|
|
v-if="usageInfo.seven_day_sonnet"
|
|
label="7d S"
|
|
:utilization="usageInfo.seven_day_sonnet.utilization"
|
|
:resets-at="usageInfo.seven_day_sonnet.resets_at"
|
|
color="purple"
|
|
/>
|
|
</div>
|
|
|
|
<!-- No data yet -->
|
|
<div v-else class="text-xs text-gray-400">-</div>
|
|
</template>
|
|
|
|
<!-- OpenAI OAuth accounts: show Codex usage from extra field -->
|
|
<template v-else-if="account.platform === 'openai' && account.type === 'oauth'">
|
|
<div v-if="hasCodexUsage" class="space-y-1">
|
|
<!-- 5h Window -->
|
|
<UsageProgressBar
|
|
v-if="codex5hUsedPercent !== null"
|
|
label="5h"
|
|
:utilization="codex5hUsedPercent"
|
|
:resets-at="codex5hResetAt"
|
|
color="indigo"
|
|
/>
|
|
|
|
<!-- 7d Window -->
|
|
<UsageProgressBar
|
|
v-if="codex7dUsedPercent !== null"
|
|
label="7d"
|
|
:utilization="codex7dUsedPercent"
|
|
:resets-at="codex7dResetAt"
|
|
color="emerald"
|
|
/>
|
|
</div>
|
|
<div v-else class="text-xs text-gray-400">-</div>
|
|
</template>
|
|
|
|
<!-- Other accounts: no usage window -->
|
|
<template v-else>
|
|
<div class="text-xs text-gray-400">-</div>
|
|
</template>
|
|
</div>
|
|
|
|
<!-- Non-OAuth/Setup-Token accounts -->
|
|
<div v-else class="text-xs text-gray-400">-</div>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import { ref, computed, onMounted } from 'vue'
|
|
import { useI18n } from 'vue-i18n'
|
|
import { adminAPI } from '@/api/admin'
|
|
import type { Account, AccountUsageInfo } from '@/types'
|
|
import UsageProgressBar from './UsageProgressBar.vue'
|
|
|
|
const props = defineProps<{
|
|
account: Account
|
|
}>()
|
|
|
|
const { t } = useI18n()
|
|
|
|
const loading = ref(false)
|
|
const error = ref<string | null>(null)
|
|
const usageInfo = ref<AccountUsageInfo | null>(null)
|
|
|
|
// Show usage windows for OAuth and Setup Token accounts
|
|
const showUsageWindows = computed(
|
|
() => props.account.type === 'oauth' || props.account.type === 'setup-token'
|
|
)
|
|
|
|
// OpenAI Codex usage computed properties
|
|
const hasCodexUsage = computed(() => {
|
|
const extra = props.account.extra
|
|
return (
|
|
extra &&
|
|
// Check for new canonical fields first
|
|
(extra.codex_5h_used_percent !== undefined ||
|
|
extra.codex_7d_used_percent !== undefined ||
|
|
// Fallback to legacy fields
|
|
extra.codex_primary_used_percent !== undefined ||
|
|
extra.codex_secondary_used_percent !== undefined)
|
|
)
|
|
})
|
|
|
|
// 5h window usage (prefer canonical field)
|
|
const codex5hUsedPercent = computed(() => {
|
|
const extra = props.account.extra
|
|
if (!extra) return null
|
|
|
|
// Prefer canonical field
|
|
if (extra.codex_5h_used_percent !== undefined) {
|
|
return extra.codex_5h_used_percent
|
|
}
|
|
|
|
// Fallback: detect from legacy fields using window_minutes
|
|
if (
|
|
extra.codex_primary_window_minutes !== undefined &&
|
|
extra.codex_primary_window_minutes <= 360
|
|
) {
|
|
return extra.codex_primary_used_percent ?? null
|
|
}
|
|
if (
|
|
extra.codex_secondary_window_minutes !== undefined &&
|
|
extra.codex_secondary_window_minutes <= 360
|
|
) {
|
|
return extra.codex_secondary_used_percent ?? null
|
|
}
|
|
|
|
// Legacy assumption: secondary = 5h (may be incorrect)
|
|
return extra.codex_secondary_used_percent ?? null
|
|
})
|
|
|
|
const codex5hResetAt = computed(() => {
|
|
const extra = props.account.extra
|
|
if (!extra) return null
|
|
|
|
// Prefer canonical field
|
|
if (extra.codex_5h_reset_after_seconds !== undefined) {
|
|
const resetTime = new Date(Date.now() + extra.codex_5h_reset_after_seconds * 1000)
|
|
return resetTime.toISOString()
|
|
}
|
|
|
|
// Fallback: detect from legacy fields using window_minutes
|
|
if (
|
|
extra.codex_primary_window_minutes !== undefined &&
|
|
extra.codex_primary_window_minutes <= 360
|
|
) {
|
|
if (extra.codex_primary_reset_after_seconds !== undefined) {
|
|
const resetTime = new Date(Date.now() + extra.codex_primary_reset_after_seconds * 1000)
|
|
return resetTime.toISOString()
|
|
}
|
|
}
|
|
if (
|
|
extra.codex_secondary_window_minutes !== undefined &&
|
|
extra.codex_secondary_window_minutes <= 360
|
|
) {
|
|
if (extra.codex_secondary_reset_after_seconds !== undefined) {
|
|
const resetTime = new Date(Date.now() + extra.codex_secondary_reset_after_seconds * 1000)
|
|
return resetTime.toISOString()
|
|
}
|
|
}
|
|
|
|
// Legacy assumption: secondary = 5h
|
|
if (extra.codex_secondary_reset_after_seconds !== undefined) {
|
|
const resetTime = new Date(Date.now() + extra.codex_secondary_reset_after_seconds * 1000)
|
|
return resetTime.toISOString()
|
|
}
|
|
|
|
return null
|
|
})
|
|
|
|
// 7d window usage (prefer canonical field)
|
|
const codex7dUsedPercent = computed(() => {
|
|
const extra = props.account.extra
|
|
if (!extra) return null
|
|
|
|
// Prefer canonical field
|
|
if (extra.codex_7d_used_percent !== undefined) {
|
|
return extra.codex_7d_used_percent
|
|
}
|
|
|
|
// Fallback: detect from legacy fields using window_minutes
|
|
if (
|
|
extra.codex_primary_window_minutes !== undefined &&
|
|
extra.codex_primary_window_minutes >= 10000
|
|
) {
|
|
return extra.codex_primary_used_percent ?? null
|
|
}
|
|
if (
|
|
extra.codex_secondary_window_minutes !== undefined &&
|
|
extra.codex_secondary_window_minutes >= 10000
|
|
) {
|
|
return extra.codex_secondary_used_percent ?? null
|
|
}
|
|
|
|
// Legacy assumption: primary = 7d (may be incorrect)
|
|
return extra.codex_primary_used_percent ?? null
|
|
})
|
|
|
|
const codex7dResetAt = computed(() => {
|
|
const extra = props.account.extra
|
|
if (!extra) return null
|
|
|
|
// Prefer canonical field
|
|
if (extra.codex_7d_reset_after_seconds !== undefined) {
|
|
const resetTime = new Date(Date.now() + extra.codex_7d_reset_after_seconds * 1000)
|
|
return resetTime.toISOString()
|
|
}
|
|
|
|
// Fallback: detect from legacy fields using window_minutes
|
|
if (
|
|
extra.codex_primary_window_minutes !== undefined &&
|
|
extra.codex_primary_window_minutes >= 10000
|
|
) {
|
|
if (extra.codex_primary_reset_after_seconds !== undefined) {
|
|
const resetTime = new Date(Date.now() + extra.codex_primary_reset_after_seconds * 1000)
|
|
return resetTime.toISOString()
|
|
}
|
|
}
|
|
if (
|
|
extra.codex_secondary_window_minutes !== undefined &&
|
|
extra.codex_secondary_window_minutes >= 10000
|
|
) {
|
|
if (extra.codex_secondary_reset_after_seconds !== undefined) {
|
|
const resetTime = new Date(Date.now() + extra.codex_secondary_reset_after_seconds * 1000)
|
|
return resetTime.toISOString()
|
|
}
|
|
}
|
|
|
|
// Legacy assumption: primary = 7d
|
|
if (extra.codex_primary_reset_after_seconds !== undefined) {
|
|
const resetTime = new Date(Date.now() + extra.codex_primary_reset_after_seconds * 1000)
|
|
return resetTime.toISOString()
|
|
}
|
|
|
|
return null
|
|
})
|
|
|
|
const loadUsage = async () => {
|
|
// Fetch usage for Anthropic OAuth and Setup Token accounts
|
|
// OpenAI usage comes from account.extra field (updated during forwarding)
|
|
if (props.account.platform !== 'anthropic') return
|
|
if (props.account.type !== 'oauth' && props.account.type !== 'setup-token') return
|
|
|
|
loading.value = true
|
|
error.value = null
|
|
|
|
try {
|
|
usageInfo.value = await adminAPI.accounts.getUsage(props.account.id)
|
|
} catch (e: any) {
|
|
error.value = t('common.error')
|
|
console.error('Failed to load usage:', e)
|
|
} finally {
|
|
loading.value = false
|
|
}
|
|
}
|
|
|
|
onMounted(() => {
|
|
loadUsage()
|
|
})
|
|
</script>
|