修改了菜单管理的bug

src/api/system/menu/menu.ts

@@ -19,13 +19,15 @@ enum Api {
   menuDetail = '/system/menu/detail/',
   addMenu =  '/system/menu/add',
   updataMenu = '/system/menu/update/',
-  menuList = '/system/menu/list'
+  menuList = '/system/menu/list',
+  menuSelectList = '/system/menu/treeSelect',
+  roleMenuSelected = '/system/menu/roleMenuTreeSelect/',
 }
 
 
 /** 删除菜单*/
 export const deleteById = (params?: any) =>
-  defHttp.delete<any>({ url: Api.deleteById+params });
+  defHttp.delete<any>({ url: Api.deleteById + params });
 
 /** 获取菜单详情信息*/
 export const menuDetailApi = (params: any) =>
@@ -53,3 +55,11 @@ export const menuUpdataApi = (params: any) =>
 /** 获取菜单列表信息*/
 export const getMenuList = (params?: any) =>
   defHttp.get<any>({ url: Api.menuList, params });
+
+/** 获取菜单列表信息*/
+export const getMenuSelect = (params?: any) =>
+  defHttp.get<any>({ url: Api.menuSelectList });
+
+/** 获取角色已选择的菜单*/
+export const getRoleMenuSelected = (params?: any) =>
+  defHttp.get<any>({ url: Api.roleMenuSelected + params.businessId });

src/views/system/menu/MenuDrawer.vue

@@ -23,6 +23,7 @@
   const emit = defineEmits(['success', 'register']);
   const menuId = ref('');
   const isUpdate = ref(true);
+  const isAdd = ref(true);
   const { createMessage } = useMessage();
   const [registerForm, { resetFields, setFieldsValue, updateSchema, validate }] = useForm({
     labelWidth: 100,
@@ -35,6 +36,7 @@
     resetFields();
     setDrawerProps({ confirmLoading: false });
     isUpdate.value = !!data?.isUpdate;
+    isAdd.value = !!data?.isAdd;
     if (unref(isUpdate)) {
       // 获取行数据的菜单id
       menuId.value = data.record.businessId;
@@ -47,10 +49,24 @@
         });
       })
     }
-    const menuData = await getMenuList();
+    if (unref(isAdd)){
+      // 通过id获取菜单详情信息
+      console.log('data:',data)
+      const id = data.record.businessId
+      const params = {
+        parentId: id,
+      }
+      console.log('params:',params)
+      // 塞值
+      setFieldsValue({
+        ...params,
+      });
+    }
+    const res = await getMenuList();
+    const treeData = handleTree(res.data, 'businessId',undefined,undefined,undefined)
     updateSchema({
-      field: 'parentMenu',
-      componentProps: {menuData},
+      field: 'parentId',
+      componentProps: { treeData },
     });
   });
 
@@ -58,6 +74,7 @@
   async function handleSubmit() {
     try {
       const formData = await validate();
+      console.log('formData:',formData)
       setDrawerProps({ confirmLoading: true });
       // 编辑
       if(unref(isUpdate)) {
@@ -98,4 +115,25 @@
       setDrawerProps({ confirmLoading: false });
     }
   }
+
+  /**结构转换方法*/
+  function handleTree(data, id, parentId, children, rootId) {
+    id = id || 'id'
+    parentId = parentId || 'parentId'
+    children = children || 'children'
+    rootId = rootId || Math.min.apply(Math, data.map(item => { return item[parentId] })) || 0
+    // 对源数据深度克隆
+    const cloneData = JSON.parse(JSON.stringify(data))
+    // 循环所有项
+    const treeData = cloneData.filter(father => {
+      const branchArr = cloneData.filter(child => {
+        // 返回每一项的子级数组
+        return father[id] === child[parentId]
+      })
+      branchArr.length > 0 ? father.children = branchArr : ''
+      // 返回第一层
+      return father[parentId] === rootId
+    })
+    return treeData !== '' ? treeData : data
+  }
 </script>

src/views/system/menu/index.vue

@@ -8,6 +8,10 @@
         <template v-if="column.key === 'action'">
           <TableAction
             :actions="[
+              {
+                label:'新增',
+                onClick: handleAdd.bind(null, record),
+              },
               {
                 // icon: 'clarity:note-edit-line',
                 label:'修改',
@@ -35,27 +39,32 @@
   import { nextTick } from 'vue';
 
   import { BasicTable, useTable, TableAction } from '@/components/Table';
-  // import { getMenuList } from '@/api/demo/system';
   import { getMenuListByPage } from '@/api/system/menu/menu';
   import { useDrawer } from '@/components/Drawer';
   import MenuDrawer from './MenuDrawer.vue';
-  import { getMenuList } from '@/api/demo/system';
   import { columns, searchFormSchema } from './menu.data';
   import { deleteById } from "@/api/system/menu/menu";
   import { useMessage } from "@/hooks/web/useMessage";
+  import { ref } from 'vue';
 
   defineOptions({ name: 'MenuManagement' });
   const { createMessage } = useMessage();
   const [registerDrawer, { openDrawer }] = useDrawer();
+  const treeData = ref();
   const [registerTable, { reload, expandAll }] = useTable({
     title: '菜单列表',
-    api: getMenuListByPage,
+    api: async (params) => {
+      const response = await getMenuListByPage(params);
+      //进行处理数据
+      const transformedData = transformData(response.data); // 定义一个函数transformData来做你需要的数据转换
+      return { ...response, data: transformedData };
+    },
     columns,
     formConfig: {
       labelWidth: 120,
       schemas: searchFormSchema,
     },
-    isTreeTable: true,
+    isTreeTable: false,
     pagination: false,
     striped: false,
     useSearchForm: true,
@@ -72,12 +81,50 @@
     },
   });
 
+  /**改变列表结构 列表->树*/
+  function transformData(data) {
+    treeData.value = handleTree(data, 'businessId',undefined,undefined,undefined)
+    return treeData.value
+  }
+
+  /**结构转换方法*/
+  function handleTree(data, id, parentId, children, rootId) {
+    id = id || 'id'
+    parentId = parentId || 'parentId'
+    children = children || 'children'
+    rootId = rootId || Math.min.apply(Math, data.map(item => { return item[parentId] })) || 0
+    // 对源数据深度克隆
+    const cloneData = JSON.parse(JSON.stringify(data))
+    // 循环所有项
+    const treeData = cloneData.filter(father => {
+      const branchArr = cloneData.filter(child => {
+        // 返回每一项的子级数组
+        return father[id] === child[parentId]
+      })
+      branchArr.length > 0 ? father.children = branchArr : ''
+      // 返回第一层
+      return father[parentId] === rootId
+    })
+    return treeData !== '' ? treeData : data
+  }
+
+  /**新增*/
   function handleCreate() {
     openDrawer(true, {
       isUpdate: false,
     });
   }
 
+  /**在列表里新增菜单*/
+  function handleAdd(record: Recordable) {
+    openDrawer(true, {
+      isAdd: true,
+      isUpdate: false,
+      record,
+    });
+  }
+
+  /**编辑*/
   function handleEdit(record: Recordable) {
     openDrawer(true, {
       record,
@@ -85,6 +132,7 @@
     });
   }
 
+  /**删除*/
   async function handleDelete(record: Recordable) {
     await deleteById(record.businessId);
     createMessage.success('删除成功!');

src/views/system/menu/menu.data.ts

@@ -121,7 +121,6 @@ export const formSchema: FormSchema[] = [
     field: 'jumpType',
     label: '跳转类型',
     component: 'RadioButtonGroup',
-    defaultValue: 'R',
     componentProps: {
       options: [
         { label: '正常路由跳转', value: 'R' },
@@ -139,7 +138,7 @@ export const formSchema: FormSchema[] = [
     required: true,
   },
   {
-    field: 'parentMenu',
+    field: 'parentId',
     label: '上级菜单',
     component: 'TreeSelect',
     componentProps: {