From 5026ae0bbd3a645b18b5abebab83cdf8563997a6 Mon Sep 17 00:00:00 2001
From: Kven <2955163637@qq.com>
Date: Wed, 28 May 2025 20:23:08 +0800
Subject: [PATCH] =?UTF-8?q?refactor(@vben/web-antd):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E7=BB=84=E4=BB=B6=E7=9A=84=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=92=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/dept/data.ts          |  2 +-
 apps/web-antd/src/views/dept/list.vue         |  2 +-
 apps/web-antd/src/views/ppt/index.vue         |  4 +---
 apps/web-antd/src/views/role/list.vue         |  6 +++---
 apps/web-antd/src/views/role/modules/form.vue |  4 ++++
 apps/web-antd/src/views/user/data.ts          | 12 +++++++++++-
 apps/web-antd/src/views/user/list.vue         |  6 +++---
 7 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/apps/web-antd/src/views/dept/data.ts b/apps/web-antd/src/views/dept/data.ts
index af1e9b9..a4495ac 100644
--- a/apps/web-antd/src/views/dept/data.ts
+++ b/apps/web-antd/src/views/dept/data.ts
@@ -21,7 +21,7 @@ function transformToTreeData(data: any) {
 }
 
 // 使用示例
-getAllDeptTree(1).then((res) => {
+getAllDeptTree(0).then((res) => {
   treeData.value = transformToTreeData(res);
 });
 /**
diff --git a/apps/web-antd/src/views/dept/list.vue b/apps/web-antd/src/views/dept/list.vue
index 66eb3cf..ca3d1d7 100644
--- a/apps/web-antd/src/views/dept/list.vue
+++ b/apps/web-antd/src/views/dept/list.vue
@@ -105,7 +105,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     proxyConfig: {
       ajax: {
         query: async (_params) => {
-          const res = await getAllDeptTree(1);
+          const res = await getAllDeptTree(0);
           return {
             items: res,
           };
diff --git a/apps/web-antd/src/views/ppt/index.vue b/apps/web-antd/src/views/ppt/index.vue
index cbb605a..5c0eb3a 100644
--- a/apps/web-antd/src/views/ppt/index.vue
+++ b/apps/web-antd/src/views/ppt/index.vue
@@ -1,7 +1,5 @@
 <script lang="ts" setup>
-import type { PPTTempItem } from '@vben/common-ui';
-
-import type { ResultItem } from './typing';
+import type { PPTTempItem, ResultItem } from './typing';
 
 import { onMounted, reactive, ref } from 'vue';
 
diff --git a/apps/web-antd/src/views/role/list.vue b/apps/web-antd/src/views/role/list.vue
index 0ab77e5..1959c57 100644
--- a/apps/web-antd/src/views/role/list.vue
+++ b/apps/web-antd/src/views/role/list.vue
@@ -104,12 +104,12 @@ function confirm(content: string, title: string) {
  */
 async function onStatusChange(newStatus: number, row: RoleApi.Role) {
   const status: Recordable<string> = {
-    0: '禁用',
-    1: '启用',
+    false: '禁用',
+    true: '启用',
   };
   try {
     await confirm(
-      `你要将${row.name}的状态切换为 【${status[newStatus.toString()]}】 吗？`,
+      `你要将${row.name}的状态切换为 【${status[newStatus]}】 吗？`,
       `切换状态`,
     );
     await enabledRole(row.id);
diff --git a/apps/web-antd/src/views/role/modules/form.vue b/apps/web-antd/src/views/role/modules/form.vue
index 780016c..e2983db 100644
--- a/apps/web-antd/src/views/role/modules/form.vue
+++ b/apps/web-antd/src/views/role/modules/form.vue
@@ -36,6 +36,10 @@ const [Drawer, drawerApi] = useVbenDrawer({
     const { valid } = await formApi.validate();
     if (!valid) return;
     const values = await formApi.getValues();
+    // 过滤 menuIds 中的 null/undefined/false 值
+    if (Array.isArray(values.menuIds)) {
+      values.menuIds = values.menuIds.filter((id) => id !== null && id !== '');
+    }
     drawerApi.lock();
     (id.value ? updateRole(id.value, values) : createRole(values))
       .then(() => {
diff --git a/apps/web-antd/src/views/user/data.ts b/apps/web-antd/src/views/user/data.ts
index 6ba23f7..018bae6 100644
--- a/apps/web-antd/src/views/user/data.ts
+++ b/apps/web-antd/src/views/user/data.ts
@@ -56,7 +56,7 @@ export function useFormSchema(): VbenFormSchema[] {
       rules: 'required',
     },
     {
-      component: 'Input',
+      component: 'InputPassword',
       fieldName: 'password',
       label: '密码',
       rules: 'required',
@@ -186,6 +186,16 @@ export function useColumns<T = UserApi.User>(
           nameField: 'name',
           nameTitle: '用户',
           onClick: onActionClick,
+          options: [
+            {
+              code: 'edit',
+              text: '修改',
+            },
+            {
+              code: 'delete',
+              text: '删除',
+            },
+          ],
         },
         name: 'CellOperation',
       },
diff --git a/apps/web-antd/src/views/user/list.vue b/apps/web-antd/src/views/user/list.vue
index 94f220d..2d254f4 100644
--- a/apps/web-antd/src/views/user/list.vue
+++ b/apps/web-antd/src/views/user/list.vue
@@ -104,12 +104,12 @@ function confirm(content: string, title: string) {
  */
 async function onStatusChange(newStatus: number, row: UserApi.User) {
   const status: Recordable<string> = {
-    0: '禁用',
-    1: '启用',
+    false: '禁用',
+    true: '启用',
   };
   try {
     await confirm(
-      `你要将${row.name}的状态切换为 【${status[newStatus.toString()]}】 吗？`,
+      `你要将${row.name}的状态切换为 【${status[newStatus]}】 吗？`,
       `切换状态`,
     );
     await enabledUser(row.id);