Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/js/AppBuilder/ABFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -868,6 +868,10 @@ class ABFactory extends ABFactoryCore {
return _.cloneDeep(value);
}

defaultsDeep(target, source) {
return _.defaultsDeep(target, source);
}

error(message, ...rest) {
var emitData = {
message: `ABFactory[${this.Tenant.id()}]:${message.toString()}`,
Expand Down
2 changes: 1 addition & 1 deletion src/js/AppBuilder/core
Submodule core updated from 9f045d to d52cad
36 changes: 18 additions & 18 deletions src/js/AppBuilder/platform/process/tasks/ABProcessTaskServiceApi.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ export default class ABProcessTaskServiceAPI extends ServiceAPICore {
warningsEval() {
super.warningsEval();

if (!this.formulaText) {
this.warningMessage("is missing a formula.");
}
// if (!this.formulaText) {
// this.warningMessage("is missing a formula.");
// }

if (this.formulaText) {
const hash = {};
(this.process.processDataFields(this) || []).forEach((item) => {
hash[`{${item.label}}`] = item;
});
// if (this.formulaText) {
// const hash = {};
// (this.process.processDataFields(this) || []).forEach((item) => {
// hash[`{${item.label}}`] = item;
// });

let exp = new RegExp(`{[^}]*}`, "g");
let entries = this.formulaText.match(exp) || [];
entries.forEach((entry) => {
if (!hash[entry]) {
this.warningMessage(
`could not resolve process value [${entry}]`
);
}
});
}
// let exp = new RegExp(`{[^}]*}`, "g");
// let entries = this.formulaText.match(exp) || [];
// entries.forEach((entry) => {
// if (!hash[entry]) {
// this.warningMessage(
// `could not resolve process value [${entry}]`
// );
// }
// });
// }
}
}
Loading