@yimingliao/cms 0.0.93 → 0.0.94

package/dist/server/index.js

@@ -3251,8 +3251,16 @@ function createFileSoftDeleteManyAction(ctx) {
         const { ids: ids2 } = await fileSoftDeleteManyValidator(schemas).parseAsync(formData);
         const foundFiles = await fileQueryRepository.findManyByIds({ ids: ids2 });
         if (foundFiles.length === 0) throw ServerError.notFound();
-        const targetIds = foundFiles.filter((f) => !f.isLocked).map((f) => f.id);
-        const hasLockedFile = ids2.length !== targetIds.length;
+        const lockedFiles = [];
+        const targetIds = [];
+        for (const file of foundFiles) {
+          if (isFileLocked(file)) {
+            lockedFiles.push(file.id);
+          } else {
+            targetIds.push(file.id);
+          }
+        }
+        const hasLockedFile = lockedFiles.length > 0;
         const count = await fileCommandRepository.softDeleteMany({
           ids: targetIds
         });
@@ -3260,7 +3268,7 @@ function createFileSoftDeleteManyAction(ctx) {
           throw new ServerError({ i18nKey: "error.files-batch-destroy-no" });
         }
         return {
-          i18nKey: hasLockedFile ? "ok.destroy-ok" : "ok.files-batch-destroy-has-locked"
+          i18nKey: hasLockedFile ? "ok.files-batch-destroy-has-locked" : "ok.destroy-ok"
         };
       },
       { type: "command" }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yimingliao/cms",
-  "version": "0.0.93",
+  "version": "0.0.94",
   "author": "Yiming Liao",
   "license": "MIT",
   "type": "module",