fix: 菜单tree修复

admin/src/pages/menu/form.tsx

@@ -38,7 +38,7 @@ export default function FormComponent(props: Props) {
 		const {data} = await getMenu();
 		const mergeMenu = [
 			{
-				id: 0,
+				id: null,
 				name: '无父级'
 			},
 			...data
@@ -73,7 +73,7 @@ export default function FormComponent(props: Props) {
 					<Form.Item hidden field="id">
 						<Input/>
 					</Form.Item>
-					<Form.Item label="父级菜单" field="parentId" rules={[{required: true}]}>
+					<Form.Item label="父级菜单" field="parentId">
 						<Select
 							placeholder="请选择父级菜单"
 							allowClear

admin/src/routes.ts

@@ -12,14 +12,11 @@ export type IRoute = AuthParams & {
   icon?: string
 };
 
-const generatorMenu = (data, parentId?:string) => {
+const generatorMenu = (data, parentId = '-') => {
   const menu = [];
   for (const item of data) {
     item.key = item.url;
-    if(!parentId){
-      menu.push(item);
-    }else{
-      if (item.parentId === parentId) {
+	  if ((item.parentId || '-') === parentId) {
 		  const children = generatorMenu(data, item.id);
 		  if (children.length) {
 			  item.children = children;
@@ -27,7 +24,6 @@ const generatorMenu = (data, parentId?:string) => {
 		  menu.push(item);
 	  }
   }
-  }
   return menu;
 };
 

server/.env

@@ -1 +1 @@
-DATABASE_URL="postgresql://postgres:ultimate@81.70.149.52:8000/promise?schema=public"
+DATABASE_URL="postgresql://postgres:ultimate@81.70.149.52:8000/nestjs-admin?schema=public"

server/src/modules/system/menu/menu.service.ts

@@ -35,14 +35,10 @@ export class MenuService {
     });
   }
 
-  generatorMenu(data, parentId?: string) {
+  generatorMenu(data, parentId = '-') {
     const menu = [];
     for (const item of data) {
-      // 不存在父id 代表是顶级菜单
-      if (!parentId) {
-        menu.push(item);
-      } else {
-        if (item.parentId === parentId) {
+      if ((item.parentId || '-') === parentId) {
         const children = this.generatorMenu(data, item.id);
         if (children.length) {
           item.children = children;
@@ -50,13 +46,12 @@ export class MenuService {
         menu.push(item);
       }
     }
-    }
     return menu;
   }
 
   async getTreeMenu() {
     const query: Prisma.SysMenuFindManyArgs = {
-      orderBy: [{ sort: 'desc' }, { id: 'asc' }],
+      orderBy: [{ sort: 'desc' }, { createdAt: 'desc' }],
     };
     const list = await this.prisma.sysMenu.findMany(query);
     return this.generatorMenu(list);