@steedos/objectql 3.0.0-beta.19 → 3.0.0-beta.20
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/lib/formula/index.d.ts +1 -1
- package/lib/formula/index.js +16 -35
- package/lib/formula/index.js.map +1 -1
- package/lib/types/restrictionRule.js +41 -45
- package/lib/types/restrictionRule.js.map +1 -1
- package/lib/types/shareRule.js +45 -49
- package/lib/types/shareRule.js.map +1 -1
- package/package.json +12 -12
package/lib/formula/index.d.ts
CHANGED
|
@@ -11,4 +11,4 @@ declare function _computeFormula(formula: string, objectName: string, recordId:
|
|
|
11
11
|
export declare const computeFormula: typeof _computeFormula;
|
|
12
12
|
declare function _computeSimpleFormula(formula: string, data: any, userSession: any, options?: SteedosFormulaOptions): Promise<any>;
|
|
13
13
|
export declare const computeSimpleFormula: typeof _computeSimpleFormula;
|
|
14
|
-
export declare function traverseNestedArrayFormula(arr: any, userSession: any):
|
|
14
|
+
export declare function traverseNestedArrayFormula(arr: any, userSession: any): void;
|
package/lib/formula/index.js
CHANGED
|
@@ -108,41 +108,22 @@ function _computeSimpleFormula(formula, data, userSession, options) {
|
|
|
108
108
|
}
|
|
109
109
|
exports.computeSimpleFormula = _computeSimpleFormula;
|
|
110
110
|
function traverseNestedArrayFormula(arr, userSession) {
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
case 3:
|
|
126
|
-
if (!/\$\{([^}]*)\}/.test(arr[i])) return [3, 7];
|
|
127
|
-
_c.label = 4;
|
|
128
|
-
case 4:
|
|
129
|
-
_c.trys.push([4, 6, , 7]);
|
|
130
|
-
_a = arr;
|
|
131
|
-
_b = i;
|
|
132
|
-
return [4, (0, exports.computeSimpleFormula)(arr[i], {}, userSession)];
|
|
133
|
-
case 5:
|
|
134
|
-
_a[_b] = _c.sent();
|
|
135
|
-
return [3, 7];
|
|
136
|
-
case 6:
|
|
137
|
-
ex_1 = _c.sent();
|
|
138
|
-
console.error("运行过滤器公式时出现错误:", ex_1);
|
|
139
|
-
return [3, 7];
|
|
140
|
-
case 7:
|
|
141
|
-
i++;
|
|
142
|
-
return [3, 1];
|
|
143
|
-
case 8: return [2];
|
|
111
|
+
for (var i = 0; i < arr.length; i++) {
|
|
112
|
+
if (Array.isArray(arr[i])) {
|
|
113
|
+
traverseNestedArrayFormula(arr[i], userSession);
|
|
114
|
+
}
|
|
115
|
+
else {
|
|
116
|
+
if (/\$\{([^}]*)\}/.test(arr[i])) {
|
|
117
|
+
try {
|
|
118
|
+
arr[i] = (0, core_1.runAmisFormula)(arr[i], [], {
|
|
119
|
+
userSession: userSession,
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
catch (ex) {
|
|
123
|
+
console.error("运行过滤器公式时出现错误:", ex);
|
|
124
|
+
}
|
|
144
125
|
}
|
|
145
|
-
}
|
|
146
|
-
}
|
|
126
|
+
}
|
|
127
|
+
}
|
|
147
128
|
}
|
|
148
129
|
//# sourceMappingURL=index.js.map
|
package/lib/formula/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/formula/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/formula/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ var RestrictionRule = (function () {
|
|
|
28
28
|
};
|
|
29
29
|
RestrictionRule.getUserObjectFilters = function (objectApiName, userSession) {
|
|
30
30
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
31
|
-
var rules, rulesFilters, globalData, rules_1, rules_1_1, rule, _a, active, entry_criteria, record_filter, meetCriteria, isEntryCriteriaExpression, isEntryCriteriaAmisFormula, isFilterExpression, isFilterAmisFormula, filters, error_1,
|
|
31
|
+
var rules, rulesFilters, globalData, rules_1, rules_1_1, rule, _a, active, entry_criteria, record_filter, meetCriteria, isEntryCriteriaExpression, isEntryCriteriaAmisFormula, isFilterExpression, isFilterAmisFormula, filters, error_1, e_1_1;
|
|
32
32
|
var e_1, _b;
|
|
33
33
|
return tslib_1.__generator(this, function (_c) {
|
|
34
34
|
switch (_c.label) {
|
|
@@ -42,19 +42,19 @@ var RestrictionRule = (function () {
|
|
|
42
42
|
globalData = { now: new Date() };
|
|
43
43
|
_c.label = 2;
|
|
44
44
|
case 2:
|
|
45
|
-
_c.trys.push([2,
|
|
45
|
+
_c.trys.push([2, 12, 13, 14]);
|
|
46
46
|
rules_1 = tslib_1.__values(rules), rules_1_1 = rules_1.next();
|
|
47
47
|
_c.label = 3;
|
|
48
48
|
case 3:
|
|
49
|
-
if (!!rules_1_1.done) return [3,
|
|
49
|
+
if (!!rules_1_1.done) return [3, 11];
|
|
50
50
|
rule = rules_1_1.value;
|
|
51
51
|
_a = rule.metadata, active = _a.active, entry_criteria = _a.entry_criteria;
|
|
52
52
|
record_filter = rule.metadata.record_filter;
|
|
53
|
-
if (!active) return [3,
|
|
53
|
+
if (!active) return [3, 10];
|
|
54
54
|
_c.label = 4;
|
|
55
55
|
case 4:
|
|
56
|
-
_c.trys.push([4,
|
|
57
|
-
if (!_.isString(entry_criteria)) return [3,
|
|
56
|
+
_c.trys.push([4, 9, , 10]);
|
|
57
|
+
if (!_.isString(entry_criteria)) return [3, 8];
|
|
58
58
|
meetCriteria = void 0;
|
|
59
59
|
isEntryCriteriaExpression = (0, util_1.isExpression)(entry_criteria.trim());
|
|
60
60
|
isEntryCriteriaAmisFormula = (0, formula_1.isAmisFormula)(entry_criteria);
|
|
@@ -68,57 +68,53 @@ var RestrictionRule = (function () {
|
|
|
68
68
|
meetCriteria = _c.sent();
|
|
69
69
|
_c.label = 7;
|
|
70
70
|
case 7:
|
|
71
|
-
if (
|
|
71
|
+
if (_.isBoolean(meetCriteria) && meetCriteria) {
|
|
72
|
+
try {
|
|
73
|
+
if (_.isString(record_filter)) {
|
|
74
|
+
record_filter = record_filter.trim();
|
|
75
|
+
isFilterExpression = (0, util_1.isExpression)(record_filter);
|
|
76
|
+
isFilterAmisFormula = (0, formula_1.isAmisFormula)(record_filter);
|
|
77
|
+
filters = void 0;
|
|
78
|
+
if (isFilterExpression) {
|
|
79
|
+
filters = (0, util_1.parseSingleExpression)(record_filter, {}, "#", globalData, userSession);
|
|
80
|
+
}
|
|
81
|
+
else if (isFilterAmisFormula) {
|
|
82
|
+
if (record_filter.startsWith("[")) {
|
|
83
|
+
record_filter = (0, util_1.safeJsonParseArray)(record_filter);
|
|
84
|
+
(0, formula_1.traverseNestedArrayFormula)(record_filter, userSession);
|
|
85
|
+
filters = record_filter;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
if (filters && !_.isString(filters)) {
|
|
89
|
+
rulesFilters.push("(".concat((0, filters_1.formatFiltersToODataQuery)(filters, userSession), ")"));
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
catch (error) {
|
|
94
|
+
console.error("RestrictionRule.getUserObjectFilters record_filter error", objectApiName, record_filter, error.message);
|
|
95
|
+
}
|
|
96
|
+
}
|
|
72
97
|
_c.label = 8;
|
|
73
|
-
case 8:
|
|
74
|
-
_c.trys.push([8, 13, , 14]);
|
|
75
|
-
if (!_.isString(record_filter)) return [3, 12];
|
|
76
|
-
record_filter = record_filter.trim();
|
|
77
|
-
isFilterExpression = (0, util_1.isExpression)(record_filter);
|
|
78
|
-
isFilterAmisFormula = (0, formula_1.isAmisFormula)(record_filter);
|
|
79
|
-
filters = void 0;
|
|
80
|
-
if (!isFilterExpression) return [3, 9];
|
|
81
|
-
filters = (0, util_1.parseSingleExpression)(record_filter, {}, "#", globalData, userSession);
|
|
82
|
-
return [3, 11];
|
|
98
|
+
case 8: return [3, 10];
|
|
83
99
|
case 9:
|
|
84
|
-
if (!isFilterAmisFormula) return [3, 11];
|
|
85
|
-
if (!record_filter.startsWith("[")) return [3, 11];
|
|
86
|
-
record_filter = (0, util_1.safeJsonParseArray)(record_filter);
|
|
87
|
-
return [4, (0, formula_1.traverseNestedArrayFormula)(record_filter, userSession)];
|
|
88
|
-
case 10:
|
|
89
|
-
_c.sent();
|
|
90
|
-
filters = record_filter;
|
|
91
|
-
_c.label = 11;
|
|
92
|
-
case 11:
|
|
93
|
-
if (filters && !_.isString(filters)) {
|
|
94
|
-
rulesFilters.push("(".concat((0, filters_1.formatFiltersToODataQuery)(filters, userSession), ")"));
|
|
95
|
-
}
|
|
96
|
-
_c.label = 12;
|
|
97
|
-
case 12: return [3, 14];
|
|
98
|
-
case 13:
|
|
99
100
|
error_1 = _c.sent();
|
|
100
|
-
console.error("RestrictionRule.getUserObjectFilters
|
|
101
|
-
return [3,
|
|
102
|
-
case
|
|
103
|
-
case 15:
|
|
104
|
-
error_2 = _c.sent();
|
|
105
|
-
console.error("RestrictionRule.getUserObjectFilters entry_criteria error", objectApiName, entry_criteria, error_2.message);
|
|
106
|
-
return [3, 16];
|
|
107
|
-
case 16:
|
|
101
|
+
console.error("RestrictionRule.getUserObjectFilters entry_criteria error", objectApiName, entry_criteria, error_1.message);
|
|
102
|
+
return [3, 10];
|
|
103
|
+
case 10:
|
|
108
104
|
rules_1_1 = rules_1.next();
|
|
109
105
|
return [3, 3];
|
|
110
|
-
case
|
|
111
|
-
case
|
|
106
|
+
case 11: return [3, 14];
|
|
107
|
+
case 12:
|
|
112
108
|
e_1_1 = _c.sent();
|
|
113
109
|
e_1 = { error: e_1_1 };
|
|
114
|
-
return [3,
|
|
115
|
-
case
|
|
110
|
+
return [3, 14];
|
|
111
|
+
case 13:
|
|
116
112
|
try {
|
|
117
113
|
if (rules_1_1 && !rules_1_1.done && (_b = rules_1.return)) _b.call(rules_1);
|
|
118
114
|
}
|
|
119
115
|
finally { if (e_1) throw e_1.error; }
|
|
120
116
|
return [7];
|
|
121
|
-
case
|
|
117
|
+
case 14: return [2, rulesFilters];
|
|
122
118
|
}
|
|
123
119
|
});
|
|
124
120
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restrictionRule.js","sourceRoot":"","sources":["../../src/types/restrictionRule.ts"],"names":[],"mappings":";;;;AAOA,kCAA4C;AAC5C,0BAA4B;AAC5B,gCAIiB;AACjB,sCAIoB;AACpB,4CAA6D;AAC7D,kEAAuE;AAYvE;IAAA;
|
|
1
|
+
{"version":3,"file":"restrictionRule.js","sourceRoot":"","sources":["../../src/types/restrictionRule.ts"],"names":[],"mappings":"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"}
|
package/lib/types/shareRule.js
CHANGED
|
@@ -28,7 +28,7 @@ var ShareRules = (function () {
|
|
|
28
28
|
};
|
|
29
29
|
ShareRules.getUserObjectFilters = function (objectApiName, userSession) {
|
|
30
30
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
31
|
-
var rules, rulesFilters, allowEditRulesFilters, globalData, rules_1, rules_1_1, rule, _a, active, entry_criteria, allowEdit, record_filter, meetCriteria, isEntryCriteriaExpression, isEntryCriteriaAmisFormula, isFilterExpression, isFilterAmisFormula, filters, filter, error_1,
|
|
31
|
+
var rules, rulesFilters, allowEditRulesFilters, globalData, rules_1, rules_1_1, rule, _a, active, entry_criteria, allowEdit, record_filter, meetCriteria, isEntryCriteriaExpression, isEntryCriteriaAmisFormula, isFilterExpression, isFilterAmisFormula, filters, filter, error_1, e_1_1;
|
|
32
32
|
var e_1, _b;
|
|
33
33
|
return tslib_1.__generator(this, function (_c) {
|
|
34
34
|
switch (_c.label) {
|
|
@@ -46,19 +46,19 @@ var ShareRules = (function () {
|
|
|
46
46
|
globalData = { now: new Date() };
|
|
47
47
|
_c.label = 2;
|
|
48
48
|
case 2:
|
|
49
|
-
_c.trys.push([2,
|
|
49
|
+
_c.trys.push([2, 12, 13, 14]);
|
|
50
50
|
rules_1 = tslib_1.__values(rules), rules_1_1 = rules_1.next();
|
|
51
51
|
_c.label = 3;
|
|
52
52
|
case 3:
|
|
53
|
-
if (!!rules_1_1.done) return [3,
|
|
53
|
+
if (!!rules_1_1.done) return [3, 11];
|
|
54
54
|
rule = rules_1_1.value;
|
|
55
55
|
_a = rule.metadata, active = _a.active, entry_criteria = _a.entry_criteria, allowEdit = _a.allowEdit;
|
|
56
56
|
record_filter = rule.metadata.record_filter;
|
|
57
|
-
if (!active) return [3,
|
|
57
|
+
if (!active) return [3, 10];
|
|
58
58
|
_c.label = 4;
|
|
59
59
|
case 4:
|
|
60
|
-
_c.trys.push([4,
|
|
61
|
-
if (!_.isString(entry_criteria)) return [3,
|
|
60
|
+
_c.trys.push([4, 9, , 10]);
|
|
61
|
+
if (!_.isString(entry_criteria)) return [3, 8];
|
|
62
62
|
meetCriteria = void 0;
|
|
63
63
|
isEntryCriteriaExpression = (0, util_1.isExpression)(entry_criteria.trim());
|
|
64
64
|
isEntryCriteriaAmisFormula = (0, formula_1.isAmisFormula)(entry_criteria);
|
|
@@ -72,61 +72,57 @@ var ShareRules = (function () {
|
|
|
72
72
|
meetCriteria = _c.sent();
|
|
73
73
|
_c.label = 7;
|
|
74
74
|
case 7:
|
|
75
|
-
if (
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
75
|
+
if (_.isBoolean(meetCriteria) && meetCriteria) {
|
|
76
|
+
try {
|
|
77
|
+
if (_.isString(record_filter)) {
|
|
78
|
+
record_filter = record_filter.trim();
|
|
79
|
+
isFilterExpression = (0, util_1.isExpression)(record_filter);
|
|
80
|
+
isFilterAmisFormula = (0, formula_1.isAmisFormula)(record_filter);
|
|
81
|
+
filters = void 0;
|
|
82
|
+
if (isFilterExpression) {
|
|
83
|
+
filters = (0, util_1.parseSingleExpression)(record_filter, {}, "#", globalData, userSession);
|
|
84
|
+
}
|
|
85
|
+
else if (isFilterAmisFormula) {
|
|
86
|
+
if (record_filter.startsWith("[")) {
|
|
87
|
+
record_filter = (0, util_1.safeJsonParseArray)(record_filter);
|
|
88
|
+
(0, formula_1.traverseNestedArrayFormula)(record_filter, userSession);
|
|
89
|
+
filters = record_filter;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
if (filters && !_.isString(filters)) {
|
|
93
|
+
filter = "(".concat((0, filters_1.formatFiltersToODataQuery)(filters, userSession), ")");
|
|
94
|
+
rulesFilters.push(filter);
|
|
95
|
+
if (allowEdit) {
|
|
96
|
+
allowEditRulesFilters.push(filter);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
catch (error) {
|
|
102
|
+
console.error("ShareRules.getUserObjectFilters record_filter error", objectApiName, record_filter, error.message);
|
|
102
103
|
}
|
|
103
104
|
}
|
|
104
|
-
_c.label =
|
|
105
|
-
case
|
|
106
|
-
case
|
|
105
|
+
_c.label = 8;
|
|
106
|
+
case 8: return [3, 10];
|
|
107
|
+
case 9:
|
|
107
108
|
error_1 = _c.sent();
|
|
108
|
-
console.error("ShareRules.getUserObjectFilters
|
|
109
|
-
return [3,
|
|
110
|
-
case
|
|
111
|
-
case 15:
|
|
112
|
-
error_2 = _c.sent();
|
|
113
|
-
console.error("ShareRules.getUserObjectFilters entry_criteria error", objectApiName, entry_criteria, error_2.message);
|
|
114
|
-
return [3, 16];
|
|
115
|
-
case 16:
|
|
109
|
+
console.error("ShareRules.getUserObjectFilters entry_criteria error", objectApiName, entry_criteria, error_1.message);
|
|
110
|
+
return [3, 10];
|
|
111
|
+
case 10:
|
|
116
112
|
rules_1_1 = rules_1.next();
|
|
117
113
|
return [3, 3];
|
|
118
|
-
case
|
|
119
|
-
case
|
|
114
|
+
case 11: return [3, 14];
|
|
115
|
+
case 12:
|
|
120
116
|
e_1_1 = _c.sent();
|
|
121
117
|
e_1 = { error: e_1_1 };
|
|
122
|
-
return [3,
|
|
123
|
-
case
|
|
118
|
+
return [3, 14];
|
|
119
|
+
case 13:
|
|
124
120
|
try {
|
|
125
121
|
if (rules_1_1 && !rules_1_1.done && (_b = rules_1.return)) _b.call(rules_1);
|
|
126
122
|
}
|
|
127
123
|
finally { if (e_1) throw e_1.error; }
|
|
128
124
|
return [7];
|
|
129
|
-
case
|
|
125
|
+
case 14: return [2, {
|
|
130
126
|
rulesFilters: rulesFilters,
|
|
131
127
|
allowEditRulesFilters: allowEditRulesFilters,
|
|
132
128
|
}];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shareRule.js","sourceRoot":"","sources":["../../src/types/shareRule.ts"],"names":[],"mappings":";;;;AAOA,kCAA4C;AAC5C,0BAA4B;AAC5B,gCAIiB;AACjB,sCAIoB;AACpB,4CAA6D;AAC7D,kEAAiE;AAYjE;IAAA;
|
|
1
|
+
{"version":3,"file":"shareRule.js","sourceRoot":"","sources":["../../src/types/shareRule.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/objectql",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "3.0.0-beta.
|
|
4
|
+
"version": "3.0.0-beta.20",
|
|
5
5
|
"description": "",
|
|
6
6
|
"main": "lib/index.js",
|
|
7
7
|
"scripts": {
|
|
@@ -16,16 +16,16 @@
|
|
|
16
16
|
"dependencies": {
|
|
17
17
|
"@salesforce/kit": "1.0.4",
|
|
18
18
|
"@salesforce/ts-types": "1.1.1",
|
|
19
|
-
"@steedos/cachers": "3.0.0-beta.
|
|
20
|
-
"@steedos/filters": "3.0.0-beta.
|
|
21
|
-
"@steedos/formula": "3.0.0-beta.
|
|
22
|
-
"@steedos/i18n": "3.0.0-beta.
|
|
23
|
-
"@steedos/metadata-core": "3.0.0-beta.
|
|
24
|
-
"@steedos/metadata-registrar": "3.0.0-beta.
|
|
25
|
-
"@steedos/odata-v4-mongodb": "3.0.0-beta.
|
|
26
|
-
"@steedos/odata-v4-sql": "3.0.0-beta.
|
|
27
|
-
"@steedos/odata-v4-typeorm": "3.0.0-beta.
|
|
28
|
-
"@steedos/schemas": "3.0.0-beta.
|
|
19
|
+
"@steedos/cachers": "3.0.0-beta.20",
|
|
20
|
+
"@steedos/filters": "3.0.0-beta.20",
|
|
21
|
+
"@steedos/formula": "3.0.0-beta.20",
|
|
22
|
+
"@steedos/i18n": "3.0.0-beta.20",
|
|
23
|
+
"@steedos/metadata-core": "3.0.0-beta.20",
|
|
24
|
+
"@steedos/metadata-registrar": "3.0.0-beta.20",
|
|
25
|
+
"@steedos/odata-v4-mongodb": "3.0.0-beta.20",
|
|
26
|
+
"@steedos/odata-v4-sql": "3.0.0-beta.20",
|
|
27
|
+
"@steedos/odata-v4-typeorm": "3.0.0-beta.20",
|
|
28
|
+
"@steedos/schemas": "3.0.0-beta.20",
|
|
29
29
|
"amis-formula": "~6.3.0",
|
|
30
30
|
"app-root-path": "^2.2.1",
|
|
31
31
|
"axios": "^0.21.1",
|
|
@@ -63,5 +63,5 @@
|
|
|
63
63
|
"publishConfig": {
|
|
64
64
|
"access": "public"
|
|
65
65
|
},
|
|
66
|
-
"gitHead": "
|
|
66
|
+
"gitHead": "49b4ca0246b6a5bf7c56511b2b2806bca7344c40"
|
|
67
67
|
}
|