@steedos/service-metadata-objects 2.2.52-beta.22 → 2.2.52-beta.24
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/LICENSE.txt +2 -3
- package/lib/actionsHandler.js +14 -14
- package/lib/actionsHandler.js.map +1 -1
- package/lib/formula/core.js +1 -1
- package/lib/formula/formulaActionHandler.js +30 -24
- package/lib/formula/formulaActionHandler.js.map +1 -1
- package/lib/formula/type.d.ts +1 -0
- package/lib/formula/type.js.map +1 -1
- package/lib/lookup/LookupActionHandler.js +12 -12
- package/lib/lookup/LookupActionHandler.js.map +1 -1
- package/lib/master-detail/masterDetailActionHandler.js +28 -28
- package/lib/master-detail/masterDetailActionHandler.js.map +1 -1
- package/lib/objects/fields/index.js +1 -1
- package/lib/objects/fields/index.js.map +1 -1
- package/lib/objects/index.js +4 -4
- package/lib/objects/translationTemplate.js +1 -1
- package/lib/objects.service.js +34 -34
- package/lib/summary/summaryActionHandler.js +17 -17
- package/lib/summary/summaryActionHandler.js.map +1 -1
- package/package.json +4 -4
- package/src/formula/formulaActionHandler.ts +6 -0
- package/src/formula/type.ts +1 -0
|
@@ -7,7 +7,7 @@ const type_1 = require("./type");
|
|
|
7
7
|
const core_1 = require("../formula/core");
|
|
8
8
|
const _ = require("lodash");
|
|
9
9
|
const clone = require('clone');
|
|
10
|
-
|
|
10
|
+
tslib_1.__exportStar(require("./type"), exports);
|
|
11
11
|
// TODO
|
|
12
12
|
// const isCodeObject = (objectApiName) => {
|
|
13
13
|
// return objectApiName ? false : true
|
|
@@ -18,7 +18,7 @@ class SummaryActionHandler {
|
|
|
18
18
|
this.broker = broker;
|
|
19
19
|
}
|
|
20
20
|
deleteAll(objectConfig) {
|
|
21
|
-
return
|
|
21
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
22
22
|
try {
|
|
23
23
|
if (!objectConfig) {
|
|
24
24
|
return;
|
|
@@ -35,7 +35,7 @@ class SummaryActionHandler {
|
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
37
|
getObjectConfig(objectApiName) {
|
|
38
|
-
return
|
|
38
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
39
39
|
const data = yield this.broker.call('objects.get', { objectApiName: objectApiName });
|
|
40
40
|
return data ? data.metadata : null;
|
|
41
41
|
});
|
|
@@ -46,7 +46,7 @@ class SummaryActionHandler {
|
|
|
46
46
|
* @param summaryConfig
|
|
47
47
|
*/
|
|
48
48
|
initSummaryConfig(summaryConfig, summaryObject) {
|
|
49
|
-
return
|
|
49
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
50
50
|
const { summary_object, field_name, object_name } = summaryConfig;
|
|
51
51
|
if (!summaryObject) {
|
|
52
52
|
summaryObject = yield this.getObjectConfig(summary_object);
|
|
@@ -76,7 +76,7 @@ class SummaryActionHandler {
|
|
|
76
76
|
});
|
|
77
77
|
}
|
|
78
78
|
getSummaryDataType(summaryConfig, summaryObject) {
|
|
79
|
-
return
|
|
79
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
80
80
|
const { summary_object, summary_type, summary_field, field_name, object_name } = summaryConfig;
|
|
81
81
|
let result;
|
|
82
82
|
let needSummaryField = true;
|
|
@@ -125,7 +125,7 @@ class SummaryActionHandler {
|
|
|
125
125
|
return !!(type_1.SupportedSummaryFieldTypes[summaryType] && type_1.SupportedSummaryFieldTypes[summaryType].indexOf(summaryFieldType) > -1);
|
|
126
126
|
}
|
|
127
127
|
getObjectFieldSummaryConfig(fieldConfig, objectConfig) {
|
|
128
|
-
return
|
|
128
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
129
129
|
let summaryConfig = {
|
|
130
130
|
_id: `${objectConfig.name}.${fieldConfig.name}`,
|
|
131
131
|
object_name: objectConfig.name,
|
|
@@ -143,10 +143,10 @@ class SummaryActionHandler {
|
|
|
143
143
|
}
|
|
144
144
|
getObjectFieldsSummaryConfig(config, datasource) {
|
|
145
145
|
var e_1, _a;
|
|
146
|
-
return
|
|
146
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
147
147
|
const configs = [];
|
|
148
148
|
try {
|
|
149
|
-
for (var _b =
|
|
149
|
+
for (var _b = tslib_1.__asyncValues(_.values(config.fields)), _c; _c = yield _b.next(), !_c.done;) {
|
|
150
150
|
const field = _c.value;
|
|
151
151
|
if (field.type === "summary") {
|
|
152
152
|
if (datasource !== "meteor" && datasource !== "default") {
|
|
@@ -176,12 +176,12 @@ class SummaryActionHandler {
|
|
|
176
176
|
}
|
|
177
177
|
getQuoteMineSummaryConfigs(objectConfig) {
|
|
178
178
|
var e_2, _a;
|
|
179
|
-
return
|
|
179
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
180
180
|
const fixedConfigs = [];
|
|
181
181
|
//给引用了当前对象的汇总配置中，设置reference_to_field值并校验
|
|
182
182
|
const quoteMineSummaryConfigs = yield this.filterSummaryConfig("*.*", objectConfig.name);
|
|
183
183
|
try {
|
|
184
|
-
for (var quoteMineSummaryConfigs_1 =
|
|
184
|
+
for (var quoteMineSummaryConfigs_1 = tslib_1.__asyncValues(quoteMineSummaryConfigs), quoteMineSummaryConfigs_1_1; quoteMineSummaryConfigs_1_1 = yield quoteMineSummaryConfigs_1.next(), !quoteMineSummaryConfigs_1_1.done;) {
|
|
185
185
|
const summaryConfig = quoteMineSummaryConfigs_1_1.value;
|
|
186
186
|
if (!summaryConfig.reference_to_field) {
|
|
187
187
|
yield this.initSummaryConfig(summaryConfig, objectConfig);
|
|
@@ -209,10 +209,10 @@ class SummaryActionHandler {
|
|
|
209
209
|
}
|
|
210
210
|
addSummaryMetadata(config, datasource) {
|
|
211
211
|
var e_3, _a, e_4, _b;
|
|
212
|
-
return
|
|
212
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
213
213
|
const fieldsSummaryConfig = yield this.getObjectFieldsSummaryConfig(config, datasource);
|
|
214
214
|
try {
|
|
215
|
-
for (var fieldsSummaryConfig_1 =
|
|
215
|
+
for (var fieldsSummaryConfig_1 = tslib_1.__asyncValues(fieldsSummaryConfig), fieldsSummaryConfig_1_1; fieldsSummaryConfig_1_1 = yield fieldsSummaryConfig_1.next(), !fieldsSummaryConfig_1_1.done;) {
|
|
216
216
|
const fieldSummary = fieldsSummaryConfig_1_1.value;
|
|
217
217
|
// await this.broker.call('metadata.add', {key: this.cacherKey(fieldSummary._id, fieldSummary.summary_object), data: fieldSummary}, {meta: {}})
|
|
218
218
|
yield metadata_registrar_1.Register.add(this.broker, { key: this.cacherKey(fieldSummary._id, fieldSummary.summary_object), data: fieldSummary }, {});
|
|
@@ -227,7 +227,7 @@ class SummaryActionHandler {
|
|
|
227
227
|
}
|
|
228
228
|
const quoteMineSummaryConfigs = yield this.getQuoteMineSummaryConfigs(config);
|
|
229
229
|
try {
|
|
230
|
-
for (var quoteMineSummaryConfigs_2 =
|
|
230
|
+
for (var quoteMineSummaryConfigs_2 = tslib_1.__asyncValues(quoteMineSummaryConfigs), quoteMineSummaryConfigs_2_1; quoteMineSummaryConfigs_2_1 = yield quoteMineSummaryConfigs_2.next(), !quoteMineSummaryConfigs_2_1.done;) {
|
|
231
231
|
const fieldSummary = quoteMineSummaryConfigs_2_1.value;
|
|
232
232
|
// await this.broker.call('metadata.add', {key: this.cacherKey(fieldSummary._id, fieldSummary.summary_object), data: fieldSummary}, {meta: {}})
|
|
233
233
|
yield metadata_registrar_1.Register.add(this.broker, { key: this.cacherKey(fieldSummary._id, fieldSummary.summary_object), data: fieldSummary }, {});
|
|
@@ -244,7 +244,7 @@ class SummaryActionHandler {
|
|
|
244
244
|
});
|
|
245
245
|
}
|
|
246
246
|
add(objectConfig) {
|
|
247
|
-
return
|
|
247
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
248
248
|
try {
|
|
249
249
|
yield this.addSummaryMetadata(objectConfig, objectConfig.datasource);
|
|
250
250
|
return true;
|
|
@@ -256,7 +256,7 @@ class SummaryActionHandler {
|
|
|
256
256
|
});
|
|
257
257
|
}
|
|
258
258
|
filterSummaryConfig(fieldApiFullName, summaryObjectApiName) {
|
|
259
|
-
return
|
|
259
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
260
260
|
const key = this.cacherKey(fieldApiFullName, summaryObjectApiName);
|
|
261
261
|
const configs = [];
|
|
262
262
|
// const res = await this.broker.call('metadata.filter', {key: key}, {meta: {}})
|
|
@@ -268,7 +268,7 @@ class SummaryActionHandler {
|
|
|
268
268
|
});
|
|
269
269
|
}
|
|
270
270
|
filter(ctx) {
|
|
271
|
-
return
|
|
271
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
272
272
|
let { objectApiName, fieldApiName } = ctx.params;
|
|
273
273
|
if (!objectApiName) {
|
|
274
274
|
objectApiName = "*";
|
|
@@ -281,7 +281,7 @@ class SummaryActionHandler {
|
|
|
281
281
|
});
|
|
282
282
|
}
|
|
283
283
|
get(ctx) {
|
|
284
|
-
return
|
|
284
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
285
285
|
let { fieldApiFullName } = ctx.params;
|
|
286
286
|
const res = yield this.filterSummaryConfig(fieldApiFullName);
|
|
287
287
|
if (res && res.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"summaryActionHandler.js","sourceRoot":"","sources":["../../src/summary/summaryActionHandler.ts"],"names":[],"mappings":";;;;AAAA,oEAAuD;AACvD,iCAAyI;AACzI,0CAAuE;AACvE,4BAA4B;AAC5B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;AAE9B,
|
|
1
|
+
{"version":3,"file":"summaryActionHandler.js","sourceRoot":"","sources":["../../src/summary/summaryActionHandler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/service-metadata-objects",
|
|
3
|
-
"version": "2.2.52-beta.
|
|
3
|
+
"version": "2.2.52-beta.24",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/objects.service.js",
|
|
6
6
|
"scripts": {
|
|
@@ -19,8 +19,8 @@
|
|
|
19
19
|
"author": "",
|
|
20
20
|
"license": "MIT",
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@steedos/formula": "2.2.52-beta.
|
|
23
|
-
"@steedos/metadata-registrar": "2.2.52-beta.
|
|
22
|
+
"@steedos/formula": "2.2.52-beta.24",
|
|
23
|
+
"@steedos/metadata-registrar": "2.2.52-beta.24",
|
|
24
24
|
"dotenv-flow": "^3.1.0",
|
|
25
25
|
"ioredis": "^4.22.0",
|
|
26
26
|
"lodash": "^4.17.21",
|
|
@@ -41,5 +41,5 @@
|
|
|
41
41
|
"publishConfig": {
|
|
42
42
|
"access": "public"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "df7ecf38938c2dc5573564a51afc397e56d9c1f2"
|
|
45
45
|
}
|
|
@@ -104,6 +104,7 @@ export class FormulaActionHandler{
|
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
106
|
let tempObjectConfig = objectConfig;
|
|
107
|
+
let lastReferenceToField;
|
|
107
108
|
let i = -1;
|
|
108
109
|
for await (let varItem of varItems) {
|
|
109
110
|
i++;
|
|
@@ -143,6 +144,9 @@ export class FormulaActionHandler{
|
|
|
143
144
|
if (isFormulaType) {
|
|
144
145
|
tempFieldFormulaVarPath.is_formula = true;
|
|
145
146
|
}
|
|
147
|
+
if(lastReferenceToField){
|
|
148
|
+
tempFieldFormulaVarPath.reference_to_field = lastReferenceToField;
|
|
149
|
+
}
|
|
146
150
|
// 当是$user时，不需要把第一个path记录下来，只需要记录其后续的路径即可
|
|
147
151
|
paths.push(tempFieldFormulaVarPath);
|
|
148
152
|
}
|
|
@@ -162,6 +166,7 @@ export class FormulaActionHandler{
|
|
|
162
166
|
}
|
|
163
167
|
this.addFieldFormulaQuotesConfig(tempFieldFormulaQuote, quotes);
|
|
164
168
|
}
|
|
169
|
+
lastReferenceToField = null;
|
|
165
170
|
if (tempFieldConfig.type === "lookup" || tempFieldConfig.type === "master_detail") {
|
|
166
171
|
// 引用类型字段
|
|
167
172
|
if (tempFieldConfig.multiple) {
|
|
@@ -172,6 +177,7 @@ export class FormulaActionHandler{
|
|
|
172
177
|
// 引用类型字段后面必须继续引用该字段的相关属性，否则直接报错
|
|
173
178
|
throw new Error(`computeFormulaVarAndQuotes:The field '${tempFieldConfig.name}' for the formula var '${formulaVar}' is a ${tempFieldConfig.type} type, so you must add more property after it.`);
|
|
174
179
|
}
|
|
180
|
+
lastReferenceToField = tempFieldConfig.reference_to_field;
|
|
175
181
|
}
|
|
176
182
|
else {
|
|
177
183
|
// 不是引用类型字段，则直接退出
|
package/src/formula/type.ts
CHANGED