@infomaximum/widget-sdk 4.10.0 → 4.11.1

package/dist/index.d.ts

@@ -394,9 +394,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;
@@ -740,6 +740,7 @@ interface IParameterFromManualInput {
     inputMethod: EWidgetActionInputMethod.MANUALLY;
     description: string;
     defaultValue?: string;
+    filterByRows?: boolean;
 }
 interface IParameterFromStaticList {
     inputMethod: EWidgetActionInputMethod.STATIC_LIST;
@@ -752,6 +753,7 @@ interface IParameterFromDynamicList {
     defaultValue: string;
     displayOptions: string;
     filters: TExtendedFormulaFilterValue[];
+    filterByRows?: boolean;
 }
 interface IWidgetActionParameterCommon {
     name: string;
@@ -813,7 +815,6 @@ type TActionOpenView = IActionCommon & {
 }>));
 type TActionsOnClick = IActionGoToUrl | IActionRunScript | IActionUpdateVariable | TActionOpenView;
 interface IWidgetAction extends IActionCommon {
-    filters: TExtendedFormulaFilterValue[];
     parameters: TWidgetActionParameter[];
     type: EActionTypes.EXECUTE_SCRIPT;
     scriptKey: string;
@@ -851,12 +852,14 @@ declare enum ESortDirection {
 type TSortDirection = ESortDirection.ascend | ESortDirection.descend;
 interface ISortOrder {
     formula: string;
+    dataType?: ESimpleDataType;
     direction: TSortDirection;
     displayCondition?: TNullable<string>;
 }
 type TWidgetSortingValue = {
     mode: ESortingValueModes.FORMULA;
     formula: string;
+    dataType?: ESimpleDataType;
 } | {
     mode: ESortingValueModes.IN_WIDGET;
     group: string;

package/dist/index.esm.js

@@ -566,6 +566,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) {
@@ -600,7 +603,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:
@@ -1090,7 +1093,13 @@ var getDefaultSortOrders = function (_a) {
             ].includes(dimension.format);
     });
     if (timeDimension) {
-        return [{ formula: getDimensionFormula(timeDimension), direction: ESortDirection.ascend }];
+        return [
+            {
+                formula: getDimensionFormula(timeDimension),
+                dataType: timeDimension.dataType,
+                direction: ESortDirection.ascend,
+            },
+        ];
     }
     if (measures.length > 0) {
         var firstMeasure = measures[0];
@@ -1099,6 +1108,7 @@ var getDefaultSortOrders = function (_a) {
                 {
                     direction: ESortDirection.descend,
                     formula: getMeasureFormula(firstMeasure),
+                    dataType: firstMeasure.dataType,
                 },
             ];
         }
@@ -1112,7 +1122,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, dataType: value.dataType }
+                : undefined;
         }
         var indicatorsGroup = settings[value.group];
         var indicator = indicatorsGroup === null || indicatorsGroup === void 0 ? void 0 : indicatorsGroup[value.index];
@@ -1130,6 +1142,7 @@ function mapSortingToInputs(_a) {
             return {
                 formula: formula,
                 direction: direction,
+                dataType: activeDimensions.dataType,
                 displayCondition: ((_b = indicator.displayCondition) === null || _b === void 0 ? void 0 : _b.mode) === EDisplayConditionMode.FORMULA
                     ? indicator.displayCondition.formula
                     : undefined,
@@ -1138,6 +1151,7 @@ function mapSortingToInputs(_a) {
         return {
             formula: getMeasureFormula(indicator),
             direction: direction,
+            dataType: indicator.dataType,
         };
     });
     return sortOrder;

package/dist/index.js

@@ -567,6 +567,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) {
@@ -601,7 +604,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:
@@ -1091,7 +1094,13 @@ var getDefaultSortOrders = function (_a) {
             ].includes(dimension.format);
     });
     if (timeDimension) {
-        return [{ formula: getDimensionFormula(timeDimension), direction: exports.ESortDirection.ascend }];
+        return [
+            {
+                formula: getDimensionFormula(timeDimension),
+                dataType: timeDimension.dataType,
+                direction: exports.ESortDirection.ascend,
+            },
+        ];
     }
     if (measures.length > 0) {
         var firstMeasure = measures[0];
@@ -1100,6 +1109,7 @@ var getDefaultSortOrders = function (_a) {
                 {
                     direction: exports.ESortDirection.descend,
                     formula: getMeasureFormula(firstMeasure),
+                    dataType: firstMeasure.dataType,
                 },
             ];
         }
@@ -1113,7 +1123,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, dataType: value.dataType }
+                : undefined;
         }
         var indicatorsGroup = settings[value.group];
         var indicator = indicatorsGroup === null || indicatorsGroup === void 0 ? void 0 : indicatorsGroup[value.index];
@@ -1131,6 +1143,7 @@ function mapSortingToInputs(_a) {
             return {
                 formula: formula,
                 direction: direction,
+                dataType: activeDimensions.dataType,
                 displayCondition: ((_b = indicator.displayCondition) === null || _b === void 0 ? void 0 : _b.mode) === exports.EDisplayConditionMode.FORMULA
                     ? indicator.displayCondition.formula
                     : undefined,
@@ -1139,6 +1152,7 @@ function mapSortingToInputs(_a) {
         return {
             formula: getMeasureFormula(indicator),
             direction: direction,
+            dataType: indicator.dataType,
         };
     });
     return sortOrder;

package/package.json

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