|
|
@@ -19,14 +19,17 @@ public class SysCodeGenService : IDynamicApiController, ITransient
|
|
|
private readonly SysCodeGenConfigService _codeGenConfigService;
|
|
|
private readonly CodeGenOptions _codeGenOptions;
|
|
|
private readonly IViewEngine _viewEngine;
|
|
|
+ private readonly UserManager _userManager;
|
|
|
|
|
|
public SysCodeGenService(ISqlSugarClient db,
|
|
|
SysCodeGenConfigService codeGenConfigService,
|
|
|
IOptions<CodeGenOptions> codeGenOptions,
|
|
|
+ UserManager userManager,
|
|
|
IViewEngine viewEngine)
|
|
|
{
|
|
|
_db = db;
|
|
|
_viewEngine = viewEngine;
|
|
|
+ _userManager = userManager;
|
|
|
_codeGenOptions = codeGenOptions.Value;
|
|
|
_codeGenConfigService = codeGenConfigService;
|
|
|
}
|
|
|
@@ -455,12 +458,15 @@ public class SysCodeGenService : IDynamicApiController, ITransient
|
|
|
await DeleteMenuTree(title, pid == 0 ? MenuTypeEnum.Dir : MenuTypeEnum.Menu);
|
|
|
|
|
|
var parentMenuPath = "";
|
|
|
+ var appId = _userManager.AppId;
|
|
|
+ var appMenuList = new List<SysAppMenu>();
|
|
|
var lowerClassName = className[..1].ToLower() + className[1..];
|
|
|
if (pid == 0)
|
|
|
{
|
|
|
// 新增目录，并记录Id
|
|
|
var dirMenu = new SysMenu { Pid=0, Title=title, Type=MenuTypeEnum.Dir, Icon="robot", Path="/" + className.ToLower(), Component="Layout" };
|
|
|
pid = (await _db.Insertable(dirMenu).ExecuteReturnEntityAsync()).Id;
|
|
|
+ appMenuList.Add(new SysAppMenu { AppId = appId, MenuId = pid });
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -471,6 +477,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
|
|
|
// 新增菜单，并记录Id
|
|
|
var rootMenu = new SysMenu { Pid=pid, Title=title, Type=MenuTypeEnum.Menu, Icon=menuIcon, Path=$"{parentMenuPath}/{className.ToLower()}", Component=$"/{pagePath}/{lowerClassName}/index" };
|
|
|
pid = (await _db.Insertable(rootMenu).ExecuteReturnEntityAsync()).Id;
|
|
|
+ appMenuList.Add(new SysAppMenu { AppId = appId, MenuId = pid });
|
|
|
|
|
|
var orderNo = 100;
|
|
|
var menuList = new List<SysMenu>
|
|
|
@@ -494,6 +501,10 @@ public class SysCodeGenService : IDynamicApiController, ITransient
|
|
|
menuList.Add(new SysMenu { Title=$"上传{column.ColumnComment}", Permission=$"{lowerClassName}:upload{column.PropertyName}", Pid=pid, Type=MenuTypeEnum.Btn, OrderNo=orderNo+=10});
|
|
|
|
|
|
await _db.Insertable(menuList).ExecuteCommandAsync();
|
|
|
+
|
|
|
+ // 新增应用菜单关联
|
|
|
+ appMenuList.AddRange(menuList.Select(u => new SysAppMenu { AppId = appId, MenuId = u.Id }));
|
|
|
+ await _db.Insertable(appMenuList).ExecuteCommandAsync();
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
zuohuaijun