ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update 合并菜单接口

Browse Source
This commit is contained in:
自带大佬气场
2021-07-05 13:35:31 +08:00
parent 6d9fbd15da
commit ecb00f664a
7 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Api/Ewide.Core/Service/Auth/AuthService.cs
View File

@@ -245,8 +245,12 @@ namespace Ewide.Core.Service
// 菜单信息
if (loginOutput.Apps.Count > 0)
{
var defaultActiveAppCode = loginOutput.Apps.FirstOrDefault(u => u.Active == true).Code; // loginOutput.Apps[0].Code;
loginOutput.Menus = await _sysMenuService.GetLoginMenusAntDesign(userId, defaultActiveAppCode);
//var defaultActiveAppCode = loginOutput.Apps.FirstOrDefault(u => u.Active == true).Code; // loginOutput.Apps[0].Code;
//loginOutput.Menus = await _sysMenuService.GetLoginMenusAntDesign(userId, defaultActiveAppCode);
foreach (var app in loginOutput.Apps)
{
loginOutput.Menus.AddRange(await _sysMenuService.GetLoginMenusAntDesign(userId, app.Code));
}
}
return loginOutput;

2
Api/Ewide.Core/Service/Menu/Dto/AntDesignTreeNode.cs
View File

@@ -49,6 +49,8 @@
/// 打开方式
/// </summary>
public int OpenType { get; set; }
public string Application { get; set; }
}
/// <summary>

3
Api/Ewide.Core/Service/Menu/SysMenuService.cs
View File

@@ -116,7 +116,8 @@ namespace Ewide.Core.Service
Show = u.Visible,
Link = u.Link,
Target = u.OpenType == (int)MenuOpenType.OUTER ? "_blank" : ""
}
},
Application = u.Application
}).ToList();
#if DEBUG

2
web-react/src/assets/style/dark/main.less
View File

@@ -496,8 +496,10 @@
transition-property: opacity;
opacity: 0;
border-radius: @border-radius-base;
}
.swiper-scrollbar-drag {
border-radius: @border-radius-base;
background-color: fade(@white, 30%);
}
&:hover {

4
web-react/src/assets/style/default/main.less
View File

@@ -490,9 +490,11 @@
transition-property: opacity;
opacity: 0;
border-radius: @border-radius-base;
}
.swiper-scrollbar-drag {
background-color: fade(@white, 30%);
border-radius: @border-radius-base;
background-color: fade(@black, 30%);
}
&:hover {
.swiper-scrollbar {

4
web-react/src/pages/system/menu/form.jsx
View File

@@ -116,6 +116,10 @@ export default class form extends Component {
postData.id = this.record.id
}
//#region 从前段转换后端所需格式
// 目录的pic必须为空
if (!postData.type) {
postData.pid = EMPTY_ID
}
//#endregion
return postData
}

8
web-react/src/views/main/index.jsx
View File

@@ -30,15 +30,13 @@ const serializeMenu = menus => {
const setNav = async nav => {
const getNav = []
nav.apps.forEach(app => {
const menu = serializeMenu(nav.menus.filter(p => p.application === app.code))
getNav.push({
app,
menu,
})
})
const menus = await Promise.all(getNav.map(p => api.sysMenuChange({ application: p.app.code })))
menus.forEach((menu, i) => {
getNav[i].menu = serializeMenu(menu.data)
})
return getNav
}