feat: 修改请求用户菜单

cypress/e2e/utils/setup.ts

@@ -81,7 +81,7 @@ export function loginIntercept() {
 }
 
 export function menuIntercept() {
-  normalIntercept('/menu/getUserMenu', 'menu/basic').as('menuIntercept');
+  normalIntercept('/menu/getUserMenuPc', 'menu/basic').as('menuIntercept');
 }
 
 export function optionsIntercept() {

packages/app/src/apis/menu.ts

@@ -74,7 +74,7 @@ export function getRoleMenu(
   return request({
     method: 'GET',
     data: {userId: uid},
-    url: `${BASE_URL}/getUserMenu`,
+    url: `${BASE_URL}/getUserMenuPc`,
     signal,
   });
 }

packages/app/src/models/request/user.ts

@@ -32,6 +32,7 @@ export type AddUserParams = Omit<
   | 'modifyUser'
   | 'modifyTime'
   | 'menu'
+  | 'menuBefore'
 >;
 
 /** 修改用户 */
@@ -45,12 +46,14 @@ export type EditUserParams = Omit<
   | 'modifyUser'
   | 'modifyTime'
   | 'menu'
+  | 'menuBefore'
 >;
 
 /** 修改用户菜单权限 */
 export type EditUserMenuParams = {
   id: string;
   menu: string;
+  menuBefore: string;
 };
 
 /** 修改密码 */

packages/app/src/models/response/user.ts

@@ -43,4 +43,6 @@ export type UserListData = {
   createTime: string;
   /** 用户菜单权限 */
   menu: string;
+  /** 用户菜单权限 antd用 */
+  menuBefore: string;
 } & ModifyData;

packages/app/src/pages/user/table/tree-modal/hooks.ts

@@ -95,11 +95,12 @@ export function useSubmit({
     e.preventDefault();
 
     const listStr = list.join(',');
-    const {menu} = parseMenuTreeList(listStr);
+    const {menu, antd} = parseMenuTreeList(listStr);
 
     mutate({
       id,
       menu,
+      menuBefore: antd,
     });
   }
 
@@ -121,7 +122,7 @@ export function useWatchId(id: string, visible: boolean) {
       const res = data?.find(val => String(val.id) === id);
 
       if (res) {
-        const menuList = res?.menu ? res.menu.split(',').slice(0, -1) : [];
+        const menuList = res?.menuBefore ? res.menuBefore.split(',') : [];
 
         dispatch(menuList);
       }