@pxp-nd/flow 1.0.60 → 1.0.62
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -69,8 +69,9 @@ let NodeInstance = class NodeInstance extends core_1.Controller {
|
|
|
69
69
|
nodeInstance.nodeId = node.nodeId;
|
|
70
70
|
nodeInstance.runTime = new Date();
|
|
71
71
|
if (node.action.actionType.isDelay === "Y") {
|
|
72
|
-
const
|
|
73
|
-
const
|
|
72
|
+
const delayData = JSON.parse(node.actionConfigJson);
|
|
73
|
+
const delay = delayData.quantity;
|
|
74
|
+
const typeDelay = delayData.type;
|
|
74
75
|
nodeInstance.schedule = (0, moment_1.default)().add(delay, typeDelay).toDate();
|
|
75
76
|
nodeInstance.status = "WAIT";
|
|
76
77
|
await manager.save(NodeInstance_1.default, nodeInstance);
|
|
@@ -96,7 +97,7 @@ let NodeInstance = class NodeInstance extends core_1.Controller {
|
|
|
96
97
|
for (const nodeConnection of nodeConnectionList) {
|
|
97
98
|
const condition = lodash_1.default.template(nodeConnection.condition)(resultFromOrigin);
|
|
98
99
|
const evalCondition = eval(condition);
|
|
99
|
-
if (evalCondition) {
|
|
100
|
+
if (!nodeConnection.condition || evalCondition) {
|
|
100
101
|
const nodeRes = await (0, core_1.__)(Node_1.default.findOne(nodeConnection.nodeIdChild));
|
|
101
102
|
await this.RecursiveInstance({
|
|
102
103
|
node: nodeRes,
|