@infomaximum/widget-sdk 3.26.0-beta → 3.26.0

package/dist/index.d.ts

@@ -404,6 +404,13 @@ interface IWidgetFiltration {
     removeStagesFilter(widgetKey: string): void;
 }
 
+interface IPlacement {
+    left: number;
+    top: number;
+    width: number;
+    height: number;
+    zIndex: number;
+}
 declare enum EWidgetFilterMode {
     DEFAULT = "DEFAULT",
     SINGLE = "SINGLE",
@@ -470,6 +477,7 @@ type TSortDirection = ESortDirection.ascend | ESortDirection.descend;
 interface ISortOrder {
     formula: string;
     direction: TSortDirection;
+    displayCondition?: TNullable<string>;
 }
 type TWidgetSortingValueRelatedWidgetMeasure = {
     mode: ESortingValueModes.MEASURE_IN_WIDGET;
@@ -770,7 +778,7 @@ interface IWidgetAction {
     inputs: IWidgetActionInput[];
     shouldRefreshWidgetsAfterExecution: boolean;
 }
-declare const isActionValid: (action: IWidgetAction, { scripts, tables }: IWidgetsContext) => boolean;
+declare const isActionValid: (action: IWidgetAction, { scripts, tables, variables }: IWidgetsContext) => boolean;
 
 interface IBaseWidgetSettings {
     apiVersion: string;
@@ -781,6 +789,7 @@ interface IBaseWidgetSettings {
     filters?: (IFormulaFilterValue | string)[];
     filterMode?: EWidgetFilterMode;
     ignoreFilters?: boolean;
+    placement: IPlacement;
     sorting?: IWidgetSortingIndicator[];
     actions?: IWidgetAction[];
     displayCondition?: TDisplayCondition;
@@ -1127,7 +1136,7 @@ declare function mapEventMeasuresToInputs<T extends IProcessIndicator>(indicator
  * @param measuresInOriginalOrder меры виджета (конкретная мера будет браться по индексу)
  * @returns
  */
-declare function mapSortingToInputs(sortingIndicators?: IWidgetSortingIndicator[], dimensionsInOriginalOrder?: IWidgetDimension[], measuresInOriginalOrder?: IWidgetMeasure[]): ISortOrder[];
+declare function mapSortingToInputs(sortingIndicators: IWidgetSortingIndicator[] | undefined, dimensionsInOriginalOrder: IWidgetDimension[] | undefined, measuresInOriginalOrder: IWidgetMeasure[] | undefined, variables: Map<string, TWidgetVariable>): ISortOrder[];
 
 /**
  * Выбрать активный разрез иерархии на основе активных фильтров.
@@ -1179,10 +1188,6 @@ type TLaunchActionParams = {
     filters: ICalculatorFilter[];
     needConfirmation?: boolean;
 };
-type TWidgetContainer = {
-    /** Имеет ли контейнер виджета ограниченную максимальную высоту */
-    isMaxHeightLimited: boolean;
-};
 interface IWidgetProps<WidgetSettings extends IBaseWidgetSettings = IBaseWidgetSettings> {
     /** guid виджета */
     guid: string;
@@ -1203,10 +1208,8 @@ interface IWidgetProps<WidgetSettings extends IBaseWidgetSettings = IBaseWidgetS
     rootViewContainer: HTMLDivElement;
     /** Объект для управления плейсхолдером */
     placeholder: IWidgetPlaceholderController;
-    /** Контекст виджетов */
+    /** Контекст виджета */
     widgetsContext: IWidgetsContext;
-    /** Данные о контейнере виджета */
-    widgetContainer: TWidgetContainer;
     /** Запуск действия */
     launchAction(params: TLaunchActionParams): void;
 }
@@ -1364,7 +1367,7 @@ declare const replaceFiltersBySelection: (filters: ICalculatorFilter[], selectio
  * @param {P} [props] - Дополнительные параметры локализации.
  * @returns {string} - Локализованный текст для указанного языка.
  */
-declare const getLocalizedText: <L extends TLocalizationDescription, P extends ILocalizationProps = TExtractLocalizationParams<L>>(language: ELanguages, locObj: L, props?: P | undefined) => string;
+declare const getLocalizedText: <L extends TLocalizationDescription, P extends ILocalizationProps = TExtractLocalizationParams<L>>(language: ELanguages, locObj: L, props?: P) => string;
 
 type TDefineWidgetOptions = {
     manifest?: Record<string, unknown>;
@@ -1380,4 +1383,4 @@ declare global {
     }
 }
 
-export { ECalculatorFilterMethods, EColorMode, EControlType, EDbType, EDimensionTemplateNames, EDisplayConditionMode, EDurationUnit, EEventMeasureTemplateNames, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMeasureTemplateNames, EProcessFilterNames, ESimpleDataType, ESortDirection, ESortingValueModes, ETransitionMeasureTemplateNames, EWidgetActionInputMode, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, type IActionScript, type IAddDurationOfTransitionFilter, type IAddPresenceOfEventFilter, type IAddPresenceOfTransitionFilter, type IAddRepetitionOfEventFilter, type IBaseDimensionsAndMeasuresCalculator, type IBaseDimensionsAndMeasuresCalculatorInput, type IBaseDimensionsAndMeasuresCalculatorOutput, type IBaseWidgetSettings, type ICalculator, type ICalculatorDimensionInput, type ICalculatorDimensionOutput, type ICalculatorFactory, type ICalculatorFilter, type ICalculatorIndicatorInput, type ICalculatorIndicatorOutput, type ICalculatorMeasureInput, type ICalculatorMeasureOutput, type ICalculatorVariable, type ICalculatorVariablesValues, type ICommonColumnIndicator, type IControlRecord, type ICustomAddButtonProps, type ICustomWidgetProps, type IDefinition, type IDimensionSelection, type IDimensionSelectionByFormula, type IDisplayPredicate, type IDivePanelDescription, type IDividerRecord, type IEdge, type IExportColumnOrder, type IFillSettings, type IFormulaFilterValue, type IGeneralCalculator, type IGeneralCalculatorExportInput, type IGeneralCalculatorInput, type IGeneralCalculatorOutput, type IGraphElement, type IGroupSetDescription, type IGroupSetRecord, type IGroupSettings, type IHistogramBin, type IHistogramCalculator, type IHistogramCalculatorInput, type IHistogramCalculatorOutput, type ILens, type IPanelDescription, type IPanelDescriptionCreator, type IPieCalculator, type IPieCalculatorInput, type IPieCalculatorOutput, type IProcessEventFilterValue, type IProcessEventIndicator, type IProcessGraphCalculator, type IProcessGraphCalculatorInput, type IProcessGraphCalculatorOutput, type IProcessIndicator, type IProcessTransitionFilterValue, type IProcessTransitionIndicator, type IRange, type ISelectOption, type ISortOrder, type IStagesFilterValue, type ITwoLimitsCalculator, type ITwoLimitsCalculatorExportInput, type ITwoLimitsCalculatorInput, type ITwoLimitsCalculatorOutput, type ITypeCalculator, type ITypeCalculatorInput, type ITypeCalculatorOutput, type IVertex, type IWidget, type IWidgetAction, type IWidgetActionInput, type IWidgetColumnIndicator, type IWidgetDimension, type IWidgetDimensionHierarchy, type IWidgetEntity, type IWidgetFilter, type IWidgetFiltration, type IWidgetFormatting, type IWidgetFormulaFilterValue, type IWidgetIndicator, type IWidgetMeasure, type IWidgetPlaceholderController, type IWidgetProcess, type IWidgetProps, type IWidgetSortingIndicator, type IWidgetTable, type IWidgetTableColumn, type IWidgetsContext, type TBoundedContentWithIndicator, type TColor, type TColumnIndicatorValue, type TDefineWidgetOptions, type TDisplayCondition, type TDisplayMode, type TEmptyRecord, type TGroupLevelRecord, type TLaunchActionParams, type TProcessIndicatorValue, type TRecordAccessor, type TSelectivePartial, type TSortDirection, type TUpdateSelection, type TValuePath, type TWidgetActionInputValue, type TWidgetContainer, type TWidgetFilterValue, type TWidgetFiltering, type TWidgetLevelRecord, type TWidgetSortingValue, type TWidgetSortingValueRelatedWidgetDimension, type TWidgetSortingValueRelatedWidgetIndicator, type TWidgetSortingValueRelatedWidgetMeasure, type TWidgetVariable, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, dimensionTemplateFormulas, escapeSpecialCharacters, eventMeasureTemplateFormulas, fillTemplateString, formulaFilterMethods, generateColumnFormula, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getTransitionMeasureFormula, isActionValid, isHierarchy, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, mapVariablesToInputs, measureTemplateFormulas, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, transitionMeasureTemplateFormulas, updateDefaultModeSelection, updateMultiModeSelection, updateSingleModeSelection };
+export { ECalculatorFilterMethods, EColorMode, EControlType, EDbType, EDimensionTemplateNames, EDisplayConditionMode, EDurationUnit, EEventMeasureTemplateNames, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMeasureTemplateNames, EProcessFilterNames, ESimpleDataType, ESortDirection, ESortingValueModes, ETransitionMeasureTemplateNames, EWidgetActionInputMode, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, type IActionScript, type IAddDurationOfTransitionFilter, type IAddPresenceOfEventFilter, type IAddPresenceOfTransitionFilter, type IAddRepetitionOfEventFilter, type IBaseDimensionsAndMeasuresCalculator, type IBaseDimensionsAndMeasuresCalculatorInput, type IBaseDimensionsAndMeasuresCalculatorOutput, type IBaseWidgetSettings, type ICalculator, type ICalculatorDimensionInput, type ICalculatorDimensionOutput, type ICalculatorFactory, type ICalculatorFilter, type ICalculatorIndicatorInput, type ICalculatorIndicatorOutput, type ICalculatorMeasureInput, type ICalculatorMeasureOutput, type ICalculatorVariable, type ICalculatorVariablesValues, type ICommonColumnIndicator, type IControlRecord, type ICustomAddButtonProps, type ICustomWidgetProps, type IDefinition, type IDimensionSelection, type IDimensionSelectionByFormula, type IDisplayPredicate, type IDivePanelDescription, type IDividerRecord, type IEdge, type IExportColumnOrder, type IFillSettings, type IFormulaFilterValue, type IGeneralCalculator, type IGeneralCalculatorExportInput, type IGeneralCalculatorInput, type IGeneralCalculatorOutput, type IGraphElement, type IGroupSetDescription, type IGroupSetRecord, type IGroupSettings, type IHistogramBin, type IHistogramCalculator, type IHistogramCalculatorInput, type IHistogramCalculatorOutput, type ILens, type IPanelDescription, type IPanelDescriptionCreator, type IPieCalculator, type IPieCalculatorInput, type IPieCalculatorOutput, type IPlacement, type IProcessEventFilterValue, type IProcessEventIndicator, type IProcessGraphCalculator, type IProcessGraphCalculatorInput, type IProcessGraphCalculatorOutput, type IProcessIndicator, type IProcessTransitionFilterValue, type IProcessTransitionIndicator, type IRange, type ISelectOption, type ISortOrder, type IStagesFilterValue, type ITwoLimitsCalculator, type ITwoLimitsCalculatorExportInput, type ITwoLimitsCalculatorInput, type ITwoLimitsCalculatorOutput, type ITypeCalculator, type ITypeCalculatorInput, type ITypeCalculatorOutput, type IVertex, type IWidget, type IWidgetAction, type IWidgetActionInput, type IWidgetColumnIndicator, type IWidgetDimension, type IWidgetDimensionHierarchy, type IWidgetEntity, type IWidgetFilter, type IWidgetFiltration, type IWidgetFormatting, type IWidgetFormulaFilterValue, type IWidgetIndicator, type IWidgetMeasure, type IWidgetPlaceholderController, type IWidgetProcess, type IWidgetProps, type IWidgetSortingIndicator, type IWidgetTable, type IWidgetTableColumn, type IWidgetsContext, type TBoundedContentWithIndicator, type TColor, type TColumnIndicatorValue, type TDefineWidgetOptions, type TDisplayCondition, type TDisplayMode, type TEmptyRecord, type TGroupLevelRecord, type TLaunchActionParams, type TProcessIndicatorValue, type TRecordAccessor, type TSelectivePartial, type TSortDirection, type TUpdateSelection, type TValuePath, type TWidgetActionInputValue, type TWidgetFilterValue, type TWidgetFiltering, type TWidgetLevelRecord, type TWidgetSortingValue, type TWidgetSortingValueRelatedWidgetDimension, type TWidgetSortingValueRelatedWidgetIndicator, type TWidgetSortingValueRelatedWidgetMeasure, type TWidgetVariable, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, dimensionTemplateFormulas, escapeSpecialCharacters, eventMeasureTemplateFormulas, fillTemplateString, formulaFilterMethods, generateColumnFormula, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getTransitionMeasureFormula, isActionValid, isHierarchy, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, mapVariablesToInputs, measureTemplateFormulas, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, transitionMeasureTemplateFormulas, updateDefaultModeSelection, updateMultiModeSelection, updateSingleModeSelection };

package/dist/index.esm.js

@@ -73,7 +73,7 @@ var EWidgetActionInputMode;
 })(EWidgetActionInputMode || (EWidgetActionInputMode = {}));
 var isActionValid = function (action, _a) {
     var _b;
-    var scripts = _a.scripts, tables = _a.tables;
+    var scripts = _a.scripts, tables = _a.tables, variables = _a.variables;
     var currentScript = scripts.get((_b = action.scriptGuid) !== null && _b !== void 0 ? _b : "");
     if (!currentScript) {
         return false;
@@ -88,7 +88,7 @@ var isActionValid = function (action, _a) {
             return false;
         }
         var value = actionInput.value;
-        if (value.mode === EWidgetActionInputMode.FROM_VARIABLE && !value.guid) {
+        if (value.mode === EWidgetActionInputMode.FROM_VARIABLE && !variables.has(value.guid)) {
             return false;
         }
         if (value.mode === EWidgetActionInputMode.FORMULA && !value.formula) {
@@ -97,8 +97,7 @@ var isActionValid = function (action, _a) {
         if (value.mode === EWidgetActionInputMode.DYNAMIC_LIST && !value.formula) {
             return false;
         }
-        if (value.mode === EWidgetActionInputMode.FROM_COLUMN &&
-            !tables.has(value.tableName)) {
+        if (value.mode === EWidgetActionInputMode.FROM_COLUMN && !tables.has(value.tableName)) {
             return false;
         }
         return true;
@@ -123,9 +122,7 @@ var prepareValuesForSql = function (dataType, values) {
         dataType === ESimpleDataType.BOOLEAN
         ? values
         : values.map(function (value) {
-            return value === null
-                ? null
-                : "'".concat(escapeSingularQuotes(escapeReverseSlash(value)), "'");
+            return value === null ? null : "'".concat(escapeSingularQuotes(escapeReverseSlash(value)), "'");
         });
 };
 var escapeReverseSlash = function (formula) {
@@ -136,7 +133,9 @@ var escapeSingularQuotes = function (formula) {
 };
 
 var compact = function (items) { return ((items === null || items === void 0 ? void 0 : items.filter(Boolean)) || []); };
-var compactMap = function (items, f) { return compact(items === null || items === void 0 ? void 0 : items.map(f)); };
+var compactMap = function (items, f) {
+    return compact(items === null || items === void 0 ? void 0 : items.map(f));
+};
 var isNil = function (value) {
     return value === null || value === undefined;
 };
@@ -508,9 +507,7 @@ function getDisplayConditionFormula(displayCondition) {
     }
 }
 var replaceDisplayCondition = function (dimension, displayCondition) {
-    return isNil(displayCondition)
-        ? dimension
-        : __assign(__assign({}, dimension), { displayCondition: displayCondition });
+    return isNil(displayCondition) ? dimension : __assign(__assign({}, dimension), { displayCondition: displayCondition });
 };
 
 var escapeSpecialCharacters = function (formula) {
@@ -755,9 +752,7 @@ function mapMeasureToInput(measure, variables, addFormulas) {
 }
 /** Конвертировать меры виджета во входы для вычислителя */
 function mapMeasuresToInputs(measures, variables, addFormulas) {
-    return compactMap(measures, function (measure) {
-        return mapMeasureToInput(measure, variables, addFormulas);
-    });
+    return compactMap(measures, function (measure) { return mapMeasureToInput(measure, variables, addFormulas); });
 }
 
 function mapDimensionToInput(dimension, variables) {
@@ -778,9 +773,7 @@ function mapDimensionToInput(dimension, variables) {
 }
 /** Конвертировать разрезы виджета во входы для вычислителя */
 function mapDimensionsToInputs(dimensions, variables) {
-    return compactMap(dimensions, function (dimension) {
-        return mapDimensionToInput(dimension, variables);
-    });
+    return compactMap(dimensions, function (dimension) { return mapDimensionToInput(dimension, variables); });
 }
 
 function mapTransitionMeasureToInput(indicator, process, variables, addFormulas) {
@@ -838,11 +831,12 @@ function mapEventMeasuresToInputs(indicators, process, variables, addFormulas) {
  * @param measuresInOriginalOrder меры виджета (конкретная мера будет браться по индексу)
  * @returns
  */
-function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measuresInOriginalOrder) {
+function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measuresInOriginalOrder, variables) {
     if (sortingIndicators === void 0) { sortingIndicators = []; }
     if (dimensionsInOriginalOrder === void 0) { dimensionsInOriginalOrder = []; }
     if (measuresInOriginalOrder === void 0) { measuresInOriginalOrder = []; }
     return compactMap(sortingIndicators, function (_a) {
+        var _b;
         var value = _a.value, direction = _a.direction;
         if (value.mode === ESortingValueModes.FORMULA ||
             value.mode === ESortingValueModes.QUANTITY ||
@@ -853,7 +847,20 @@ function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measur
         if (value.mode === ESortingValueModes.DIMENSION_IN_WIDGET ||
             value.mode === ESortingValueModes.HIERARCHY) {
             var dimension = dimensionsInOriginalOrder[value.index];
-            return (dimension && { formula: getDimensionFormula(dimension), direction: direction });
+            if (!dimension) {
+                return;
+            }
+            var formula = getDimensionFormula(dimension);
+            if (!formula || !checkDisplayCondition(dimension.displayCondition, variables)) {
+                return;
+            }
+            return {
+                formula: getDimensionFormula(dimension),
+                direction: direction,
+                displayCondition: ((_b = dimension.displayCondition) === null || _b === void 0 ? void 0 : _b.mode) === EDisplayConditionMode.FORMULA
+                    ? dimension.displayCondition.formula
+                    : undefined,
+            };
         }
         if (value.mode === ESortingValueModes.MEASURE_IN_WIDGET) {
             var measure = measuresInOriginalOrder[value.index];
@@ -881,9 +888,7 @@ function selectDimensionFromHierarchy(_a, filters) {
         if (!matchedFilter) {
             return "continue";
         }
-        var selectionIndex = matchedFilter.values.length > 1
-            ? i
-            : Math.min(i + 1, dimensions.length - 1);
+        var selectionIndex = matchedFilter.values.length > 1 ? i : Math.min(i + 1, dimensions.length - 1);
         return { value: dimensions[selectionIndex] };
     };
     for (var i = dimensions.length - 1; i >= 0; i--) {
@@ -898,8 +903,7 @@ var replaceHierarchiesWithDimensions = function (dimensions, filters) {
     return compactMap(dimensions, function (indicator) {
         if (isHierarchy(indicator)) {
             var selectedDimension = selectDimensionFromHierarchy(indicator, filters);
-            return (selectedDimension &&
-                replaceDisplayCondition(selectedDimension, indicator.displayCondition));
+            return (selectedDimension && replaceDisplayCondition(selectedDimension, indicator.displayCondition));
         }
         return indicator;
     });
@@ -916,9 +920,7 @@ function bindContentWithIndicator(outputs, indicator) {
  * Массив объектов, каждый из которых содержит показатель и его контент
  */
 function bindContentsWithIndicators(outputs, indicators) {
-    return compactMap(indicators, function (indicator) {
-        return bindContentWithIndicator(outputs, indicator);
-    });
+    return compactMap(indicators, function (indicator) { return bindContentWithIndicator(outputs, indicator); });
 }
 
 var EControlType;

package/dist/index.js

@@ -74,7 +74,7 @@ exports.EWidgetActionInputMode = void 0;
 })(exports.EWidgetActionInputMode || (exports.EWidgetActionInputMode = {}));
 var isActionValid = function (action, _a) {
     var _b;
-    var scripts = _a.scripts, tables = _a.tables;
+    var scripts = _a.scripts, tables = _a.tables, variables = _a.variables;
     var currentScript = scripts.get((_b = action.scriptGuid) !== null && _b !== void 0 ? _b : "");
     if (!currentScript) {
         return false;
@@ -89,7 +89,7 @@ var isActionValid = function (action, _a) {
             return false;
         }
         var value = actionInput.value;
-        if (value.mode === exports.EWidgetActionInputMode.FROM_VARIABLE && !value.guid) {
+        if (value.mode === exports.EWidgetActionInputMode.FROM_VARIABLE && !variables.has(value.guid)) {
             return false;
         }
         if (value.mode === exports.EWidgetActionInputMode.FORMULA && !value.formula) {
@@ -98,8 +98,7 @@ var isActionValid = function (action, _a) {
         if (value.mode === exports.EWidgetActionInputMode.DYNAMIC_LIST && !value.formula) {
             return false;
         }
-        if (value.mode === exports.EWidgetActionInputMode.FROM_COLUMN &&
-            !tables.has(value.tableName)) {
+        if (value.mode === exports.EWidgetActionInputMode.FROM_COLUMN && !tables.has(value.tableName)) {
             return false;
         }
         return true;
@@ -124,9 +123,7 @@ var prepareValuesForSql = function (dataType, values) {
         dataType === exports.ESimpleDataType.BOOLEAN
         ? values
         : values.map(function (value) {
-            return value === null
-                ? null
-                : "'".concat(escapeSingularQuotes(escapeReverseSlash(value)), "'");
+            return value === null ? null : "'".concat(escapeSingularQuotes(escapeReverseSlash(value)), "'");
         });
 };
 var escapeReverseSlash = function (formula) {
@@ -137,7 +134,9 @@ var escapeSingularQuotes = function (formula) {
 };
 
 var compact = function (items) { return ((items === null || items === void 0 ? void 0 : items.filter(Boolean)) || []); };
-var compactMap = function (items, f) { return compact(items === null || items === void 0 ? void 0 : items.map(f)); };
+var compactMap = function (items, f) {
+    return compact(items === null || items === void 0 ? void 0 : items.map(f));
+};
 var isNil = function (value) {
     return value === null || value === undefined;
 };
@@ -509,9 +508,7 @@ function getDisplayConditionFormula(displayCondition) {
     }
 }
 var replaceDisplayCondition = function (dimension, displayCondition) {
-    return isNil(displayCondition)
-        ? dimension
-        : __assign(__assign({}, dimension), { displayCondition: displayCondition });
+    return isNil(displayCondition) ? dimension : __assign(__assign({}, dimension), { displayCondition: displayCondition });
 };
 
 var escapeSpecialCharacters = function (formula) {
@@ -756,9 +753,7 @@ function mapMeasureToInput(measure, variables, addFormulas) {
 }
 /** Конвертировать меры виджета во входы для вычислителя */
 function mapMeasuresToInputs(measures, variables, addFormulas) {
-    return compactMap(measures, function (measure) {
-        return mapMeasureToInput(measure, variables, addFormulas);
-    });
+    return compactMap(measures, function (measure) { return mapMeasureToInput(measure, variables, addFormulas); });
 }
 
 function mapDimensionToInput(dimension, variables) {
@@ -779,9 +774,7 @@ function mapDimensionToInput(dimension, variables) {
 }
 /** Конвертировать разрезы виджета во входы для вычислителя */
 function mapDimensionsToInputs(dimensions, variables) {
-    return compactMap(dimensions, function (dimension) {
-        return mapDimensionToInput(dimension, variables);
-    });
+    return compactMap(dimensions, function (dimension) { return mapDimensionToInput(dimension, variables); });
 }
 
 function mapTransitionMeasureToInput(indicator, process, variables, addFormulas) {
@@ -839,11 +832,12 @@ function mapEventMeasuresToInputs(indicators, process, variables, addFormulas) {
  * @param measuresInOriginalOrder меры виджета (конкретная мера будет браться по индексу)
  * @returns
  */
-function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measuresInOriginalOrder) {
+function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measuresInOriginalOrder, variables) {
     if (sortingIndicators === void 0) { sortingIndicators = []; }
     if (dimensionsInOriginalOrder === void 0) { dimensionsInOriginalOrder = []; }
     if (measuresInOriginalOrder === void 0) { measuresInOriginalOrder = []; }
     return compactMap(sortingIndicators, function (_a) {
+        var _b;
         var value = _a.value, direction = _a.direction;
         if (value.mode === exports.ESortingValueModes.FORMULA ||
             value.mode === exports.ESortingValueModes.QUANTITY ||
@@ -854,7 +848,20 @@ function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measur
         if (value.mode === exports.ESortingValueModes.DIMENSION_IN_WIDGET ||
             value.mode === exports.ESortingValueModes.HIERARCHY) {
             var dimension = dimensionsInOriginalOrder[value.index];
-            return (dimension && { formula: getDimensionFormula(dimension), direction: direction });
+            if (!dimension) {
+                return;
+            }
+            var formula = getDimensionFormula(dimension);
+            if (!formula || !checkDisplayCondition(dimension.displayCondition, variables)) {
+                return;
+            }
+            return {
+                formula: getDimensionFormula(dimension),
+                direction: direction,
+                displayCondition: ((_b = dimension.displayCondition) === null || _b === void 0 ? void 0 : _b.mode) === exports.EDisplayConditionMode.FORMULA
+                    ? dimension.displayCondition.formula
+                    : undefined,
+            };
         }
         if (value.mode === exports.ESortingValueModes.MEASURE_IN_WIDGET) {
             var measure = measuresInOriginalOrder[value.index];
@@ -882,9 +889,7 @@ function selectDimensionFromHierarchy(_a, filters) {
         if (!matchedFilter) {
             return "continue";
         }
-        var selectionIndex = matchedFilter.values.length > 1
-            ? i
-            : Math.min(i + 1, dimensions.length - 1);
+        var selectionIndex = matchedFilter.values.length > 1 ? i : Math.min(i + 1, dimensions.length - 1);
         return { value: dimensions[selectionIndex] };
     };
     for (var i = dimensions.length - 1; i >= 0; i--) {
@@ -899,8 +904,7 @@ var replaceHierarchiesWithDimensions = function (dimensions, filters) {
     return compactMap(dimensions, function (indicator) {
         if (isHierarchy(indicator)) {
             var selectedDimension = selectDimensionFromHierarchy(indicator, filters);
-            return (selectedDimension &&
-                replaceDisplayCondition(selectedDimension, indicator.displayCondition));
+            return (selectedDimension && replaceDisplayCondition(selectedDimension, indicator.displayCondition));
         }
         return indicator;
     });
@@ -917,9 +921,7 @@ function bindContentWithIndicator(outputs, indicator) {
  * Массив объектов, каждый из которых содержит показатель и его контент
  */
 function bindContentsWithIndicators(outputs, indicators) {
-    return compactMap(indicators, function (indicator) {
-        return bindContentWithIndicator(outputs, indicator);
-    });
+    return compactMap(indicators, function (indicator) { return bindContentWithIndicator(outputs, indicator); });
 }
 
 exports.EControlType = void 0;
@@ -1047,11 +1049,11 @@ var getLocalizedText = function (language, locObj, props) {
     return localization.getLocalized(locObj, props);
 };
 
-Object.defineProperty(exports, 'ELanguages', {
+Object.defineProperty(exports, "ELanguages", {
     enumerable: true,
     get: function () { return localization$1.ELanguages; }
 });
-Object.defineProperty(exports, 'EFilteringMethodValues', {
+Object.defineProperty(exports, "EFilteringMethodValues", {
     enumerable: true,
     get: function () { return baseFilter.EFilteringMethodValues; }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infomaximum/widget-sdk",
-  "version": "3.26.0-beta",
+  "version": "3.26.0",
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",
@@ -12,24 +12,26 @@
   "scripts": {
     "build": "rollup -c",
     "lint": "tsc --noEmit",
-    "release": "tsc --noEmit && standard-version && rollup -c"
+    "release": "tsc --noEmit && standard-version && rollup -c",
+    "format": "prettier --find-config-path --write 'src/**/*'"
   },
   "dependencies": {
+    "@infomaximum/base-filter": "^1.1.0",
     "@infomaximum/global-types": "^1.2.0",
-    "@infomaximum/localization": "^1.0.4",
-    "@infomaximum/base-filter": "^1.1.0"
+    "@infomaximum/localization": "^1.0.4"
   },
   "devDependencies": {
+    "@infomaximum/config": "^2.6.0",
     "@rollup/plugin-commonjs": "25.0.7",
     "@rollup/plugin-node-resolve": "15.2.3",
     "@rollup/plugin-typescript": "11.1.5",
-    "prettier": "3.0.3",
-    "rollup": "4.4.1",
+    "prettier": "3.2.5",
+    "rollup": "4.14.3",
     "rollup-plugin-delete": "2.0.0",
     "rollup-plugin-dts": "6.1.0",
     "standard-version": "9.5.0",
     "tslib": "^2.4.1",
-    "typescript": "5.2.2"
+    "typescript": "5.4.5"
   },
   "repository": {
     "type": "git",