diff --git a/web/app/Services/Cloud/CloudTrafficPoolReadModel.php b/web/app/Services/Cloud/CloudTrafficPoolReadModel.php index 5d4cb17a..8d4184a9 100644 --- a/web/app/Services/Cloud/CloudTrafficPoolReadModel.php +++ b/web/app/Services/Cloud/CloudTrafficPoolReadModel.php @@ -306,6 +306,7 @@ final class CloudTrafficPoolReadModel ->orderBy('id')->get([ 'id', 'instance_id', 'user_id', 'traffic_pool_group_id', 'starts_at', 'ends_at', 'traffic_quota_mode', 'status', + 'traffic_quota_bytes', ])->keyBy('id'); if ($periods->isEmpty()) { return []; @@ -335,6 +336,10 @@ final class CloudTrafficPoolReadModel 'traffic_download_bytes' => $download, 'traffic_upload_bytes' => $upload, 'traffic_used_bytes' => $download + $upload, + 'period_traffic_quota_bytes' => max( + 0, + (int) $period->traffic_quota_bytes + ), 'service_expires_at' => $instance->expires_at === null ? null : (int) $instance->expires_at, 'network_status' => (string) $instance->network_status, diff --git a/web/app/Services/Cloud/CloudUserPageView.php b/web/app/Services/Cloud/CloudUserPageView.php index 4083c76e..24d7d26a 100644 --- a/web/app/Services/Cloud/CloudUserPageView.php +++ b/web/app/Services/Cloud/CloudUserPageView.php @@ -118,6 +118,9 @@ final class CloudUserPageView 'used_display' => self::bytes( $instance['traffic_used_bytes'] ?? null ), + 'period_quota_display' => self::bytes( + $instance['period_traffic_quota_bytes'] ?? null + ), 'download_display' => self::bytes( $instance['traffic_download_bytes'] ?? null ), diff --git a/web/public/cloud/styles.css b/web/public/cloud/styles.css index 159a5496..e9dd50ea 100644 --- a/web/public/cloud/styles.css +++ b/web/public/cloud/styles.css @@ -327,16 +327,18 @@ body.vu-body .ssh-key-picker-manage:hover { .cloud-traffic-instance>div{display:grid;gap:4px;min-width:0} .cloud-traffic-instance strong{color:#344f62;font-size:12px;overflow-wrap:anywhere} .cloud-traffic-instance small{color:#8798a6;font-size:9px} -.cloud-traffic-instance dl{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:10px;margin:0} +.cloud-traffic-instance dl{display:grid;grid-template-columns:repeat(auto-fit,minmax(140px,1fr));gap:10px;margin:0} .cloud-traffic-instance dl>div{display:grid;gap:3px;min-width:0} .cloud-traffic-instance dt{color:#8a9aa7;font-size:9px} .cloud-traffic-instance dd{margin:0;color:#50697a;font-size:10px;font-weight:700;overflow-wrap:anywhere} +.cloud-traffic-instance .state-pill{max-width:100%;white-space:normal;line-height:1.35} .cloud-traffic-instance-empty,.cloud-traffic-empty{margin:0;color:#8395a3;text-align:center} .cloud-traffic-instance-empty{padding:18px;border:1px dashed #d9e3e7;border-radius:9px;font-size:10px;line-height:1.65} .cloud-traffic-empty{display:grid;justify-items:center;gap:7px;padding:50px 18px} .cloud-traffic-empty strong{color:#52697b;font-size:14px} .cloud-traffic-empty>span:last-child{font-size:10px;line-height:1.6} -@media(max-width:820px){.cloud-traffic-facts{grid-template-columns:repeat(2,minmax(0,1fr))}.cloud-traffic-instance{grid-template-columns:1fr}.cloud-traffic-instance dl{grid-template-columns:repeat(3,minmax(0,1fr))}} +@media(max-width:1100px){.cloud-traffic-instance{grid-template-columns:1fr}.cloud-traffic-instance dl{grid-template-columns:repeat(2,minmax(0,1fr))}} +@media(max-width:820px){.cloud-traffic-facts{grid-template-columns:repeat(2,minmax(0,1fr))}} @media(max-width:510px){.cloud-traffic-panel>.panel-heading,.cloud-traffic-list{padding-inline:16px}.cloud-traffic-card{padding:15px}.cloud-traffic-card-heading{align-items:flex-start;flex-direction:column}.cloud-traffic-state-group{justify-content:flex-start}.cloud-traffic-facts{grid-template-columns:1fr 1fr}.cloud-traffic-instance{padding:12px}.cloud-traffic-instance dl{grid-template-columns:1fr}.cloud-traffic-instance dl>div{display:flex;align-items:center;justify-content:space-between;gap:10px}.cloud-traffic-instance dd{text-align:right}} /* VPC list, creation and member views share the existing user shell. */ diff --git a/web/public/cloud/traffic.js b/web/public/cloud/traffic.js index 97e20660..1b9ef9a7 100644 --- a/web/public/cloud/traffic.js +++ b/web/public/cloud/traffic.js @@ -95,7 +95,8 @@ function renderInstances(pool, section) { identity.append(element('strong', '', instance.name || `实例 #${instance.id || ''}`), element('small', '', `到期 ${formatDate(instance.service_expires_at, '时间未记录')}`)); const facts = document.createElement('dl'); - facts.append(fact('本实例已用', formatBytes(instance.traffic_used_bytes)), + facts.append(fact('本周期总额度', formatBytes(instance.period_traffic_quota_bytes)), + fact('本实例已用', formatBytes(instance.traffic_used_bytes)), fact('RX / TX', `${formatBytes(instance.traffic_download_bytes)} / ${formatBytes(instance.traffic_upload_bytes)}`)); const [networkLabel, networkClass] = instanceNetwork(instance.network_status); const network = document.createElement('div'); diff --git a/web/resources/views/venix/cloud/pages/traffic.tpl b/web/resources/views/venix/cloud/pages/traffic.tpl index fc3a2c75..45e5e332 100644 --- a/web/resources/views/venix/cloud/pages/traffic.tpl +++ b/web/resources/views/venix/cloud/pages/traffic.tpl @@ -5,14 +5,14 @@
额度按服务周期到期同一线路内的实例共享有效额度,并按最早到期优先消耗;实例到期时只作废该周期尚未使用的额度。
-

当前共享流量池

只显示已经进入强制执行的线路分组;实例流量是本实例当前周期采样,不代表独占额度。

{$cloud_traffic_view.count|default:0|escape:'html'} 个
+

当前共享流量池

只显示已经进入强制执行的线路分组;“本周期总额度”是该实例当前服务周期贡献给共享池的总额度,“本实例已用”和 RX / TX 为当前周期采样,均不代表独占余额。

{$cloud_traffic_view.count|default:0|escape:'html'} 个
{foreach $cloud_traffic_view.items|default:[] as $pool}

{$pool.name|escape:'html'}

共享额度按最早到期批次优先消耗

{$pool.state_label|escape:'html'}{$pool.network_label|escape:'html'}
当前有效额度
{$pool.entitlement_display|escape:'html'}
有效额度已消耗
{$pool.consumed_display|escape:'html'}
当前可用余额
{$pool.available_display|escape:'html'}
采样超额债务
{$pool.overage_display|escape:'html'}
下一批额度到期
{$pool.next_expiry_display|escape:'html'}{$pool.next_expiry_note|escape:'html'}
最近可信采样
{$pool.last_observed_display|escape:'html'}
-

当前实例采样

{$pool.instances|@count|escape:'html'} 台
+

当前实例采样

{$pool.instances|@count|escape:'html'} 台
{foreachelse}
当前没有已启用的共享流量池管理员完成影子核算验收并启用后,将在这里显示共享额度。
{/foreach}
diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 08c5a034..3101dbd4 100644 --- a/web/resources/views/venix/layout_assets.tpl +++ b/web/resources/views/venix/layout_assets.tpl @@ -1,2 +1,2 @@ {* Shared Venix CSS/JS cache key. Increment whenever a shared browser asset changes. *} -{assign var=venix_asset_version value='2026110102' scope='global'} +{assign var=venix_asset_version value='2026110103' scope='global'} diff --git a/web/tests/CloudTrafficPoolUserReadModelTest.php b/web/tests/CloudTrafficPoolUserReadModelTest.php index 84b623af..f501ea5f 100644 --- a/web/tests/CloudTrafficPoolUserReadModelTest.php +++ b/web/tests/CloudTrafficPoolUserReadModelTest.php @@ -295,6 +295,7 @@ $assert($lineA['active_entitlement_bytes'] === 1500 $assert(count($lineA['instances']) === 1 && $lineA['instances'][0]['id'] === '1' && $lineA['instances'][0]['traffic_used_bytes'] === 150 + && $lineA['instances'][0]['period_traffic_quota_bytes'] === 1000 && $lineA['network_restriction_state'] === 'clear', 'Current-instance observations crossed user, group, deletion or unlimited boundaries.'); $assert($payload['items'][1]['network_restriction_state'] === 'restricted', diff --git a/web/tests/CloudTrafficPoolUserUiContractTest.php b/web/tests/CloudTrafficPoolUserUiContractTest.php index 007189e8..82a2cb49 100644 --- a/web/tests/CloudTrafficPoolUserUiContractTest.php +++ b/web/tests/CloudTrafficPoolUserUiContractTest.php @@ -85,6 +85,9 @@ $assert(str_contains($sidebar, 'href="/user/cloud/traffic"') && str_contains($template, 'id="cloud-traffic-bootstrap"') && str_contains($template, 'id="cloud-traffic-list"') && str_contains($template, '下一批额度到期') + && str_contains($template, '本周期总额度') + && str_contains($template, '{$instance.period_quota_display|escape:') + && str_contains($template, '当前服务周期贡献给共享池的总额度') && str_contains($template, '本实例已用') && str_contains($template, '只显示已经进入强制执行的线路分组'), 'The user traffic-pool page lacks SSR first paint, navigation or clear shared-vs-instance copy.'); @@ -100,16 +103,26 @@ $assert(str_contains($script, && str_contains($script, 'pool.active_consumed_bytes') && str_contains($script, 'pool.available_bytes') && str_contains($script, 'pool.projection_ready === true') + && str_contains($script, + "fact('本周期总额度', formatBytes(instance.period_traffic_quota_bytes))") && str_contains($script, "preparing: ['额度准备中', 'warning']"), 'Browser code must only refresh the server projection and must not mutate, sum or inject traffic data.'); $assert(str_contains($view, 'function trafficPools(') && str_contains($view, "'network_restriction_state'") + && str_contains($view, "'period_quota_display'") + && str_contains($readModel, "'period_traffic_quota_bytes'") && str_contains($detail, 'id="vm-detail-traffic-pool-link"') && str_contains($detail, '本实例本期下载(RX)') && str_contains($detail, '本实例本期上传(TX)') && str_contains($styles, '.cloud-traffic-facts') && str_contains($styles, '.cloud-traffic-instance') + && str_contains($styles, + '.cloud-traffic-instance dl{display:grid;grid-template-columns:repeat(auto-fit,minmax(140px,1fr))') + && str_contains($styles, + '.cloud-traffic-instance .state-pill{max-width:100%;white-space:normal') + && str_contains($styles, + '@media(max-width:1100px){.cloud-traffic-instance{grid-template-columns:1fr}.cloud-traffic-instance dl{grid-template-columns:repeat(2,minmax(0,1fr))') && str_contains($styles, '@media(max-width:510px)') && preg_match( "/venix_asset_version value='20261101[0-9]+'/",