Skip to content

Commit 2ae40e5

Browse files
optimajetoptimajet
committed
WFE 7.2.0 (autocommit)
1 parent 1e3e6e2 commit 2ae40e5

File tree

98 files changed

+896
-144
lines changed

Some content is hidden

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

98 files changed

+896
-144
lines changed

‎Designer/templates/jsonform.html

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ <h3>{{ customTitle ? customTitle : (formMode ? labels2.Title : labels.Title) }}<
1616
<el-date-picker
1717
v-if="field.Type == 'DateTime'"
1818
v-model="FormData[field.Name]"
19+
value-format="yyyy-MM-ddTHH:mm:ss"
1920
:class="validateFieldDD(FormData[field.Name]) ? 'WorkflowDesignerInputError' : ''"
2021
:readonly="readonly"
2122
type="datetime">
@@ -186,6 +187,21 @@ <h3>{{ customTitle ? customTitle : (formMode ? labels2.Title : labels.Title) }}<
186187
}
187188

188189
if (me.VueConfig.data.formMode) {
190+
191+
if (value) {
192+
var serialized = WorkflowDesignerCommon.toJSON(value);
193+
194+
if (me.VueConfig.data.fields) {
195+
me.VueConfig.data.fields.forEach(function (field) {
196+
if (field.Type === 'Json') {
197+
serialized[field.Name] = WorkflowDesignerCommon.toJSON(serialized[field.Name]);
198+
}
199+
});
200+
}
201+
202+
value = WorkflowDesignerCommon.toString(serialized);
203+
}
204+
189205
if (me.VueConfig.data.fields.length === 1 && me.VueConfig.data.fields[0].Name === '') {
190206
if (me.VueConfig.data.fields[0].Type === 'Text'
191207
|| me.VueConfig.data.fields[0].Type === 'TextArea'
@@ -394,11 +410,15 @@ <h3>{{ customTitle ? customTitle : (formMode ? labels2.Title : labels.Title) }}<
394410
if (field.Type === 'Json') {
395411
if (me.editors && me.editors[field.Name]) {
396412
var value = me.editors[field.Name].getValue();
397-
data[field.Name] = WorkflowDesignerCommon.toJSON(value);
413+
data[field.Name] = value;
398414
} else {
399-
data[field.Name] = data[field.Name] === '' ? undefined : WorkflowDesignerCommon.toJSON(data[field.Name]);
415+
data[field.Name] = data[field.Name] === '' ? undefined : data[field.Name];
400416
}
401417
}
418+
419+
if (field.Type === 'MultiSelect') {
420+
data[field.Name] = WorkflowDesignerCommon.toString(data[field.Name]);
421+
}
402422
});
403423
return data;
404424
}
@@ -508,7 +528,7 @@ <h3>{{ customTitle ? customTitle : (formMode ? labels2.Title : labels.Title) }}<
508528
}
509529
}
510530
} else {
511-
value = WorkflowDesignerCommon.toCompactJSON(me.editor.getValue());
531+
value = me.editor.getValue();
512532
}
513533

514534
if (isValid) {

‎Designer/templates/toolbar.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,10 @@
315315
me.graph.designer?.save(() => notify(WorkflowDesignerConstants.SchemeSaved));
316316
};
317317

318+
me.VueConfig.methods.undo = function () {
319+
me.graph.Undo();
320+
};
321+
318322
me.VueConfig.methods.redo = function () {
319323
me.graph.Redo();
320324
};

‎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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"targets": {
88
".NETStandard,Version=v2.0": {},
99
".NETStandard,Version=v2.0/": {
10-
"OptimaJet.Workflow.MSSQL/7.1.4": {
10+
"OptimaJet.Workflow.MSSQL/7.2.0": {
1111
"dependencies": {
1212
"Microsoft.Data.SqlClient": "2.0.1",
1313
"NETStandard.Library": "2.0.3",
14-
"WorkflowEngine.NETCore-Core": "7.1.4"
14+
"WorkflowEngine.NETCore-Core": "7.2.0"
1515
},
1616
"runtime": {
1717
"OptimaJet.Workflow.MSSQL.dll": {}
@@ -1418,7 +1418,7 @@
14181418
}
14191419
}
14201420
},
1421-
"WorkflowEngine.NETCore-Core/7.1.4": {
1421+
"WorkflowEngine.NETCore-Core/7.2.0": {
14221422
"dependencies": {
14231423
"Microsoft.CodeAnalysis.CSharp": "4.1.0",
14241424
"Microsoft.CodeAnalysis.CSharp.Scripting": "4.1.0",
@@ -1437,7 +1437,7 @@
14371437
}
14381438
},
14391439
"libraries": {
1440-
"OptimaJet.Workflow.MSSQL/7.1.4": {
1440+
"OptimaJet.Workflow.MSSQL/7.2.0": {
14411441
"type": "project",
14421442
"serviceable": false,
14431443
"sha512": ""
@@ -2212,7 +2212,7 @@
22122212
"path": "thomaslevesque.weakevent/4.1.0",
22132213
"hashPath": "thomaslevesque.weakevent.4.1.0.nupkg.sha512"
22142214
},
2215-
"WorkflowEngine.NETCore-Core/7.1.4": {
2215+
"WorkflowEngine.NETCore-Core/7.2.0": {
22162216
"type": "project",
22172217
"serviceable": false,
22182218
"sha512": ""

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

4 KB
Binary file not shown.

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ public async Task<Dictionary<string, T>> LoadGlobalParametersWithNamesAsync<T>(s
964964

965965
return dict;
966966
}
967-
967+
968968
public virtual async Task<List<T>> LoadGlobalParametersAsync<T>(string type)
969969
{
970970
using var connection = OpenConnection();
@@ -973,7 +973,22 @@ public virtual async Task<List<T>> LoadGlobalParametersAsync<T>(string type)
973973

974974
return parameters.Select(p => JsonConvert.DeserializeObject<T>(p.Value)).ToList();
975975
}
976-
976+
977+
public virtual async Task<PagedResponse<T>> LoadGlobalParametersWithPagingAsync<T>(string type, Paging paging, string name = null)
978+
{
979+
using var connection = OpenConnection();
980+
var parameters = await WorkflowGlobalParameter
981+
.SearchByTypeAndNameWithPagingAsync(connection, type, name, paging)
982+
.ConfigureAwait(false);
983+
var count = await WorkflowGlobalParameter.GetCountByTypeAndNameAsync(connection, type, name)
984+
.ConfigureAwait(false);
985+
return new PagedResponse<T>()
986+
{
987+
Data = parameters.Select(p => JsonConvert.DeserializeObject<T>(p.Value)).ToList(),
988+
Count = count
989+
};
990+
}
991+
977992
public virtual async Task DeleteGlobalParametersAsync(string type, string name = null)
978993
{
979994
using var connection = OpenConnection();

‎Providers/OptimaJet.Workflow.DbPersistence/Source/Models/QueryDefinition.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System.Collections.Generic;
2+
using Microsoft.Data.SqlClient;
3+
4+
namespace OptimaJet.Workflow.MSSQL.Models;
5+
6+
/// <summary>
7+
/// Definition of query
8+
/// </summary>
9+
public class QueryDefinition
10+
{
11+
/// <summary>
12+
/// Query text
13+
/// </summary>
14+
public string Query { get; set; }
15+
16+
/// <summary>
17+
/// Query parameters
18+
/// </summary>
19+
public List<SqlParameter> Parameters { get; set; }
20+
}

‎Providers/OptimaJet.Workflow.DbPersistence/Source/Models/WorkflowGlobalParameter.cs

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
using System;
2+
using System.Collections.Generic;
23
using Microsoft.Data.SqlClient;
34
using System.Data;
45
using System.Threading.Tasks;
56
using OptimaJet.Workflow.Core.Entities;
7+
using OptimaJet.Workflow.Core.Persistence;
8+
using OptimaJet.Workflow.MSSQL.Models;
69

710
// ReSharper disable once CheckNamespace
811
namespace OptimaJet.Workflow.DbPersistence
@@ -41,6 +44,51 @@ public async Task<GlobalParameterEntity[]> SelectByTypeAndNameAsync(SqlConnectio
4144
return await SelectAsync(connection, selectText, p, p1).ConfigureAwait(false);
4245
}
4346

47+
private QueryDefinition GetBasicSearchQuery(string type, string name = null)
48+
{
49+
var parameters = new List<SqlParameter>();
50+
var selectText = $"FROM {ObjectName} WHERE [{nameof(GlobalParameterEntity.Type)}] = @type";
51+
52+
parameters.Add(new SqlParameter("type", SqlDbType.NVarChar) {Value = type});
53+
54+
if (!String.IsNullOrEmpty(name))
55+
{
56+
selectText += $" AND [{nameof(GlobalParameterEntity.Name)}] LIKE @name";
57+
parameters.Add(new SqlParameter("name", SqlDbType.NVarChar) {Value = $"%{name}%"});
58+
}
59+
60+
return new QueryDefinition() {Parameters = parameters, Query = selectText};
61+
}
62+
63+
public async Task<GlobalParameterEntity[]> SearchByTypeAndNameWithPagingAsync(SqlConnection connection, string type,
64+
string name = null, Paging paging = null)
65+
{
66+
var queryDefinition = GetBasicSearchQuery(type, name);
67+
var parameters = queryDefinition.Parameters;
68+
var selectText = $"SELECT * {queryDefinition.Query} ORDER BY [{nameof(GlobalParameterEntity.Name)}]";
69+
70+
if (paging != null)
71+
{
72+
selectText += " OFFSET @skip ROWS FETCH NEXT @size ROWS ONLY";
73+
74+
parameters.Add(new SqlParameter("skip", SqlDbType.Int) {Value = paging.SkipCount()});
75+
parameters.Add(new SqlParameter("size", SqlDbType.Int) {Value = paging.PageSize});
76+
}
77+
78+
return await SelectAsync(connection, selectText, parameters.ToArray()).ConfigureAwait(false);
79+
}
80+
81+
public async Task<int> GetCountByTypeAndNameAsync(SqlConnection connection, string type, string name = null)
82+
{
83+
var queryDefinition = GetBasicSearchQuery(type, name);
84+
var parameters = queryDefinition.Parameters;
85+
var selectText = $"SELECT COUNT(*) {queryDefinition.Query}";
86+
87+
var result = await ExecuteCommandScalarAsync(connection, selectText, parameters.ToArray()).ConfigureAwait(false);
88+
var count = result == DBNull.Value ? 0 : result;
89+
return Convert.ToInt32(count);
90+
}
91+
4492
public async Task<int> DeleteByTypeAndNameAsync(SqlConnection connection, string type, string name = null)
4593
{
4694
string selectText = $"DELETE FROM {ObjectName} WHERE [{nameof(GlobalParameterEntity.Type)}] = @type";

‎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>7.1.4</AssemblyVersion>
10-
<FileVersion>7.1.4</FileVersion>
11-
<Version>7.1.4</Version>
9+
<AssemblyVersion>7.2.0</AssemblyVersion>
10+
<FileVersion>7.2.0</FileVersion>
11+
<Version>7.2.0</Version>
1212
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
1313
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
1414
<Authors>OptimaJet, LLC</Authors>

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

Lines changed: 5 additions & 5 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/7.1.4": {
10+
"OptimaJet.Workflow.MongoDB/7.2.0": {
1111
"dependencies": {
1212
"MongoDB.Driver.signed": "2.10.4",
1313
"NETStandard.Library": "2.0.3",
1414
"System.Linq.Dynamic.Core": "1.2.8",
15-
"WorkflowEngine.NETCore-Core": "7.1.4"
15+
"WorkflowEngine.NETCore-Core": "7.2.0"
1616
},
1717
"runtime": {
1818
"OptimaJet.Workflow.MongoDB.dll": {}
@@ -1437,7 +1437,7 @@
14371437
}
14381438
}
14391439
},
1440-
"WorkflowEngine.NETCore-Core/7.1.4": {
1440+
"WorkflowEngine.NETCore-Core/7.2.0": {
14411441
"dependencies": {
14421442
"Microsoft.CodeAnalysis.CSharp": "4.1.0",
14431443
"Microsoft.CodeAnalysis.CSharp.Scripting": "4.1.0",
@@ -1456,7 +1456,7 @@
14561456
}
14571457
},
14581458
"libraries": {
1459-
"OptimaJet.Workflow.MongoDB/7.1.4": {
1459+
"OptimaJet.Workflow.MongoDB/7.2.0": {
14601460
"type": "project",
14611461
"serviceable": false,
14621462
"sha512": ""
@@ -2231,7 +2231,7 @@
22312231
"path": "thomaslevesque.weakevent/4.1.0",
22322232
"hashPath": "thomaslevesque.weakevent.4.1.0.nupkg.sha512"
22332233
},
2234-
"WorkflowEngine.NETCore-Core/7.1.4": {
2234+
"WorkflowEngine.NETCore-Core/7.2.0": {
22352235
"type": "project",
22362236
"serviceable": false,
22372237
"sha512": ""

0 commit comments

Comments
 (0)