@infomaximum/widget-sdk 3.18.0 → 3.19.1
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/index.d.ts +43 -9
- package/dist/index.esm.js +46 -6
- package/dist/index.js +46 -6
- package/package.json +1 -1
package/dist/index.d.ts
CHANGED
|
@@ -65,7 +65,7 @@ interface ICalculatorIndicatorInput {
|
|
|
65
65
|
displayConditionFormula?: TNullable<string>;
|
|
66
66
|
}
|
|
67
67
|
interface ICalculatorIndicatorOutput {
|
|
68
|
-
values: string[];
|
|
68
|
+
values: (string | null)[];
|
|
69
69
|
}
|
|
70
70
|
interface ICalculatorDimensionInput extends ICalculatorIndicatorInput {
|
|
71
71
|
formula: string;
|
|
@@ -106,7 +106,7 @@ interface ICalculatorFilter {
|
|
|
106
106
|
/** Тип данных для формулы фильтра */
|
|
107
107
|
dataType: ESimpleDataType;
|
|
108
108
|
/** Значения фильтра */
|
|
109
|
-
values: string[];
|
|
109
|
+
values: (null | string)[];
|
|
110
110
|
/** Метод фильтрации */
|
|
111
111
|
filteringMethod: valueof<typeof formulaFilterMethods>;
|
|
112
112
|
}
|
|
@@ -151,21 +151,50 @@ declare enum EFormattingPresets {
|
|
|
151
151
|
"AUTO" = "AUTO",
|
|
152
152
|
"TUNE" = "TUNE",
|
|
153
153
|
"DD/M/YYYY" = "DD/M/YYYY",
|
|
154
|
+
"DD-MM-YYYY" = "DD-MM-YYYY",
|
|
155
|
+
"DD-MM-YY" = "DD-MM-YY",
|
|
154
156
|
"YYYY-MM-DD" = "YYYY-MM-DD",
|
|
157
|
+
"YY-MM-DD" = "YY-MM-DD",
|
|
155
158
|
"DD MM YYYY" = "DD MM YYYY",
|
|
156
159
|
"DD MMM YYYY" = "DD MMM YYYY",
|
|
160
|
+
"DD MMM YY" = "DD MMM YY",
|
|
157
161
|
"MM.DD.YYYY" = "MM.DD.YYYY",
|
|
162
|
+
"MM.DD.YY" = "MM.DD.YY",
|
|
158
163
|
"DD MMMM YYYY" = "DD MMMM YYYY",
|
|
164
|
+
"DD MMMM YY" = "DD MMMM YY",
|
|
159
165
|
"DD/MM/YYYY" = "DD/MM/YYYY",
|
|
166
|
+
"DD/MM/YY" = "DD/MM/YY",
|
|
167
|
+
"MM/DD/YYYY" = "MM/DD/YYYY",
|
|
168
|
+
"MM/DD/YY" = "MM/DD/YY",
|
|
160
169
|
"MMMM DD, YYYY" = "MMMM DD, YYYY",
|
|
170
|
+
"MMMM DD, YY" = "MMMM DD, YY",
|
|
161
171
|
"DD.MM.YYYY" = "DD.MM.YYYY",
|
|
162
|
-
"MM.
|
|
172
|
+
"DD.MM.YY" = "DD.MM.YY",
|
|
173
|
+
"MM-DD-YY" = "MM-DD-YY",
|
|
174
|
+
"MM-DD-YYYY" = "MM-DD-YYYY",
|
|
163
175
|
"DD/M/YYYY HH:mm" = "DD/M/YYYY HH:mm",
|
|
176
|
+
"DD/MM/YYYY, HH:mm" = "DD/MM/YYYY, HH:mm",
|
|
177
|
+
"DD/MM/YY, HH:mm" = "DD/MM/YY, HH:mm",
|
|
178
|
+
"MM/DD/YY, hh:mm a" = "MM/DD/YY, hh:mm a",
|
|
179
|
+
"MM/DD/YYYY, hh:mm a" = "MM/DD/YYYY, hh:mm a",
|
|
164
180
|
"YYYY-MM-DD HH:mm" = "YYYY-MM-DD HH:mm",
|
|
181
|
+
"YY-MM-DD, HH:mm" = "YY-MM-DD, HH:mm",
|
|
182
|
+
"YYYY-MM-DD, HH:mm" = "YYYY-MM-DD, HH:mm",
|
|
165
183
|
"YYYY-MM-DD HH:mm:ss" = "YYYY-MM-DD HH:mm:ss",
|
|
166
184
|
"DD MM YYYY HH:mm" = "DD MM YYYY HH:mm",
|
|
167
|
-
"DD MMM YYYY, HH:mm" = "DD MMM YYYY, HH:mm",
|
|
168
185
|
"DD MMMM YYYY, HH:mm" = "DD MMMM YYYY, HH:mm",
|
|
186
|
+
"DD.MM.YY, HH:mm" = "DD.MM.YY, HH:mm",
|
|
187
|
+
"DD.MM.YYYY, HH:mm" = "DD.MM.YYYY, HH:mm",
|
|
188
|
+
"MM-DD-YY, hh:mm a" = "MM-DD-YY, hh:mm a",
|
|
189
|
+
"MM-DD-YYYY, hh:mm a" = "MM-DD-YYYY, hh:mm a",
|
|
190
|
+
"MM.DD.YY, hh:mm a" = "MM.DD.YY, hh:mm a",
|
|
191
|
+
"MM.DD.YYYY, hh:mm a" = "MM.DD.YYYY, hh:mm a",
|
|
192
|
+
"MM.DD.YYYY hh:mm a" = "MM.DD.YYYY hh:mm a",
|
|
193
|
+
"DD MMM YY, HH:mm" = "DD MMM YY, HH:mm",
|
|
194
|
+
"DD MMM YYYY, HH:mm" = "DD MMM YYYY, HH:mm",
|
|
195
|
+
"MMMM DD, YY, HH:mm" = "MMMM DD, YY, HH:mm",
|
|
196
|
+
"MMMM DD, YYYY, HH:mm" = "MMMM DD, YYYY, HH:mm",
|
|
197
|
+
"DD MMMM YY, HH:mm" = "DD MMMM YY, HH:mm",
|
|
169
198
|
"DD.MM.YYYY, HH:mm:ss" = "DD.MM.YYYY, HH:mm:ss",
|
|
170
199
|
"DD.MM.YYYY HH:mm:ss" = "DD.MM.YYYY HH:mm:ss",
|
|
171
200
|
"DD/MM/YYYY HH:mm:ss" = "DD/MM/YYYY HH:mm:ss",
|
|
@@ -193,12 +222,17 @@ declare enum EFormattingPresets {
|
|
|
193
222
|
"HH" = "HH",
|
|
194
223
|
"hh a" = "hh a",
|
|
195
224
|
"MMM, YYYY" = "MMM, YYYY",
|
|
225
|
+
"MMM, YY" = "MMM, YY",
|
|
196
226
|
"MM.YYYY" = "MM.YYYY",
|
|
227
|
+
"MM.YY" = "MM.YY",
|
|
197
228
|
"MMMM YYYY" = "MMMM YYYY",
|
|
229
|
+
"MMMM YY" = "MMMM YY",
|
|
198
230
|
"[Q]q" = "[Q]q",
|
|
199
231
|
"R" = "R",
|
|
200
232
|
"[Q]q[-]YYYY" = "[Q]q[-]YYYY",
|
|
201
|
-
"
|
|
233
|
+
"[Q]q[-]YY" = "[Q]q[-]YY",
|
|
234
|
+
"R[-]YYYY" = "R[-]YYYY",
|
|
235
|
+
"R[-]YY" = "R[-]YY"
|
|
202
236
|
}
|
|
203
237
|
interface IWidgetFormatting {
|
|
204
238
|
getFormattedValue: (value: string, formatType: EFormatTypes, formatTemplate: TNullable<string>) => string;
|
|
@@ -263,7 +297,7 @@ interface IProcessFilterValue {
|
|
|
263
297
|
* События, доступные при выборе процесса.
|
|
264
298
|
* Если параметр не передан, используются все события процесса на основе запроса к вычислителю.
|
|
265
299
|
*/
|
|
266
|
-
eventsNamesByProcessGuidMap?: Map<string, string[]>;
|
|
300
|
+
eventsNamesByProcessGuidMap?: Map<string, (string | null)[]>;
|
|
267
301
|
}
|
|
268
302
|
interface IProcessEventFilterValue extends IProcessFilterValue {
|
|
269
303
|
processGuid: string;
|
|
@@ -950,7 +984,7 @@ interface IGraphElement {
|
|
|
950
984
|
additionalValues: Map<string, Map<string, string>>;
|
|
951
985
|
}
|
|
952
986
|
interface IVertex extends IGraphElement {
|
|
953
|
-
name: string;
|
|
987
|
+
name: string | null;
|
|
954
988
|
}
|
|
955
989
|
interface IEdge extends IGraphElement {
|
|
956
990
|
beginName: string | null;
|
|
@@ -1038,7 +1072,7 @@ interface ITypeCalculatorOutput {
|
|
|
1038
1072
|
interface ITypeCalculator extends ICalculator<ITypeCalculatorInput, ITypeCalculatorOutput> {
|
|
1039
1073
|
}
|
|
1040
1074
|
|
|
1041
|
-
declare const prepareValuesForSql: (dataType: ESimpleDataType, values: string[]) => string[];
|
|
1075
|
+
declare const prepareValuesForSql: (dataType: ESimpleDataType, values: (string | null)[]) => (string | null)[];
|
|
1042
1076
|
|
|
1043
1077
|
declare function mapVariablesToInputs(variables: Map<string, TWidgetVariable>): ICalculatorVariablesValues;
|
|
1044
1078
|
|
|
@@ -1272,7 +1306,7 @@ declare const transitionMeasureTemplateFormulas: {
|
|
|
1272
1306
|
declare function getTransitionMeasureFormula({ value }: IProcessIndicator, process: IWidgetProcess): string;
|
|
1273
1307
|
|
|
1274
1308
|
interface IDimensionSelection {
|
|
1275
|
-
values: Set<string>;
|
|
1309
|
+
values: Set<string | null>;
|
|
1276
1310
|
replacedFilter: ICalculatorFilter | null;
|
|
1277
1311
|
}
|
|
1278
1312
|
interface IDimensionSelectionByFormula extends Map<string, IDimensionSelection> {
|
package/dist/index.esm.js
CHANGED
|
@@ -122,7 +122,11 @@ var prepareValuesForSql = function (dataType, values) {
|
|
|
122
122
|
dataType === ESimpleDataType.FLOAT ||
|
|
123
123
|
dataType === ESimpleDataType.BOOLEAN
|
|
124
124
|
? values
|
|
125
|
-
: values.map(function (value) {
|
|
125
|
+
: values.map(function (value) {
|
|
126
|
+
return value === null
|
|
127
|
+
? null
|
|
128
|
+
: "'".concat(escapeSingularQuotes(escapeReverseSlash(value)), "'");
|
|
129
|
+
});
|
|
126
130
|
};
|
|
127
131
|
var escapeReverseSlash = function (formula) {
|
|
128
132
|
return formula.replaceAll(/\\/gm, "\\\\");
|
|
@@ -229,22 +233,51 @@ var EFormattingPresets;
|
|
|
229
233
|
EFormattingPresets["TUNE"] = "TUNE";
|
|
230
234
|
//Группа шаблонов для формата DATE
|
|
231
235
|
EFormattingPresets["DD/M/YYYY"] = "DD/M/YYYY";
|
|
236
|
+
EFormattingPresets["DD-MM-YYYY"] = "DD-MM-YYYY";
|
|
237
|
+
EFormattingPresets["DD-MM-YY"] = "DD-MM-YY";
|
|
232
238
|
EFormattingPresets["YYYY-MM-DD"] = "YYYY-MM-DD";
|
|
239
|
+
EFormattingPresets["YY-MM-DD"] = "YY-MM-DD";
|
|
233
240
|
EFormattingPresets["DD MM YYYY"] = "DD MM YYYY";
|
|
234
241
|
EFormattingPresets["DD MMM YYYY"] = "DD MMM YYYY";
|
|
242
|
+
EFormattingPresets["DD MMM YY"] = "DD MMM YY";
|
|
235
243
|
EFormattingPresets["MM.DD.YYYY"] = "MM.DD.YYYY";
|
|
244
|
+
EFormattingPresets["MM.DD.YY"] = "MM.DD.YY";
|
|
236
245
|
EFormattingPresets["DD MMMM YYYY"] = "DD MMMM YYYY";
|
|
246
|
+
EFormattingPresets["DD MMMM YY"] = "DD MMMM YY";
|
|
237
247
|
EFormattingPresets["DD/MM/YYYY"] = "DD/MM/YYYY";
|
|
248
|
+
EFormattingPresets["DD/MM/YY"] = "DD/MM/YY";
|
|
249
|
+
EFormattingPresets["MM/DD/YYYY"] = "MM/DD/YYYY";
|
|
250
|
+
EFormattingPresets["MM/DD/YY"] = "MM/DD/YY";
|
|
238
251
|
EFormattingPresets["MMMM DD, YYYY"] = "MMMM DD, YYYY";
|
|
252
|
+
EFormattingPresets["MMMM DD, YY"] = "MMMM DD, YY";
|
|
239
253
|
EFormattingPresets["DD.MM.YYYY"] = "DD.MM.YYYY";
|
|
240
|
-
EFormattingPresets["MM.
|
|
254
|
+
EFormattingPresets["DD.MM.YY"] = "DD.MM.YY";
|
|
255
|
+
EFormattingPresets["MM-DD-YY"] = "MM-DD-YY";
|
|
256
|
+
EFormattingPresets["MM-DD-YYYY"] = "MM-DD-YYYY";
|
|
241
257
|
//Группа шаблонов для формата DATETIME
|
|
242
258
|
EFormattingPresets["DD/M/YYYY HH:mm"] = "DD/M/YYYY HH:mm";
|
|
259
|
+
EFormattingPresets["DD/MM/YYYY, HH:mm"] = "DD/MM/YYYY, HH:mm";
|
|
260
|
+
EFormattingPresets["DD/MM/YY, HH:mm"] = "DD/MM/YY, HH:mm";
|
|
261
|
+
EFormattingPresets["MM/DD/YY, hh:mm a"] = "MM/DD/YY, hh:mm a";
|
|
262
|
+
EFormattingPresets["MM/DD/YYYY, hh:mm a"] = "MM/DD/YYYY, hh:mm a";
|
|
243
263
|
EFormattingPresets["YYYY-MM-DD HH:mm"] = "YYYY-MM-DD HH:mm";
|
|
264
|
+
EFormattingPresets["YY-MM-DD, HH:mm"] = "YY-MM-DD, HH:mm";
|
|
265
|
+
EFormattingPresets["YYYY-MM-DD, HH:mm"] = "YYYY-MM-DD, HH:mm";
|
|
244
266
|
EFormattingPresets["YYYY-MM-DD HH:mm:ss"] = "YYYY-MM-DD HH:mm:ss";
|
|
245
267
|
EFormattingPresets["DD MM YYYY HH:mm"] = "DD MM YYYY HH:mm";
|
|
246
|
-
EFormattingPresets["DD MMM YYYY, HH:mm"] = "DD MMM YYYY, HH:mm";
|
|
247
268
|
EFormattingPresets["DD MMMM YYYY, HH:mm"] = "DD MMMM YYYY, HH:mm";
|
|
269
|
+
EFormattingPresets["DD.MM.YY, HH:mm"] = "DD.MM.YY, HH:mm";
|
|
270
|
+
EFormattingPresets["DD.MM.YYYY, HH:mm"] = "DD.MM.YYYY, HH:mm";
|
|
271
|
+
EFormattingPresets["MM-DD-YY, hh:mm a"] = "MM-DD-YY, hh:mm a";
|
|
272
|
+
EFormattingPresets["MM-DD-YYYY, hh:mm a"] = "MM-DD-YYYY, hh:mm a";
|
|
273
|
+
EFormattingPresets["MM.DD.YY, hh:mm a"] = "MM.DD.YY, hh:mm a";
|
|
274
|
+
EFormattingPresets["MM.DD.YYYY, hh:mm a"] = "MM.DD.YYYY, hh:mm a";
|
|
275
|
+
EFormattingPresets["MM.DD.YYYY hh:mm a"] = "MM.DD.YYYY hh:mm a";
|
|
276
|
+
EFormattingPresets["DD MMM YY, HH:mm"] = "DD MMM YY, HH:mm";
|
|
277
|
+
EFormattingPresets["DD MMM YYYY, HH:mm"] = "DD MMM YYYY, HH:mm";
|
|
278
|
+
EFormattingPresets["MMMM DD, YY, HH:mm"] = "MMMM DD, YY, HH:mm";
|
|
279
|
+
EFormattingPresets["MMMM DD, YYYY, HH:mm"] = "MMMM DD, YYYY, HH:mm";
|
|
280
|
+
EFormattingPresets["DD MMMM YY, HH:mm"] = "DD MMMM YY, HH:mm";
|
|
248
281
|
EFormattingPresets["DD.MM.YYYY, HH:mm:ss"] = "DD.MM.YYYY, HH:mm:ss";
|
|
249
282
|
EFormattingPresets["DD.MM.YYYY HH:mm:ss"] = "DD.MM.YYYY HH:mm:ss";
|
|
250
283
|
EFormattingPresets["DD/MM/YYYY HH:mm:ss"] = "DD/MM/YYYY HH:mm:ss";
|
|
@@ -278,14 +311,19 @@ var EFormattingPresets;
|
|
|
278
311
|
EFormattingPresets["hh a"] = "hh a";
|
|
279
312
|
//Группа шаблонов для преобразования Month_Year
|
|
280
313
|
EFormattingPresets["MMM, YYYY"] = "MMM, YYYY";
|
|
314
|
+
EFormattingPresets["MMM, YY"] = "MMM, YY";
|
|
281
315
|
EFormattingPresets["MM.YYYY"] = "MM.YYYY";
|
|
316
|
+
EFormattingPresets["MM.YY"] = "MM.YY";
|
|
282
317
|
EFormattingPresets["MMMM YYYY"] = "MMMM YYYY";
|
|
318
|
+
EFormattingPresets["MMMM YY"] = "MMMM YY";
|
|
283
319
|
//Группа шаблонов для преобразования Quarter
|
|
284
320
|
EFormattingPresets["[Q]q"] = "[Q]q";
|
|
285
321
|
EFormattingPresets["R"] = "R";
|
|
286
322
|
//Группа шаблонов для преобразования Quarter_Year
|
|
287
323
|
EFormattingPresets["[Q]q[-]YYYY"] = "[Q]q[-]YYYY";
|
|
324
|
+
EFormattingPresets["[Q]q[-]YY"] = "[Q]q[-]YY";
|
|
288
325
|
EFormattingPresets["R[-]YYYY"] = "R[-]YYYY";
|
|
326
|
+
EFormattingPresets["R[-]YY"] = "R[-]YY";
|
|
289
327
|
})(EFormattingPresets || (EFormattingPresets = {}));
|
|
290
328
|
|
|
291
329
|
var ELastTimeUnit;
|
|
@@ -454,9 +492,11 @@ function checkDisplayCondition(displayCondition, variables) {
|
|
|
454
492
|
var _a;
|
|
455
493
|
if ((displayCondition === null || displayCondition === void 0 ? void 0 : displayCondition.mode) === EDisplayConditionMode.VARIABLE) {
|
|
456
494
|
var variableGuid = displayCondition.variableGuid, variableValue = displayCondition.variableValue;
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
495
|
+
var currentVariableValue = variableGuid && ((_a = variables.get(variableGuid)) === null || _a === void 0 ? void 0 : _a.value);
|
|
496
|
+
var isCurrentVariableMatch = Array.isArray(currentVariableValue)
|
|
497
|
+
? !!variableValue && (currentVariableValue === null || currentVariableValue === void 0 ? void 0 : currentVariableValue.includes(variableValue))
|
|
498
|
+
: currentVariableValue === variableValue;
|
|
499
|
+
if (!isCurrentVariableMatch) {
|
|
460
500
|
return false;
|
|
461
501
|
}
|
|
462
502
|
}
|
package/dist/index.js
CHANGED
|
@@ -123,7 +123,11 @@ var prepareValuesForSql = function (dataType, values) {
|
|
|
123
123
|
dataType === exports.ESimpleDataType.FLOAT ||
|
|
124
124
|
dataType === exports.ESimpleDataType.BOOLEAN
|
|
125
125
|
? values
|
|
126
|
-
: values.map(function (value) {
|
|
126
|
+
: values.map(function (value) {
|
|
127
|
+
return value === null
|
|
128
|
+
? null
|
|
129
|
+
: "'".concat(escapeSingularQuotes(escapeReverseSlash(value)), "'");
|
|
130
|
+
});
|
|
127
131
|
};
|
|
128
132
|
var escapeReverseSlash = function (formula) {
|
|
129
133
|
return formula.replaceAll(/\\/gm, "\\\\");
|
|
@@ -230,22 +234,51 @@ exports.EFormattingPresets = void 0;
|
|
|
230
234
|
EFormattingPresets["TUNE"] = "TUNE";
|
|
231
235
|
//Группа шаблонов для формата DATE
|
|
232
236
|
EFormattingPresets["DD/M/YYYY"] = "DD/M/YYYY";
|
|
237
|
+
EFormattingPresets["DD-MM-YYYY"] = "DD-MM-YYYY";
|
|
238
|
+
EFormattingPresets["DD-MM-YY"] = "DD-MM-YY";
|
|
233
239
|
EFormattingPresets["YYYY-MM-DD"] = "YYYY-MM-DD";
|
|
240
|
+
EFormattingPresets["YY-MM-DD"] = "YY-MM-DD";
|
|
234
241
|
EFormattingPresets["DD MM YYYY"] = "DD MM YYYY";
|
|
235
242
|
EFormattingPresets["DD MMM YYYY"] = "DD MMM YYYY";
|
|
243
|
+
EFormattingPresets["DD MMM YY"] = "DD MMM YY";
|
|
236
244
|
EFormattingPresets["MM.DD.YYYY"] = "MM.DD.YYYY";
|
|
245
|
+
EFormattingPresets["MM.DD.YY"] = "MM.DD.YY";
|
|
237
246
|
EFormattingPresets["DD MMMM YYYY"] = "DD MMMM YYYY";
|
|
247
|
+
EFormattingPresets["DD MMMM YY"] = "DD MMMM YY";
|
|
238
248
|
EFormattingPresets["DD/MM/YYYY"] = "DD/MM/YYYY";
|
|
249
|
+
EFormattingPresets["DD/MM/YY"] = "DD/MM/YY";
|
|
250
|
+
EFormattingPresets["MM/DD/YYYY"] = "MM/DD/YYYY";
|
|
251
|
+
EFormattingPresets["MM/DD/YY"] = "MM/DD/YY";
|
|
239
252
|
EFormattingPresets["MMMM DD, YYYY"] = "MMMM DD, YYYY";
|
|
253
|
+
EFormattingPresets["MMMM DD, YY"] = "MMMM DD, YY";
|
|
240
254
|
EFormattingPresets["DD.MM.YYYY"] = "DD.MM.YYYY";
|
|
241
|
-
EFormattingPresets["MM.
|
|
255
|
+
EFormattingPresets["DD.MM.YY"] = "DD.MM.YY";
|
|
256
|
+
EFormattingPresets["MM-DD-YY"] = "MM-DD-YY";
|
|
257
|
+
EFormattingPresets["MM-DD-YYYY"] = "MM-DD-YYYY";
|
|
242
258
|
//Группа шаблонов для формата DATETIME
|
|
243
259
|
EFormattingPresets["DD/M/YYYY HH:mm"] = "DD/M/YYYY HH:mm";
|
|
260
|
+
EFormattingPresets["DD/MM/YYYY, HH:mm"] = "DD/MM/YYYY, HH:mm";
|
|
261
|
+
EFormattingPresets["DD/MM/YY, HH:mm"] = "DD/MM/YY, HH:mm";
|
|
262
|
+
EFormattingPresets["MM/DD/YY, hh:mm a"] = "MM/DD/YY, hh:mm a";
|
|
263
|
+
EFormattingPresets["MM/DD/YYYY, hh:mm a"] = "MM/DD/YYYY, hh:mm a";
|
|
244
264
|
EFormattingPresets["YYYY-MM-DD HH:mm"] = "YYYY-MM-DD HH:mm";
|
|
265
|
+
EFormattingPresets["YY-MM-DD, HH:mm"] = "YY-MM-DD, HH:mm";
|
|
266
|
+
EFormattingPresets["YYYY-MM-DD, HH:mm"] = "YYYY-MM-DD, HH:mm";
|
|
245
267
|
EFormattingPresets["YYYY-MM-DD HH:mm:ss"] = "YYYY-MM-DD HH:mm:ss";
|
|
246
268
|
EFormattingPresets["DD MM YYYY HH:mm"] = "DD MM YYYY HH:mm";
|
|
247
|
-
EFormattingPresets["DD MMM YYYY, HH:mm"] = "DD MMM YYYY, HH:mm";
|
|
248
269
|
EFormattingPresets["DD MMMM YYYY, HH:mm"] = "DD MMMM YYYY, HH:mm";
|
|
270
|
+
EFormattingPresets["DD.MM.YY, HH:mm"] = "DD.MM.YY, HH:mm";
|
|
271
|
+
EFormattingPresets["DD.MM.YYYY, HH:mm"] = "DD.MM.YYYY, HH:mm";
|
|
272
|
+
EFormattingPresets["MM-DD-YY, hh:mm a"] = "MM-DD-YY, hh:mm a";
|
|
273
|
+
EFormattingPresets["MM-DD-YYYY, hh:mm a"] = "MM-DD-YYYY, hh:mm a";
|
|
274
|
+
EFormattingPresets["MM.DD.YY, hh:mm a"] = "MM.DD.YY, hh:mm a";
|
|
275
|
+
EFormattingPresets["MM.DD.YYYY, hh:mm a"] = "MM.DD.YYYY, hh:mm a";
|
|
276
|
+
EFormattingPresets["MM.DD.YYYY hh:mm a"] = "MM.DD.YYYY hh:mm a";
|
|
277
|
+
EFormattingPresets["DD MMM YY, HH:mm"] = "DD MMM YY, HH:mm";
|
|
278
|
+
EFormattingPresets["DD MMM YYYY, HH:mm"] = "DD MMM YYYY, HH:mm";
|
|
279
|
+
EFormattingPresets["MMMM DD, YY, HH:mm"] = "MMMM DD, YY, HH:mm";
|
|
280
|
+
EFormattingPresets["MMMM DD, YYYY, HH:mm"] = "MMMM DD, YYYY, HH:mm";
|
|
281
|
+
EFormattingPresets["DD MMMM YY, HH:mm"] = "DD MMMM YY, HH:mm";
|
|
249
282
|
EFormattingPresets["DD.MM.YYYY, HH:mm:ss"] = "DD.MM.YYYY, HH:mm:ss";
|
|
250
283
|
EFormattingPresets["DD.MM.YYYY HH:mm:ss"] = "DD.MM.YYYY HH:mm:ss";
|
|
251
284
|
EFormattingPresets["DD/MM/YYYY HH:mm:ss"] = "DD/MM/YYYY HH:mm:ss";
|
|
@@ -279,14 +312,19 @@ exports.EFormattingPresets = void 0;
|
|
|
279
312
|
EFormattingPresets["hh a"] = "hh a";
|
|
280
313
|
//Группа шаблонов для преобразования Month_Year
|
|
281
314
|
EFormattingPresets["MMM, YYYY"] = "MMM, YYYY";
|
|
315
|
+
EFormattingPresets["MMM, YY"] = "MMM, YY";
|
|
282
316
|
EFormattingPresets["MM.YYYY"] = "MM.YYYY";
|
|
317
|
+
EFormattingPresets["MM.YY"] = "MM.YY";
|
|
283
318
|
EFormattingPresets["MMMM YYYY"] = "MMMM YYYY";
|
|
319
|
+
EFormattingPresets["MMMM YY"] = "MMMM YY";
|
|
284
320
|
//Группа шаблонов для преобразования Quarter
|
|
285
321
|
EFormattingPresets["[Q]q"] = "[Q]q";
|
|
286
322
|
EFormattingPresets["R"] = "R";
|
|
287
323
|
//Группа шаблонов для преобразования Quarter_Year
|
|
288
324
|
EFormattingPresets["[Q]q[-]YYYY"] = "[Q]q[-]YYYY";
|
|
325
|
+
EFormattingPresets["[Q]q[-]YY"] = "[Q]q[-]YY";
|
|
289
326
|
EFormattingPresets["R[-]YYYY"] = "R[-]YYYY";
|
|
327
|
+
EFormattingPresets["R[-]YY"] = "R[-]YY";
|
|
290
328
|
})(exports.EFormattingPresets || (exports.EFormattingPresets = {}));
|
|
291
329
|
|
|
292
330
|
exports.ELastTimeUnit = void 0;
|
|
@@ -455,9 +493,11 @@ function checkDisplayCondition(displayCondition, variables) {
|
|
|
455
493
|
var _a;
|
|
456
494
|
if ((displayCondition === null || displayCondition === void 0 ? void 0 : displayCondition.mode) === exports.EDisplayConditionMode.VARIABLE) {
|
|
457
495
|
var variableGuid = displayCondition.variableGuid, variableValue = displayCondition.variableValue;
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
496
|
+
var currentVariableValue = variableGuid && ((_a = variables.get(variableGuid)) === null || _a === void 0 ? void 0 : _a.value);
|
|
497
|
+
var isCurrentVariableMatch = Array.isArray(currentVariableValue)
|
|
498
|
+
? !!variableValue && (currentVariableValue === null || currentVariableValue === void 0 ? void 0 : currentVariableValue.includes(variableValue))
|
|
499
|
+
: currentVariableValue === variableValue;
|
|
500
|
+
if (!isCurrentVariableMatch) {
|
|
461
501
|
return false;
|
|
462
502
|
}
|
|
463
503
|
}
|