eservices-back-core 2.1.34 → 2.1.36
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.
|
@@ -13,23 +13,12 @@ export default class ListSettingService {
|
|
|
13
13
|
type: "Entity" | "Integer" | "Guid" | "String" | "Decimal" | "DateTime" | "List" | "Boolean";
|
|
14
14
|
unit: string;
|
|
15
15
|
presentation: string;
|
|
16
|
-
entity?: undefined;
|
|
17
|
-
name?: undefined;
|
|
18
|
-
useObjectTypeName?: undefined;
|
|
19
16
|
} | {
|
|
20
17
|
name: string[];
|
|
21
18
|
entity: string;
|
|
22
19
|
type?: undefined;
|
|
23
20
|
unit?: undefined;
|
|
24
21
|
presentation?: undefined;
|
|
25
|
-
useObjectTypeName?: undefined;
|
|
26
|
-
} | {
|
|
27
|
-
entity: string;
|
|
28
|
-
name: string[];
|
|
29
|
-
useObjectTypeName: boolean;
|
|
30
|
-
type?: undefined;
|
|
31
|
-
unit?: undefined;
|
|
32
|
-
presentation?: undefined;
|
|
33
22
|
};
|
|
34
23
|
/**
|
|
35
24
|
* @description Устанавливает в один вид actions.
|
|
@@ -67,6 +56,7 @@ export interface IBaseListSettingsConfigCell {
|
|
|
67
56
|
title?: string;
|
|
68
57
|
self?: boolean;
|
|
69
58
|
value?: string;
|
|
59
|
+
displayMode?: 'form' | 'inline' | 'modal';
|
|
70
60
|
}
|
|
71
61
|
export interface IBaseListSettings {
|
|
72
62
|
entity: string;
|
|
@@ -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
|
|
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;;;;;;;;;;;IAkE9D;;;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,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAA;CACzC;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"}
|
|
@@ -45,8 +45,8 @@ class ListSettingService {
|
|
|
45
45
|
* имени сущности полю в ней.
|
|
46
46
|
*/
|
|
47
47
|
getCellReferenceInformation(entity, fieldName) {
|
|
48
|
+
// let useObjectTypeName = false;
|
|
48
49
|
var _a, _b;
|
|
49
|
-
let useObjectTypeName = false;
|
|
50
50
|
// Если у нас есть название поля, то получаем именно для него настройки, в противном случае только для сущности.
|
|
51
51
|
if (fieldName) {
|
|
52
52
|
const fieldMetadata = metadata_service_1.default.getFieldInformation(entity, fieldName);
|
|
@@ -68,7 +68,7 @@ class ListSettingService {
|
|
|
68
68
|
entity = fieldMetadata.referencedEntity;
|
|
69
69
|
}
|
|
70
70
|
else {
|
|
71
|
-
useObjectTypeName = true;
|
|
71
|
+
// useObjectTypeName = true;
|
|
72
72
|
}
|
|
73
73
|
// В хранилище можно переопределить поведение для сущностей. Указав какие именно поля необходимо показывать и как
|
|
74
74
|
// себя должна вести ячейка.
|
|
@@ -82,18 +82,18 @@ class ListSettingService {
|
|
|
82
82
|
throw entity_error_1.default.EntityWithoutPrimaryField(entity);
|
|
83
83
|
// Устанавливаем поля, которые необходимы для данной колонки
|
|
84
84
|
const names = [
|
|
85
|
-
metadata.useCatalogInsteadId ? constants_1.CATALOG_NAME_FIELD : metadata.fieldNameForIdentification,
|
|
85
|
+
metadata.useCatalogInsteadId ? constants_1.CATALOG_NAME_FIELD : metadata.fieldNameForIdentification,
|
|
86
|
+
metadata.fieldNameForLabel || metadata.fieldNameForIdentification
|
|
86
87
|
];
|
|
87
88
|
// Если для данной сущности существует поле, которое указывает имя сущности.
|
|
88
|
-
if (useObjectTypeName)
|
|
89
|
-
names.push(constants_1.OBJECT_TYPE_NAME_FIELD);
|
|
89
|
+
// if (useObjectTypeName) names.push(OBJECT_TYPE_NAME_FIELD);
|
|
90
90
|
const parsedNames = names.map(name => [fieldName, name]
|
|
91
91
|
.filter(a => !!a)
|
|
92
92
|
.join('.'));
|
|
93
93
|
return {
|
|
94
94
|
entity,
|
|
95
95
|
name: parsedNames,
|
|
96
|
-
useObjectTypeName
|
|
96
|
+
//useObjectTypeName
|
|
97
97
|
};
|
|
98
98
|
}
|
|
99
99
|
/**
|
|
@@ -175,7 +175,7 @@ class ListSettingService {
|
|
|
175
175
|
}
|
|
176
176
|
if (cell.self) {
|
|
177
177
|
debug(`Self was detected for list-settings with entity %s`, entity);
|
|
178
|
-
Object.assign(cell, this.getCellReferenceInformation(entity));
|
|
178
|
+
Object.assign(cell, this.getCellReferenceInformation(entity, null));
|
|
179
179
|
delete cell.self;
|
|
180
180
|
}
|
|
181
181
|
return cell;
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"list-setting-service.js","sourceRoot":"","sources":["../../src/services/list-setting-service.ts"],"names":[],"mappings":"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"}
|