@infomaximum/widget-sdk 5.0.0-beta2 → 5.0.0-beta4

package/dist/index.d.ts

@@ -383,9 +383,9 @@ interface IFormulaFilterValue {
     /** Метод фильтрации */
     filteringMethod: valueof<typeof formulaFilterMethods>;
     /** Выбранные в списке значения в виде моделей */
-    checkedValues: (string | null)[];
+    checkedValues?: (string | null)[];
     /** Значения полей формы редактора */
-    formValues: Partial<{
+    formValues?: Partial<{
         [EFormulaFilterFieldKeys.date]: string | null;
         [EFormulaFilterFieldKeys.dateRange]: [string, string];
         [EFormulaFilterFieldKeys.duration]: string;
@@ -416,7 +416,7 @@ interface IStagesFilterValue {
     /** Этапы */
     stages: IStagesFilterItem[];
 }
-type TWidgetFilterValue = IFormulaFilterValue | IStagesFilterValue | IProcessEventFilterValue | IProcessTransitionFilterValue;
+type TWidgetFilterValue = TExtendedFormulaFilterValue | IStagesFilterValue | IProcessEventFilterValue | IProcessTransitionFilterValue;
 interface IWidgetFilter {
     /** Значение фильтра */
     filterValue: TWidgetFilterValue;
@@ -801,7 +801,6 @@ type TActionOpenView = IActionCommon & {
 }>));
 type TActionsOnClick = IActionGoToUrl | IActionRunScript | IActionUpdateVariable | TActionOpenView;
 interface IWidgetAction extends IActionCommon {
-    filters: TExtendedFormulaFilterValue[];
     parameters: TWidgetActionParameter[];
     type: EActionTypes.EXECUTE_SCRIPT;
     scriptKey: string;
@@ -831,13 +830,19 @@ declare enum ESortDirection {
 }
 type TSortDirection = ESortDirection.ascend | ESortDirection.descend;
 interface ISortOrder {
+    /** Формула сортировки */
     formula: string;
+    /** Тип данных формулы */
+    dbDataType: TNullable<string>;
+    /** Направление сортировки */
     direction: TSortDirection;
+    /** Условие применения сортировки */
     displayCondition?: TNullable<string>;
 }
 type TWidgetSortingValue = {
     mode: ESortingValueModes.FORMULA;
     formula: string;
+    dbDataType: string;
 } | {
     mode: ESortingValueModes.IN_WIDGET;
     group: string;
@@ -910,15 +915,15 @@ interface ICommonDimensions {
 }
 type TColumnIndicatorValue = {
     mode: EWidgetIndicatorValueModes.FORMULA;
-    formula: string;
+    formula?: string;
 } | {
     mode: EWidgetIndicatorValueModes.TEMPLATE;
     /** Имя шаблонной формулы, использующей колонку таблицы */
-    templateName: string;
+    templateName?: string;
     /** Имя таблицы */
-    tableName: string;
+    tableName?: string;
     /** Имя колонки */
-    columnName: string;
+    columnName?: string;
 };
 /** Общий интерфейс разреза и меры */
 interface IWidgetColumnIndicator extends IWidgetIndicator {
@@ -1769,10 +1774,8 @@ type TLaunchActionParams = {
     filters: ICalculatorFilter[];
     /** Выбранные имена событий для способа ввода EVENT, START_EVENT и FINISH_EVENT */
     eventNames?: [string] | [string, string];
-    /** Callback, вызывается при успешном получении данных модального окна запуска действия,
-     * а так же при клике на другое действие, вызовется для предыдущего действия
-     */
-    resetAndHandleModalData?: () => void;
+    /** Callback вызывается при успешном открытии модального окна подтверждения или при прерывании открытия */
+    onConfirmationOpenSettled?: () => void;
 };
 type TWidgetContainer = {
     /** Имеет ли контейнер виджета ограниченную максимальную высоту */

package/dist/index.esm.js

@@ -646,6 +646,9 @@ var getFormulaFilterValues = function (filterValue) {
     if (checkedValues && checkedValues.length) {
         return checkedValues;
     }
+    if (!formValues) {
+        return [];
+    }
     function stringifyNumbersRange(range) {
         if (range === void 0) { range = [undefined, undefined]; }
         return range.map(function (value, index) {
@@ -680,7 +683,7 @@ var getFormulaFilterValues = function (filterValue) {
             }
             return compact([datePickerValue]);
         case EFormatTypes.STRING:
-            return compact([(_a = formValues === null || formValues === void 0 ? void 0 : formValues[EFormulaFilterFieldKeys.string]) !== null && _a !== void 0 ? _a : null]);
+            return compact([(_a = formValues[EFormulaFilterFieldKeys.string]) !== null && _a !== void 0 ? _a : null]);
         case EFormatTypes.NUMBER:
         case EFormatTypes.YEAR:
         case EFormatTypes.DAY_OF_MONTH:
@@ -877,17 +880,18 @@ var dimensionTemplateFormulas = (_a$3 = {},
     _a$3[EDimensionTemplateNames.hour] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toHour({columnFormula}))",
     _a$3);
 function getDimensionFormula(_a) {
+    var _b;
     var value = _a.value;
     if (!value) {
         return "";
     }
     if (value.mode === EWidgetIndicatorValueModes.FORMULA) {
-        return value.formula;
+        return (_b = value.formula) !== null && _b !== void 0 ? _b : "";
     }
     if (value.mode === EWidgetIndicatorValueModes.TEMPLATE) {
         var templateName = value.templateName, tableName = value.tableName, columnName = value.columnName;
         var templateFormula = dimensionTemplateFormulas[templateName];
-        if (!templateFormula) {
+        if (!templateFormula || !tableName || !columnName) {
             return "";
         }
         return fillTemplateString(templateFormula, {
@@ -918,17 +922,18 @@ var measureTemplateFormulas = (_a$2 = {},
     _a$2[EMeasureTemplateNames.sum] = "sum({columnFormula})",
     _a$2);
 function getMeasureFormula(_a) {
+    var _b;
     var value = _a.value;
     if (!value) {
         return "";
     }
     if (value.mode === EWidgetIndicatorValueModes.FORMULA) {
-        return value.formula;
+        return (_b = value.formula) !== null && _b !== void 0 ? _b : "";
     }
     if (value.mode === EWidgetIndicatorValueModes.TEMPLATE) {
         var templateName = value.templateName, tableName = value.tableName, columnName = value.columnName;
         var templateFormula = measureTemplateFormulas[templateName];
-        if (!templateFormula) {
+        if (!templateFormula || !tableName || !columnName) {
             return "";
         }
         return fillTemplateString(templateFormula, {
@@ -1179,7 +1184,13 @@ var getDefaultSortOrders = function (_a) {
             ].includes(dimension.format);
     });
     if (timeDimension) {
-        return [{ formula: getDimensionFormula(timeDimension), direction: ESortDirection.ascend }];
+        return [
+            {
+                formula: getDimensionFormula(timeDimension),
+                dbDataType: timeDimension.dbDataType,
+                direction: ESortDirection.ascend,
+            },
+        ];
     }
     if (measures.length > 0) {
         var firstMeasure = measures[0];
@@ -1188,6 +1199,7 @@ var getDefaultSortOrders = function (_a) {
                 {
                     direction: ESortDirection.descend,
                     formula: getMeasureFormula(firstMeasure),
+                    dbDataType: firstMeasure.dbDataType,
                 },
             ];
         }
@@ -1201,7 +1213,9 @@ function mapSortingToInputs(_a) {
         var _b;
         var direction = _a.direction, value = _a.value;
         if (value.mode === ESortingValueModes.FORMULA) {
-            return value.formula ? { formula: value.formula, direction: direction } : undefined;
+            return value.formula
+                ? { formula: value.formula, direction: direction, dbDataType: value.dbDataType }
+                : undefined;
         }
         var indicatorsGroup = settings[value.group];
         var indicator = indicatorsGroup === null || indicatorsGroup === void 0 ? void 0 : indicatorsGroup[value.index];
@@ -1219,6 +1233,7 @@ function mapSortingToInputs(_a) {
             return {
                 formula: formula,
                 direction: direction,
+                dbDataType: activeDimensions.dbDataType,
                 displayCondition: ((_b = indicator.displayCondition) === null || _b === void 0 ? void 0 : _b.mode) === EDisplayConditionMode.FORMULA
                     ? indicator.displayCondition.formula
                     : undefined,
@@ -1227,6 +1242,7 @@ function mapSortingToInputs(_a) {
         return {
             formula: getMeasureFormula(indicator),
             direction: direction,
+            dbDataType: indicator.dbDataType,
         };
     });
     return sortOrder;

package/dist/index.js

@@ -647,6 +647,9 @@ var getFormulaFilterValues = function (filterValue) {
     if (checkedValues && checkedValues.length) {
         return checkedValues;
     }
+    if (!formValues) {
+        return [];
+    }
     function stringifyNumbersRange(range) {
         if (range === void 0) { range = [undefined, undefined]; }
         return range.map(function (value, index) {
@@ -681,7 +684,7 @@ var getFormulaFilterValues = function (filterValue) {
             }
             return compact([datePickerValue]);
         case exports.EFormatTypes.STRING:
-            return compact([(_a = formValues === null || formValues === void 0 ? void 0 : formValues[exports.EFormulaFilterFieldKeys.string]) !== null && _a !== void 0 ? _a : null]);
+            return compact([(_a = formValues[exports.EFormulaFilterFieldKeys.string]) !== null && _a !== void 0 ? _a : null]);
         case exports.EFormatTypes.NUMBER:
         case exports.EFormatTypes.YEAR:
         case exports.EFormatTypes.DAY_OF_MONTH:
@@ -878,17 +881,18 @@ var dimensionTemplateFormulas = (_a$3 = {},
     _a$3[exports.EDimensionTemplateNames.hour] = "if(defaultValueOfArgumentType({columnFormula}) = {columnFormula}, 0, toHour({columnFormula}))",
     _a$3);
 function getDimensionFormula(_a) {
+    var _b;
     var value = _a.value;
     if (!value) {
         return "";
     }
     if (value.mode === exports.EWidgetIndicatorValueModes.FORMULA) {
-        return value.formula;
+        return (_b = value.formula) !== null && _b !== void 0 ? _b : "";
     }
     if (value.mode === exports.EWidgetIndicatorValueModes.TEMPLATE) {
         var templateName = value.templateName, tableName = value.tableName, columnName = value.columnName;
         var templateFormula = dimensionTemplateFormulas[templateName];
-        if (!templateFormula) {
+        if (!templateFormula || !tableName || !columnName) {
             return "";
         }
         return fillTemplateString(templateFormula, {
@@ -919,17 +923,18 @@ var measureTemplateFormulas = (_a$2 = {},
     _a$2[exports.EMeasureTemplateNames.sum] = "sum({columnFormula})",
     _a$2);
 function getMeasureFormula(_a) {
+    var _b;
     var value = _a.value;
     if (!value) {
         return "";
     }
     if (value.mode === exports.EWidgetIndicatorValueModes.FORMULA) {
-        return value.formula;
+        return (_b = value.formula) !== null && _b !== void 0 ? _b : "";
     }
     if (value.mode === exports.EWidgetIndicatorValueModes.TEMPLATE) {
         var templateName = value.templateName, tableName = value.tableName, columnName = value.columnName;
         var templateFormula = measureTemplateFormulas[templateName];
-        if (!templateFormula) {
+        if (!templateFormula || !tableName || !columnName) {
             return "";
         }
         return fillTemplateString(templateFormula, {
@@ -1180,7 +1185,13 @@ var getDefaultSortOrders = function (_a) {
             ].includes(dimension.format);
     });
     if (timeDimension) {
-        return [{ formula: getDimensionFormula(timeDimension), direction: exports.ESortDirection.ascend }];
+        return [
+            {
+                formula: getDimensionFormula(timeDimension),
+                dbDataType: timeDimension.dbDataType,
+                direction: exports.ESortDirection.ascend,
+            },
+        ];
     }
     if (measures.length > 0) {
         var firstMeasure = measures[0];
@@ -1189,6 +1200,7 @@ var getDefaultSortOrders = function (_a) {
                 {
                     direction: exports.ESortDirection.descend,
                     formula: getMeasureFormula(firstMeasure),
+                    dbDataType: firstMeasure.dbDataType,
                 },
             ];
         }
@@ -1202,7 +1214,9 @@ function mapSortingToInputs(_a) {
         var _b;
         var direction = _a.direction, value = _a.value;
         if (value.mode === exports.ESortingValueModes.FORMULA) {
-            return value.formula ? { formula: value.formula, direction: direction } : undefined;
+            return value.formula
+                ? { formula: value.formula, direction: direction, dbDataType: value.dbDataType }
+                : undefined;
         }
         var indicatorsGroup = settings[value.group];
         var indicator = indicatorsGroup === null || indicatorsGroup === void 0 ? void 0 : indicatorsGroup[value.index];
@@ -1220,6 +1234,7 @@ function mapSortingToInputs(_a) {
             return {
                 formula: formula,
                 direction: direction,
+                dbDataType: activeDimensions.dbDataType,
                 displayCondition: ((_b = indicator.displayCondition) === null || _b === void 0 ? void 0 : _b.mode) === exports.EDisplayConditionMode.FORMULA
                     ? indicator.displayCondition.formula
                     : undefined,
@@ -1228,6 +1243,7 @@ function mapSortingToInputs(_a) {
         return {
             formula: getMeasureFormula(indicator),
             direction: direction,
+            dbDataType: indicator.dbDataType,
         };
     });
     return sortOrder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infomaximum/widget-sdk",
-  "version": "5.0.0-beta2",
+  "version": "5.0.0-beta4",
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",