Skip to content

Commit f650202

Browse files
optimajetoptimajet
committed
WFE 5.2.6 (autocommit)
1 parent c25d11b commit f650202

103 files changed

Lines changed: 1481 additions & 617 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/Localization/workflowdesigner.localization_de.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,9 @@ var WorkflowDesignerConstants = {
388388
MailServerPort: "Mail server port",
389389
MailServerFrom: "Mail server from",
390390
To: "To",
391+
CcList: "CC address list",
392+
BccList: "BCC address list",
393+
ReplyToList: "Reply to address list",
391394
Subject: "Subject",
392395
MailServerSsl: "MailServerSsl",
393396
IsHTML: "IsHTML",

‎Designer/Localization/workflowdesigner.localization_en.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,9 @@ var WorkflowDesignerConstants = {
378378
MailServerPort: "Mail server port",
379379
MailServerFrom: "Mail server from",
380380
To: "To",
381+
CcList: "CC address list",
382+
BccList: "BCC address list",
383+
ReplyToList: "Reply to address list",
381384
Subject: "Subject",
382385
MailServerSsl: "MailServerSsl",
383386
IsHTML: "IsHTML",

‎Designer/Localization/workflowdesigner.localization_es.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,9 @@ var WorkflowDesignerConstants = {
388388
MailServerPort: "Mail server port",
389389
MailServerFrom: "Mail server from",
390390
To: "To",
391+
CcList: "CC address list",
392+
BccList: "BCC address list",
393+
ReplyToList: "Reply to address list",
391394
Subject: "Subject",
392395
MailServerSsl: "MailServerSsl",
393396
IsHTML: "IsHTML",

‎Designer/Localization/workflowdesigner.localization_fr.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,9 @@ var WorkflowDesignerConstants = {
388388
MailServerPort: "Mail server port",
389389
MailServerFrom: "Mail server from",
390390
To: "To",
391+
CcList: "CC address list",
392+
BccList: "BCC address list",
393+
ReplyToList: "Reply to address list",
391394
Subject: "Subject",
392395
MailServerSsl: "MailServerSsl",
393396
IsHTML: "IsHTML",

‎Designer/Localization/workflowdesigner.localization_it.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,9 @@ var WorkflowDesignerConstants = {
388388
MailServerPort: "Mail server port",
389389
MailServerFrom: "Mail server from",
390390
To: "To",
391+
CcList: "CC address list",
392+
BccList: "BCC address list",
393+
ReplyToList: "Reply to address list",
391394
Subject: "Subject",
392395
MailServerSsl: "MailServerSsl",
393396
IsHTML: "IsHTML",

‎Designer/Localization/workflowdesigner.localization_pt.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,9 @@ var WorkflowDesignerConstants = {
388388
MailServerPort: "Mail server port",
389389
MailServerFrom: "Mail server from",
390390
To: "To",
391+
CcList: "CC address list",
392+
BccList: "BCC address list",
393+
ReplyToList: "Reply to address list",
391394
Subject: "Subject",
392395
MailServerSsl: "MailServerSsl",
393396
IsHTML: "IsHTML",

‎Designer/Localization/workflowdesigner.localization_ru.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,9 @@ var WorkflowDesignerConstants = {
388388
MailServerPort: "Mail server port",
389389
MailServerFrom: "Mail server from",
390390
To: "To",
391+
CcList: "CC address list",
392+
BccList: "BCC address list",
393+
ReplyToList: "Reply to address list",
391394
Subject: "Subject",
392395
MailServerSsl: "MailServerSsl",
393396
IsHTML: "IsHTML",

‎Designer/Localization/workflowdesigner.localization_tr.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,9 @@ var WorkflowDesignerConstants = {
388388
MailServerPort: "Mail server port",
389389
MailServerFrom: "Mail server from",
390390
To: "To",
391+
CcList: "CC address list",
392+
BccList: "BCC address list",
393+
ReplyToList: "Reply to address list",
391394
Subject: "Subject",
392395
MailServerSsl: "MailServerSsl",
393396
IsHTML: "IsHTML",

‎Designer/templates/customforms/basicsplugin/sendemailform.html‎

Lines changed: 70 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <h4 v-if="Field.State != undefined" style="padding-bottom: 1px;border-bottom: 1p
3838
:rules="getFieldRules(Field.MailServer)"
3939
:prop="Field.MailServer.Name"
4040
class="el-form-item"
41-
style="flex-grow: 3;">
41+
style="flex-grow: 1;">
4242
<el-input v-model="FormData.MailServer" :readonly="readonly"></el-input>
4343
</el-form-item>
4444

@@ -54,7 +54,7 @@ <h4 v-if="Field.State != undefined" style="padding-bottom: 1px;border-bottom: 1p
5454
class="WorkflowDesignerParameterFromProcess">@
5555
</span>
5656
</span>
57-
<el-input-number v-if="!parameterFromProcess.MailServerPort" controls-position="right" v-model="FormData.MailServerPort" :disabled="readonly" style="width:180px"></el-input-number>
57+
<el-input type="number" v-if="!parameterFromProcess.MailServerPort" v-model="FormData.MailServerPort" :disabled="readonly"></el-input>
5858
<el-input v-if="parameterFromProcess.MailServerPort" v-model="FormData.MailServerPort" :disabled="readonly" style="width:180px"></el-input>
5959
</el-form-item>
6060
</div>
@@ -79,6 +79,54 @@ <h4 v-if="Field.State != undefined" style="padding-bottom: 1px;border-bottom: 1p
7979
</el-form-item>
8080
</div>
8181

82+
<div class="el-form--inline el-form--label-top" >
83+
<el-form-item
84+
:label="customLabels.CcList"
85+
:rules="getFieldRules(Field.CcList)"
86+
:prop="Field.CcList.Name"
87+
class="el-form-item"
88+
style="flex-grow: 1;">
89+
<el-select
90+
:readonly="readonly"
91+
v-model="FormData.CcList"
92+
filterable
93+
multiple
94+
allow-create
95+
style="width: 100%">
96+
</el-select>
97+
</el-form-item>
98+
<el-form-item
99+
:label="customLabels.BccList"
100+
:rules="getFieldRules(Field.BccList)"
101+
:prop="Field.BccList.Name"
102+
class="el-form-item"
103+
style="flex-grow: 1;">
104+
<el-select
105+
:readonly="readonly"
106+
v-model="FormData.BccList"
107+
filterable
108+
multiple
109+
allow-create
110+
style="width: 100%">
111+
</el-select>
112+
</el-form-item>
113+
</div>
114+
115+
<el-form-item
116+
:label="customLabels.ReplyToList"
117+
:rules="getFieldRules(Field.ReplyToList)"
118+
:prop="Field.ReplyToList.Name"
119+
class="el-form-item"
120+
style="flex-grow: 1;">
121+
<el-select
122+
:readonly="readonly"
123+
v-model="FormData.ReplyToList"
124+
filterable
125+
multiple
126+
allow-create>
127+
</el-select>
128+
</el-form-item>
129+
82130
<el-form-item
83131
:label="customLabels.Subject"
84132
:rules="getFieldRules(Field.Subject)"
@@ -186,7 +234,9 @@ <h4 v-if="Field.State != undefined" style="padding-bottom: 1px;border-bottom: 1p
186234
MailServerSsl: false,
187235
IsHTML: false
188236
},
189-
FormData: {},
237+
FormData: {
238+
239+
},
190240
Field:{},
191241
useAuth: false
192242
});
@@ -256,6 +306,10 @@ <h4 v-if="Field.State != undefined" style="padding-bottom: 1px;border-bottom: 1p
256306
delete me.VueConfig.data.FormData[key];
257307
}
258308

309+
me.VueConfig.data.FormData.CcList = WorkflowDesignerCommon.toJSON(me.VueConfig.data.FormData.CcList);
310+
me.VueConfig.data.FormData.BccList = WorkflowDesignerCommon.toJSON(me.VueConfig.data.FormData.BccList);
311+
me.VueConfig.data.FormData.ReplyToList = WorkflowDesignerCommon.toJSON(me.VueConfig.data.FormData.ReplyToList);
312+
259313
me.graph.insertDefaultValuesInForm(me.VueConfig.data.Field, me.VueConfig.data.FormData)
260314

261315
me.VueConfig.data.useAuth = me.VueConfig.data.FormData.MailServerPass != null || me.VueConfig.data.FormData.MailServerLogin != null
@@ -284,16 +338,20 @@ <h4 v-if="Field.State != undefined" style="padding-bottom: 1px;border-bottom: 1p
284338
};
285339

286340
me.VueConfig.methods.onSave = function(){
287-
if(!me.VueConfig.data.useAuth){
288-
me.VueConfig.data.FormData.MailServerLogin = null;
289-
me.VueConfig.data.FormData.MailServerPass = null;
290-
}
291-
292-
var value = undefined;
293-
value = WorkflowDesignerCommon.toString(me.VueConfig.data.FormData);
294-
295341
this.$refs.form.validate(function(valid) {
296342
if (valid) {
343+
if(!me.VueConfig.data.useAuth){
344+
me.VueConfig.data.FormData.MailServerLogin = null;
345+
me.VueConfig.data.FormData.MailServerPass = null;
346+
}
347+
348+
var FormData = me.VueConfig.data.FormData;
349+
350+
FormData.CcList = WorkflowDesignerCommon.toString(FormData.CcList);
351+
FormData.BccList = WorkflowDesignerCommon.toString(FormData.BccList);
352+
FormData.ReplyToList = WorkflowDesignerCommon.toString(FormData.ReplyToList);
353+
354+
var value = WorkflowDesignerCommon.toString(FormData);
297355
me.onSuccess(WorkflowDesignerCommon.toCompactJSON(value));
298356
me.onClose(true);
299357
}
@@ -304,4 +362,4 @@ <h4 v-if="Field.State != undefined" style="padding-bottom: 1px;border-bottom: 1p
304362
me.onClose(true);
305363
};
306364
};
307-
</script>
365+
</script>

‎Designer/templates/library.html‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,16 @@ <h3>{{ header }}</h3>
4949
return items;
5050
};
5151

52-
if(window.WFE_WITH_TEMPLATES){
53-
me.VueConfig.data.items = me.VueConfig.methods.ValidateItems(Array.from(WFELibrary));
52+
const url = me.VueConfig.data.folder + "library.json";
53+
const onLoad = data => {
54+
me.VueConfig.data.items = me.VueConfig.methods.ValidateItems(data);
5455
me.VueConfig.data.loading = false;
5556
}
56-
else{
57-
var libraryUrl = me.VueConfig.data.folder + "library.json";
58-
$.ajax({url: libraryUrl, async: true}).done(function(result)
59-
{
60-
me.VueConfig.data.items = me.VueConfig.methods.ValidateItems(result);
61-
me.VueConfig.data.loading = false;
62-
});
63-
}
57+
58+
me.graph.designer.loadFile(url,
59+
() => onLoad(Array.from(WFELibrary)),
60+
() => $.ajax({url, async: true}).done(onLoad)
61+
);
6462

6563

6664
me.VueConfig.methods.onUpdate = function(){

0 commit comments

Comments
 (0)