@freelog/freelog-cg-collection 1.2.4 → 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.
Files changed (6) hide show
  1. package/dist/function-executor/FunFunctionExecutor.d.ts +0 -3
  2. package/dist/function-executor/FunFunctionExecutor.js +2 -1
  3. package/package.json +1 -1
  4. package/resources/zhaojn.json +6 -30
  5. package/resources/zhaojn.sc +1 -1
  6. package/src/function-executor/FunFunctionExecutor.ts +3 -8
package/dist/function-executor/FunFunctionExecutor.d.ts CHANGED
@@ -8,9 +8,6 @@ export declare class FunFunctionExecutor extends DynamicFunctionExecutor {
8
8
  title: string;
9
9
  }): Promise<void>;
10
10
  F_005(args: {
11
- subject: any;
12
- policyId?: string;
13
- licensee: any;
14
11
  label: string;
15
12
  limitTime?: string;
16
13
  ttl?: number;
package/dist/function-executor/FunFunctionExecutor.js CHANGED
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRnVuRnVuY3Rpb25FeGVjdXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mdW5jdGlvbi1leGVjdXRvci9GdW5GdW5jdGlvbkV4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVFQUFrRTtBQUVsRSxNQUFhLG1CQUFvQixTQUFRLGlEQUF1QjtJQUU1RCxrQkFBa0I7UUFDZCxPQUFPLElBQUksR0FBRyxDQUFpQjtZQUMzQixDQUFDLGlCQUFpQixFQUFFLE9BQU8sQ0FBQztZQUM1QixDQUFDLGdCQUFnQixFQUFFLE9BQU8sQ0FBQztZQUMzQixDQUFDLGVBQWUsRUFBRSxPQUFPLENBQUM7WUFDMUIsQ0FBQyxlQUFlLEVBQUUsT0FBTyxDQUFDO1lBQzFCLENBQUMsY0FBYyxFQUFFLE9BQU8sQ0FBQztTQUM1QixDQUFDLENBQUM7SUFDUCxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFPLEVBQUUsS0FBUyxFQUFFLFFBQWlCO1FBQzdDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQztRQUNuQixPQUFPLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQztJQUNwQixDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFPO1FBQ2YsR0FBRyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUM7UUFDZixPQUFPLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQztJQUNwQixDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFXO1FBQ25CLE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUF1QjtRQUMvQixPQUFPLENBQUMsR0FBRyxDQUFDLDRDQUE0QyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNoRixJQUFJLFdBQVcsR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztRQUM3RCxJQUFJLENBQUMsaUJBQWlCLENBQUMsR0FBRyxXQUFXLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDcEQsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEdBQUcsV0FBVyxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ3BELElBQUksQ0FBQyxjQUFjLENBQUMsR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsaUJBQWlCLENBQUMsQ0FBQztRQUNuRSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMscUJBQXFCLENBQUMsQ0FBQztRQUN6RSxJQUFJLFlBQVksR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsbUJBQW1CLENBQUMsQ0FBQztRQUNqRSxJQUFJLENBQUMsa0JBQWtCLENBQUMsR0FBRyxZQUFZLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDdEQsSUFBSSxDQUFDLGtCQUFrQixDQUFDLEdBQUcsWUFBWSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ3RELElBQUksaUJBQWlCLEdBQUcsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDLHdCQUF3QixDQUFDLENBQUM7UUFDM0UsSUFBSSxDQUFDLHVCQUF1QixDQUFDLEdBQUcsaUJBQWlCLENBQUMsWUFBWSxDQUFDLENBQUM7UUFFaEUsT0FBTyxJQUFJLENBQUMsaUJBQWlCLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2pELDRDQUE0QztJQUNoRCxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxJQU9YO1FBQ0csT0FBTyxJQUFJLENBQUMsaUJBQWlCLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2hELDJDQUEyQztJQUMvQyxDQUFDO0NBQ0o7QUF0REQsa0RBc0RDIn0=
48
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRnVuRnVuY3Rpb25FeGVjdXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mdW5jdGlvbi1leGVjdXRvci9GdW5GdW5jdGlvbkV4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVFQUFrRTtBQUVsRSxNQUFhLG1CQUFvQixTQUFRLGlEQUF1QjtJQUU1RCxrQkFBa0I7UUFDZCxPQUFPLElBQUksR0FBRyxDQUFpQjtZQUMzQixDQUFDLGlCQUFpQixFQUFFLE9BQU8sQ0FBQztZQUM1QixDQUFDLGdCQUFnQixFQUFFLE9BQU8sQ0FBQztZQUMzQixDQUFDLGVBQWUsRUFBRSxPQUFPLENBQUM7WUFDMUIsQ0FBQyxlQUFlLEVBQUUsT0FBTyxDQUFDO1lBQzFCLENBQUMsY0FBYyxFQUFFLE9BQU8sQ0FBQztTQUM1QixDQUFDLENBQUM7SUFDUCxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFPLEVBQUUsS0FBUyxFQUFFLFFBQWlCO1FBQzdDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQztRQUNuQixPQUFPLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQztJQUNwQixDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFPO1FBQ2YsR0FBRyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUM7UUFDZixPQUFPLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQztJQUNwQixDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFXO1FBQ25CLE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUF1QjtRQUMvQixPQUFPLENBQUMsR0FBRyxDQUFDLDRDQUE0QyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNoRixJQUFJLFdBQVcsR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztRQUM3RCxJQUFJLENBQUMsaUJBQWlCLENBQUMsR0FBRyxXQUFXLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDcEQsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEdBQUcsV0FBVyxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ3BELElBQUksQ0FBQyxjQUFjLENBQUMsR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsaUJBQWlCLENBQUMsQ0FBQztRQUNuRSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMscUJBQXFCLENBQUMsQ0FBQztRQUN6RSxJQUFJLFlBQVksR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsbUJBQW1CLENBQUMsQ0FBQztRQUNqRSxJQUFJLENBQUMsa0JBQWtCLENBQUMsR0FBRyxZQUFZLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDdEQsSUFBSSxDQUFDLGtCQUFrQixDQUFDLEdBQUcsWUFBWSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ3RELElBQUksaUJBQWlCLEdBQUcsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDLHdCQUF3QixDQUFDLENBQUM7UUFDM0UsSUFBSSxDQUFDLHVCQUF1QixDQUFDLEdBQUcsaUJBQWlCLENBQUMsWUFBWSxDQUFDLENBQUM7UUFFaEUsT0FBTyxJQUFJLENBQUMsaUJBQWlCLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2pELDRDQUE0QztJQUNoRCxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUF5RDtRQUNqRSxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDLHFCQUFxQixDQUFDLENBQUM7UUFFckUsT0FBTyxJQUFJLENBQUMsaUJBQWlCLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2hELDJDQUEyQztJQUMvQyxDQUFDO0NBQ0o7QUFqREQsa0RBaURDIn0=
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@freelog/freelog-cg-collection",
3
- "version": "1.2.4",
3
+ "version": "1.2.5",
4
4
  "main": "index.js",
5
5
  "dependencies": {
6
6
  "antlr4": "4.8.0",
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({\"subject\":echoSubject,\"licensee\":contract.licensee,\"label\":\"vip2\",\"ttl\":7200})}",
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({\"subject\":echoSubject,\"licensee\":contract.licensee,\"label\":\"vip2\",\"ttl\":7200})",
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": "{\"subject\":echoSubject,\"licensee\":contract.licensee,\"label\":\"vip2\",\"ttl\":7200}",
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": "{\"subject\":echoSubject,\"licensee\":contract.licensee,\"label\":\"vip2\",\"ttl\":7200}"
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({"subject":echoSubject, "licensee":contract.licensee, "label":"vip2", "ttl":7200})}
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/src/function-executor/FunFunctionExecutor.ts CHANGED
@@ -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
- subject: any,
48
- policyId?: string,
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
  }