@freelog/freelog-cg-collection 1.2.3 → 1.2.5
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.
- package/dist/calculator/ExpBooleanCalculator.js +6 -7
- package/dist/function-executor/FunFunctionExecutor.d.ts +0 -3
- package/dist/function-executor/FunFunctionExecutor.js +2 -1
- package/package.json +1 -1
- package/resources/zhaojn.json +6 -30
- package/resources/zhaojn.sc +1 -1
- package/resources/zhaojn2.json +11 -81
- package/src/calculator/ExpBooleanCalculator.ts +6 -6
- package/src/function-executor/FunFunctionExecutor.ts +3 -8
- package/test/state-machine/ContractStateMachineTest.test.ts +1 -1
|
@@ -6,7 +6,6 @@ class ExpBooleanCalculator {
|
|
|
6
6
|
if (varObj.expType == "expBooleanOpLogic") {
|
|
7
7
|
return this.calculateExpBooleanOpLogic(varObj, varContextCapable);
|
|
8
8
|
}
|
|
9
|
-
2;
|
|
10
9
|
if (varObj.expType == "expBooleanOpCollection") {
|
|
11
10
|
return this.calculateExpBooleanOpCollection(varObj, varContextCapable);
|
|
12
11
|
}
|
|
@@ -22,12 +21,12 @@ class ExpBooleanCalculator {
|
|
|
22
21
|
throw new Error("getExpValue fail [ExpBooleanCalculator]...");
|
|
23
22
|
}
|
|
24
23
|
async calculateExpBooleanOpLogic(expBooleanOpLogic, varContextCapable) {
|
|
25
|
-
let var1 = this.expHelper.getExpValue(expBooleanOpLogic.var1, varContextCapable);
|
|
24
|
+
let var1 = await this.expHelper.getExpValue(expBooleanOpLogic.var1, varContextCapable);
|
|
26
25
|
if (expBooleanOpLogic.op == "not") {
|
|
27
26
|
return !var1;
|
|
28
27
|
}
|
|
29
28
|
else {
|
|
30
|
-
let var2 = this.expHelper.getExpValue(expBooleanOpLogic.var2, varContextCapable);
|
|
29
|
+
let var2 = await this.expHelper.getExpValue(expBooleanOpLogic.var2, varContextCapable);
|
|
31
30
|
if (expBooleanOpLogic.op == "and") {
|
|
32
31
|
return var1 && var2;
|
|
33
32
|
}
|
|
@@ -45,9 +44,9 @@ class ExpBooleanCalculator {
|
|
|
45
44
|
}
|
|
46
45
|
return false;
|
|
47
46
|
}
|
|
48
|
-
calculateExpBooleanOpCompare(expBooleanOpCompare, varContextCapable) {
|
|
49
|
-
let var1 = this.expHelper.getExpValue(expBooleanOpCompare.var1, varContextCapable);
|
|
50
|
-
let var2 = this.expHelper.getExpValue(expBooleanOpCompare.var2, varContextCapable);
|
|
47
|
+
async calculateExpBooleanOpCompare(expBooleanOpCompare, varContextCapable) {
|
|
48
|
+
let var1 = await this.expHelper.getExpValue(expBooleanOpCompare.var1, varContextCapable);
|
|
49
|
+
let var2 = await this.expHelper.getExpValue(expBooleanOpCompare.var2, varContextCapable);
|
|
51
50
|
if (expBooleanOpCompare.op == "less" || expBooleanOpCompare.op == "<") {
|
|
52
51
|
return var1 < var2;
|
|
53
52
|
}
|
|
@@ -79,4 +78,4 @@ class ExpBooleanCalculator {
|
|
|
79
78
|
}
|
|
80
79
|
}
|
|
81
80
|
exports.ExpBooleanCalculator = ExpBooleanCalculator;
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwQm9vbGVhbkNhbGN1bGF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2FsY3VsYXRvci9FeHBCb29sZWFuQ2FsY3VsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFTQSxNQUFhLG9CQUFvQjtJQUk3QixLQUFLLENBQUMsV0FBVyxDQUFDLE1BQTRCLEVBQUUsaUJBQXlDO1FBQ3JGLElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxtQkFBbUIsRUFBRSxDQUFDO1lBQ3hDLE9BQU8sSUFBSSxDQUFDLDBCQUEwQixDQUFDLE1BQWEsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1FBQzdFLENBQUM7UUFDRCxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksd0JBQXdCLEVBQUUsQ0FBQztZQUM3QyxPQUFPLElBQUksQ0FBQywrQkFBK0IsQ0FBQyxNQUFhLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUNsRixDQUFDO1FBQ0QsSUFBSSxNQUFNLENBQUMsT0FBTyxJQUFJLHFCQUFxQixFQUFFLENBQUM7WUFDMUMsT0FBTyxJQUFJLENBQUMsNEJBQTRCLENBQUMsTUFBYSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDL0UsQ0FBQztRQUNELElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxpQkFBaUIsRUFBRSxDQUFDO1lBQ3RDLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDekUsQ0FBQztRQUNELElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxTQUFTLEVBQUUsQ0FBQztZQUM5QixPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxNQUFNLENBQUM7UUFDckMsQ0FBQztRQUVELE1BQU0sSUFBSSxLQUFLLENBQUMsNENBQTRDLENBQUMsQ0FBQztJQUNsRSxDQUFDO0lBRU8sS0FBSyxDQUFDLDBCQUEwQixDQUFDLGlCQUFvQyxFQUFFLGlC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
|
|
@@ -39,9 +39,10 @@ class FunFunctionExecutor extends DynamicFunctionExecutor_1.DynamicFunctionExecu
|
|
|
39
39
|
// throw new Error("该函数未实现【fun.sendEvent】");
|
|
40
40
|
}
|
|
41
41
|
async F_005(args) {
|
|
42
|
+
args["contractId"] = await this.getVarContext("contract.contractId");
|
|
42
43
|
return this.outsideApiService.funSetLabel(args);
|
|
43
44
|
// throw new Error("该函数未实现【fun.setLabel】");
|
|
44
45
|
}
|
|
45
46
|
}
|
|
46
47
|
exports.FunFunctionExecutor = FunFunctionExecutor;
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRnVuRnVuY3Rpb25FeGVjdXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mdW5jdGlvbi1leGVjdXRvci9GdW5GdW5jdGlvbkV4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVFQUFrRTtBQUVsRSxNQUFhLG1CQUFvQixTQUFRLGlEQUF1QjtJQUU1RCxrQkFBa0I7UUFDZCxPQUFPLElBQUksR0FBRyxDQUFpQjtZQUMzQixDQUFDLGlCQUFpQixFQUFFLE9BQU8sQ0FBQztZQUM1QixDQUFDLGdCQUFnQixFQUFFLE9BQU8sQ0FBQztZQUMzQixDQUFDLGVBQWUsRUFBRSxPQUFPLENBQUM7WUFDMUIsQ0FBQyxlQUFlLEVBQUUsT0FBTyxDQUFDO1lBQzFCLENBQUMsY0FBYyxFQUFFLE9BQU8sQ0FBQztTQUM1QixDQUFDLENBQUM7SUFDUCxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFPLEVBQUUsS0FBUyxFQUFFLFFBQWlCO1FBQzdDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQztRQUNuQixPQUFPLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQztJQUNwQixDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFPO1FBQ2YsR0FBRyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUM7UUFDZixPQUFPLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQztJQUNwQixDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFXO1FBQ25CLE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUF1QjtRQUMvQixPQUFPLENBQUMsR0FBRyxDQUFDLDRDQUE0QyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNoRixJQUFJLFdBQVcsR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztRQUM3RCxJQUFJLENBQUMsaUJBQWlCLENBQUMsR0FBRyxXQUFXLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDcEQsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEdBQUcsV0FBVyxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ3BELElBQUksQ0FBQyxjQUFjLENBQUMsR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsaUJBQWlCLENBQUMsQ0FBQztRQUNuRSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMscUJBQXFCLENBQUMsQ0FBQztRQUN6RSxJQUFJLFlBQVksR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsbUJBQW1CLENBQUMsQ0FBQztRQUNqRSxJQUFJLENBQUMsa0JBQWtCLENBQUMsR0FBRyxZQUFZLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDdEQsSUFBSSxDQUFDLGtCQUFrQixDQUFDLEdBQUcsWUFBWSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ3RELElBQUksaUJBQWlCLEdBQUcsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDLHdCQUF3QixDQUFDLENBQUM7UUFDM0UsSUFBSSxDQUFDLHVCQUF1QixDQUFDLEdBQUcsaUJBQWlCLENBQUMsWUFBWSxDQUFDLENBQUM7UUFFaEUsT0FBTyxJQUFJLENBQUMsaUJBQWlCLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2pELDRDQUE0QztJQUNoRCxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUF5RDtRQUNqRSxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDLHFCQUFxQixDQUFDLENBQUM7UUFFckUsT0FBTyxJQUFJLENBQUMsaUJBQWlCLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2hELDJDQUEyQztJQUMvQyxDQUFDO0NBQ0o7QUFqREQsa0RBaURDIn0=
|
package/package.json
CHANGED
package/resources/zhaojn.json
CHANGED
|
@@ -236,7 +236,7 @@
|
|
|
236
236
|
"events": [
|
|
237
237
|
{
|
|
238
238
|
"type": "normal",
|
|
239
|
-
"content": "Event.Void(not(\"vip2\"inlabels))->AUTH_MEMBER{fun.setLabel({\"
|
|
239
|
+
"content": "Event.Void(not(\"vip2\"inlabels))->AUTH_MEMBER{fun.setLabel({\"label\":\"vip2\",\"ttl\":7200})}",
|
|
240
240
|
"config_params": [
|
|
241
241
|
{
|
|
242
242
|
"name": "condition",
|
|
@@ -282,37 +282,16 @@
|
|
|
282
282
|
"actions": [
|
|
283
283
|
{
|
|
284
284
|
"type": "functionCall",
|
|
285
|
-
"content": "fun.setLabel({\"
|
|
285
|
+
"content": "fun.setLabel({\"label\":\"vip2\",\"ttl\":7200})",
|
|
286
286
|
"actionObj": {
|
|
287
287
|
"funcName": "setLabel",
|
|
288
|
-
"variableChainList": [
|
|
289
|
-
"echoSubject",
|
|
290
|
-
"contract.licensee"
|
|
291
|
-
],
|
|
288
|
+
"variableChainList": [],
|
|
292
289
|
"paramList": [
|
|
293
290
|
{
|
|
294
|
-
"paramValue": "{\"
|
|
291
|
+
"paramValue": "{\"label\":\"vip2\",\"ttl\":7200}",
|
|
295
292
|
"paramValueObj": {
|
|
296
293
|
"expType": "expArgsGroup",
|
|
297
294
|
"paramList": [
|
|
298
|
-
{
|
|
299
|
-
"paramName": "subject",
|
|
300
|
-
"paramValue": "echoSubject",
|
|
301
|
-
"paramValueObj": {
|
|
302
|
-
"expType": "variableChain",
|
|
303
|
-
"varType": "normal",
|
|
304
|
-
"content": "echoSubject"
|
|
305
|
-
}
|
|
306
|
-
},
|
|
307
|
-
{
|
|
308
|
-
"paramName": "licensee",
|
|
309
|
-
"paramValue": "contract.licensee",
|
|
310
|
-
"paramValueObj": {
|
|
311
|
-
"expType": "variableChain",
|
|
312
|
-
"varType": "normal",
|
|
313
|
-
"content": "contract.licensee"
|
|
314
|
-
}
|
|
315
|
-
},
|
|
316
295
|
{
|
|
317
296
|
"paramName": "label",
|
|
318
297
|
"paramValue": "\"vip2\"",
|
|
@@ -330,12 +309,9 @@
|
|
|
330
309
|
}
|
|
331
310
|
}
|
|
332
311
|
],
|
|
333
|
-
"variableChainList": [
|
|
334
|
-
"echoSubject",
|
|
335
|
-
"contract.licensee"
|
|
336
|
-
]
|
|
312
|
+
"variableChainList": []
|
|
337
313
|
},
|
|
338
|
-
"content": "{\"
|
|
314
|
+
"content": "{\"label\":\"vip2\",\"ttl\":7200}"
|
|
339
315
|
}
|
|
340
316
|
],
|
|
341
317
|
"expType": "functionCall",
|
package/resources/zhaojn.sc
CHANGED
|
@@ -20,7 +20,7 @@ Initial None:
|
|
|
20
20
|
// Event.Void("vip1" in labels) -> AUTH_VIP1
|
|
21
21
|
// Event.Void(not ("vip1" in labels)) -> AUTH_MEMBER
|
|
22
22
|
// Event.Echo.Labels({"subject":echoSubject, "licensee":contract.licensee, "label":"vip1"}) -> AUTH_VIP1
|
|
23
|
-
Event.Void(not ("vip2" in labels)) -> AUTH_MEMBER{fun.setLabel({"
|
|
23
|
+
Event.Void(not ("vip2" in labels)) -> AUTH_MEMBER{fun.setLabel({"label":"vip2", "ttl":7200})}
|
|
24
24
|
|
|
25
25
|
AUTH_MEMBER Partial{setUnlocked, setTemp}:
|
|
26
26
|
Event.Transaction.Pay(amount = unitPrice, elemsNum = 1) -> AUTH_MEMBER{fun.addElements(setUnlocked, contract.licenseeSelectedElems, false)}
|
package/resources/zhaojn2.json
CHANGED
|
@@ -76,95 +76,25 @@
|
|
|
76
76
|
}
|
|
77
77
|
],
|
|
78
78
|
"currentStateInfo": {
|
|
79
|
-
"currentState": "
|
|
80
|
-
"currentServiceState": "
|
|
81
|
-
"serviceStateCollection": [
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
"varValue": []
|
|
85
|
-
},
|
|
79
|
+
"currentState": "Initial",
|
|
80
|
+
"currentServiceState": "None",
|
|
81
|
+
"serviceStateCollection": [],
|
|
82
|
+
"varLocalAtStateList": [],
|
|
83
|
+
"varLocalCurrentStateList": [
|
|
86
84
|
{
|
|
87
|
-
"varName": "
|
|
88
|
-
"varValue":
|
|
85
|
+
"varName": "labels",
|
|
86
|
+
"varValue": -1
|
|
89
87
|
}
|
|
90
88
|
],
|
|
91
|
-
"varLocalAtStateList": [],
|
|
92
|
-
"varLocalCurrentStateList": [],
|
|
93
89
|
"currentEventInfos": [
|
|
94
90
|
{
|
|
95
|
-
"eventCode": "
|
|
96
|
-
"
|
|
97
|
-
"
|
|
98
|
-
"eventId": "b103eb03",
|
|
99
|
-
"varLocalAtEventList": [
|
|
100
|
-
{
|
|
101
|
-
"varName": "amount",
|
|
102
|
-
"varValue": 1
|
|
103
|
-
},
|
|
104
|
-
{
|
|
105
|
-
"varName": "elemsNum",
|
|
106
|
-
"varValue": 1
|
|
107
|
-
}
|
|
108
|
-
]
|
|
109
|
-
},
|
|
110
|
-
{
|
|
111
|
-
"eventCode": "T101",
|
|
112
|
-
"eventPath": "Transaction",
|
|
113
|
-
"eventName": "Pay",
|
|
114
|
-
"eventId": "1f954422",
|
|
115
|
-
"varLocalAtEventList": [
|
|
116
|
-
{
|
|
117
|
-
"varName": "amount",
|
|
118
|
-
"varValue": 8
|
|
119
|
-
},
|
|
120
|
-
{
|
|
121
|
-
"varName": "elemsNum",
|
|
122
|
-
"varValue": 10
|
|
123
|
-
}
|
|
124
|
-
]
|
|
125
|
-
},
|
|
126
|
-
{
|
|
127
|
-
"eventCode": "C103",
|
|
128
|
-
"eventPath": "Custom",
|
|
129
|
-
"eventName": "AcceptEvent",
|
|
130
|
-
"eventId": "a237f57a",
|
|
91
|
+
"eventCode": "V101",
|
|
92
|
+
"eventName": "Void",
|
|
93
|
+
"eventId": "b3449b02",
|
|
131
94
|
"varLocalAtEventList": [
|
|
132
95
|
{
|
|
133
96
|
"varName": "condition",
|
|
134
|
-
"varValue":
|
|
135
|
-
"title": "MembershipChange",
|
|
136
|
-
"subject": {
|
|
137
|
-
"expType": "entity",
|
|
138
|
-
"entityType": "Echo",
|
|
139
|
-
"entityName": "连载小说的会员",
|
|
140
|
-
"variableChainList": []
|
|
141
|
-
},
|
|
142
|
-
"label": "vip1"
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
]
|
|
146
|
-
},
|
|
147
|
-
{
|
|
148
|
-
"eventCode": "C101",
|
|
149
|
-
"eventPath": "Custom",
|
|
150
|
-
"eventName": "WatchAD",
|
|
151
|
-
"eventId": "ab73e554",
|
|
152
|
-
"varLocalAtEventList": [
|
|
153
|
-
{
|
|
154
|
-
"varName": "elemsNum",
|
|
155
|
-
"varValue": 1
|
|
156
|
-
}
|
|
157
|
-
]
|
|
158
|
-
},
|
|
159
|
-
{
|
|
160
|
-
"eventCode": "T202",
|
|
161
|
-
"eventPath": "Time",
|
|
162
|
-
"eventName": "Schedule",
|
|
163
|
-
"eventId": "490d5f83",
|
|
164
|
-
"varLocalAtEventList": [
|
|
165
|
-
{
|
|
166
|
-
"varName": "dateTime",
|
|
167
|
-
"varValue": "2026-03-06 00:00:00"
|
|
97
|
+
"varValue": false
|
|
168
98
|
}
|
|
169
99
|
]
|
|
170
100
|
}
|
|
@@ -14,7 +14,7 @@ export class ExpBooleanCalculator implements Calculator, ExpHelperAware {
|
|
|
14
14
|
async getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): Promise<boolean> {
|
|
15
15
|
if (varObj.expType == "expBooleanOpLogic") {
|
|
16
16
|
return this.calculateExpBooleanOpLogic(varObj as any, varContextCapable);
|
|
17
|
-
}
|
|
17
|
+
}
|
|
18
18
|
if (varObj.expType == "expBooleanOpCollection") {
|
|
19
19
|
return this.calculateExpBooleanOpCollection(varObj as any, varContextCapable);
|
|
20
20
|
}
|
|
@@ -32,11 +32,11 @@ export class ExpBooleanCalculator implements Calculator, ExpHelperAware {
|
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
private async calculateExpBooleanOpLogic(expBooleanOpLogic: ExpBooleanOpLogic, varContextCapable: VarContextCapable<any>): Promise<boolean> {
|
|
35
|
-
let var1 = this.expHelper.getExpValue(expBooleanOpLogic.var1, varContextCapable);
|
|
35
|
+
let var1 = await this.expHelper.getExpValue(expBooleanOpLogic.var1, varContextCapable);
|
|
36
36
|
if (expBooleanOpLogic.op == "not") {
|
|
37
37
|
return !var1;
|
|
38
38
|
} else {
|
|
39
|
-
let var2 = this.expHelper.getExpValue(expBooleanOpLogic.var2, varContextCapable);
|
|
39
|
+
let var2 = await this.expHelper.getExpValue(expBooleanOpLogic.var2, varContextCapable);
|
|
40
40
|
if (expBooleanOpLogic.op == "and") {
|
|
41
41
|
return var1 && var2;
|
|
42
42
|
}
|
|
@@ -58,9 +58,9 @@ export class ExpBooleanCalculator implements Calculator, ExpHelperAware {
|
|
|
58
58
|
return false;
|
|
59
59
|
}
|
|
60
60
|
|
|
61
|
-
private calculateExpBooleanOpCompare(expBooleanOpCompare: ExpBooleanOpCompare, varContextCapable: VarContextCapable<any>): boolean {
|
|
62
|
-
let var1 = this.expHelper.getExpValue(expBooleanOpCompare.var1, varContextCapable);
|
|
63
|
-
let var2 = this.expHelper.getExpValue(expBooleanOpCompare.var2, varContextCapable);
|
|
61
|
+
private async calculateExpBooleanOpCompare(expBooleanOpCompare: ExpBooleanOpCompare, varContextCapable: VarContextCapable<any>): Promise<boolean> {
|
|
62
|
+
let var1 = await this.expHelper.getExpValue(expBooleanOpCompare.var1, varContextCapable);
|
|
63
|
+
let var2 = await this.expHelper.getExpValue(expBooleanOpCompare.var2, varContextCapable);
|
|
64
64
|
if (expBooleanOpCompare.op == "less" || expBooleanOpCompare.op == "<") {
|
|
65
65
|
return var1 < var2;
|
|
66
66
|
}
|
|
@@ -43,14 +43,9 @@ export class FunFunctionExecutor extends DynamicFunctionExecutor {
|
|
|
43
43
|
// throw new Error("该函数未实现【fun.sendEvent】");
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
-
async F_005(args: {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
licensee: any,
|
|
50
|
-
label: string,
|
|
51
|
-
limitTime?: string,
|
|
52
|
-
ttl?: number
|
|
53
|
-
}) {
|
|
46
|
+
async F_005(args: { label: string, limitTime?: string, ttl?: number }) {
|
|
47
|
+
args["contractId"] = await this.getVarContext("contract.contractId");
|
|
48
|
+
|
|
54
49
|
return this.outsideApiService.funSetLabel(args);
|
|
55
50
|
// throw new Error("该函数未实现【fun.setLabel】");
|
|
56
51
|
}
|
|
@@ -23,7 +23,7 @@ describe("test/state-machine/ContractStateMachineTest.test.ts", () => {
|
|
|
23
23
|
csm.setPolicyHelper(policyHelper);
|
|
24
24
|
csm.setFsmHook(cfh);
|
|
25
25
|
await csm.build({compileResult: source, currentState: "Initial"});
|
|
26
|
-
await csm.execEvent("b3449b02");
|
|
26
|
+
// await csm.execEvent("b3449b02");
|
|
27
27
|
|
|
28
28
|
fs.writeFile("./resources/zhaojn2.json", JSON.stringify(await policyHelper.getPolicyInfoResult(), null, 4), (err) => {
|
|
29
29
|
if (err) throw err;
|