Skip to content

Commit f32f84a

Browse files
optimajetoptimajet
committed
WFE 5.1.4
1 parent 627949b commit f32f84a

62 files changed

Lines changed: 550 additions & 263 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Designer/templates/decisiontable.html‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ <h4 class="SettingsHeader" style="margin-bottom: 17px;">
251251
formdata.EnableOtherwise = !!transitions.otherwise.activity;
252252
me.VueConfig.data.Transitions = transitions;
253253
me.VueConfig.data.originalTransitions = WorkflowDesignerCommon.clone(transitions);
254+
me.VueConfig.data.originalName = item.Name;
254255

255256
transitions.all.forEach(function (transition) {
256257
if (!transition.condition.Action)
@@ -433,17 +434,33 @@ <h4 class="SettingsHeader" style="margin-bottom: 17px;">
433434
var FormData = me.VueConfig.data.FormData;
434435
var transitions = me.VueConfig.data.Transitions;
435436
var originalTransitions = me.VueConfig.data.originalTransitions;
437+
var originalName = me.VueConfig.data.originalName;
436438

437-
originalTransitions.all.forEach(function (originalTransition) {
438-
if (!transitions.all.some(function(current) {return originalTransition.activity === current.activity})) {
439-
var controls = me.transitionManager.GetTransitionsFromTo(FormData.Name, originalTransition.activity);
439+
if (FormData.Name !== originalName)
440+
{
441+
originalTransitions.all.forEach(function (originalTransition) {
442+
var controls = me.transitionManager.GetTransitionsFromTo(originalName, originalTransition.activity);
440443
if (controls && controls.length) {
441444
controls.forEach(function(control) {
442445
control.Delete();
443446
})
444447
}
445-
}
446-
});
448+
});
449+
}
450+
else
451+
{
452+
originalTransitions.all.forEach(function (originalTransition) {
453+
if (!transitions.all.some(function(current) {return originalTransition.activity === current.activity})) {
454+
var controls = me.transitionManager.GetTransitionsFromTo(FormData.Name, originalTransition.activity);
455+
if (controls && controls.length) {
456+
controls.forEach(function(control) {
457+
control.Delete();
458+
})
459+
}
460+
}
461+
});
462+
}
463+
447464

448465
transitions.all.forEach(function(item) {
449466
var controls = me.transitionManager.GetTransitionsFromTo(FormData.Name, item.activity);
@@ -455,6 +472,15 @@ <h4 class="SettingsHeader" style="margin-bottom: 17px;">
455472
}
456473
});
457474

475+
if (FormData.Name !== originalName && originalTransitions.otherwise) {
476+
var controls = me.transitionManager.GetTransitionsFromTo(originalName, originalTransitions.otherwise.activity);
477+
if (controls && controls.length) {
478+
controls.forEach(function (control) {
479+
control.Delete();
480+
})
481+
}
482+
}
483+
458484
if (originalTransitions.otherwise.activity !== transitions.otherwise.activity || !me.VueConfig.data.FormData.EnableOtherwise) {
459485
var controls = me.transitionManager.GetTransitionsFromTo(FormData.Name, originalTransitions.otherwise.activity);
460486
if (controls && controls.length) {

‎Designer/workflowdesigner.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Samples/ASP.NET Core/MSSQL/WF.Sample.Business/WF.Sample.Business.csproj‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
1+
<Project Sdk="Microsoft.NET.Sdk">
32
<PropertyGroup>
43
<TargetFramework>netstandard2.0</TargetFramework>
54
</PropertyGroup>
6-
75
<ItemGroup>
86
<Folder Include="Workflow" />
97
</ItemGroup>
10-
118
<ItemGroup>
12-
<PackageReference Include="WorkflowEngine.NETCore-Core" Version="5.1.3" />
13-
<PackageReference Include="WorkflowEngine.NETCore-FilesPlugin" Version="5.1.3" />
14-
9+
<PackageReference Include="WorkflowEngine.NETCore-Core" Version="5.1.4" />
10+
<PackageReference Include="WorkflowEngine.NETCore-FilesPlugin" Version="5.1.4" />
1511
</ItemGroup>
16-
17-
</Project>
12+
</Project>

‎Samples/ASP.NET Core/MSSQL/WF.Sample.MsSql/WF.Sample.MsSql.csproj‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
1+
<Project Sdk="Microsoft.NET.Sdk">
32
<PropertyGroup>
43
<TargetFramework>netstandard2.0</TargetFramework>
54
</PropertyGroup>
6-
75
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
8-
<OutputPath></OutputPath>
96
</PropertyGroup>
10-
117
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
12-
<OutputPath></OutputPath>
138
</PropertyGroup>
14-
159
<ItemGroup>
1610
<PackageReference Include="AutoMapper" Version="8.0.0" />
1711
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.1" />
1812
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.0" />
1913
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
20-
<PackageReference Include="WorkflowEngine.NETCore-Core" Version="5.1.3" />
21-
<PackageReference Include="WorkflowEngine.NETCore-ProviderForMSSQL" Version="5.1.3" />
14+
<PackageReference Include="WorkflowEngine.NETCore-Core" Version="5.1.4" />
15+
<PackageReference Include="WorkflowEngine.NETCore-ProviderForMSSQL" Version="5.1.4" />
2216
</ItemGroup>
23-
2417
<ItemGroup>
2518
<ProjectReference Include="..\WF.Sample.Business\WF.Sample.Business.csproj" />
2619
</ItemGroup>
27-
28-
</Project>
20+
</Project>

‎Samples/ASP.NET Core/MSSQL/WF.Sample/WF.Sample.csproj‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
32
<PropertyGroup>
43
<TargetFramework>netcoreapp2.1</TargetFramework>
54
</PropertyGroup>
6-
75
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
8-
<OutputPath></OutputPath>
96
</PropertyGroup>
10-
117
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
12-
<OutputPath></OutputPath>
138
</PropertyGroup>
14-
159
<ItemGroup>
1610
<PackageReference Include="Autofac.Configuration" Version="4.1.0" />
1711
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.3.1" />
@@ -25,20 +19,17 @@
2519
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
2620
<PackageReference Include="Microsoft.NET.Sdk.Razor" Version="2.2.0" />
2721
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
28-
<PackageReference Include="WorkflowEngine.NETCore-Core" Version="5.1.3" />
22+
<PackageReference Include="WorkflowEngine.NETCore-Core" Version="5.1.4" />
2923
</ItemGroup>
30-
31-
<ItemGroup>
24+
<ItemGroup>
3225
<ProjectReference Include="..\WF.Sample.*\*.csproj" />
3326
</ItemGroup>
34-
3527
<ItemGroup>
3628
<Folder Include="Controllers\" />
3729
<Folder Include="Models\" />
3830
<Folder Include="Helpers\" />
3931
<Folder Include="Extensions\" />
4032
</ItemGroup>
41-
4233
<ItemGroup>
4334
<None Remove="autofac.json" />
4435
</ItemGroup>
@@ -48,11 +39,9 @@
4839
<ItemGroup>
4940
<Content Include="autofac.json" />
5041
</ItemGroup>
51-
5242
<ItemGroup>
5343
<Content Update="autofac.json">
5444
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5545
</Content>
5646
</ItemGroup>
57-
58-
</Project>
47+
</Project>

‎Samples/ASP.NET Core/MSSQL/WF.Sample/wwwroot/js/workflowdesigner.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Samples/ASP.NET Core/MSSQL/WF.Sample/wwwroot/templates/decisiontable.html‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ <h4 class="SettingsHeader" style="margin-bottom: 17px;">
251251
formdata.EnableOtherwise = !!transitions.otherwise.activity;
252252
me.VueConfig.data.Transitions = transitions;
253253
me.VueConfig.data.originalTransitions = WorkflowDesignerCommon.clone(transitions);
254+
me.VueConfig.data.originalName = item.Name;
254255

255256
transitions.all.forEach(function (transition) {
256257
if (!transition.condition.Action)
@@ -433,17 +434,33 @@ <h4 class="SettingsHeader" style="margin-bottom: 17px;">
433434
var FormData = me.VueConfig.data.FormData;
434435
var transitions = me.VueConfig.data.Transitions;
435436
var originalTransitions = me.VueConfig.data.originalTransitions;
437+
var originalName = me.VueConfig.data.originalName;
436438

437-
originalTransitions.all.forEach(function (originalTransition) {
438-
if (!transitions.all.some(function(current) {return originalTransition.activity === current.activity})) {
439-
var controls = me.transitionManager.GetTransitionsFromTo(FormData.Name, originalTransition.activity);
439+
if (FormData.Name !== originalName)
440+
{
441+
originalTransitions.all.forEach(function (originalTransition) {
442+
var controls = me.transitionManager.GetTransitionsFromTo(originalName, originalTransition.activity);
440443
if (controls && controls.length) {
441444
controls.forEach(function(control) {
442445
control.Delete();
443446
})
444447
}
445-
}
446-
});
448+
});
449+
}
450+
else
451+
{
452+
originalTransitions.all.forEach(function (originalTransition) {
453+
if (!transitions.all.some(function(current) {return originalTransition.activity === current.activity})) {
454+
var controls = me.transitionManager.GetTransitionsFromTo(FormData.Name, originalTransition.activity);
455+
if (controls && controls.length) {
456+
controls.forEach(function(control) {
457+
control.Delete();
458+
})
459+
}
460+
}
461+
});
462+
}
463+
447464

448465
transitions.all.forEach(function(item) {
449466
var controls = me.transitionManager.GetTransitionsFromTo(FormData.Name, item.activity);
@@ -455,6 +472,15 @@ <h4 class="SettingsHeader" style="margin-bottom: 17px;">
455472
}
456473
});
457474

475+
if (FormData.Name !== originalName && originalTransitions.otherwise) {
476+
var controls = me.transitionManager.GetTransitionsFromTo(originalName, originalTransitions.otherwise.activity);
477+
if (controls && controls.length) {
478+
controls.forEach(function (control) {
479+
control.Delete();
480+
})
481+
}
482+
}
483+
458484
if (originalTransitions.otherwise.activity !== transitions.otherwise.activity || !me.VueConfig.data.FormData.EnableOtherwise) {
459485
var controls = me.transitionManager.GetTransitionsFromTo(FormData.Name, originalTransitions.otherwise.activity);
460486
if (controls && controls.length) {

‎Samples/ASP.NET Core/MongoDB/WF.Sample.Business/WF.Sample.Business.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>netstandard2.0</TargetFramework>
54
</PropertyGroup>
6-
75
<ItemGroup>
8-
<PackageReference Include="WorkflowEngine.NETCore-Core" Version="5.1.3" />
9-
<PackageReference Include="WorkflowEngine.NETCore-FilesPlugin" Version="5.1.3" />
6+
<PackageReference Include="WorkflowEngine.NETCore-Core" Version="5.1.4" />
7+
<PackageReference Include="WorkflowEngine.NETCore-FilesPlugin" Version="5.1.4" />
108
</ItemGroup>
11-
12-
</Project>
9+
</Project>

‎Samples/ASP.NET Core/MongoDB/WF.Sample.MongoDb/WF.Sample.MongoDb.csproj‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>netstandard2.0</TargetFramework>
54
</PropertyGroup>
6-
75
<ItemGroup>
86
<PackageReference Include="AutoMapper" Version="8.0.0" />
97
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
10-
<PackageReference Include="WorkflowEngine.NETCore-Core" Version="5.1.3" />
11-
<PackageReference Include="WorkflowEngine.NETCore-ProviderForMongoDB" Version="5.1.3" />
8+
<PackageReference Include="WorkflowEngine.NETCore-Core" Version="5.1.4" />
9+
<PackageReference Include="WorkflowEngine.NETCore-ProviderForMongoDB" Version="5.1.4" />
1210
</ItemGroup>
13-
1411
<ItemGroup>
1512
<ProjectReference Include="..\WF.Sample.Business\WF.Sample.Business.csproj" />
1613
</ItemGroup>
17-
18-
</Project>
14+
</Project>

‎Samples/ASP.NET Core/MongoDB/WF.Sample/WF.Sample.csproj‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
32
<PropertyGroup>
43
<TargetFramework>netcoreapp2.1</TargetFramework>
54
</PropertyGroup>
6-
75
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
8-
<OutputPath></OutputPath>
96
</PropertyGroup>
10-
117
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
12-
<OutputPath></OutputPath>
138
</PropertyGroup>
14-
159
<ItemGroup>
1610
<PackageReference Include="Autofac.Configuration" Version="4.1.0" />
1711
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.3.1" />
@@ -25,20 +19,17 @@
2519
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
2620
<PackageReference Include="Microsoft.NET.Sdk.Razor" Version="2.2.0" />
2721
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
28-
<PackageReference Include="WorkflowEngine.NETCore-Core" Version="5.1.3" />
22+
<PackageReference Include="WorkflowEngine.NETCore-Core" Version="5.1.4" />
2923
</ItemGroup>
30-
31-
<ItemGroup>
24+
<ItemGroup>
3225
<ProjectReference Include="..\WF.Sample.*\*.csproj" />
3326
</ItemGroup>
34-
3527
<ItemGroup>
3628
<Folder Include="Controllers\" />
3729
<Folder Include="Models\" />
3830
<Folder Include="Helpers\" />
3931
<Folder Include="Extensions\" />
4032
</ItemGroup>
41-
4233
<ItemGroup>
4334
<None Remove="autofac.json" />
4435
</ItemGroup>
@@ -48,11 +39,9 @@
4839
<ItemGroup>
4940
<Content Include="autofac.json" />
5041
</ItemGroup>
51-
5242
<ItemGroup>
5343
<Content Update="autofac.json">
5444
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5545
</Content>
5646
</ItemGroup>
57-
58-
</Project>
47+
</Project>

0 commit comments

Comments
 (0)