f

apps/bdrp-admin-web/src/views/system/user/list.vue

@@ -42,11 +42,18 @@ const [Grid, gridApi] = useVbenVxeGrid({
     keepSource: true,
     proxyConfig: {
       ajax: {
-        query: async ({ page }, formValues) => {
+        query: async (
+          { page, form }: { page: { currentPage: number; pageSize: number }; form?: Record<string, any> },
+          formValues: Record<string, any>,
+        ) => {
+          const filters =
+            formValues && Object.keys(formValues).length > 0
+              ? formValues
+              : (form ?? {});
           return await getUserList({
             page: page.currentPage,
             pageSize: page.pageSize,
-            ...formValues,
+            ...filters,
           });
         },
       },

apps/bdrp-admin-web/src/views/system/user/modules/form.vue

@@ -43,14 +43,13 @@ const [Drawer, drawerApi] = useVbenDrawer({
     }
 
     drawerApi.lock();
-    (id.value ? updateUser(id.value, values) : createUser(values))
-      .then(() => {
-        emits('success');
-        drawerApi.close();
-      })
-      .catch(() => {
-        drawerApi.unlock();
-      });
+    try {
+      await (id.value ? updateUser(id.value, values) : createUser(values));
+      emits('success');
+      drawerApi.close();
+    } finally {
+      drawerApi.unlock();
+    }
   },
   onOpenChange(isOpen) {
     if (isOpen) {

apps/bdrp-admin-web/src/views/system/user/modules/reset-password-form.vue

@@ -49,14 +49,13 @@ const [Drawer, drawerApi] = useVbenDrawer({
     const values = await formApi.getValues();
 
     drawerApi.lock();
-    resetPassword(id.value, { password: values.password })
-      .then(() => {
-        emits('success');
-        drawerApi.close();
-      })
-      .catch(() => {
-        drawerApi.unlock();
-      });
+    try {
+      await resetPassword(id.value, { password: values.password });
+      emits('success');
+      drawerApi.close();
+    } finally {
+      drawerApi.unlock();
+    }
   },
   onOpenChange(isOpen) {
     if (isOpen) {