diff --git a/web/public/cloud/admin-object-storage.css b/web/public/cloud/admin-object-storage.css index 553de62f..af00ca3f 100644 --- a/web/public/cloud/admin-object-storage.css +++ b/web/public/cloud/admin-object-storage.css @@ -784,35 +784,100 @@ body.os-drawer-open { } } -.os-debt-table { - overflow-x: auto; +.os-cleanup-legend { + display: flex; + flex-wrap: wrap; + gap: 10px 24px; + margin-bottom: 16px; + padding: 12px 14px; + border-radius: 10px; + color: #60758b; + background: #f4f8fa; + font-size: 12px; + line-height: 1.55; } -.os-debt-table table { - width: 100%; - min-width: 780px; - border-collapse: collapse; +.os-cleanup-legend > span { + display: inline-flex; + align-items: center; + gap: 6px; } -.os-debt-table th, -.os-debt-table td { - padding: 12px 10px; - border-bottom: 1px solid #e2e8f0; - text-align: left; - vertical-align: middle; +.os-cleanup-legend i { + color: #0f9fa8; + font-size: 17px; } -.os-debt-table th { - color: #64748b; - font-size: 12px; +.os-cleanup-legend b { + color: #334b62; } -.os-debt-table td { - color: #334155; +.os-debt-list { + overflow: hidden; + border: 1px solid #e0e9ee; + border-radius: 12px; } -.os-debt-table tr:last-child td { - border-bottom: 0; +.os-debt-list-head, +.os-debt-row { + display: grid; + grid-template-columns: minmax(210px, 1.6fr) minmax(125px, 0.8fr) minmax(210px, 1.35fr) minmax(150px, 0.9fr) minmax(110px, 0.65fr); + gap: 14px; + align-items: center; +} + +.os-debt-list-head { + padding: 11px 16px; + color: #7b8da0; + background: #f3f7f9; + font-size: 11px; + font-weight: 800; + letter-spacing: 0.02em; +} + +.os-debt-row { + padding: 15px 16px; + border-top: 1px solid #e5ecef; + background: #fff; +} + +.os-debt-cell { + display: grid; + gap: 5px; + min-width: 0; +} + +.os-debt-cell strong { + overflow-wrap: anywhere; + color: #31495f; + font-size: 13px; +} + +.os-debt-cell small { + overflow-wrap: anywhere; + color: #8192a4; + font-size: 11px; + line-height: 1.45; +} + +.os-cell-label { + display: none; + color: #8495a7; + font-size: 10px; + font-weight: 800; + letter-spacing: 0.05em; +} + +.os-debt-action { + justify-items: start; +} + +.os-waiting-action { + display: inline-flex; + align-items: center; + gap: 5px; + color: #8293a5; + font-size: 12px; } .os-debt-state { @@ -927,4 +992,51 @@ body.os-drawer-open { .os-drawer-footer .btn { flex: 1 1 0; } + + .os-cleanup-legend { + display: grid; + } + + .os-debt-list { + overflow: visible; + border: 0; + } + + .os-debt-list-head { + display: none; + } + + .os-debt-row { + grid-template-columns: repeat(2, minmax(0, 1fr)); + gap: 14px 16px; + margin-bottom: 12px; + padding: 16px; + border: 1px solid #e0e9ee; + border-radius: 12px; + box-shadow: 0 7px 20px rgba(35, 61, 82, 0.04); + } + + .os-debt-identity, + .os-debt-action { + grid-column: 1 / -1; + } + + .os-cell-label { + display: block; + } + + .os-debt-action .btn { + width: 100%; + } +} + +@media (max-width: 480px) { + .os-debt-row { + grid-template-columns: 1fr; + } + + .os-debt-identity, + .os-debt-action { + grid-column: auto; + } } diff --git a/web/resources/views/venix/admin/object_storage.tpl b/web/resources/views/venix/admin/object_storage.tpl index 75cb3cac..4ff5a9c2 100644 --- a/web/resources/views/venix/admin/object_storage.tpl +++ b/web/resources/views/venix/admin/object_storage.tpl @@ -132,22 +132,21 @@
占用空间{$cleanup_debt.summary.bytes} B
{if $cleanup_debt.items|@count > 0} -
- - - - {foreach $cleanup_debt.items as $item} - - - - - - - - - {/foreach} - -
备份用户 / 实例状态删除代次对象大小操作
#{$item.id} {$item.name|escape}
{$item.error_code|escape}
用户 #{$item.user_id}
实例 #{$item.source_instance_id}
{if $item.state == 'delete_attention'}需人工处理{else}自动核对中{/if}总计 {$item.delete_generation}
本轮 {$item.cycle_attempts} / 3
{$item.object_size_bytes} B{if $item.can_retry}{else}等待系统核对{/if}
+
+ 自动核对中系统按受限周期验证对象是否仍存在。 + 需人工处理当前周期已停止,管理员检查后才能重新进入稳定性核对。 +
+
+ + {foreach $cleanup_debt.items as $item} +
+
备份对象#{$item.id} {$item.name|escape}{$item.error_code|escape}
+
归属用户 #{$item.user_id}实例 #{$item.source_instance_id}
+
清理状态{if $item.state == 'delete_attention'}需人工处理{else}自动核对中{/if}{if $item.state == 'delete_attention'}{if $item.attention_at}停止于 {$item.attention_at|date_format:'%Y-%m-%d %H:%M:%S'|escape}{else}等待管理员检查{/if}{else}{if $item.next_check_at}下次核对 {$item.next_check_at|date_format:'%Y-%m-%d %H:%M:%S'|escape}{else}等待调度{/if}{/if}
+
代次 / 大小总计 {$item.delete_generation} · 本轮 {$item.cycle_attempts} / 3{$item.object_size_bytes} B
+
操作{if $item.can_retry}{else}系统处理{/if}
+
+ {/foreach}
{if $cleanup_debt.pagination.total_pages > 1}
diff --git a/web/tests/CloudObjectStorageAdminContractTest.php b/web/tests/CloudObjectStorageAdminContractTest.php index 22432336..c103026d 100644 --- a/web/tests/CloudObjectStorageAdminContractTest.php +++ b/web/tests/CloudObjectStorageAdminContractTest.php @@ -75,6 +75,10 @@ $assert(str_contains($template, "admin_title value='对象存储'") && str_contains($template, 'id="osConfigDrawer"') && str_contains($template, 'id="osReplaceCredentials"') && str_contains($template, '保存任何连接字段都会使当前验证失效') + && str_contains($template, 'class="os-debt-list"') + && str_contains($template, '$item.next_check_at') + && str_contains($template, '$item.attention_at') + && !str_contains($template, '') && str_contains($template, '/cloud/admin-object-storage.css?v={$venix_asset_version}') && str_contains($template, '/cloud/admin-object-storage.js?v={$venix_asset_version}') && !str_contains($template, '