diff --git a/apps/web-antd/src/views/bpm/category/modules/form.vue b/apps/web-antd/src/views/bpm/category/modules/form.vue
index d3f9f06c4..b331aeb85 100644
--- a/apps/web-antd/src/views/bpm/category/modules/form.vue
+++ b/apps/web-antd/src/views/bpm/category/modules/form.vue
@@ -50,7 +50,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -69,7 +69,7 @@ const [Modal, modalApi] = useVbenModal({
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/infra/apiAccessLog/modules/detail.vue b/apps/web-antd/src/views/infra/apiAccessLog/modules/detail.vue
index bfc8aee06..33c7f2633 100644
--- a/apps/web-antd/src/views/infra/apiAccessLog/modules/detail.vue
+++ b/apps/web-antd/src/views/infra/apiAccessLog/modules/detail.vue
@@ -28,7 +28,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = data;
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/infra/apiErrorLog/modules/detail.vue b/apps/web-antd/src/views/infra/apiErrorLog/modules/detail.vue
index 7832783a1..dec2b3efb 100644
--- a/apps/web-antd/src/views/infra/apiErrorLog/modules/detail.vue
+++ b/apps/web-antd/src/views/infra/apiErrorLog/modules/detail.vue
@@ -28,7 +28,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = data;
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/infra/codegen/modules/import-table.vue b/apps/web-antd/src/views/infra/codegen/modules/import-table.vue
index 5c0b59d33..9684d501e 100644
--- a/apps/web-antd/src/views/infra/codegen/modules/import-table.vue
+++ b/apps/web-antd/src/views/infra/codegen/modules/import-table.vue
@@ -110,7 +110,7 @@ const [Modal, modalApi] = useVbenModal({
       });
     } finally {
       hideLoading();
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/infra/config/modules/form.vue b/apps/web-antd/src/views/infra/config/modules/form.vue
index 389648c65..1278efbea 100644
--- a/apps/web-antd/src/views/infra/config/modules/form.vue
+++ b/apps/web-antd/src/views/infra/config/modules/form.vue
@@ -53,7 +53,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/infra/dataSourceConfig/modules/form.vue b/apps/web-antd/src/views/infra/dataSourceConfig/modules/form.vue
index ab66b86be..d73b586cb 100644
--- a/apps/web-antd/src/views/infra/dataSourceConfig/modules/form.vue
+++ b/apps/web-antd/src/views/infra/dataSourceConfig/modules/form.vue
@@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -79,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue
index b9b5ea2db..5d01994bd 100644
--- a/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue
+++ b/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue
@@ -59,7 +59,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -78,7 +78,7 @@ const [Modal, modalApi] = useVbenModal({
       try {
         data = await getDemo01Contact(data.id);
       } finally {
-        modalApi.lock(false);
+        modalApi.unlock();
       }
     }
     // 设置到 values
diff --git a/apps/web-antd/src/views/infra/demo/demo02/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo02/modules/form.vue
index 3d38f5bae..3d203b320 100644
--- a/apps/web-antd/src/views/infra/demo/demo02/modules/form.vue
+++ b/apps/web-antd/src/views/infra/demo/demo02/modules/form.vue
@@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -86,7 +86,7 @@ const [Modal, modalApi] = useVbenModal({
       try {
         data = await getDemo02Category(data.id);
       } finally {
-        modalApi.lock(false);
+        modalApi.unlock();
       }
     }
     // 设置到 values
diff --git a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-course-form.vue b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-course-form.vue
index d98f4fa1b..b386ed401 100644
--- a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-course-form.vue
+++ b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-course-form.vue
@@ -61,7 +61,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -80,7 +80,7 @@ const [Modal, modalApi] = useVbenModal({
       try {
         data = await getDemo03Course(data.id);
       } finally {
-        modalApi.lock(false);
+        modalApi.unlock();
       }
     }
     // 设置到 values
diff --git a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-grade-form.vue b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-grade-form.vue
index 4b134e203..23fdeb54b 100644
--- a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-grade-form.vue
+++ b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-grade-form.vue
@@ -61,7 +61,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -80,7 +80,7 @@ const [Modal, modalApi] = useVbenModal({
       try {
         data = await getDemo03Grade(data.id);
       } finally {
-        modalApi.lock(false);
+        modalApi.unlock();
       }
     }
     // 设置到 values
diff --git a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/form.vue
index 8fee6aa28..3795215b1 100644
--- a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/form.vue
+++ b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/form.vue
@@ -59,7 +59,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -78,7 +78,7 @@ const [Modal, modalApi] = useVbenModal({
       try {
         data = await getDemo03Student(data.id);
       } finally {
-        modalApi.lock(false);
+        modalApi.unlock();
       }
     }
     // 设置到 values
diff --git a/apps/web-antd/src/views/infra/demo/demo03/inner/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo03/inner/modules/form.vue
index 1c5e65090..51d91311b 100644
--- a/apps/web-antd/src/views/infra/demo/demo03/inner/modules/form.vue
+++ b/apps/web-antd/src/views/infra/demo/demo03/inner/modules/form.vue
@@ -61,9 +61,8 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as Demo03StudentApi.Demo03Student;
     // 拼接子表的数据
-    // TODO @puhui999：字段对不上
-    data.demo03Courses = demo03CourseFormRef.value?.getData();
-    data.demo03Grade = await demo03GradeFormRef.value?.getValues();
+    data.demo03courses = demo03CourseFormRef.value?.getData();
+    data.demo03grade = await demo03GradeFormRef.value?.getValues();
     try {
       await (formData.value?.id
         ? updateDemo03Student(data)
@@ -76,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -95,7 +94,7 @@ const [Modal, modalApi] = useVbenModal({
       try {
         data = await getDemo03Student(data.id);
       } finally {
-        modalApi.lock(false);
+        modalApi.unlock();
       }
     }
     // 设置到 values
diff --git a/apps/web-antd/src/views/infra/demo/demo03/normal/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo03/normal/modules/form.vue
index 520226889..c8e47dcf7 100644
--- a/apps/web-antd/src/views/infra/demo/demo03/normal/modules/form.vue
+++ b/apps/web-antd/src/views/infra/demo/demo03/normal/modules/form.vue
@@ -61,8 +61,8 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as Demo03StudentApi.Demo03Student;
     // 拼接子表的数据
-    data.demo03Courses = demo03CourseFormRef.value?.getData();
-    data.demo03Grade = await demo03GradeFormRef.value?.getValues();
+    data.demo03courses = demo03CourseFormRef.value?.getData();
+    data.demo03grade = await demo03GradeFormRef.value?.getValues();
     try {
       await (formData.value?.id
         ? updateDemo03Student(data)
@@ -75,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -94,7 +94,7 @@ const [Modal, modalApi] = useVbenModal({
       try {
         data = await getDemo03Student(data.id);
       } finally {
-        modalApi.lock(false);
+        modalApi.unlock();
       }
     }
     // 设置到 values
diff --git a/apps/web-antd/src/views/infra/demo/general/demo01/modules/form.vue b/apps/web-antd/src/views/infra/demo/general/demo01/modules/form.vue
index a0862b012..537353c7b 100644
--- a/apps/web-antd/src/views/infra/demo/general/demo01/modules/form.vue
+++ b/apps/web-antd/src/views/infra/demo/general/demo01/modules/form.vue
@@ -82,7 +82,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -101,7 +101,7 @@ const [Modal, modalApi] = useVbenModal({
       try {
         data = await getDemo01Contact(data.id);
       } finally {
-        modalApi.lock(false);
+        modalApi.unlock();
       }
     }
     formData.value = data;
diff --git a/apps/web-antd/src/views/infra/file/modules/form.vue b/apps/web-antd/src/views/infra/file/modules/form.vue
index 9eb497e42..5a668084a 100644
--- a/apps/web-antd/src/views/infra/file/modules/form.vue
+++ b/apps/web-antd/src/views/infra/file/modules/form.vue
@@ -46,7 +46,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/infra/fileConfig/modules/form.vue b/apps/web-antd/src/views/infra/fileConfig/modules/form.vue
index a7393833d..d9ce11a2f 100644
--- a/apps/web-antd/src/views/infra/fileConfig/modules/form.vue
+++ b/apps/web-antd/src/views/infra/fileConfig/modules/form.vue
@@ -59,7 +59,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -78,7 +78,7 @@ const [Modal, modalApi] = useVbenModal({
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/infra/job/logger/modules/detail.vue b/apps/web-antd/src/views/infra/job/logger/modules/detail.vue
index ac33769b3..2b52c6c13 100644
--- a/apps/web-antd/src/views/infra/job/logger/modules/detail.vue
+++ b/apps/web-antd/src/views/infra/job/logger/modules/detail.vue
@@ -29,7 +29,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getJobLog(data.id);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/infra/job/modules/detail.vue b/apps/web-antd/src/views/infra/job/modules/detail.vue
index 7c9f3f452..8ebd101ec 100644
--- a/apps/web-antd/src/views/infra/job/modules/detail.vue
+++ b/apps/web-antd/src/views/infra/job/modules/detail.vue
@@ -32,7 +32,7 @@ const [Modal, modalApi] = useVbenModal({
       // 获取下一次执行时间
       nextTimes.value = await getJobNextTimes(data.id);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/infra/job/modules/form.vue b/apps/web-antd/src/views/infra/job/modules/form.vue
index 31653a8ee..ea09368c9 100644
--- a/apps/web-antd/src/views/infra/job/modules/form.vue
+++ b/apps/web-antd/src/views/infra/job/modules/form.vue
@@ -53,7 +53,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/area/modules/form.vue b/apps/web-antd/src/views/system/area/modules/form.vue
index 071af7ed1..3bb4e3926 100644
--- a/apps/web-antd/src/views/system/area/modules/form.vue
+++ b/apps/web-antd/src/views/system/area/modules/form.vue
@@ -40,7 +40,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/dept/modules/form.vue b/apps/web-antd/src/views/system/dept/modules/form.vue
index f9b9d9e0b..7e11979d8 100644
--- a/apps/web-antd/src/views/system/dept/modules/form.vue
+++ b/apps/web-antd/src/views/system/dept/modules/form.vue
@@ -53,12 +53,12 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      formData.value = undefined;
+      formApi.resetForm();
       return;
     }
     // 加载数据
@@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({
       try {
         data = await getDept(data.id);
       } finally {
-        modalApi.lock(false);
+        modalApi.unlock();
       }
     }
     // 设置到 values
diff --git a/apps/web-antd/src/views/system/dict/modules/data-form.vue b/apps/web-antd/src/views/system/dict/modules/data-form.vue
index 06cda33fd..32ad98bb0 100644
--- a/apps/web-antd/src/views/system/dict/modules/data-form.vue
+++ b/apps/web-antd/src/views/system/dict/modules/data-form.vue
@@ -59,7 +59,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -82,7 +82,7 @@ const [Modal, modalApi] = useVbenModal({
           await formApi.setValues(formData.value);
         }
       } finally {
-        modalApi.lock(false);
+        modalApi.unlock();
       }
     } else if (data && 'dictType' in data && data.dictType) {
       // 新增时，如果传入了dictType，则需要设置
diff --git a/apps/web-antd/src/views/system/dict/modules/type-form.vue b/apps/web-antd/src/views/system/dict/modules/type-form.vue
index b48decb54..39ff329fa 100644
--- a/apps/web-antd/src/views/system/dict/modules/type-form.vue
+++ b/apps/web-antd/src/views/system/dict/modules/type-form.vue
@@ -57,7 +57,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -78,7 +78,7 @@ const [Modal, modalApi] = useVbenModal({
         await formApi.setValues(formData.value);
       }
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/loginlog/modules/detail.vue b/apps/web-antd/src/views/system/loginlog/modules/detail.vue
index 8d21d4ff7..0d624d2e9 100644
--- a/apps/web-antd/src/views/system/loginlog/modules/detail.vue
+++ b/apps/web-antd/src/views/system/loginlog/modules/detail.vue
@@ -28,7 +28,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = data;
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/mail/account/modules/form.vue b/apps/web-antd/src/views/system/mail/account/modules/form.vue
index d107a94ff..51a227bb8 100644
--- a/apps/web-antd/src/views/system/mail/account/modules/form.vue
+++ b/apps/web-antd/src/views/system/mail/account/modules/form.vue
@@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -79,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/mail/log/modules/detail.vue b/apps/web-antd/src/views/system/mail/log/modules/detail.vue
index 9857ff9e4..9b0016833 100644
--- a/apps/web-antd/src/views/system/mail/log/modules/detail.vue
+++ b/apps/web-antd/src/views/system/mail/log/modules/detail.vue
@@ -28,7 +28,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = data;
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/mail/template/modules/form.vue b/apps/web-antd/src/views/system/mail/template/modules/form.vue
index eadac6e5c..33018e417 100644
--- a/apps/web-antd/src/views/system/mail/template/modules/form.vue
+++ b/apps/web-antd/src/views/system/mail/template/modules/form.vue
@@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -79,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/mail/template/modules/send-form.vue b/apps/web-antd/src/views/system/mail/template/modules/send-form.vue
index cdb51cf61..8d5913a4c 100644
--- a/apps/web-antd/src/views/system/mail/template/modules/send-form.vue
+++ b/apps/web-antd/src/views/system/mail/template/modules/send-form.vue
@@ -61,7 +61,7 @@ const [Modal, modalApi] = useVbenModal({
     } catch (error) {
       console.error('发送邮件失败', error);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
diff --git a/apps/web-antd/src/views/system/menu/modules/form.vue b/apps/web-antd/src/views/system/menu/modules/form.vue
index be090afec..b294abf3e 100644
--- a/apps/web-antd/src/views/system/menu/modules/form.vue
+++ b/apps/web-antd/src/views/system/menu/modules/form.vue
@@ -53,7 +53,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({
       try {
         data = await getMenu(data.id as number);
       } finally {
-        modalApi.lock(false);
+        modalApi.unlock();
       }
     }
     // 设置到 values
diff --git a/apps/web-antd/src/views/system/notice/modules/form.vue b/apps/web-antd/src/views/system/notice/modules/form.vue
index 8df1d3c84..0722f75d4 100644
--- a/apps/web-antd/src/views/system/notice/modules/form.vue
+++ b/apps/web-antd/src/views/system/notice/modules/form.vue
@@ -53,7 +53,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -74,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({
         await formApi.setValues(formData.value);
       }
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/notify/message/modules/detail.vue b/apps/web-antd/src/views/system/notify/message/modules/detail.vue
index 2f8e03a3f..1818b10f1 100644
--- a/apps/web-antd/src/views/system/notify/message/modules/detail.vue
+++ b/apps/web-antd/src/views/system/notify/message/modules/detail.vue
@@ -28,7 +28,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = data;
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/notify/my/modules/detail.vue b/apps/web-antd/src/views/system/notify/my/modules/detail.vue
index 69dc6b02e..53afbc313 100644
--- a/apps/web-antd/src/views/system/notify/my/modules/detail.vue
+++ b/apps/web-antd/src/views/system/notify/my/modules/detail.vue
@@ -78,7 +78,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = data;
       descApi.setState({ data });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/notify/template/modules/form.vue b/apps/web-antd/src/views/system/notify/template/modules/form.vue
index 8a3c4a4e7..59a5c5066 100644
--- a/apps/web-antd/src/views/system/notify/template/modules/form.vue
+++ b/apps/web-antd/src/views/system/notify/template/modules/form.vue
@@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -79,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/notify/template/modules/send-form.vue b/apps/web-antd/src/views/system/notify/template/modules/send-form.vue
index 52a36044c..e18c92a7f 100644
--- a/apps/web-antd/src/views/system/notify/template/modules/send-form.vue
+++ b/apps/web-antd/src/views/system/notify/template/modules/send-form.vue
@@ -63,7 +63,7 @@ const [Modal, modalApi] = useVbenModal({
     } catch (error) {
       console.error('发送站内信失败', error);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
diff --git a/apps/web-antd/src/views/system/oauth2/client/modules/form.vue b/apps/web-antd/src/views/system/oauth2/client/modules/form.vue
index 38a07370f..735166159 100644
--- a/apps/web-antd/src/views/system/oauth2/client/modules/form.vue
+++ b/apps/web-antd/src/views/system/oauth2/client/modules/form.vue
@@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -79,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/operatelog/modules/detail.vue b/apps/web-antd/src/views/system/operatelog/modules/detail.vue
index a28238680..b18a1578d 100644
--- a/apps/web-antd/src/views/system/operatelog/modules/detail.vue
+++ b/apps/web-antd/src/views/system/operatelog/modules/detail.vue
@@ -25,7 +25,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = data;
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/post/modules/form.vue b/apps/web-antd/src/views/system/post/modules/form.vue
index 967a2e45b..ec45da576 100644
--- a/apps/web-antd/src/views/system/post/modules/form.vue
+++ b/apps/web-antd/src/views/system/post/modules/form.vue
@@ -53,7 +53,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue b/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue
index 6fd2b2c95..d98bb1f6f 100644
--- a/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue
+++ b/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue
@@ -64,7 +64,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -83,7 +83,7 @@ const [Modal, modalApi] = useVbenModal({
       await loadDeptTree();
       toggleExpandAll();
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue b/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
index b7c9e572f..1aa913350 100644
--- a/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
+++ b/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
@@ -59,7 +59,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -80,7 +80,7 @@ const [Modal, modalApi] = useVbenModal({
       // 加载菜单列表
       await loadMenuTree();
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/role/modules/form.vue b/apps/web-antd/src/views/system/role/modules/form.vue
index 30c169844..a71c296d7 100644
--- a/apps/web-antd/src/views/system/role/modules/form.vue
+++ b/apps/web-antd/src/views/system/role/modules/form.vue
@@ -53,7 +53,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/sms/channel/modules/form.vue b/apps/web-antd/src/views/system/sms/channel/modules/form.vue
index ebf3b1591..af45003c2 100644
--- a/apps/web-antd/src/views/system/sms/channel/modules/form.vue
+++ b/apps/web-antd/src/views/system/sms/channel/modules/form.vue
@@ -59,7 +59,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -78,7 +78,7 @@ const [Modal, modalApi] = useVbenModal({
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/sms/log/modules/detail.vue b/apps/web-antd/src/views/system/sms/log/modules/detail.vue
index 8211846fd..8711724a2 100644
--- a/apps/web-antd/src/views/system/sms/log/modules/detail.vue
+++ b/apps/web-antd/src/views/system/sms/log/modules/detail.vue
@@ -28,7 +28,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = data;
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/sms/template/modules/form.vue b/apps/web-antd/src/views/system/sms/template/modules/form.vue
index e89992d8b..438d92837 100644
--- a/apps/web-antd/src/views/system/sms/template/modules/form.vue
+++ b/apps/web-antd/src/views/system/sms/template/modules/form.vue
@@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -79,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/sms/template/modules/send-form.vue b/apps/web-antd/src/views/system/sms/template/modules/send-form.vue
index e677bfd04..862ea313d 100644
--- a/apps/web-antd/src/views/system/sms/template/modules/send-form.vue
+++ b/apps/web-antd/src/views/system/sms/template/modules/send-form.vue
@@ -61,7 +61,7 @@ const [Modal, modalApi] = useVbenModal({
     } catch (error) {
       console.error('发送短信失败', error);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
diff --git a/apps/web-antd/src/views/system/social/client/modules/form.vue b/apps/web-antd/src/views/system/social/client/modules/form.vue
index ba5f069c3..ac7088a7f 100644
--- a/apps/web-antd/src/views/system/social/client/modules/form.vue
+++ b/apps/web-antd/src/views/system/social/client/modules/form.vue
@@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -79,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/social/user/modules/detail.vue b/apps/web-antd/src/views/system/social/user/modules/detail.vue
index 16f0733a5..cbd86afd8 100644
--- a/apps/web-antd/src/views/system/social/user/modules/detail.vue
+++ b/apps/web-antd/src/views/system/social/user/modules/detail.vue
@@ -30,7 +30,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getSocialUser(data.id);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/tenant/modules/form.vue b/apps/web-antd/src/views/system/tenant/modules/form.vue
index 4d31c3352..6f744a4db 100644
--- a/apps/web-antd/src/views/system/tenant/modules/form.vue
+++ b/apps/web-antd/src/views/system/tenant/modules/form.vue
@@ -53,7 +53,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/tenantPackage/modules/form.vue b/apps/web-antd/src/views/system/tenantPackage/modules/form.vue
index d862ce036..ea973ed0a 100644
--- a/apps/web-antd/src/views/system/tenantPackage/modules/form.vue
+++ b/apps/web-antd/src/views/system/tenantPackage/modules/form.vue
@@ -68,7 +68,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -88,7 +88,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = await getTenantPackage(data.id as number);
       await formApi.setValues(data);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/user/modules/assign-role-form.vue b/apps/web-antd/src/views/system/user/modules/assign-role-form.vue
index 28068e347..6131dbb8d 100644
--- a/apps/web-antd/src/views/system/user/modules/assign-role-form.vue
+++ b/apps/web-antd/src/views/system/user/modules/assign-role-form.vue
@@ -47,7 +47,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -68,7 +68,7 @@ const [Modal, modalApi] = useVbenModal({
         roleIds,
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/user/modules/form.vue b/apps/web-antd/src/views/system/user/modules/form.vue
index 9b5c9cffd..325933004 100644
--- a/apps/web-antd/src/views/system/user/modules/form.vue
+++ b/apps/web-antd/src/views/system/user/modules/form.vue
@@ -53,7 +53,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/user/modules/import-form.vue b/apps/web-antd/src/views/system/user/modules/import-form.vue
index 10c4def1e..c43dc0c29 100644
--- a/apps/web-antd/src/views/system/user/modules/import-form.vue
+++ b/apps/web-antd/src/views/system/user/modules/import-form.vue
@@ -46,7 +46,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/system/user/modules/reset-password-form.vue b/apps/web-antd/src/views/system/user/modules/reset-password-form.vue
index 8dee8c64f..6c685e2ba 100644
--- a/apps/web-antd/src/views/system/user/modules/reset-password-form.vue
+++ b/apps/web-antd/src/views/system/user/modules/reset-password-form.vue
@@ -44,7 +44,7 @@ const [Modal, modalApi] = useVbenModal({
         key: 'action_process_msg',
       });
     } finally {
-      modalApi.lock(false);
+      modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {