eservices-back-core 2.1.28 → 2.1.30
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/services/list-setting-service.d.ts +2 -1
- package/dist/services/list-setting-service.d.ts.map +1 -1
- package/dist/services/list-setting-service.js +10 -8
- package/dist/services/list-setting-service.js.map +1 -1
- package/dist/types/request-type.d.ts +1 -1
- package/dist/types/request-type.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -36,12 +36,13 @@ export default class ListSettingService {
|
|
|
36
36
|
* @param tools
|
|
37
37
|
*/
|
|
38
38
|
modifyTools(tools: unknown): any[];
|
|
39
|
-
private
|
|
39
|
+
private modifyCellConfiguration;
|
|
40
40
|
/**
|
|
41
41
|
* @description На вход функция получает неопознанный объект. Далее проводит проверки по типу и т.д. Неважно в каком
|
|
42
42
|
* состоянии по итогу будет объект, он всё-равно будет заново преобразован.
|
|
43
43
|
*/
|
|
44
44
|
modifyConfigCell(entity: string, cell: unknown): IBaseListSettingsConfigCell;
|
|
45
|
+
getCellLabel(entity: string, fieldName: string): string;
|
|
45
46
|
/**
|
|
46
47
|
* @description Метод возвращает надстройку для переданного поля. В случае, если данное поле не является ссылкой
|
|
47
48
|
* на другое поле, то возвращаются значения из метаданных. В ином случае, необходимо произвести поиск связанных полей,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-setting-service.d.ts","sourceRoot":"","sources":["../../src/services/list-setting-service.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAEtC;;;;OAIG;IACG,eAAe,CAAC,IAAI,EAAE,OAAO;IAYnC;;;OAGG;IACH,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;IA8D9D;;;OAGG;IACH,WAAW,CAAC,KAAK,EAAE,OAAO;IAiB1B,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"list-setting-service.d.ts","sourceRoot":"","sources":["../../src/services/list-setting-service.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAEtC;;;;OAIG;IACG,eAAe,CAAC,IAAI,EAAE,OAAO;IAYnC;;;OAGG;IACH,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;IA8D9D;;;OAGG;IACH,WAAW,CAAC,KAAK,EAAE,OAAO;IAiB1B,OAAO,CAAC,uBAAuB;IAkB/B;;;OAGG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;IAgD9C,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAK9C;;;;;;OAMG;IAEH;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAI9B,OAAO,CAAC,0BAA0B;IAIlC,OAAO,CAAC,gBAAgB;CAaxB;AAED,MAAM,WAAW,2BAA2B;IAC3C,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACd;AACD,MAAM,WAAW,iBAAiB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,GAAG,EAAE,CAAA;CACpB"}
|
|
@@ -33,7 +33,7 @@ class ListSettingService {
|
|
|
33
33
|
return __awaiter(this, void 0, void 0, function* () {
|
|
34
34
|
const listSetting = (0, dto_list_setting_1.default)(data);
|
|
35
35
|
// Checking the Column Configuration Array
|
|
36
|
-
listSetting.config = this.
|
|
36
|
+
listSetting.config = this.modifyCellConfiguration(listSetting);
|
|
37
37
|
if (this.checkFiltersInsideSettings(listSetting))
|
|
38
38
|
listSetting.filters = this.parseListFilters(listSetting.entity, listSetting.filters);
|
|
39
39
|
listSetting.tools = this.modifyTools(listSetting.tools);
|
|
@@ -118,7 +118,7 @@ class ListSettingService {
|
|
|
118
118
|
return tool;
|
|
119
119
|
});
|
|
120
120
|
}
|
|
121
|
-
|
|
121
|
+
modifyCellConfiguration(listSettings) {
|
|
122
122
|
const entity = listSettings.entity;
|
|
123
123
|
const config = listSettings.config;
|
|
124
124
|
if (!Array.isArray(config))
|
|
@@ -139,7 +139,6 @@ class ListSettingService {
|
|
|
139
139
|
* состоянии по итогу будет объект, он всё-равно будет заново преобразован.
|
|
140
140
|
*/
|
|
141
141
|
modifyConfigCell(entity, cell) {
|
|
142
|
-
var _a;
|
|
143
142
|
if (!this.checkTypeForConfigCell(cell)) {
|
|
144
143
|
debug('Inside listSettings found cell with wrong type. %o', cell);
|
|
145
144
|
return null;
|
|
@@ -164,7 +163,10 @@ class ListSettingService {
|
|
|
164
163
|
cell.name = cell.name.filter(name => metadata_service_1.default.checkFieldInEntity(entity, name));
|
|
165
164
|
}
|
|
166
165
|
else if (typeof cell.name === 'string') {
|
|
167
|
-
|
|
166
|
+
const cellName = cell.name;
|
|
167
|
+
Object.assign(cell, this.getCellReferenceInformation(entity, cellName));
|
|
168
|
+
if (cell.label === undefined)
|
|
169
|
+
cell.label = this.getCellLabel(entity, cellName);
|
|
168
170
|
}
|
|
169
171
|
else {
|
|
170
172
|
debug('Type of name is incorrect: %o', cell.name);
|
|
@@ -176,12 +178,12 @@ class ListSettingService {
|
|
|
176
178
|
Object.assign(cell, this.getCellReferenceInformation(entity));
|
|
177
179
|
delete cell.self;
|
|
178
180
|
}
|
|
179
|
-
// Установка заголовка в ячейку.
|
|
180
|
-
if (cell.label === undefined && cell.name) {
|
|
181
|
-
cell.label = (_a = (metadata_service_1.default.getFieldInformation(entity, cell.name))) === null || _a === void 0 ? void 0 : _a.displayName;
|
|
182
|
-
}
|
|
183
181
|
return cell;
|
|
184
182
|
}
|
|
183
|
+
getCellLabel(entity, fieldName) {
|
|
184
|
+
const fieldMetadata = metadata_service_1.default.getFieldInformation(entity, fieldName);
|
|
185
|
+
return fieldMetadata === null || fieldMetadata === void 0 ? void 0 : fieldMetadata.displayName;
|
|
186
|
+
}
|
|
185
187
|
/**
|
|
186
188
|
* @description Метод возвращает надстройку для переданного поля. В случае, если данное поле не является ссылкой
|
|
187
189
|
* на другое поле, то возвращаются значения из метаданных. В ином случае, необходимо произвести поиск связанных полей,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-setting-service.js","sourceRoot":"","sources":["../../src/services/list-setting-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wFAA8D;AAC9D,kDAAgC;AAChC,oCAA0C;AAC1C,0EAAiD;AACjD,0EAAiD;AACjD,kEAAyE;AACzE,4CAAoD;AACpD,uDAA+B;AAC/B,6EAAoD;AACpD,gFAAsD;AAEtD,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,IAAA,wBAAgB,EAAC,eAAe,CAAC,CAAC,CAAC;AAE7D,MAAqB,kBAAkB;IAEtC;;;;OAIG;IACG,eAAe,CAAC,IAAa;;YAClC,MAAM,WAAW,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC,CAAA;YACxC,0CAA0C;YAC1C,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"list-setting-service.js","sourceRoot":"","sources":["../../src/services/list-setting-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,6 @@ export interface IUniversalEntityUpdateOptions {
|
|
|
14
14
|
primaryKey: any;
|
|
15
15
|
version?: number;
|
|
16
16
|
values: unknown;
|
|
17
|
-
masterEntities
|
|
17
|
+
masterEntities?: IMasterEntity | IMasterEntity[];
|
|
18
18
|
}
|
|
19
19
|
//# sourceMappingURL=request-type.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-type.d.ts","sourceRoot":"","sources":["../../src/types/request-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,EAAE,CAAC,EAAE,GAAG,CAAA;IACR;;OAEG;IACH,UAAU,EAAE,GAAG,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,aAAa,GAAG,aAAa,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"request-type.d.ts","sourceRoot":"","sources":["../../src/types/request-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,EAAE,CAAC,EAAE,GAAG,CAAA;IACR;;OAEG;IACH,UAAU,EAAE,GAAG,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,aAAa,GAAG,aAAa,EAAE,CAAA;CAChD"}
|