wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3.4.6

Browse Source
This commit is contained in:
潘飞
2023-05-31 10:19:05 +08:00
parent 1b65a7a9e5
commit 9c621c75cd
238 changed files with 9905 additions and 4034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
workflow/Tnb.WorkFlow/Service/FlowEngineService.cs
View File

@@ -1,4 +1,5 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Const;
using JNPF.Common.Core.Manager;
using JNPF.Common.Core.Manager.Files;
using JNPF.Common.Enums;
using JNPF.Common.Extension;
@@ -225,7 +226,7 @@ public class FlowEngineService : IFlowEngineService, IDynamicApiController, ITra
{
var formTemplateBase = new TemplateParsingBase(entity.FormTemplateJson, entity.Tables, true);
formDataFieldList = formTemplateBase.SingleFormData
.Where(x => x.__config__.jnpfKey != "relationForm" && x.__config__.jnpfKey != "relationFlow")
.Where(x => x.__config__.jnpfKey != JnpfKeyConst.RELATIONFORM && x.__config__.jnpfKey != "relationFlow")
.Select(x => new FlowEngineFieldOutput() { vmodel = x.__vModel__, label = x.__config__.label }).ToList();
}
@@ -543,21 +544,6 @@ public class FlowEngineService : IFlowEngineService, IDynamicApiController, ITra
FormData = entity.FormTemplateJson
};
var res = await _visualDevService.NoTblToTable(devEntity, mTableName);
entity.Tables = res.Tables;
entity.FormTemplateJson = res.FormData;
var entityData = await _runService.GetInfo(entity.Id);
if (entityData != null && entityData.Data != null)
{
var sqlList = _visualDevService.DataToInsertSql(mTableName, entityData.Data);
if (sqlList.Any())
{
var link = await _flowTaskRepository.GetLinkInfo(entity.DbLinkId) ?? _dataBaseManager.GetTenantDbLink(_userManager.TenantId, _userManager.TenantDbName);
foreach (var item in sqlList)
{
await _dataBaseManager.ExecuteSql(link, item);
}
}
}
}
#endregion
}