feat：角色 role 的分配菜单 100%（基于 VbenTree）

apps/web-antd/src/api/system/menu/index.ts

@@ -0,0 +1,52 @@
+import { requestClient } from '#/api/request';
+
+export namespace SystemMenuApi {
+  /** 菜单信息 */
+  export interface MenuVO {
+    id: number;
+    name: string;
+    permission: string;
+    type: number;
+    sort: number;
+    parentId: number;
+    path: string;
+    icon: string;
+    component: string;
+    componentName?: string;
+    status: number;
+    visible: boolean;
+    keepAlive: boolean;
+    alwaysShow?: boolean;
+    createTime: Date;
+  }
+}
+
+/** 查询菜单（精简）列表 */
+export async function getSimpleMenusList() {
+  return requestClient.get('/system/menu/simple-list');
+}
+
+/** 查询菜单列表 */
+export async function getMenuList(params?: Record<string, any>) {
+  return requestClient.get('/system/menu/list', { params });
+}
+
+/** 获取菜单详情 */
+export async function getMenu(id: number) {
+  return requestClient.get(`/system/menu/get?id=${id}`);
+}
+
+/** 新增菜单 */
+export async function createMenu(data: SystemMenuApi.MenuVO) {
+  return requestClient.post('/system/menu/create', data);
+}
+
+/** 修改菜单 */
+export async function updateMenu(data: SystemMenuApi.MenuVO) {
+  return requestClient.put('/system/menu/update', data);
+}
+
+/** 删除菜单 */
+export async function deleteMenu(id: number) {
+  return requestClient.delete(`/system/menu/delete?id=${id}`);
+}

apps/web-antd/src/views/system/role/data.ts

@@ -114,6 +114,44 @@ export function useAssignDataPermissionFormSchema(): VbenFormSchema[] {
   ];
 }
 
+/** 分配菜单的表单 */
+export function useAssignMenuFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      component: 'Input',
+      fieldName: 'id',
+      label: 'id',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      component: 'Input',
+      fieldName: 'name',
+      label: '角色名称',
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      component: 'Input',
+      fieldName: 'code',
+      label: '角色标识',
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      component: 'Input',
+      fieldName: 'menuIds',
+      label: '菜单权限',
+      formItemClass: 'items-start',
+      modelPropName: 'modelValue', // TODO @芋艿：这个是不是可以去掉哈
+    },
+  ];
+}
+
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
@@ -214,14 +252,16 @@ export function useGridColumns<T = SystemRoleApi.SystemRole>(
             code: 'assign-data-permission',
             text: '数据权限',
           },
+          {
+            code: 'assign-menu',
+            text: '菜单权限',
+          }
         ],
       },
       field: 'operation',
       fixed: 'right',
       title: '操作',
-      width: 220,
+      width: 240,
     },
   ];
-}
+}
-
-// TODO @芋艿：角色分配

apps/web-antd/src/views/system/role/index.vue

@@ -16,6 +16,7 @@ import { Plus, Download } from '@vben/icons';
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
 import AssignDataPermissionForm from './modules/assign-data-permission-form.vue';
+import AssignMenuForm from '#/views/system/role/modules/assign-menu-form.vue';
 import { downloadByData } from '#/utils/download';
 
 const [FormModal, formModalApi] = useVbenModal({
@@ -28,6 +29,11 @@ const [AssignDataPermissionFormModel, assignDataPermissionFormApi] = useVbenModa
   destroyOnClose: true,
 });
 
+const [AssignMenuFormModel, assignMenuFormApi] = useVbenModal({
+  connectedComponent: AssignMenuForm,
+  destroyOnClose: true,
+})
+
 /** 编辑角色 */
 function onEdit(row: SystemRoleApi.SystemRole) {
   formModalApi.setData(row).open();
@@ -62,6 +68,11 @@ function onAssignDataPermission(row: SystemRoleApi.SystemRole) {
   assignDataPermissionFormApi.setData(row).open();
 }
 
+/** 分配角色的菜单权限 */
+function onAssignMenu(row: SystemRoleApi.SystemRole) {
+  assignMenuFormApi.setData(row).open();
+}
+
 /** 表格操作按钮的回调函数 */
 function onActionClick({
    code,
@@ -80,6 +91,10 @@ function onActionClick({
       onAssignDataPermission(row);
       break;
     }
+    case 'assign-menu': {
+      onAssignMenu(row);
+      break;
+    }
   }
 }
 
@@ -129,6 +144,7 @@ async function onExport() {
   <Page auto-content-height>
     <FormModal @success="onRefresh" />
     <AssignDataPermissionFormModel @success="onRefresh" />
+    <AssignMenuFormModel @success="onRefresh" />
     <Grid table-title="角色列表">
       <template #toolbar-tools>
         <Button type="primary" @click="onCreate">

apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue

@@ -18,7 +18,6 @@ import { useAssignDataPermissionFormSchema } from '../data';
 import { SystemDataScopeEnum } from '#/utils/constants';
 
 const emit = defineEmits(['success']);
-const formData = ref<SystemRoleApi.SystemRole>();
 
 const deptTree = ref<SystemDeptApi.SystemDept[]>([]); // 部门树
 const deptLoading = ref(false); // 加载部门列表
@@ -70,8 +69,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      formData.value = await getRole(data.id as number);
+      await formApi.setValues(await getRole(data.id as number));
-      await formApi.setValues(formData.value);
       // 加载部门列表
       await loadDeptTree();
       toggleExpandAll();
@@ -104,7 +102,7 @@ function toggleSelectAll() {
 }
 
 /** 展开/折叠所有节点 */
-async function toggleExpandAll() {
+function toggleExpandAll() {
   isExpanded.value = !isExpanded.value;
   if (isExpanded.value) {
     // 获取所有节点的 ID

apps/web-antd/src/views/system/role/modules/assign-menu-form.vue

@@ -0,0 +1,151 @@
+<script lang="ts" setup>
+import type { SystemRoleApi } from '#/api/system/role';
+import type { SystemDeptApi } from '#/api/system/dept';
+
+import { VbenTree } from '@vben/common-ui';
+import { useVbenModal } from '@vben/common-ui';
+import { message, Checkbox } from 'ant-design-vue';
+
+import { ref } from 'vue';
+import { $t } from '#/locales';
+import { useVbenForm } from '#/adapter/form';
+import { assignRoleMenu, getRoleMenuList } from '#/api/system/permission';
+import { getMenuList } from '#/api/system/menu';
+import { handleTree } from '#/utils/tree';
+
+import { useAssignMenuFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+
+const menuTree = ref<SystemDeptApi.SystemDept[]>([]); // 菜单树
+const menuLoading = ref(false); // 加载菜单列表
+const isAllSelected = ref(false); // 全选状态
+const isExpanded = ref(false); // 展开状态
+const expandedKeys = ref<number[]>([]); // 展开的节点
+
+const [Form, formApi] = useVbenForm({
+  layout: 'horizontal',
+  schema: useAssignMenuFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    const data = await formApi.getValues();
+    try {
+      await assignRoleMenu({
+        roleId: data.id,
+        menuIds: data.menuIds
+      });
+      await modalApi.close();
+      emit('success');
+      message.success({
+        content: $t('ui.actionMessage.operationSuccess'),
+        key: 'action_process_msg',
+      });
+    } finally {
+      modalApi.lock(false);
+    }
+  },
+  async onOpenChange(isOpen) {
+    if (!isOpen) {
+      return;
+    }
+    const data = modalApi.getData<SystemRoleApi.SystemRole>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      await formApi.setValues(data);
+      // 加载角色菜单
+      const menuIds = await getRoleMenuList(data.id as number);
+      await formApi.setFieldValue('menuIds', menuIds);
+      // 加载菜单列表
+      await loadMenuTree();
+    } finally {
+      modalApi.lock(false);
+    }
+  },
+});
+
+/** 加载菜单树 */
+async function loadMenuTree() {
+  menuLoading.value = true;
+  try {
+    const data = await getMenuList();
+    menuTree.value = handleTree(data);
+  } finally {
+    menuLoading.value = false;
+  }
+}
+
+/** 全选/全不选 */
+function toggleSelectAll() {
+  isAllSelected.value = !isAllSelected.value;
+  if (isAllSelected.value) {
+    const allIds = getAllNodeIds(menuTree.value);
+    formApi.setFieldValue('menuIds', allIds);
+  } else {
+    formApi.setFieldValue('menuIds', []);
+  }
+}
+
+/** 展开/折叠所有节点 */
+function toggleExpandAll() {
+  isExpanded.value = !isExpanded.value;
+  if (isExpanded.value) {
+    // 获取所有节点的 ID
+    expandedKeys.value = getAllNodeIds(menuTree.value);
+  } else {
+    expandedKeys.value = [];
+  }
+}
+
+/** 递归获取所有节点 ID */
+function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
+  nodes.forEach((node: any) => {
+    ids.push(node.id);
+    if (node.children && node.children.length > 0) {
+      getAllNodeIds(node.children, ids);
+    }
+  });
+  return ids;
+}
+</script>
+
+<template>
+  <Modal title="数据权限">
+    <Form class="mx-4">
+      <template #menuIds="slotProps">
+        <Spin :spinning="menuLoading" class="w-full">
+          <!-- TODO @芋艿：可优化，使用 antd 的 tree？原因是，更原生 -->
+          <VbenTree
+            :tree-data="menuTree"
+            multiple
+            bordered
+            :expanded="expandedKeys"
+            v-bind="slotProps"
+            value-field="id"
+            label-field="name"
+          />
+        </Spin>
+      </template>
+    </Form>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center">
+        <Checkbox :checked="isAllSelected" @change="toggleSelectAll">
+          全选
+        </Checkbox>
+        <Checkbox :checked="isExpanded" @change="toggleExpandAll">
+          全部展开
+        </Checkbox>
+      </div>
+    </template>
+  </Modal>
+</template>