-
+
@@ -34,23 +35,55 @@
-
-
-
- ↳{{ step }}
-
-
-
+ /** 订阅锁定倍率（group_id → multiplier）；优先于用户专属倍率。 */
+ lockedGroupRates: Record
}>()
// Suppress unused warning — props is accessed via template automatically but
// the explicit reference here keeps the linter from flagging userGroupRates.
void props.userGroupRates
+void props.lockedGroupRates
const { t } = useI18n()
diff --git a/frontend/src/components/charts/__tests__/GroupDistributionChart.spec.ts b/frontend/src/components/charts/__tests__/GroupDistributionChart.spec.ts
index 4718e83aab1..b43ea5ba2fe 100644
--- a/frontend/src/components/charts/__tests__/GroupDistributionChart.spec.ts
+++ b/frontend/src/components/charts/__tests__/GroupDistributionChart.spec.ts
@@ -42,6 +42,7 @@ describe('GroupDistributionChart', () => {
total_tokens: 1200,
cost: 1.8,
actual_cost: 0.1,
+ account_cost: 0.08,
},
{
group_id: 2,
@@ -50,6 +51,7 @@ describe('GroupDistributionChart', () => {
total_tokens: 600,
cost: 0.7,
actual_cost: 0.9,
+ account_cost: 0.3,
},
]
diff --git a/frontend/src/components/charts/__tests__/ModelDistributionChart.spec.ts b/frontend/src/components/charts/__tests__/ModelDistributionChart.spec.ts
index 82b62367658..a79cba6bd46 100644
--- a/frontend/src/components/charts/__tests__/ModelDistributionChart.spec.ts
+++ b/frontend/src/components/charts/__tests__/ModelDistributionChart.spec.ts
@@ -53,6 +53,7 @@ describe('ModelDistributionChart', () => {
total_tokens: 1000,
cost: 1.5,
actual_cost: 0.2,
+ account_cost: 0.15,
},
{
model: 'model-b',
@@ -64,6 +65,7 @@ describe('ModelDistributionChart', () => {
total_tokens: 500,
cost: 0.5,
actual_cost: 1.4,
+ account_cost: 0.4,
},
]
diff --git a/frontend/src/components/common/DataTable.vue b/frontend/src/components/common/DataTable.vue
index 456b1da79a8..8b153efbb12 100644
--- a/frontend/src/components/common/DataTable.vue
+++ b/frontend/src/components/common/DataTable.vue
@@ -1,6 +1,6 @@
+
@@ -171,11 +173,14 @@ const props = defineProps<{
emptyLabel: string
/** 用户专属倍率（group_id → multiplier）；无专属时由 GroupBadge 仅显示默认倍率。 */
userGroupRates: Record
+
+
+
{{ row.model }}
-
- ↳{{ row.upstream_model }}
+
- {{ row.model }}
@@ -291,9 +324,23 @@
+ {{ t('usage.requestedModel') }}:
+ {{ row.requested_model }}
+
+
+ {{ t('usage.upstreamModel') }}:
+ {{ row.upstream_model }}
+
+
+ {{ t('usage.billingModel') }}:
+ {{ row.billing_model }}
+
+
+ {{ t('usage.compatibilityMode') }}:
+
+ {{ getCompatModeLabel(row.compat_mode) }}
+
+
+
+ {{ t('usage.mapping') }}:
+ {{ row.model_mapping_chain }}
+ {{ t('usage.imageCount') }}
+ {{ tooltipData.image_count }}{{ t('usage.imageUnit') }} ({{ tooltipData.image_size || '2K' }})
+
+
+ {{ t('usage.imageUnitPrice') }}
+ ${{ imageUnitPrice(tooltipData).toFixed(6) }}
+
+
+ {{ t('usage.imageTotalPrice') }}
+ ${{ tooltipData.total_cost?.toFixed(6) || '0.000000' }}
+
+
- {{ tooltipData.billing_mode === BILLING_MODE_IMAGE ? t('usage.imageUnitPrice') : t('usage.unitPrice') }}
- ${{ tooltipData.total_cost?.toFixed(6) || '0.000000' }}
+ {{ t('usage.unitPrice') }}
+ ${{ tooltipData?.total_cost?.toFixed(6) || '0.000000' }}
{{ t('admin.usage.cacheCreationCost') }}
@@ -360,6 +407,13 @@ function accountBilled(row: { total_cost?: number | null; account_stats_cost?: n
return Number.isNaN(result) ? 0 : result
}
+function imageUnitPrice(row: AdminUsageLog | null): number {
+ if (!row || row.image_count <= 0) return 0
+ const total = row.total_cost ?? 0
+ const price = total / row.image_count
+ return Number.isFinite(price) ? price : 0
+}
+
import DataTable from '@/components/common/DataTable.vue'
import EmptyState from '@/components/common/EmptyState.vue'
import Icon from '@/components/icons/Icon.vue'
@@ -413,6 +467,22 @@ const getRequestTypeBadgeClass = (row: AdminUsageLog): string => {
return 'bg-amber-100 text-amber-800 dark:bg-amber-900 dark:text-amber-200'
}
+const getCompatModeLabel = (mode: AdminUsageLog['compat_mode']): string => {
+ if (mode === 'native_gpt') return t('usage.compatNativeGPT')
+ if (mode === 'legacy_claude_alias') return t('usage.compatLegacyClaudeAlias')
+ return t('usage.compatOtherHistorical')
+}
+
+const getCompatModeBadgeClass = (mode: AdminUsageLog['compat_mode']): string => {
+ if (mode === 'native_gpt') {
+ return 'bg-emerald-100 text-emerald-800 dark:bg-emerald-900 dark:text-emerald-200'
+ }
+ if (mode === 'legacy_claude_alias') {
+ return 'bg-amber-100 text-amber-800 dark:bg-amber-900 dark:text-amber-200'
+ }
+ return 'bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-200'
+}
+
const formatUserAgent = (ua: string): string => {
@@ -455,3 +525,10 @@ const hideTokenTooltip = () => {
tokenTooltipData.value = null
}
+
+
diff --git a/frontend/src/components/admin/usage/__tests__/UsageTable.spec.ts b/frontend/src/components/admin/usage/__tests__/UsageTable.spec.ts
index 9309c88ba6f..04b54f93807 100644
--- a/frontend/src/components/admin/usage/__tests__/UsageTable.spec.ts
+++ b/frontend/src/components/admin/usage/__tests__/UsageTable.spec.ts
@@ -22,6 +22,15 @@ const messages: Record = {
'usage.original': 'Original',
'usage.userBilled': 'User billed',
'usage.accountBilled': 'Account billed',
+ 'usage.executedModel': 'Executed',
+ 'usage.requestedModel': 'Requested',
+ 'usage.upstreamModel': 'Upstream',
+ 'usage.billingModel': 'Billing',
+ 'usage.compatibilityMode': 'Compatibility',
+ 'usage.compatNativeGPT': 'Native GPT',
+ 'usage.compatLegacyClaudeAlias': 'Legacy Claude alias',
+ 'usage.compatOtherHistorical': 'Other / historical',
+ 'usage.mapping': 'Mapping',
}
vi.mock('vue-i18n', async () => {
@@ -35,9 +44,9 @@ vi.mock('vue-i18n', async () => {
})
const DataTableStub = {
- props: ['data'],
+ props: ['data', 'pageVerticalScroll'],
template: `
-
@@ -141,6 +161,7 @@
step="0.001"
min="0.001"
:value="config.customRate ?? ''"
+ :disabled="submitting || loading"
@input="updateCustomRate(config.groupId, ($event.target as HTMLInputElement).value)"
:placeholder="String(config.defaultRate)"
class="hide-spinner w-24 rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm font-medium transition-colors focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-primary-500/20 dark:border-dark-500 dark:bg-dark-700 dark:focus:border-primary-500"
@@ -166,7 +187,12 @@
+
'
+ const wrapper = mount(UsageTable, {
+ props: {
+ data: [{
+ request_id: 'req-admin-model-xss',
+ requested_model: payload,
+ model: payload,
+ upstream_model: payload,
+ billing_model: payload,
+ compat_mode: 'other',
+ actual_cost: 0,
+ total_cost: 0,
+ account_rate_multiplier: 1,
+ rate_multiplier: 1,
+ input_cost: 0,
+ output_cost: 0,
+ cache_creation_cost: 0,
+ cache_read_cost: 0,
+ input_tokens: 0,
+ output_tokens: 0,
+ }],
+ loading: false,
+ columns: [],
+ },
+ global: {
+ stubs: {
+ DataTable: DataTableStub,
+ EmptyState: true,
+ Icon: true,
+ Teleport: true,
+ },
+ },
+ })
+
+ expect(wrapper.text()).toContain(payload)
+ expect(wrapper.find('img').exists()).toBe(false)
})
})
diff --git a/frontend/src/components/admin/user/UserAllowedGroupsModal.vue b/frontend/src/components/admin/user/UserAllowedGroupsModal.vue
index ac822d4132e..7310740069f 100644
--- a/frontend/src/components/admin/user/UserAllowedGroupsModal.vue
+++ b/frontend/src/components/admin/user/UserAllowedGroupsModal.vue
@@ -12,6 +12,10 @@
+
+
@@ -83,6 +99,7 @@
step="0.001"
min="0.001"
:value="config.customRate ?? ''"
+ :disabled="submitting || loading"
@input="updateCustomRate(config.groupId, ($event.target as HTMLInputElement).value)"
:placeholder="String(config.defaultRate)"
class="hide-spinner w-24 rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm font-medium transition-colors focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-primary-500/20 dark:border-dark-500 dark:bg-dark-700 dark:focus:border-primary-500"
@@ -131,6 +148,9 @@
{{ t('admin.users.defaultRate') }}: {{ config.defaultRate }}x
+
+ {{ t('admin.users.walletRoutingBusinessRule') }}
+
+
+ {{ loadError }}
+
+
@@ -44,6 +56,7 @@
@@ -73,6 +86,9 @@
{{ t('admin.users.defaultRate') }}: {{ config.defaultRate }}x
+ + {{ t(config.policyHintKey) }} +
+ {{ t(config.policyHintKey) }} +
-
@@ -115,6 +116,7 @@
:subscription-type="(g.subscription_type || 'standard') as SubscriptionType"
:rate-multiplier="g.rate_multiplier"
:user-rate-multiplier="userGroupRates[g.id] ?? null"
+ :locked-rate-multiplier="lockedGroupRates[g.id] ?? null"
always-show-rate
/>
-
+
@@ -66,8 +66,10 @@
class="table-wrapper"
:class="{
'actions-expanded': actionsExpanded,
- 'is-scrollable': isScrollable
+ 'is-scrollable': isScrollable,
+ 'page-vertical-scroll': pageVerticalScroll
}"
+ @wheel="handleWrapperWheel"
>
@@ -120,13 +122,15 @@
-
|
-
-
-
- |
-
|
+
+
+
+ |
+