mirror of
https://gitee.com/dotnetchina/OpenAuth.Net.git
synced 2026-04-10 19:11:30 +08:00
同步OpenAuth.Core
修复mvc三级菜单; Reposiroty单元测试读取webapi配置文件; 修复日志打印2次;
This commit is contained in:
@@ -126,6 +126,14 @@ namespace OpenAuth.App
|
||||
public List<KeyDescription> GetProperties(string moduleCode)
|
||||
{
|
||||
var allprops = _dbExtension.GetProperties(moduleCode);
|
||||
|
||||
//如果是系统模块,直接返回所有字段。防止开发者把模块配置成系统模块,还在外层调用loginContext.GetProperties("xxxx");
|
||||
bool? isSysModule = UnitWork.FirstOrDefault<Module>(u => u.Code == moduleCode)?.IsSys;
|
||||
if (isSysModule!= null && isSysModule.Value)
|
||||
{
|
||||
return allprops;
|
||||
}
|
||||
|
||||
var props =UnitWork.Find<Relevance>(u =>
|
||||
u.Key == Define.ROLEDATAPROPERTY && _userRoleIds.Contains(u.FirstId) && u.SecondId == moduleCode)
|
||||
.Select(u => u.ThirdId);
|
||||
|
||||
@@ -98,7 +98,7 @@ namespace OpenAuth.App
|
||||
UnitWork.Add(flowInstance);
|
||||
wfruntime.flowInstanceId = flowInstance.Id;
|
||||
|
||||
if (flowInstance.FrmType == 1)
|
||||
if (flowInstance.FrmType == 1) //如果是开发者自定义的表单
|
||||
{
|
||||
var t = Type.GetType("OpenAuth.App."+ flowInstance.DbName +"App");
|
||||
ICustomerForm icf = (ICustomerForm) _serviceProvider.GetService(t);
|
||||
|
||||
@@ -1,7 +1,16 @@
|
||||
namespace OpenAuth.App.Interface
|
||||
{
|
||||
/// <summary>
|
||||
/// 开发者自定义表单的统一接口
|
||||
/// <para>例如:FrmLeaveReqApp为请假表单对应的应用层,实现该接口,可以自动向数据库中插入对应的记录</para>
|
||||
/// </summary>
|
||||
public interface ICustomerForm
|
||||
{
|
||||
/// <summary>
|
||||
/// 该接口定义自定义表单模式时需实现向数据库写入表单数据
|
||||
/// </summary>
|
||||
/// <param name="flowInstanceId">表单对应的流程实例ID</param>
|
||||
/// <param name="frmData">表单数据</param>
|
||||
void Add(string flowInstanceId, string frmData);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user