add menu

Author: xlorne

antd-pro/config/routes.ts

@@ -1,4 +1,5 @@
-/**
+
+/**
  * @name umi 的路由配置
  * @description 只支持 path,component,routes,redirect,wrappers,name,icon 的配置
  * @param path  path 只支持两种占位符配置，第一种是动态参数 :id 的形式，第二种是 * 通配符，通配符只能出现路由字符串的最后。
@@ -10,6 +11,7 @@
  * @param icon 配置路由的图标，取值参考 https://ant.design/components/icon-cn， 注意去除风格后缀和大小写，如想要配置图标为 <StepBackwardOutlined /> 则取值应为 stepBackward 或 StepBackward，如想要配置图标为 <UserOutlined /> 则取值应为 user 或者 User
  * @doc https://umijs.org/docs/guides/routes
  */
+
 export default [
   {
     path: '/login',

antd-pro/src/app.tsx

@@ -8,6 +8,7 @@ import defaultSettings from '../config/defaultSettings';
 import { errorConfig } from './requestErrorConfig';
 import React from 'react';
 import { AvatarDropdown, AvatarName } from './components/RightContent/AvatarDropdown';
+import { loadLayoutMenus } from './components/Menu';
 const loginPath = '/user/login';
 
 /**
@@ -59,6 +60,11 @@ export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) =
         return <AvatarDropdown>{avatarChildren}</AvatarDropdown>;
       },
     },
+    menu:{
+        request: async(params, defaultMenuData) =>{
+          return await loadLayoutMenus();
+        }
+    },
     waterMarkProps: {
       content: initialState?.currentUser?.username,
     },

antd-pro/src/components/Menu/index.tsx

@@ -0,0 +1,36 @@
+import React from 'react';
+import { menus } from '@/services/api/account';
+
+interface MenuProps {
+  icon: string
+}
+
+const Menus: React.FC<MenuProps> = (props) => {
+  return (
+    <img src={props.icon} style={{
+      width: '20px'
+    }} />
+  )
+}
+
+export async function loadLayoutMenus() {
+  const response = await menus();
+  if (response.success) {
+    let childrens = response.data.children;
+    if (childrens === null) {
+      return [];
+    }
+    const search = (data: any) => {
+      data.icon = <Menus icon={data.icon} />;
+      data.children = data.children || [];
+      data.children.forEach((item: any) => {
+        search(item);
+      });
+      return data;
+    }
+    childrens = childrens.map(item => search(item));
+    return childrens;
+  } else {
+    return [];
+  }
+}

antd-pro/src/pages/components/menu/index.tsx

@@ -62,8 +62,8 @@ const MenuPage: React.FC = () => {
       search: false,
     },
     {
-      title: "编码",
-      dataIndex: 'code',
+      title: "地址",
+      dataIndex: 'path',
       search: false,
     },
     {
@@ -248,15 +248,15 @@ const MenuPage: React.FC = () => {
           name="name"
         />
         <ProFormText
-          placeholder="请输入菜单编码"
-          label="菜单编码"
+          placeholder="请输入菜单地址"
+          label="菜单地址"
           rules={[
             {
               required: true,
-              message: "请输入菜单编码",
+              message: "请输入菜单地址",
             },
           ]}
-          name="code"
+          name="path"
         />
         <ProFormText
           placeholder="请输入菜单图标"

antd-pro/src/services/api/account.ts

@@ -2,7 +2,8 @@
 /* eslint-disable */
 import {history} from '@umijs/max';
 import {stringify} from 'querystring';
-import {post} from "./index";
+import {post,get} from "./index";
+
 
 
 export function logout() {
@@ -32,3 +33,11 @@ export async function login(body: Account.LoginRequest) {
   return post('/user/login', body);
 }
 
+
+/**
+ * 获取用户菜单
+ * @returns 菜单列表
+ */
+export async function menus(){
+  return get('/api/menu/tree');
+}

components-server/components/menu/menu-domain/src/main/java/com/codingapi/components/menu/domain/Menu.java

@@ -22,7 +22,7 @@ public class Menu {
     private String name;
 
     @Column(unique = true)
-    private String code;
+    private String path;
 
     private String icon;
 

components-server/components/menu/menu-infrastructure-db/src/main/java/com/codingapi/components/infrastructure/menu/jpa/JpaMenuRepository.java

@@ -5,5 +5,4 @@
 
 public interface JpaMenuRepository extends FastRepository<Menu,Integer> {
 
-    Menu getMenuByCode(String code);
 }