Skip to content

Commit 11add92

Browse files
optimajetoptimajet
committed
WFE 12.1.0 (autocommit)
1 parent eeebd78 commit 11add92

File tree

80 files changed

+307
-152
lines changed

Some content is hidden

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

80 files changed

+307
-152
lines changed

‎Designer/templates/jsonform.html

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ <h3>{{ customTitle ? customTitle : (formMode ? labels2.Title : labels.Title) }}<
77
class="WorkflowDesignerWindowForm"
88
label-position="top"
99
label-width="150px">
10-
<el-form-item v-for="field in fields" :key="field.Name" :label="getLocalizationParameterLabel(field)" :prop="field.Name" :rules="getFieldRules(field)">
10+
<el-form-item v-for="field in fields.filter(field => field.Type != 'Error')" :key="field.Name" :label="getLocalizationParameterLabel(field)" :prop="field.Name" :rules="getFieldRules(field)">
1111
<el-input v-if="field.Type == 'Text'" v-model="FormData[field.Name]" :readonly="readonly"></el-input>
1212
<el-input-number v-if="field.Type == 'Number'" v-model="FormData[field.Name]" :disabled="readonly"
1313
controls-position="right"></el-input-number>
@@ -58,6 +58,15 @@ <h3>{{ customTitle ? customTitle : (formMode ? labels2.Title : labels.Title) }}<
5858
<el-button v-if="field.Type == 'Json'" :class="'WorkflowDesignerTableCodeActionsButton ' + (editItem == field ? 'is-active' : '')"
5959
@click="showjson('DefaultValue', field)"></el-button>
6060
</el-form-item>
61+
<div style="display: flex;flex-direction: column;gap: 10px">
62+
<el-alert
63+
v-for="field in fields.filter(field => field.Type == 'Error')"
64+
:title="field.Title"
65+
:description="FormData[field.Name]"
66+
type="error"
67+
show-icon
68+
/>
69+
</div>
6170
</el-form>
6271

6372
<div class="WorkflowDesignerButtons">

‎Designer/workflowdesigner.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Providers/OptimaJet.Workflow.DbPersistence/OptimaJet.Workflow.MSSQL.deps.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"targets": {
88
".NETStandard,Version=v2.0": {},
99
".NETStandard,Version=v2.0/": {
10-
"OptimaJet.Workflow.MSSQL/12.0.0": {
10+
"OptimaJet.Workflow.MSSQL/12.1.0": {
1111
"dependencies": {
1212
"Microsoft.Data.SqlClient": "2.1.2",
1313
"NETStandard.Library": "2.0.3",
14-
"WorkflowEngine.NETCore-Core": "12.0.0",
15-
"OptimaJet.Workflow.Core": "12.0.0.0"
14+
"WorkflowEngine.NETCore-Core": "12.1.0",
15+
"OptimaJet.Workflow.Core": "12.1.0.0"
1616
},
1717
"runtime": {
1818
"OptimaJet.Workflow.MSSQL.dll": {}
@@ -1454,7 +1454,7 @@
14541454
}
14551455
}
14561456
},
1457-
"WorkflowEngine.NETCore-Core/12.0.0": {
1457+
"WorkflowEngine.NETCore-Core/12.1.0": {
14581458
"dependencies": {
14591459
"Microsoft.CodeAnalysis.CSharp": "4.1.0",
14601460
"Microsoft.CodeAnalysis.CSharp.Scripting": "4.1.0",
@@ -1469,18 +1469,18 @@
14691469
"OptimaJet.Workflow.Core.dll": {}
14701470
}
14711471
},
1472-
"OptimaJet.Workflow.Core/12.0.0.0": {
1472+
"OptimaJet.Workflow.Core/12.1.0.0": {
14731473
"runtime": {
14741474
"OptimaJet.Workflow.Core.dll": {
1475-
"assemblyVersion": "12.0.0.0",
1476-
"fileVersion": "12.0.0.0"
1475+
"assemblyVersion": "12.1.0.0",
1476+
"fileVersion": "12.1.0.0"
14771477
}
14781478
}
14791479
}
14801480
}
14811481
},
14821482
"libraries": {
1483-
"OptimaJet.Workflow.MSSQL/12.0.0": {
1483+
"OptimaJet.Workflow.MSSQL/12.1.0": {
14841484
"type": "project",
14851485
"serviceable": false,
14861486
"sha512": ""
@@ -2276,12 +2276,12 @@
22762276
"path": "thomaslevesque.weakevent/4.1.0",
22772277
"hashPath": "thomaslevesque.weakevent.4.1.0.nupkg.sha512"
22782278
},
2279-
"WorkflowEngine.NETCore-Core/12.0.0": {
2279+
"WorkflowEngine.NETCore-Core/12.1.0": {
22802280
"type": "project",
22812281
"serviceable": false,
22822282
"sha512": ""
22832283
},
2284-
"OptimaJet.Workflow.Core/12.0.0.0": {
2284+
"OptimaJet.Workflow.Core/12.1.0.0": {
22852285
"type": "reference",
22862286
"serviceable": false,
22872287
"sha512": ""

‎Providers/OptimaJet.Workflow.DbPersistence/OptimaJet.Workflow.MSSQL.dll

1.5 KB
Binary file not shown.

‎Providers/OptimaJet.Workflow.DbPersistence/SQL/CreatePersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for MSSQL and Azure SQL
4-
Version: 12.0
4+
Version: 12.1
55
File: CreatePersistenceObjects.sql
66
77
*/

‎Providers/OptimaJet.Workflow.DbPersistence/Source/DbObject.cs

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -467,29 +467,67 @@ private async Task<List<Dictionary<string, object>>> SelectInternalAsDictionaryA
467467

468468
#endregion Command Insert/Update/Delete/Commit
469469

470-
public async Task<int> InsertAllAsync(SqlConnection connection, TEntity[] values, SqlTransaction transaction = null)
470+
public async Task<int> InsertAllAsync(SqlConnection connection, TEntity[] entities,
471+
SqlTransaction transaction = null)
471472
{
472-
if (values.Length < 1)
473+
if (entities.Length < 1)
473474
{
474475
return 0;
475476
}
477+
478+
if (entities.Length * DBColumns.Count < 2100)
479+
{
480+
return await InsertAllInternalAsync(connection, entities, transaction).ConfigureAwait(false);
481+
}
482+
483+
bool needCommit = false;
484+
485+
if (transaction == null)
486+
{
487+
if (connection.State != ConnectionState.Open)
488+
{
489+
await connection.OpenAsync().ConfigureAwait(false);
490+
}
491+
transaction = connection.BeginTransaction();
492+
needCommit = true;
493+
}
494+
495+
int step = 2100 / DBColumns.Count - 1;
496+
int result = 0;
497+
for (int i = 0; i < entities.Length; i += step)
498+
{
499+
TEntity[] entitiesSlice = entities.Skip(i).Take(step).ToArray();
500+
result += await InsertAllInternalAsync(connection, entitiesSlice, transaction).ConfigureAwait(false);
501+
}
502+
503+
if (needCommit)
504+
{
505+
transaction.Commit();
506+
}
476507

508+
return result;
509+
}
510+
511+
private async Task<int> InsertAllInternalAsync(SqlConnection connection, TEntity[] entities,
512+
SqlTransaction transaction = null)
513+
{
477514
var parameters = new List<SqlParameter>();
478515
var names = new List<string>();
479516

480-
for (int i = 0; i < values.Length; i++)
517+
for (int i = 0; i < entities.Length; i++)
481518
{
482519
var i1 = i;
483520
names.Add("(" + String.Join(",", DBColumns.Select(c => "@" + i1 + c.Name)) + ")");
484-
parameters.AddRange(DBColumns.Select(c => CreateParameter(values[i], c, i.ToString())).ToArray());
521+
parameters.AddRange(DBColumns.Select(c => CreateParameter(entities[i], c, i.ToString())).ToArray());
485522
}
486523

487524
string command =
488525
$"INSERT INTO {ObjectName} (" +
489526
String.Join(",", DBColumns.Select(c => $"[{c.Name}]")) +
490527
$") VALUES {String.Join(",", names)}";
491528

492-
return await ExecuteCommandNonQueryAsync(connection, command, transaction, parameters.ToArray()).ConfigureAwait(false);
529+
return await ExecuteCommandNonQueryAsync(connection, command, transaction, parameters.ToArray())
530+
.ConfigureAwait(false);
493531
}
494532

495533
public static object ConvertToDbCompatibilityType(object obj)

‎Providers/OptimaJet.Workflow.DbPersistence/Source/OptimaJet.Workflow.MSSQL.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<AssemblyName>OptimaJet.Workflow.MSSQL</AssemblyName>
77
<SignAssembly>True</SignAssembly>
88
<AssemblyOriginatorKeyFile>Workflow.snk</AssemblyOriginatorKeyFile>
9-
<AssemblyVersion>12.0.0</AssemblyVersion>
10-
<FileVersion>12.0.0</FileVersion>
11-
<Version>12.0.0</Version>
9+
<AssemblyVersion>12.1.0</AssemblyVersion>
10+
<FileVersion>12.1.0</FileVersion>
11+
<Version>12.1.0</Version>
1212
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
1313
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
1414
<Authors>Optimajet Limited</Authors>

‎Providers/OptimaJet.Workflow.DbPersistence/Source/Scripts/CreatePersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for MSSQL and Azure SQL
4-
Version: 12.0
4+
Version: 12.1
55
File: CreatePersistenceObjects.sql
66
77
*/

‎Providers/OptimaJet.Workflow.MongoDB/OptimaJet.Workflow.MongoDB.deps.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"targets": {
88
".NETStandard,Version=v2.0": {},
99
".NETStandard,Version=v2.0/": {
10-
"OptimaJet.Workflow.MongoDB/12.0.0": {
10+
"OptimaJet.Workflow.MongoDB/12.1.0": {
1111
"dependencies": {
1212
"MongoDB.Driver.signed": "2.19.0",
1313
"NETStandard.Library": "2.0.3",
14-
"WorkflowEngine.NETCore-Core": "12.0.0",
15-
"OptimaJet.Workflow.Core": "12.0.0.0"
14+
"WorkflowEngine.NETCore-Core": "12.1.0",
15+
"OptimaJet.Workflow.Core": "12.1.0.0"
1616
},
1717
"runtime": {
1818
"OptimaJet.Workflow.MongoDB.dll": {}
@@ -1113,7 +1113,7 @@
11131113
}
11141114
}
11151115
},
1116-
"WorkflowEngine.NETCore-Core/12.0.0": {
1116+
"WorkflowEngine.NETCore-Core/12.1.0": {
11171117
"dependencies": {
11181118
"Microsoft.CodeAnalysis.CSharp": "4.1.0",
11191119
"Microsoft.CodeAnalysis.CSharp.Scripting": "4.1.0",
@@ -1128,18 +1128,18 @@
11281128
"OptimaJet.Workflow.Core.dll": {}
11291129
}
11301130
},
1131-
"OptimaJet.Workflow.Core/12.0.0.0": {
1131+
"OptimaJet.Workflow.Core/12.1.0.0": {
11321132
"runtime": {
11331133
"OptimaJet.Workflow.Core.dll": {
1134-
"assemblyVersion": "12.0.0.0",
1135-
"fileVersion": "12.0.0.0"
1134+
"assemblyVersion": "12.1.0.0",
1135+
"fileVersion": "12.1.0.0"
11361136
}
11371137
}
11381138
}
11391139
}
11401140
},
11411141
"libraries": {
1142-
"OptimaJet.Workflow.MongoDB/12.0.0": {
1142+
"OptimaJet.Workflow.MongoDB/12.1.0": {
11431143
"type": "project",
11441144
"serviceable": false,
11451145
"sha512": ""
@@ -1781,12 +1781,12 @@
17811781
"path": "zstdsharp.port/0.6.2",
17821782
"hashPath": "zstdsharp.port.0.6.2.nupkg.sha512"
17831783
},
1784-
"WorkflowEngine.NETCore-Core/12.0.0": {
1784+
"WorkflowEngine.NETCore-Core/12.1.0": {
17851785
"type": "project",
17861786
"serviceable": false,
17871787
"sha512": ""
17881788
},
1789-
"OptimaJet.Workflow.Core/12.0.0.0": {
1789+
"OptimaJet.Workflow.Core/12.1.0.0": {
17901790
"type": "reference",
17911791
"serviceable": false,
17921792
"sha512": ""

‎Providers/OptimaJet.Workflow.MongoDB/OptimaJet.Workflow.MongoDB.dll

0 Bytes
Binary file not shown.

‎Providers/OptimaJet.Workflow.MongoDB/Source/OptimaJet.Workflow.MongoDB.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
88
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
99
<PackageId>WorkflowEngine.NETCore-ProviderForMongoDB</PackageId>
10-
<Version>12.0.0</Version>
11-
<AssemblyVersion>12.0.0</AssemblyVersion>
12-
<FileVersion>12.0.0</FileVersion>
10+
<Version>12.1.0</Version>
11+
<AssemblyVersion>12.1.0</AssemblyVersion>
12+
<FileVersion>12.1.0</FileVersion>
1313
<Authors>Optimajet Limited</Authors>
1414
<Product>Workflow Engine</Product>
1515
<Description>

‎Providers/OptimaJet.Workflow.MySql/OptimaJet.Workflow.MySql.deps.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"targets": {
88
".NETStandard,Version=v2.0": {},
99
".NETStandard,Version=v2.0/": {
10-
"OptimaJet.Workflow.MySQL/12.0.0": {
10+
"OptimaJet.Workflow.MySQL/12.1.0": {
1111
"dependencies": {
1212
"MySql.Data": "8.0.30",
1313
"NETStandard.Library": "2.0.3",
14-
"WorkflowEngine.NETCore-Core": "12.0.0",
15-
"OptimaJet.Workflow.Core": "12.0.0.0"
14+
"WorkflowEngine.NETCore-Core": "12.1.0",
15+
"OptimaJet.Workflow.Core": "12.1.0.0"
1616
},
1717
"runtime": {
1818
"OptimaJet.Workflow.MySQL.dll": {}
@@ -1067,7 +1067,7 @@
10671067
}
10681068
}
10691069
},
1070-
"WorkflowEngine.NETCore-Core/12.0.0": {
1070+
"WorkflowEngine.NETCore-Core/12.1.0": {
10711071
"dependencies": {
10721072
"Microsoft.CodeAnalysis.CSharp": "4.1.0",
10731073
"Microsoft.CodeAnalysis.CSharp.Scripting": "4.1.0",
@@ -1082,18 +1082,18 @@
10821082
"OptimaJet.Workflow.Core.dll": {}
10831083
}
10841084
},
1085-
"OptimaJet.Workflow.Core/12.0.0.0": {
1085+
"OptimaJet.Workflow.Core/12.1.0.0": {
10861086
"runtime": {
10871087
"OptimaJet.Workflow.Core.dll": {
1088-
"assemblyVersion": "12.0.0.0",
1089-
"fileVersion": "12.0.0.0"
1088+
"assemblyVersion": "12.1.0.0",
1089+
"fileVersion": "12.1.0.0"
10901090
}
10911091
}
10921092
}
10931093
}
10941094
},
10951095
"libraries": {
1096-
"OptimaJet.Workflow.MySQL/12.0.0": {
1096+
"OptimaJet.Workflow.MySQL/12.1.0": {
10971097
"type": "project",
10981098
"serviceable": false,
10991099
"sha512": ""
@@ -1707,12 +1707,12 @@
17071707
"path": "thomaslevesque.weakevent/4.1.0",
17081708
"hashPath": "thomaslevesque.weakevent.4.1.0.nupkg.sha512"
17091709
},
1710-
"WorkflowEngine.NETCore-Core/12.0.0": {
1710+
"WorkflowEngine.NETCore-Core/12.1.0": {
17111711
"type": "project",
17121712
"serviceable": false,
17131713
"sha512": ""
17141714
},
1715-
"OptimaJet.Workflow.Core/12.0.0.0": {
1715+
"OptimaJet.Workflow.Core/12.1.0.0": {
17161716
"type": "reference",
17171717
"serviceable": false,
17181718
"sha512": ""

‎Providers/OptimaJet.Workflow.MySql/OptimaJet.Workflow.MySql.dll

0 Bytes
Binary file not shown.

‎Providers/OptimaJet.Workflow.MySql/SQL/CreatePersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Company: OptimaJet
55
Project: WorkflowEngine.NET Provider for MySQL
6-
Version: 12.0
6+
Version: 12.1
77
File: CreatePersistenceObjects.sql
88
*/
99

‎Providers/OptimaJet.Workflow.MySql/Source/OptimaJet.Workflow.MySQL.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<TargetFramework>netstandard2.0</TargetFramework>
44
<LangVersion>10</LangVersion>
55
<PackageId>WorkflowEngine.NETCore-ProviderForMySQL</PackageId>
6-
<Version>12.0.0</Version>
7-
<AssemblyVersion>12.0.0</AssemblyVersion>
8-
<FileVersion>12.0.0</FileVersion>
6+
<Version>12.1.0</Version>
7+
<AssemblyVersion>12.1.0</AssemblyVersion>
8+
<FileVersion>12.1.0</FileVersion>
99
<Authors>Optimajet Limited</Authors>
1010
<Product>Workflow Engine</Product>
1111
<Description>

‎Providers/OptimaJet.Workflow.MySql/Source/Scripts/CreatePersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Company: OptimaJet
55
Project: WorkflowEngine.NET Provider for MySQL
6-
Version: 12.0
6+
Version: 12.1
77
File: CreatePersistenceObjects.sql
88
*/
99

0 commit comments

Comments
 (0)