From 01bee126de14b4ae1433325e90320126ffc58f02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E7=99=BB=E5=B1=B1?= <cxymds@qq.com>
Date: Thu, 19 Jun 2025 16:42:23 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E5=88=A0=E9=99=A4=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=A3=80=E6=9F=A5=E4=BF=9D=E7=95=99=E4=B8=8E=E5=90=88?=
 =?UTF-8?q?=E6=B3=95=E4=BF=9D=E7=95=99=E5=B9=B6=E5=85=BC=E5=AE=B9=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=96=87=E4=BB=B6=E6=98=AF=E5=90=A6=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?=E4=B8=8E=E5=90=88=E6=B3=95=E4=BF=9D=E7=95=99=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E3=80=82=20rustfs/s3-rustf?=
 =?UTF-8?q?s#450?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/object/list.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/components/object/list.vue b/components/object/list.vue
index 38a42b5..4516e22 100644
--- a/components/object/list.vue
+++ b/components/object/list.vue
@@ -338,9 +338,10 @@ function handleBatchDelete() {
             const findOne = objects.value.find((obj) => obj.Key === item);
             // 只检查文件，目录递归时再处理
             if (findOne?.type === "object") {
+              // 兼容未设置时的异常
               const [retentionRes, legalHoldRes] = await Promise.all([
-                objectApi.getObjectRetention(item as string),
-                objectApi.getObjectLegalHold(item as string),
+                objectApi.getObjectRetention(item as string).catch(() => ({ Retention: null })),
+                objectApi.getObjectLegalHold(item as string).catch(() => ({ LegalHold: null })),
               ]);
               // 判断合法保留
               const legalHoldOn = legalHoldRes?.LegalHold?.Status === "ON";
@@ -360,8 +361,8 @@ function handleBatchDelete() {
               // 目录递归下的每个文件都要检查
               await objectApi.mapAllFiles(bucketName.value, findOne.Key, async (fileKey: string) => {
                 const [retentionRes, legalHoldRes] = await Promise.all([
-                  objectApi.getObjectRetention(fileKey),
-                  objectApi.getObjectLegalHold(fileKey),
+                  objectApi.getObjectRetention(fileKey).catch(() => ({ Retention: null })),
+                  objectApi.getObjectLegalHold(fileKey).catch(() => ({ LegalHold: null })),
                 ]);
                 const legalHoldOn = legalHoldRes?.LegalHold?.Status === "ON";
                 let retentionOn = false;
@@ -389,7 +390,7 @@ function handleBatchDelete() {
 
         // 执行删除
         await Promise.all(deletableKeys.map((item) => deleteTaskStore.addKeys([String(item)], bucketName.value)));
-        message.success("删除中");
+        message.success("删除成功");
         salt.value = randomString();
         refresh();
       } catch (error) {