From 349e983eb728239ef06d7392ddf464a146a6e7f3 Mon Sep 17 00:00:00 2001
From: Zyy <zyycn@users.noreply.github.com>
Date: Sat, 17 Oct 2026 22:00:16 +0800
Subject: [PATCH] fix(ui): correct account labels, proxy actions and usage
 defaults

Reuse account identity labels in concurrency details and use a text button
for reset-credit lead time settings. Disable row tests during batch proxy
testing while retaining loading feedback for individual tests.

Default the usage date range to today.

Co-authored-by: Codex <noreply@openai.com>
---
 .../components/AccountConcurrencyModal.vue        |  6 ++++--
 .../accounts/components/AccountIdentityCell.vue   | 12 ++----------
 .../account-quota-panel/ResetCreditAutomation.vue |  2 +-
 .../src/views/accounts/utils/accountIdentity.ts   | 15 +++++++++++++++
 .../src/views/proxies/components/ProxyActions.vue |  3 ++-
 frontend/src/views/proxies/index.vue              |  2 +-
 .../views/usage/composables/useUsageTimeRange.ts  |  2 +-
 7 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 frontend/src/views/accounts/utils/accountIdentity.ts

diff --git a/frontend/src/views/accounts/components/AccountConcurrencyModal.vue b/frontend/src/views/accounts/components/AccountConcurrencyModal.vue
index 576a5e510..a9fa37198 100644
--- a/frontend/src/views/accounts/components/AccountConcurrencyModal.vue
+++ b/frontend/src/views/accounts/components/AccountConcurrencyModal.vue
@@ -2,17 +2,19 @@
 import type { Account } from '@/api'
 import { ZDialog, ZIconButton, ZPagination } from '@codex-proxy/ui'
 import { Grid2X2, RefreshCw } from '@lucide/vue'
-import { toRef } from 'vue'
+import { computed, toRef } from 'vue'
 import { useAccountConcurrency } from '../composables/useAccountConcurrency'
+import { accountIdentityLabel } from '../utils/accountIdentity'
 import AccountConcurrencyTable from './AccountConcurrencyTable.vue'
 
 const props = defineProps<{ account: Account | null }>()
 const open = defineModel<boolean>({ required: true })
+const accountLabel = computed(() => props.account ? accountIdentityLabel(props.account) : '当前账号')
 const { pageSize, data, entries, loading, tableLoading, error, refresh, setPage, setPageSize } = useAccountConcurrency(toRef(props, 'account'), open)
 </script>
 
 <template>
-  <ZDialog v-model="open" title="并发明细" :description="`${account?.name ?? '当前账号'} · 当前正在处理的请求`" width="72rem">
+  <ZDialog v-model="open" title="并发明细" :description="`${accountLabel} · 当前正在处理的请求`" width="72rem">
     <div class="grid min-w-0 gap-2">
       <div class="flex items-center justify-between gap-3">
         <div class="flex items-center gap-1.5 text-cp-sm" role="group" aria-label="当前占用 / 并发上限">
diff --git a/frontend/src/views/accounts/components/AccountIdentityCell.vue b/frontend/src/views/accounts/components/AccountIdentityCell.vue
index 071aa7719..1e152d39f 100644
--- a/frontend/src/views/accounts/components/AccountIdentityCell.vue
+++ b/frontend/src/views/accounts/components/AccountIdentityCell.vue
@@ -5,6 +5,7 @@ import { computed } from 'vue'
 
 import AccountPlanBadge from '@/components/account/AccountPlanBadge.vue'
 import { stablePresetVisualToneClass } from '@/utils/color'
+import { accountIdentityLabel } from '../utils/accountIdentity'
 import AccountNotesPopover from './AccountNotesPopover.vue'
 
 type AccountIdentity = Pick<Account, 'id' | 'email' | 'planType' | 'planTypeDisplay'>
@@ -30,16 +31,7 @@ const props = withDefaults(
   },
 )
 
-const emailText = computed(() => {
-  if (props.account.authenticationKind === 'api_key' && props.account.name)
-    return props.account.name
-  const email = props.account.email?.trim()
-  if (email)
-    return email
-  if ('accountId' in props.account && typeof props.account.accountId === 'string')
-    return props.account.accountId
-  return String(props.account.id)
-})
+const emailText = computed(() => accountIdentityLabel(props.account))
 
 const visibleNotes = computed(() => props.showNotes ? props.account.notes : undefined)
 
diff --git a/frontend/src/views/accounts/components/account-quota-panel/ResetCreditAutomation.vue b/frontend/src/views/accounts/components/account-quota-panel/ResetCreditAutomation.vue
index ebbd3f8d8..a7e13aaf4 100644
--- a/frontend/src/views/accounts/components/account-quota-panel/ResetCreditAutomation.vue
+++ b/frontend/src/views/accounts/components/account-quota-panel/ResetCreditAutomation.vue
@@ -86,7 +86,7 @@ watch(() => props.accountId, () => {
         </ZPopover>
       </div>
       <div class="flex items-center gap-3">
-        <ZButton size="small" variant="link" aria-label="设置全局提前时间" @click="router.push('/settings#reset-credits')">
+        <ZButton size="small" variant="text" aria-label="设置全局提前时间" @click="router.push('/settings#reset-credits')">
           <template #icon>
             <Clock3 class="size-3.5 -translate-y-px" />
           </template>
diff --git a/frontend/src/views/accounts/utils/accountIdentity.ts b/frontend/src/views/accounts/utils/accountIdentity.ts
new file mode 100644
index 000000000..775d4d735
--- /dev/null
+++ b/frontend/src/views/accounts/utils/accountIdentity.ts
@@ -0,0 +1,15 @@
+import type { Account } from '@/api'
+
+type AccountIdentity = Pick<Account, 'id' | 'email'>
+  & Partial<Pick<Account, 'accountId' | 'name' | 'authenticationKind'>>
+
+export function accountIdentityLabel(account: AccountIdentity): string {
+  if (account.authenticationKind === 'api_key' && account.name)
+    return account.name
+  const email = account.email?.trim()
+  if (email)
+    return email
+  if (typeof account.accountId === 'string')
+    return account.accountId
+  return String(account.id)
+}
diff --git a/frontend/src/views/proxies/components/ProxyActions.vue b/frontend/src/views/proxies/components/ProxyActions.vue
index 3834d5011..e8a7f229f 100644
--- a/frontend/src/views/proxies/components/ProxyActions.vue
+++ b/frontend/src/views/proxies/components/ProxyActions.vue
@@ -6,6 +6,7 @@ import { MoreHorizontal, Pencil, Power, Trash2, Wifi } from '@lucide/vue'
 defineProps<{
   proxy: OutboundProxyRecord
   testing: boolean
+  batchTesting: boolean
   updating: boolean
 }>()
 
@@ -19,7 +20,7 @@ const emit = defineEmits<{
 
 <template>
   <div class="flex items-center gap-0.5">
-    <ZIconButton size="small" aria-label="测试代理" :loading="testing" :disabled="testing || updating" @click="emit('test', proxy)">
+    <ZIconButton size="small" aria-label="测试代理" :loading="testing && !batchTesting" :disabled="batchTesting || testing || updating" @click="emit('test', proxy)">
       <Wifi class="size-3.5 text-cp-link" />
     </ZIconButton>
     <ZIconButton size="small" aria-label="编辑代理" :disabled="testing || updating" @click="emit('edit', proxy)">
diff --git a/frontend/src/views/proxies/index.vue b/frontend/src/views/proxies/index.vue
index 0fce28b43..fb2242762 100644
--- a/frontend/src/views/proxies/index.vue
+++ b/frontend/src/views/proxies/index.vue
@@ -152,7 +152,7 @@ watch(search, () => {
               {{ row.lastTestAtDisplay ?? '-' }}
             </template>
             <template #actions="{ row }">
-              <ProxyActions :proxy="row" :testing="testingIds.has(row.id)" :updating="updatingIds.has(row.id)" @test="checkProxy" @edit="openForm" @toggle="toggleEnabled" @delete="requestDelete" />
+              <ProxyActions :proxy="row" :testing="testingIds.has(row.id)" :batch-testing="batchTesting" :updating="updatingIds.has(row.id)" @test="checkProxy" @edit="openForm" @toggle="toggleEnabled" @delete="requestDelete" />
             </template>
           </ZTable>
           <ZPagination v-bind="pagination" :disabled="loading" @current-change="setPage" @size-change="setPageSize" />
diff --git a/frontend/src/views/usage/composables/useUsageTimeRange.ts b/frontend/src/views/usage/composables/useUsageTimeRange.ts
index 09dede91c..6e5f15451 100644
--- a/frontend/src/views/usage/composables/useUsageTimeRange.ts
+++ b/frontend/src/views/usage/composables/useUsageTimeRange.ts
@@ -12,7 +12,7 @@ function dateStart(date: Date, offset = 0) {
 
 export function useUsageTimeRange() {
   const now = new Date()
-  const selectedDates = shallowRef<[Date, Date]>([dateStart(now, -6), dateStart(now)])
+  const selectedDates = shallowRef<[Date, Date]>([dateStart(now), dateStart(now)])
   const timeRange = computed<DatePickerValue>({
     get: () => selectedDates.value,
     set: (value) => {