Skip to content

Commit eeebd78

Browse files
optimajetoptimajet
committed
WFE 12.0.0 (autocommit)
1 parent e4cef04 commit eeebd78

File tree

103 files changed

+1474
-1586
lines changed

Some content is hidden

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

103 files changed

+1474
-1586
lines changed

‎Designer/templates/activity.html

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -319,81 +319,81 @@ <h4 class="WorkflowDesignerTitleWithCreate Underline">
319319
<a v-if="!readonly" @click="addRow(FormData.ExceptionsHandlers)">{{ButtonTextCreate}}</a>
320320
</h4>
321321
<table v-if="FormData.ExceptionsHandlers.length > 0" class="WorkflowDesignerTable">
322-
<tr>
323-
<th></th>
324-
<th>{{labels.Exceptions}}</th>
325-
<th>{{labels.TypeLabel}}</th>
326-
<th>{{labels.ImpAction}}</th>
327-
</tr>
328-
<tr v-for="(imp, index) in FormData.ExceptionsHandlers" :key="index"
329-
:class="dragOverIndex == index && dragOverBlock == imp ? 'dragOver' : ''"
322+
<tr>
323+
<th></th>
324+
<th>{{ labels.Exceptions }}</th>
325+
<th>{{ labels.TypeLabel }}</th>
326+
<th>{{ labels.ImpAction }}</th>
327+
</tr>
328+
<tr v-for="(imp, index) in FormData.ExceptionsHandlers" :key="index"
329+
:class="dragOverIndex == index && dragOverBlock == imp ? 'dragOver' : ''"
330330
@dragend="dragend($event)"
331331
@dragover="dragover(imp, index, $event)"
332332
@dragstart="dragstart(index, $event, FormData.ExceptionsHandlers)">
333333
<td :draggable="!readonly" class='WorkflowDesignerTableMoveCol'>
334-
<div v-if="!readonly" class='WorkflowDesignerTableMoveButton'></div>
335-
</td >
336-
<td>
337-
<el-select
338-
v-model="imp.Exceptions"
334+
<div v-if="!readonly" class='WorkflowDesignerTableMoveButton'></div>
335+
</td>
336+
<td>
337+
<el-select
338+
v-model="imp.Exceptions"
339339
:class="validateField(notEmpty, imp.Exceptions) ? 'WorkflowDesignerInputError' : ''"
340340
:disabled="readonly"
341341
:placeholder="labels.Exceptions"
342-
:title="validateField(notEmpty, imp.Exceptions)"
342+
:title="validateField(notEmpty, imp.Exceptions)"
343343
allow-create
344-
clearable
345-
filterable
344+
clearable
346345
filterable
347346
multiple
348347
style="width: 100%;">
349-
<el-option key="AllExceptions" :label="labels.AllExceptions" value="*"></el-option>
350-
</el-select>
351-
</td>
352-
<td >
353-
<el-select
354-
v-model="imp.Type"
348+
<el-option key="AllExceptions" :label="labels.AllExceptions" value="*"></el-option>
349+
<el-option v-for="item in imp.Exceptions" v-if="item !== '*'" :key="item" :label="item" :value="item"></el-option>
350+
</el-select>
351+
</td>
352+
<td>
353+
<el-select
354+
v-model="imp.Type"
355355
:class="validateField(notEmpty, imp.Type) ? 'WorkflowDesignerInputError' : ''"
356356
:disabled="readonly"
357357
:placeholder="labels.TypeLabel"
358-
:title="validateField(notEmpty, imp.Type)"
358+
:title="validateField(notEmpty, imp.Type)"
359359
clearable
360360
filterable
361361
style="width: 100%;"
362362
@change="delete imp.NameForSet">
363-
<el-option key="SetActivity" :label="labels.SetActivityLabel" value="SetActivity"></el-option>
364-
<el-option key="SetState" :label="labels.SetStateLabel" value="SetState"></el-option>
365-
<el-option key="Retry" :label="labels.RetryLabel" value="Retry"></el-option>
366-
<el-option key="Ignore" :label="labels.IgnoreLabel" value="Ignore"></el-option>
367-
</el-select>
368-
</td>
369-
<td v-if="imp.Type == 'SetActivity'"
370-
:readonly="readonly">
371-
<el-select
372-
v-model="imp.NameForSet"
363+
<el-option key="SetActivity" :label="labels.SetActivityLabel" value="SetActivity"></el-option>
364+
<el-option key="SetState" :label="labels.SetStateLabel" value="SetState"></el-option>
365+
<el-option key="Retry" :label="labels.RetryLabel" value="Retry"></el-option>
366+
<el-option key="Ignore" :label="labels.IgnoreLabel" value="Ignore"></el-option>
367+
</el-select>
368+
</td>
369+
<td v-if="imp.Type == 'SetActivity'"
370+
:readonly="readonly">
371+
<el-select
372+
v-model="imp.NameForSet"
373373
:class="validateField(notEmpty, imp.NameForSet) ? 'WorkflowDesignerInputError' : ''"
374374
:disabled="readonly"
375375
:placeholder="labels.ActivityLabel"
376376
:title="validateField(notEmpty, imp.NameForSet)"
377377
clearable
378-
filterable
378+
filterable
379379
style="width: 100%;">
380-
<el-option v-for="item in activities" :key="item" :label="item" :value="item"></el-option>
381-
</el-select>
382-
</td>
383-
<td v-if="imp.Type == 'SetState'" >
384-
<el-select
385-
v-model="imp.NameForSet"
380+
<el-option v-for="item in activities" :key="item" :label="item" :value="item"></el-option>
381+
</el-select>
382+
</td>
383+
<td v-if="imp.Type == 'SetState'">
384+
<el-select
385+
v-model="imp.NameForSet"
386386
:class="validateField(notEmpty, imp.NameForSet) ? 'WorkflowDesignerInputError' : ''"
387387
:disabled="readonly"
388388
:placeholder="labels.StateLabel"
389-
:title="validateField(notEmpty, imp.NameForSet)"
389+
:title="validateField(notEmpty, imp.NameForSet)"
390390
clearable
391391
filterable
392392
style="width: 100%;">
393-
<el-option v-for="item in states" :key="item" :label="item" :value="item"></el-option>
394-
</el-select>
395-
</td>
396-
<td v-if="imp.Type == 'Retry'">
393+
<el-option v-for="item in states" :key="item" :label="item" :value="item"></el-option>
394+
</el-select>
395+
</td>
396+
<td v-if="imp.Type == 'Retry'">
397397
<el-input-number v-model="imp.RetryCount" :class="validateField(notEmpty, imp.RetryCount) ? 'WorkflowDesignerInputError' : ''"
398398
:placeholder="labels.RetryCountLabel"
399399
:readonly="readonly"

‎Designer/workflowdesigner.min.css

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

‎Designer/workflowdesigner.min.js

Lines changed: 19 additions & 10 deletions
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/11.0.1": {
10+
"OptimaJet.Workflow.MSSQL/12.0.0": {
1111
"dependencies": {
1212
"Microsoft.Data.SqlClient": "2.1.2",
1313
"NETStandard.Library": "2.0.3",
14-
"WorkflowEngine.NETCore-Core": "11.0.1",
15-
"OptimaJet.Workflow.Core": "11.0.0.0"
14+
"WorkflowEngine.NETCore-Core": "12.0.0",
15+
"OptimaJet.Workflow.Core": "12.0.0.0"
1616
},
1717
"runtime": {
1818
"OptimaJet.Workflow.MSSQL.dll": {}
@@ -1454,7 +1454,7 @@
14541454
}
14551455
}
14561456
},
1457-
"WorkflowEngine.NETCore-Core/11.0.1": {
1457+
"WorkflowEngine.NETCore-Core/12.0.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/11.0.0.0": {
1472+
"OptimaJet.Workflow.Core/12.0.0.0": {
14731473
"runtime": {
14741474
"OptimaJet.Workflow.Core.dll": {
1475-
"assemblyVersion": "11.0.0.0",
1476-
"fileVersion": "11.0.0.0"
1475+
"assemblyVersion": "12.0.0.0",
1476+
"fileVersion": "12.0.0.0"
14771477
}
14781478
}
14791479
}
14801480
}
14811481
},
14821482
"libraries": {
1483-
"OptimaJet.Workflow.MSSQL/11.0.1": {
1483+
"OptimaJet.Workflow.MSSQL/12.0.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/11.0.1": {
2279+
"WorkflowEngine.NETCore-Core/12.0.0": {
22802280
"type": "project",
22812281
"serviceable": false,
22822282
"sha512": ""
22832283
},
2284-
"OptimaJet.Workflow.Core/11.0.0.0": {
2284+
"OptimaJet.Workflow.Core/12.0.0.0": {
22852285
"type": "reference",
22862286
"serviceable": false,
22872287
"sha512": ""

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

0 Bytes
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: 11.0
4+
Version: 12.0
55
File: CreatePersistenceObjects.sql
66
77
*/

‎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>11.0.0</AssemblyVersion>
10-
<FileVersion>11.0.0</FileVersion>
11-
<Version>11.0.1</Version>
9+
<AssemblyVersion>12.0.0</AssemblyVersion>
10+
<FileVersion>12.0.0</FileVersion>
11+
<Version>12.0.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: 11.0
4+
Version: 12.0
55
File: CreatePersistenceObjects.sql
66
77
*/

0 commit comments

Comments
 (0)