From 0ba3fb2c95e07bbd83d27ef933419b857be1d55a Mon Sep 17 00:00:00 2001 From: codex Date: Thu, 29 Oct 2026 15:39:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20VPC=20=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?=20IP=20=E6=A8=AA=E5=90=91=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/public/cloud/styles.css | 4 ++-- web/public/cloud/vpcs.js | 2 +- web/resources/views/venix/layout_assets.tpl | 2 +- web/tests/CloudVpcUserContractTest.php | 6 +++++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/web/public/cloud/styles.css b/web/public/cloud/styles.css index 00fa1b2d..46791771 100644 --- a/web/public/cloud/styles.css +++ b/web/public/cloud/styles.css @@ -271,7 +271,7 @@ body.vu-body .ssh-key-picker-manage:hover { .user-iso-delete{flex:none;color:#b94b57;border-color:#efd8dc} .user-isos-grid .host-test-status{margin:16px 0 0} .cloud-backups-notice{margin-bottom:20px}.cloud-backups-panel{padding:0;overflow:hidden}.cloud-backups-panel>.panel-heading{padding:20px 22px;border-bottom:1px solid #e8eef2}.cloud-backups-panel>#cloud-backups-status{margin:18px 22px 0}.cloud-backups-list{display:grid;gap:13px;padding:20px 22px}.cloud-backup-card{display:grid;gap:17px;padding:18px;border:1px solid #dfe8ed;border-radius:11px;background:#fff}.cloud-backup-card-heading{display:flex;align-items:flex-start;justify-content:space-between;gap:15px}.cloud-backup-title{display:flex;align-items:center;gap:11px;min-width:0;color:#2b4358;font-size:13px;font-weight:800}.cloud-backup-title>div{display:grid;gap:3px;min-width:0;overflow-wrap:anywhere}.cloud-backup-title small{color:#8192a1;font-size:10px;font-weight:500}.cloud-backup-icon{display:grid;place-items:center;flex:0 0 38px;width:38px;height:38px;border-radius:10px;background:#eaf8f8;color:#168e97;font-size:18px}.cloud-backup-facts{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:11px;margin:0}.cloud-backup-facts>div{display:grid;gap:4px;min-width:0;padding:11px 12px;border-radius:8px;background:#f7f9fa}.cloud-backup-facts dt{color:#8998a6;font-size:9px;font-weight:700}.cloud-backup-facts dd{margin:0;color:#40566a;font-size:11px;font-weight:750;overflow-wrap:anywhere}.cloud-backup-actions{display:flex;align-items:center;justify-content:flex-end;gap:9px;flex-wrap:wrap}.cloud-backups-empty{display:grid;justify-items:center;gap:6px;padding:45px 18px;color:#8595a3;text-align:center}.cloud-backups-empty strong{color:#52697b;font-size:14px}.cloud-backups-empty span{font-size:11px}.cloud-backups-pagination{display:flex;align-items:center;justify-content:center;gap:14px;padding:16px 22px;border-top:1px solid #e8eef2;background:#fbfcfd}.cloud-backups-pagination span{min-width:100px;color:#7f909f;font-size:10px;text-align:center} -.cloud-vpcs-notice{margin-bottom:20px}.cloud-vpcs-stack{display:grid;gap:19px}.cloud-vpc-create-panel,.cloud-vpc-list-panel{min-width:0;min-height:0;overflow:hidden}.cloud-vpc-create-form{display:grid;gap:18px;padding:22px 25px 25px}.cloud-vpc-create-fields{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:18px}.cloud-vpc-create-form .field{min-width:0}.cloud-vpc-create-form .field label{margin-bottom:9px}.cloud-vpc-create-form .field input,.cloud-vpc-create-form .field select{margin:0}.cloud-vpc-create-form .form-error{margin:0}.cloud-vpc-form-actions{display:flex;justify-content:flex-end;padding-top:2px}.cloud-vpc-form-actions .button{min-width:132px}.cloud-vpc-list-panel>#cloud-vpcs-status{margin:18px 22px 0}.cloud-vpc-list{display:grid;gap:15px;padding:20px 22px}.cloud-vpc-card{display:grid;gap:18px;padding:20px;border:1px solid #dfe8ed;border-radius:11px;background:#fff}.cloud-vpc-card-heading{display:flex;align-items:flex-start;justify-content:space-between;gap:15px}.cloud-vpc-card-title{display:flex;align-items:center;gap:11px;min-width:0;color:#2b4358;font-size:14px;font-weight:800}.cloud-vpc-card-title>div{display:grid;gap:4px;min-width:0;overflow-wrap:anywhere}.cloud-vpc-card-title small{color:#718596;font-size:11px;font-weight:600}.cloud-vpc-card-icon{display:grid;place-items:center;flex:0 0 38px;width:38px;height:38px;border-radius:10px;background:#eaf8f8;color:#168e97;font-size:18px}.cloud-vpc-card-facts{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:11px;margin:0}.cloud-vpc-card-facts>div{display:grid;gap:5px;min-width:0;padding:12px 13px;border-radius:8px;background:#f7f9fa}.cloud-vpc-card-facts dt{color:#7b8d9c;font-size:10px;font-weight:750}.cloud-vpc-card-facts dd{margin:0;color:#344e63;font-size:12px;font-weight:750;overflow-wrap:anywhere}.cloud-vpc-instance-manager{display:grid;gap:15px;padding-top:18px;border-top:1px solid #e5ecef}.cloud-vpc-instance-heading>div{display:grid;gap:5px}.cloud-vpc-instance-heading strong{color:#304a60;font-size:14px}.cloud-vpc-instance-heading small{color:#718596;font-size:11px;line-height:1.6}.cloud-vpc-instance-list{display:grid;gap:9px}.cloud-vpc-instance-row{display:grid;grid-template-columns:minmax(0,1fr) auto auto;align-items:center;gap:14px;padding:14px 16px;border:1px solid #dfe8ed;border-radius:9px;background:#fbfcfd}.cloud-vpc-instance-identity{display:grid;min-width:0;gap:5px}.cloud-vpc-instance-identity strong{color:#273f54;font-size:13px;line-height:1.45;overflow-wrap:anywhere}.cloud-vpc-instance-identity span{color:#5e768a;font:600 11px/1.6 ui-monospace,SFMono-Regular,Menlo,monospace;letter-spacing:.01em;overflow-wrap:anywhere}.cloud-vpc-instance-identity small{color:#a27024;font-size:10px;line-height:1.55}.cloud-vpc-instance-actions{display:flex;justify-content:flex-end}.cloud-vpc-instance-empty{margin:0;padding:14px;border:1px dashed #d5e0e5;border-radius:9px;color:#7d8f9e;font-size:11px;text-align:center}.cloud-vpc-attach-form{display:grid;grid-template-columns:minmax(0,1fr) auto;align-items:end;gap:12px}.cloud-vpc-attach-form .field{min-width:0}.cloud-vpc-attach-form .field label{margin-bottom:7px}.cloud-vpc-attach-form .field select{margin:0}.cloud-vpc-attach-form .button{min-width:128px}.cloud-vpc-card-actions{display:flex;align-items:center;justify-content:flex-end;gap:9px;padding-top:2px}.cloud-vpc-empty{display:grid;justify-items:center;gap:6px;padding:45px 18px;color:#8595a3;text-align:center}.cloud-vpc-empty strong{color:#52697b;font-size:14px}.cloud-vpc-empty span{font-size:11px} +.cloud-vpcs-notice{margin-bottom:20px}.cloud-vpcs-stack{display:grid;gap:19px}.cloud-vpc-create-panel,.cloud-vpc-list-panel{min-width:0;min-height:0;overflow:hidden}.cloud-vpc-create-form{display:grid;gap:18px;padding:22px 25px 25px}.cloud-vpc-create-fields{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:18px}.cloud-vpc-create-form .field{min-width:0}.cloud-vpc-create-form .field label{margin-bottom:9px}.cloud-vpc-create-form .field input,.cloud-vpc-create-form .field select{margin:0}.cloud-vpc-create-form .form-error{margin:0}.cloud-vpc-form-actions{display:flex;justify-content:flex-end;padding-top:2px}.cloud-vpc-form-actions .button{min-width:132px}.cloud-vpc-list-panel>#cloud-vpcs-status{margin:18px 22px 0}.cloud-vpc-list{display:grid;gap:15px;padding:20px 22px}.cloud-vpc-card{display:grid;gap:18px;padding:20px;border:1px solid #dfe8ed;border-radius:11px;background:#fff}.cloud-vpc-card-heading{display:flex;align-items:flex-start;justify-content:space-between;gap:15px}.cloud-vpc-card-title{display:flex;align-items:center;gap:11px;min-width:0;color:#2b4358;font-size:14px;font-weight:800}.cloud-vpc-card-title>div{display:grid;gap:4px;min-width:0;overflow-wrap:anywhere}.cloud-vpc-card-title small{color:#718596;font-size:11px;font-weight:600}.cloud-vpc-card-icon{display:grid;place-items:center;flex:0 0 38px;width:38px;height:38px;border-radius:10px;background:#eaf8f8;color:#168e97;font-size:18px}.cloud-vpc-card-facts{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:11px;margin:0}.cloud-vpc-card-facts>div{display:grid;gap:5px;min-width:0;padding:12px 13px;border-radius:8px;background:#f7f9fa}.cloud-vpc-card-facts dt{color:#7b8d9c;font-size:10px;font-weight:750}.cloud-vpc-card-facts dd{margin:0;color:#344e63;font-size:12px;font-weight:750;overflow-wrap:anywhere}.cloud-vpc-instance-manager{display:grid;gap:15px;padding-top:18px;border-top:1px solid #e5ecef}.cloud-vpc-instance-heading>div{display:grid;gap:5px}.cloud-vpc-instance-heading strong{color:#304a60;font-size:14px}.cloud-vpc-instance-heading small{color:#718596;font-size:11px;line-height:1.6}.cloud-vpc-instance-list{display:grid;gap:9px}.cloud-vpc-instance-row{display:grid;grid-template-columns:minmax(0,1fr) auto auto;align-items:center;gap:14px;padding:14px 16px;border:1px solid #dfe8ed;border-radius:9px;background:#fbfcfd}.cloud-vpc-instance-identity{display:grid;grid-template-columns:minmax(135px,.8fr) minmax(150px,.8fr) minmax(240px,1.2fr);align-items:center;min-width:0;gap:6px 20px}.cloud-vpc-instance-identity strong{color:#273f54;font-size:13px;line-height:1.45;overflow-wrap:anywhere}.cloud-vpc-instance-identity span{color:#5e768a;font:600 11px/1.6 ui-monospace,SFMono-Regular,Menlo,monospace;letter-spacing:.01em;overflow-wrap:anywhere}.cloud-vpc-instance-identity small{grid-column:1/-1;color:#a27024;font-size:10px;line-height:1.55}.cloud-vpc-instance-actions{display:flex;justify-content:flex-end}.cloud-vpc-instance-empty{margin:0;padding:14px;border:1px dashed #d5e0e5;border-radius:9px;color:#7d8f9e;font-size:11px;text-align:center}.cloud-vpc-attach-form{display:grid;grid-template-columns:minmax(0,1fr) auto;align-items:end;gap:12px}.cloud-vpc-attach-form .field{min-width:0}.cloud-vpc-attach-form .field label{margin-bottom:7px}.cloud-vpc-attach-form .field select{margin:0}.cloud-vpc-attach-form .button{min-width:128px}.cloud-vpc-card-actions{display:flex;align-items:center;justify-content:flex-end;gap:9px;padding-top:2px}.cloud-vpc-empty{display:grid;justify-items:center;gap:6px;padding:45px 18px;color:#8595a3;text-align:center}.cloud-vpc-empty strong{color:#52697b;font-size:14px}.cloud-vpc-empty span{font-size:11px} .cloud-snapshots-notice{margin-bottom:20px}.cloud-snapshots-panel>#cloud-snapshots-status{margin:18px 22px 0}.cloud-snapshot-card:target{border-color:#6bc1c7;box-shadow:0 0 0 3px rgba(24,166,176,.12)}.cloud-snapshot-icon{background:#eef1fb;color:#6176b5}.cloud-snapshot-actions .danger{color:#b94b57;border-color:#efd8dc} @media(max-width:960px){.user-isos-grid{grid-template-columns:1fr}} @media(max-width:740px){ @@ -337,4 +337,4 @@ body.vu-body .ssh-key-picker-manage:hover { .cloud-vpc-instance-row.selected{border-color:#67c2c7;background:#effafa} .cloud-vpc-instance-row.disabled{opacity:.82} .cloud-vpc-instance-checkbox{width:17px;height:17px;margin:0;accent-color:#18a6b0} -@media(max-width:740px){.cloud-vpc-instance-row{grid-template-columns:auto minmax(0,1fr) auto}.cloud-vpc-instance-actions{grid-column:2/-1}.cloud-vpc-instance-actions:empty{display:none}} +@media(max-width:740px){.cloud-vpc-instance-row{grid-template-columns:auto minmax(0,1fr) auto}.cloud-vpc-instance-identity{grid-template-columns:repeat(2,minmax(0,1fr));gap:7px 12px}.cloud-vpc-instance-identity strong,.cloud-vpc-instance-identity small{grid-column:1/-1}.cloud-vpc-instance-actions{grid-column:2/-1}.cloud-vpc-instance-actions:empty{display:none}} diff --git a/web/public/cloud/vpcs.js b/web/public/cloud/vpcs.js index fc8a723b..009d81b4 100644 --- a/web/public/cloud/vpcs.js +++ b/web/public/cloud/vpcs.js @@ -233,7 +233,7 @@ function renderInstanceRow(instance, vpc, selection, batchBlocked, onSelectionCh identity.append(element('span', '', `公网 IPv4 ${publicIpv4(instance)}`)); identity.append(element('span', '', - `私网 ${port.private_ip || '待分配'} · ${port.mac_address || 'MAC 待生成'}`)); + `私网 IPv4 ${port.private_ip || '待分配'} · ${port.mac_address || 'MAC 待生成'}`)); if (instance.action_unavailable_reason) { identity.append(element('small', '', instance.action_unavailable_reason)); } diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 5cec11d5..edb3cc15 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='2026102905' scope='global'} +{assign var=venix_asset_version value='2026102906' scope='global'} diff --git a/web/tests/CloudVpcUserContractTest.php b/web/tests/CloudVpcUserContractTest.php index de5b690b..b581cfc3 100644 --- a/web/tests/CloudVpcUserContractTest.php +++ b/web/tests/CloudVpcUserContractTest.php @@ -104,11 +104,15 @@ $assert(str_contains($styles, '.cloud-vpc-instance-identity strong{color:#273f54;font-size:13px') && str_contains($styles, '.cloud-vpc-instance-identity span{color:#5e768a;font:600 11px/1.6') + && str_contains($styles, + '.cloud-vpc-instance-identity{display:grid;grid-template-columns:minmax(135px,.8fr) minmax(150px,.8fr) minmax(240px,1.2fr)') + && str_contains($styles, + '.cloud-vpc-instance-identity{grid-template-columns:repeat(2,minmax(0,1fr));gap:7px 12px}') && str_contains($styles, '.cloud-vpc-candidate-identity small{color:#5e768a;font:600 11px/1.55') && str_contains($styles, '.cloud-vpc-instance-identity span{font-size:12px}'), - 'VPC instance names and public/private addresses must remain legible.'); + 'VPC instance names and public/private addresses must remain legible and horizontally aligned.'); $assert(!str_contains($detailTemplate, 'id="vm-settings-nav-vpc"') && !str_contains($detailTemplate, 'id="vm-settings-section-vpc"') && !str_contains($detailTemplate, 'data-instance-setting-tab="vpc"')