From ebfccca608e3f0d8ee41a167090bfa320686de21 Mon Sep 17 00:00:00 2001 From: codex Date: Sun, 1 Nov 2026 15:53:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E4=BF=AE=E7=94=A8=E6=88=B7=20VPC=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/public/cloud/styles.css | 65 ++++++++++--------- .../views/venix/cloud/pages/vpcs.tpl | 20 +++--- web/resources/views/venix/layout_assets.tpl | 2 +- web/tests/CloudVpcUserContractTest.php | 3 + 4 files changed, 51 insertions(+), 39 deletions(-) diff --git a/web/public/cloud/styles.css b/web/public/cloud/styles.css index 9a48b6ed..3240d1e2 100644 --- a/web/public/cloud/styles.css +++ b/web/public/cloud/styles.css @@ -370,19 +370,19 @@ body.vu-body .ssh-key-picker-manage:hover { #cloud-vpcs-workspace h1:focus { outline:none; } #cloud-vpcs-workspace h2 { margin:0; font-size:16px; color:#354f61; } #cloud-vpcs-workspace .button { font-size:13px; min-height:40px; } -#cloud-vpcs-workspace .state-pill { width:fit-content; white-space:nowrap; font-size:12px; padding:6px 10px; } +#cloud-vpcs-workspace .state-pill { width:fit-content; white-space:nowrap; } #cloud-vpcs-workspace .vm-settings-status { margin:0 0 18px; font-size:13px; line-height:1.6; } -.cloud-vpc-list-meta { display:flex; align-items:center; justify-content:space-between; gap:16px; margin-bottom:13px; } -.cloud-vpc-list-meta span { color:#7d91a0; font-size:13px; } -.cloud-vpc-list-panel,.cloud-vpc-create-panel,.cloud-vpc-members-panel { min-height:0; min-width:0; overflow:hidden; box-shadow:none; } -.cloud-vpc-table { width:100%; min-width:0; border-collapse:collapse; table-layout:fixed; text-align:left; font-size:14px; } -.cloud-vpc-table th { height:auto; background:#f8fafb; color:#8093a0; font-size:12px; font-weight:650; padding:17px 20px; border-bottom:1px solid #e5ecf0; } -.cloud-vpc-table td { height:auto; vertical-align:middle; padding:24px 20px; border:0; border-bottom:1px solid #e7edf1; font-size:14px; color:#526c7e; overflow-wrap:anywhere; } +.cloud-vpc-notice { margin-bottom:20px; } +.cloud-vpc-list-panel,.cloud-vpc-create-panel,.cloud-vpc-members-panel { min-height:0; min-width:0; overflow:hidden; } +.cloud-vpc-list { min-width:0; } +.cloud-vpc-table { width:100%; min-width:0; border-collapse:collapse; table-layout:fixed; text-align:left; font-size:13px; } +.cloud-vpc-table th { height:auto; background:#f8fafb; color:#8797a5; font-size:11px; font-weight:750; padding:14px 20px; border-bottom:1px solid #e5ecf0; } +.cloud-vpc-table td { height:auto; vertical-align:middle; padding:19px 20px; border:0; border-bottom:1px solid #e7edf1; font-size:13px; color:#526c7e; overflow-wrap:anywhere; } .cloud-vpc-table tr:last-child>td { border-bottom:0; } .cloud-vpc-table tbody tr:hover { background:#fcfefe; } .cloud-vpc-name-link { color:#344f62; font-weight:650; text-decoration:none; line-height:1.6; } .cloud-vpc-name-link:hover { color:#079ca8; text-decoration:underline; text-underline-offset:4px; } -.cloud-vpc-network-name small { display:block; color:#8295a2; margin-top:5px; font-size:12px; } +.cloud-vpc-network-name small { display:block; color:#8295a2; margin-top:4px; font-size:11px; } .cloud-vpc-network-table th:nth-child(1) { width:34%; } .cloud-vpc-network-table th:nth-child(2) { width:30%; } .cloud-vpc-network-table th:nth-child(3) { width:14%; } @@ -392,17 +392,17 @@ body.vu-body .ssh-key-picker-manage:hover { #cloud-vpcs-workspace .danger { color:#bf4d5a; } #cloud-vpcs-workspace .button.danger { border-color:#e6c7cc; } .cloud-vpc-footnote { color:#7b909f; font-size:12px; line-height:1.7; margin:16px 0 0; } -.cloud-vpc-empty { display:grid; justify-items:center; gap:12px; padding:54px 20px; text-align:center; color:#8094a3; } -.cloud-vpc-empty strong { font-size:16px; color:#4c6678; } -.cloud-vpc-empty p { font-size:13px; line-height:1.7; margin:0; } -.cloud-vpc-create-panel { max-width:900px; } -.cloud-vpc-create-form { display:grid; gap:28px; padding:28px 32px 0; } +.cloud-vpc-empty { display:grid; justify-items:center; gap:10px; margin:18px; padding:42px 20px; border:1px dashed #d8e4e8; border-radius:10px; background:#fbfdfd; text-align:center; color:#8094a3; } +.cloud-vpc-empty strong { font-size:14px; color:#4c6678; } +.cloud-vpc-empty p { font-size:11px; line-height:1.7; margin:0; } +.cloud-vpc-create-panel { width:100%; } +.cloud-vpc-create-form { display:grid; gap:24px; width:100%; max-width:980px; margin:0 auto; padding:25px 28px 0; } .cloud-vpc-create-fields { display:grid; grid-template-columns:repeat(2,minmax(0,1fr)); gap:24px; } .cloud-vpc-create-form .field { display:flex; flex-direction:column; min-width:0; } -.cloud-vpc-create-form .field label { font-size:13px; margin:0 0 10px; } -.cloud-vpc-create-form .field input,.cloud-vpc-create-form .field select { margin:0; height:46px; font-size:16px; } -.cloud-vpc-create-form .field small { color:#7d91a0; font-size:12px; line-height:1.7; margin-top:9px; } -.cloud-vpc-allocation { display:flex; gap:24px; padding:20px 0; border-top:1px solid #e9eef1; border-bottom:1px solid #e9eef1; font-size:13px; } +.cloud-vpc-create-form .field label { font-size:12px; margin:0 0 9px; } +.cloud-vpc-create-form .field input,.cloud-vpc-create-form .field select { margin:0; height:44px; font-size:13px; } +.cloud-vpc-create-form .field small { color:#7d91a0; font-size:11px; line-height:1.7; margin-top:8px; } +.cloud-vpc-allocation { display:flex; gap:24px; padding:16px 18px; border:1px solid #e3ebef; border-radius:10px; background:#f8fbfc; font-size:12px; } .cloud-vpc-allocation>span { color:#7b909f; min-width:88px; } .cloud-vpc-allocation>div { display:grid; gap:6px; } .cloud-vpc-allocation strong { font-size:13px; font-weight:600; } @@ -412,10 +412,12 @@ body.vu-body .ssh-key-picker-manage:hover { .cloud-vpc-create-form>.cloud-vpc-create-footer { margin-top:-12px; } .cloud-vpc-title-row { display:flex; align-items:center; flex-wrap:wrap; gap:14px; } .cloud-vpc-title-row .state-pill { margin-bottom:8px; } -.cloud-vpc-network-summary { display:flex; flex-wrap:wrap; gap:24px 56px; margin:0 0 28px; } -.cloud-vpc-network-summary>div { display:grid; gap:7px; min-width:0; } -.cloud-vpc-network-summary dt { font-size:12px; color:#8295a3; } -.cloud-vpc-network-summary dd { font-size:14px; font-weight:600; margin:0; overflow-wrap:anywhere; } +.cloud-vpc-network-overview { margin:0 0 20px; overflow:hidden; border:1px solid #e3eaef; border-radius:13px; background:#fff; box-shadow:0 10px 30px rgba(19,42,65,.027); } +.cloud-vpc-network-summary { display:grid; grid-template-columns:repeat(3,minmax(0,1fr)); margin:0; } +.cloud-vpc-network-summary>div { display:grid; gap:7px; min-width:0; padding:17px 21px; } +.cloud-vpc-network-summary>div+div { border-left:1px solid #edf1f4; } +.cloud-vpc-network-summary dt { font-size:10px; font-weight:750; color:#8a9aa7; } +.cloud-vpc-network-summary dd { font-size:13px; font-weight:700; margin:0; overflow-wrap:anywhere; } .cloud-vpc-network-summary>div:not(:first-child) dd,.cloud-vpc-table-address code,.cloud-vpc-confirm-instances code { font:500 14px/1.6 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace; color:#486579; background:none; padding:0; } .cloud-vpc-tabs { display:flex; gap:28px; padding:0 24px; border-bottom:1px solid #e5ecf0; } .cloud-vpc-tabs a { display:inline-flex; align-items:center; gap:7px; min-height:58px; padding:17px 0 15px; border-bottom:2px solid transparent; color:#7b909f; text-decoration:none; font-size:14px; font-weight:600; } @@ -475,15 +477,17 @@ html.cloud-vpc-confirm-open { overflow:hidden; } } @media(max-width:760px) { #cloud-vpcs-workspace { padding-bottom:max(8px,env(safe-area-inset-bottom)); } - #cloud-vpcs-workspace .cloud-vpcs-heading { gap:18px; flex-wrap:wrap; margin-bottom:22px; } - #cloud-vpcs-workspace .cloud-vpcs-heading>.button { width:auto; } + #cloud-vpcs-workspace .cloud-vpcs-heading { align-items:stretch; flex-direction:column; gap:18px; margin-bottom:22px; } + #cloud-vpcs-workspace .cloud-vpcs-heading>.button { width:100%; justify-content:center; } #cloud-vpcs-workspace h1 { font-size:25px; } .cloud-vpc-table,.cloud-vpc-table tbody { display:block; } .cloud-vpc-table thead { display:none; } - .cloud-vpc-table tr { display:grid; padding:20px; gap:15px 18px; border-bottom:1px solid #e6edf1; } + .cloud-vpc-table tr { display:grid; padding:17px 16px; gap:13px 16px; border-bottom:1px solid #e6edf1; } .cloud-vpc-table tr:last-child { border-bottom:0; } .cloud-vpc-table td { padding:0; border:0; min-width:0; } - .cloud-vpc-table-address::before,.cloud-vpc-network-count::before { content:attr(data-label); display:block; margin-bottom:4px; font-family:inherit; font-size:12px; line-height:1.6; color:#8a9ca9; } + .cloud-vpc-table-address::before,.cloud-vpc-network-count::before { content:attr(data-label); display:block; margin-bottom:4px; font-family:inherit; font-size:10px; line-height:1.6; color:#8a9ca9; } + .cloud-vpc-network-table tbody { display:grid; gap:10px; padding:12px; background:#f5f8fa; } + .cloud-vpc-network-table tr,.cloud-vpc-network-table tr:last-child { border:1px solid #dfe8ed; border-radius:12px; background:#fff; } .cloud-vpc-network-table tr { grid-template-columns:minmax(0,1fr) auto; } .cloud-vpc-network-name { grid-column:1; grid-row:1; } .cloud-vpc-network-status { grid-column:2; grid-row:1; justify-self:end; } @@ -512,9 +516,9 @@ html.cloud-vpc-confirm-open { overflow:hidden; } .cloud-vpc-instance-status .cloud-vpc-text-button { min-height:40px; margin-top:0; } .cloud-vpc-create-form { gap:24px; padding:24px 20px 0; } .cloud-vpc-create-fields { grid-template-columns:1fr; gap:22px; } - .cloud-vpc-network-summary { display:grid; grid-template-columns:repeat(3,minmax(0,1fr)); gap:0; padding:14px 0; border-block:1px solid #e6edf1; } - .cloud-vpc-network-summary>div { gap:4px; padding:0 12px; } - .cloud-vpc-network-summary>div+div { border-left:1px solid #e6edf1; } + .cloud-vpc-create-form .field input,.cloud-vpc-create-form .field select { font-size:16px; } + .cloud-vpc-network-summary { grid-template-columns:repeat(3,minmax(0,1fr)); } + .cloud-vpc-network-summary>div { gap:4px; padding:14px 12px; } .cloud-vpc-network-summary dt { font-size:10px; } .cloud-vpc-network-summary dd,.cloud-vpc-network-summary>div:not(:first-child) dd { font-size:12px; } .cloud-vpc-tabs { gap:22px; padding-inline:16px; background:#fff; } @@ -538,5 +542,8 @@ html.cloud-vpc-confirm-open { overflow:hidden; } .cloud-vpc-table tr { padding-inline:14px; } .cloud-vpc-confirm { padding:20px; } .cloud-vpc-confirm-instances li { flex-wrap:wrap; gap:4px; } - .cloud-vpc-network-summary>div { padding-inline:8px; } + .cloud-vpc-network-summary { grid-template-columns:1fr; } + .cloud-vpc-network-summary>div { grid-template-columns:100px minmax(0,1fr); align-items:center; padding:12px 14px; } + .cloud-vpc-network-summary>div+div { border-top:1px solid #edf1f4; border-left:0; } + .cloud-vpc-network-summary dd,.cloud-vpc-network-summary>div:not(:first-child) dd { text-align:right; } } diff --git a/web/resources/views/venix/cloud/pages/vpcs.tpl b/web/resources/views/venix/cloud/pages/vpcs.tpl index fc83c1f5..06f47271 100644 --- a/web/resources/views/venix/cloud/pages/vpcs.tpl +++ b/web/resources/views/venix/cloud/pages/vpcs.tpl @@ -4,11 +4,13 @@
-

VPC 私网

管理同地区实例之间的私有网络。

+
PRIVATE NETWORKING

VPC 私网

集中管理同地区实例之间的私有网络。

+ 创建 VPC
-

我的网络

{$cloud_vpc_view.used|default:0|escape:'html'} / {$cloud_vpc_view.maximum|default:16|escape:'html'} 个
-
+
私网与公网相互独立同一 VPC 内的实例默认互通;加入或移出私网不会修改实例的公网配置。
+
+

我的网络

每张 VPC 仅连接同一地区的实例,私网地址由系统统一分配。

{$cloud_vpc_view.used|default:0|escape:'html'} / {$cloud_vpc_view.maximum|default:16|escape:'html'} 个
+
{if !empty($cloud_vpc_view.networks)} @@ -20,15 +22,15 @@ {/foreach}
网络名称 / 地区私网网段实例状态
{else}
还没有 VPC

选择一个地区,建立你的第一张私有网络。

创建 VPC
{/if} -
-

同一 VPC 内默认互通,实例公网配置保持独立。

+
+
-

创建 VPC

先建立网络,再选择需要加入的实例。

+
CREATE PRIVATE NETWORK

创建 VPC

先建立私有网络,再选择需要加入的同地区实例。

+

网络配置

只需填写名称和所属地区,网段与默认网关由系统自动分配。

自动分配地址
-

基本信息

用于识别这张私有网络。
只有同地区的实例可以加入。
@@ -42,8 +44,8 @@
-

{$cloud_vpc_view.current.name|default:''|escape:'html'}

{$cloud_vpc_view.current.state_label|default:''|escape:'html'}

实例成员管理

-
{if !empty($cloud_vpc_view.current)}
地区
{$cloud_vpc_view.current.region_name|escape:'html'}
私网网段
{$cloud_vpc_view.current.cidr|escape:'html'}
默认网关
{$cloud_vpc_view.current.gateway|escape:'html'}
{/if}
+
PRIVATE NETWORK

{$cloud_vpc_view.current.name|default:''|escape:'html'}

{$cloud_vpc_view.current.state_label|default:''|escape:'html'}

管理实例成员、私网地址和连接状态。

+
{if !empty($cloud_vpc_view.current)}
地区
{$cloud_vpc_view.current.region_name|escape:'html'}
私网网段
{$cloud_vpc_view.current.cidr|escape:'html'}
默认网关
{$cloud_vpc_view.current.gateway|escape:'html'}
{/if}
{if !empty($cloud_vpc_view.current.batch)}
正在应用私网变更共 {$cloud_vpc_view.current.batch.total|default:0|escape:'html'} 台 · {$cloud_vpc_view.current.batch.succeeded|default:0|escape:'html'} 台成功。离开页面不会中断任务。
{/if}
diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 5f710035..80b4f894 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='2026110108' scope='global'} +{assign var=venix_asset_version value='2026110109' scope='global'} diff --git a/web/tests/CloudVpcUserContractTest.php b/web/tests/CloudVpcUserContractTest.php index f5636055..9389ea03 100644 --- a/web/tests/CloudVpcUserContractTest.php +++ b/web/tests/CloudVpcUserContractTest.php @@ -83,6 +83,9 @@ $assert(str_contains($template, 'id="cloud-vpcs-home"') && str_contains($template, 'class="inventory-panel cloud-vpc-list-panel"') && str_contains($template, 'class="inventory-panel cloud-vpc-create-panel"') && str_contains($template, 'class="inventory-panel cloud-vpc-members-panel"') + && str_contains($template, 'class="eyebrow">PRIVATE NETWORKING') + && str_contains($template, 'class="panel-heading">

我的网络

') + && str_contains($template, 'class="cloud-vpc-network-overview"') && str_contains($template, 'class="cloud-vpc-create-form"') && str_contains($template, 'class="cloud-vpc-create-footer"') && str_contains($template, 'id="cloud-vpc-batch-status"')