@infomaximum/widget-sdk 5.10.1 → 5.11.1

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [5.11.1](https://github.com/Infomaximum/widget-sdk/compare/v5.11.0...v5.11.1) (2025-04-01)
+
+
+### Bug Fixes
+
+* для фильтра в режиме в/не в диапозоне, реализована подмена dataType c INTEGER на FLOAT ([5cccb69](https://github.com/Infomaximum/widget-sdk/commit/5cccb695c72a39bb594b0c5899fb92aa387b080c))
+* поведение строкового фильтра по формуле приведено к поведению условия отображения ([72611bc](https://github.com/Infomaximum/widget-sdk/commit/72611bc54ebecc1402160cc876aa3252800ad218))
+
+## [5.11.0](https://github.com/Infomaximum/widget-sdk/compare/v5.10.1...v5.11.0) (2025-03-28)
+
+
+### Features
+
+* в EFormatTypes добавлен новый тип PERCENT, удалено подкапотное умножение меры конверсия на 100 ([21a8f98](https://github.com/Infomaximum/widget-sdk/commit/21a8f9847d54992771f47abd792bd394cd013841))
+* в getDefaultSortOrders добавлена проверка на наличии формулы ([85b2b59](https://github.com/Infomaximum/widget-sdk/commit/85b2b590c2e28e0cb52ceb473200c3ee5a1b6d6b))
+* добавлена outerAggregation top ([0550463](https://github.com/Infomaximum/widget-sdk/commit/0550463375bc0e5b1abb2559a6da41a43cc2adb0))
+
 ### [5.10.1](https://github.com/Infomaximum/widget-sdk/compare/v5.10.0...v5.10.1) (2025-03-21)
 
 ## [5.10.0](https://github.com/Infomaximum/widget-sdk/compare/v5.9.1...v5.10.0) (2025-03-14)

package/dist/index.d.ts

@@ -103,7 +103,8 @@ declare enum EFormatTypes {
     /** Неделя */
     WEEK = "WEEK",
     /** Логический */
-    BOOLEAN = "BOOLEAN"
+    BOOLEAN = "BOOLEAN",
+    PERCENT = "PERCENT"
 }
 declare enum EFormattingPresets {
     "AUTO" = "AUTO",
@@ -222,6 +223,7 @@ declare const formattingConfig: {
         WEEK: never[];
         YEAR: never[];
         BOOLEAN: never[];
+        PERCENT: EFormattingPresets[];
     };
 };
 
@@ -496,7 +498,8 @@ declare enum EOuterAggregation {
     countDistinct = "countDistinct",
     min = "min",
     max = "max",
-    sum = "sum"
+    sum = "sum",
+    top = "top"
 }
 interface IWidgetIndicator extends IAutoIdentifiedArrayItem {
     name: string;
@@ -1625,6 +1628,21 @@ declare const prepareValuesForSql: (simpleType: ESimpleDataType, values: (string
 declare function checkDisplayCondition(displayCondition: TNullable<TDisplayCondition>, variables: Map<string, TWidgetVariable>): boolean;
 declare function getDisplayConditionFormula(displayCondition: TNullable<TDisplayCondition>): TNullable<string>;
 declare const replaceDisplayCondition: <I extends IWidgetColumnIndicator>(dimension: I, displayCondition: TNullable<TDisplayCondition>) => TNullable<I>;
+/**
+ * Шаблон формулы для проверки условия отображения.
+ *
+ * - 0 -> false
+ * - 1 -> true
+ * - 15 -> true
+ * - '0' ->	false
+ * - '1' -> true
+ * - '15' ->	true (значение по умолчанию, т.к. не преобразуется к Boolean)
+ * - 'false' -> false
+ * - 'true' -> true
+ * - 'abc' -> true (значение по умолчанию, т.к. не преобразуется к Boolean)
+ * - null -> true (значение по умолчанию, т.к. не преобразуется к Boolean)
+ */
+declare const displayConditionTemplate = "accurateCastOrDefault({formula}, 'Boolean', true)";
 
 /** Конвертировать меры виджета во входы для вычислителя */
 declare function mapMeasuresToInputs<T extends IWidgetMeasure>(measures: T[], variables: Map<string, TWidgetVariable>, addFormulas?: (measure: T) => Map<string, string>): ICalculatorMeasureInput[];
@@ -1831,7 +1849,20 @@ declare enum EMeasureAggregationTemplateName {
     countReworks = "countReworks"
 }
 /** Шаблоны процессных метрик меры с режимом AGGREGATION */
-declare const measureAggregationTemplates: Record<EMeasureAggregationTemplateName, string>;
+declare const measureAggregationTemplates: {
+    agvIf: string;
+    medianIf: string;
+    countIf: string;
+    countIfDistinct: string;
+    minIf: string;
+    maxIf: string;
+    sumIf: string;
+    top: (outerAggregation: EOuterAggregation) => string;
+    firstValue: (outerAggregation: EOuterAggregation) => string;
+    lastValue: (outerAggregation: EOuterAggregation) => string;
+    countExecutions: string;
+    countReworks: string;
+};
 /** На основе значения режима AGGREGATION подготовить параметры для подстановки в шаблонную формулу */
 declare const prepareMeasureAggregationParams: (value: Extract<IWidgetMeasure["value"], {
     mode: EWidgetIndicatorValueModes.AGGREGATION;
@@ -1847,7 +1878,7 @@ declare const prepareMeasureAggregationParams: (value: Extract<IWidgetMeasure["v
 } | null;
 
 /** Шаблон процессной метрики меры с режимом CONVERSION */
-declare const conversionTemplate = "countIf(\n    process(\n        minIf(\n            {startEventTimeFormula}, \n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) < \n    process(\n        maxIf(\n            {endEventTimeFormula}, \n            {endEventNameFormula} = '{endEventName}'{endEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) \n    and \n    process(\n        countIf(\n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n) * 100 / countIf(\n    process(\n        countIf(\n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n)";
+declare const conversionTemplate = "countIf(\n    process(\n        minIf(\n            {startEventTimeFormula}, \n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) < \n    process(\n        maxIf(\n            {endEventTimeFormula}, \n            {endEventNameFormula} = '{endEventName}'{endEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) \n    and \n    process(\n        countIf(\n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n) / countIf(\n    process(\n        countIf(\n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n)";
 /** На основе значения режима CONVERSION подготовить параметры для подстановки в шаблонную формулу */
 declare const prepareConversionParams: (value: TWidgetIndicatorConversionValue) => {
     objectFilters: string;
@@ -2535,4 +2566,4 @@ declare global {
     }
 }
 
-export { EActionButtonsTypes, EActionTypes, EAutoUpdateMode, EBlockingConditionMode, ECalculatorFilterMethods, EClickHouseBaseTypes, EColorMode, EControlType, ECustomSelectTemplates, EDimensionAggregationTemplateName, EDimensionTemplateNames, EDisplayConditionMode, EDrawerPlacement, EDurationTemplateName, EDurationUnit, EEventAppearances, EEventMeasureTemplateNames, EFontWeight, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMarkdownDisplayMode, EMeasureAggregationTemplateName, EMeasureTemplateNames, EOuterAggregation, EProcessFilterNames, ESelectOptionTypes, ESimpleDataType, ESimpleInputType, ESortDirection, ESortingValueModes, ESystemRecordKey, ETransitionMeasureTemplateNames, EUnitMode, EViewMode, EViewOpenIn, EWidgetActionInputMethod, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, type IActionGoToUrl, type IActionOnClickControl, type IActionRunScript, type IActionScript, type IActionUpdateVariable, type IAddButtonSelectOption, type IAddDurationOfTransitionFilter, type IAddPresenceOfEventFilter, type IAddPresenceOfTransitionFilter, type IAddRepetitionOfEventFilter, type IAutoIdentifiedArrayItem, 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 ICollapseRecord, type IColorPickerControl, type IColoredValue, type ICommonDimensions, type ICommonMeasures, type ICommonState, type IControlRecord, type ICustomAddButtonProps, type ICustomWidgetProps, type IDefinition, type IDimensionSelection, type IDimensionSelectionByFormula, type IDisplayConditionControl, type IDisplayPredicate, type IDisplayRule, type IDivePanelDescription, type IDividerRecord, type IEdge, type IEventsColorControl, type IEventsPickerControl, type IExportColumnOrder, type IFillSettings, type IFilterControl, type IFormattingControl, type IFormattingTemplateControl, type IFormulaControl, type IFormulaFilterValue, type IGeneralCalculator, type IGeneralCalculatorExportInput, type IGeneralCalculatorInput, type IGeneralCalculatorOutput, type IGlobalContext, type IGraphElement, type IGroupSetDescription, type IGroupSetRecord, type IGroupSettings, type IHistogramBin, type IHistogramCalculator, type IHistogramCalculatorInput, type IHistogramCalculatorOutput, type IIndicatorLink, type IInitialSettings, type IInputControl, type IInputMarkdownControl, type IInputNumberControl, type IInputRangeControl, type ILens, type IMarkdownMeasure, type IMeasureAddButtonProps, type IPanelDescription, type IPanelDescriptionCreator, type IPieCalculator, type IPieCalculatorInput, type IPieCalculatorOutput, type IProcessEventFilterValue, type IProcessEventIndicator, type IProcessFilterPreviewParams, type IProcessGraphCalculator, type IProcessGraphCalculatorInput, type IProcessGraphCalculatorOutput, type IProcessIndicator, type IProcessTransitionFilterValue, type IProcessTransitionIndicator, type IRadioIconGroupControl, type IRange, type ISelectBranchOption, type ISelectControl, type ISelectDividerOption, type ISelectGroupOption, type ISelectLeafOption, type ISelectNode, type ISelectOption, type ISelectSystemOption, type ISettingsMigratorParams, type ISizeControl, type ISortOrder, type ISortingAddButtonProps, type IStagesFilterValue, type IStaticListLabeledOption, type ISwitchControl, type ITagSetControl, type ITwoLimitsCalculator, type ITwoLimitsCalculatorExportInput, type ITwoLimitsCalculatorInput, type ITwoLimitsCalculatorOutput, type ITypeCalculator, type ITypeCalculatorInput, type ITypeCalculatorOutput, type ITypeCalculatorOutputItem, type ITypedFormulaControl, type IVertex, type IViewContext, type IWidget, type IWidgetAction, type IWidgetColumnIndicator, type IWidgetColumnListVariable, type IWidgetDimension, type IWidgetDimensionHierarchy, type IWidgetDynamicListVariable, type IWidgetEntity, type IWidgetFilter, type IWidgetFiltration, type IWidgetFormatting, type IWidgetIndicator, type IWidgetIndicatorAddButtonProps, type IWidgetManifest, type IWidgetMeasure, type IWidgetMigrator, type IWidgetPersistValue, type IWidgetPlaceholderController, type IWidgetPlaceholderValues, type IWidgetPresetSettings, type IWidgetProcess, type IWidgetProps, type IWidgetSortingIndicator, type IWidgetStaticListVariable, type IWidgetStaticVariable, type IWidgetStruct, type IWidgetTable, type IWidgetTableColumn, OuterAggregation, type TAction, type TActionOnClickParameter, type TActionOpenView, type TActionValidator, type TActionsOnClick, type TAddButton, type TAppearanceSettings, type TBoundedContentWithIndicator, type TColor, type TColorBase, type TColorRule, type TColumnIndicatorValue, type TContextMenu, type TContextMenuButton, type TContextMenuButtonActions, type TContextMenuButtonApply, type TContextMenuButtonClose, type TContextMenuButtonCustom, type TContextMenuButtonGroup, type TContextMenuButtonOptions, type TContextMenuList, type TContextMenuPositionUnit, type TContextMenuRow, type TControlUnion, type TCustomAddButtonSelectOption, type TDefineWidgetOptions, type TDisplayCondition, type TDisplayMode, type TEmptyRecord, type TExtendedFormulaFilterValue, type TFiltrationAccessibility, type TGroupLevelRecord, type TLaunchActionParams, type TMeasureAddButtonSelectOption, type TMigrateProcessor, type TMigrationStruct, type TProcessIndicatorValue, type TRecordAccessor, type TSelectChildOptions, type TSelectFetchNodes, type TSelectivePartial, type TSortDirection, type TUpdateSelection, type TValuePath, type TVersion, type TWidgetActionParameter, type TWidgetContainer, type TWidgetDimensionData, type TWidgetFilterValue, type TWidgetFiltering, type TWidgetIndicatorAggregationValue, type TWidgetIndicatorConversionValue, type TWidgetIndicatorData, type TWidgetIndicatorDurationValue, type TWidgetIndicatorTimeValue, type TWidgetLevelRecord, type TWidgetSortingValue, type TWidgetVariable, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, clearMultiLineComments, clearSingleLineComments, colors, conversionTemplate, convertFiltersToFormula, convertToFormulasChain, countExecutionsTemplate, dashboardLinkRegExp, dimensionAggregationTemplates, dimensionTemplateFormulas, durationTemplates, escapeSpecialCharacters, eventMeasureTemplateFormulas, fillTemplateString, formattingConfig, formulaFilterMethods, generateColumnFormula, getColorByIndex, getDefaultSortOrders, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getRuleColor, getTransitionMeasureFormula, isDimensionsHierarchy, isFormulaFilterValue, isValidColor, linkNameRegExp, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, measureAggregationTemplates, measureTemplateFormulas, parseClickHouseType, parseIndicatorLink, prepareConversionParams, prepareDimensionAggregationParams, prepareDurationParams, prepareFormulaForSql, prepareMeasureAggregationParams, prepareSortOrders, prepareTimeParams, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, timeTemplates, transitionMeasureTemplateFormulas, unescapeSpecialCharacters, updateDefaultModeSelection, updateMultiModeSelection, updateSingleModeSelection, workspaceLinkRegExp };
+export { EActionButtonsTypes, EActionTypes, EAutoUpdateMode, EBlockingConditionMode, ECalculatorFilterMethods, EClickHouseBaseTypes, EColorMode, EControlType, ECustomSelectTemplates, EDimensionAggregationTemplateName, EDimensionTemplateNames, EDisplayConditionMode, EDrawerPlacement, EDurationTemplateName, EDurationUnit, EEventAppearances, EEventMeasureTemplateNames, EFontWeight, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMarkdownDisplayMode, EMeasureAggregationTemplateName, EMeasureTemplateNames, EOuterAggregation, EProcessFilterNames, ESelectOptionTypes, ESimpleDataType, ESimpleInputType, ESortDirection, ESortingValueModes, ESystemRecordKey, ETransitionMeasureTemplateNames, EUnitMode, EViewMode, EViewOpenIn, EWidgetActionInputMethod, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, type IActionGoToUrl, type IActionOnClickControl, type IActionRunScript, type IActionScript, type IActionUpdateVariable, type IAddButtonSelectOption, type IAddDurationOfTransitionFilter, type IAddPresenceOfEventFilter, type IAddPresenceOfTransitionFilter, type IAddRepetitionOfEventFilter, type IAutoIdentifiedArrayItem, 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 ICollapseRecord, type IColorPickerControl, type IColoredValue, type ICommonDimensions, type ICommonMeasures, type ICommonState, type IControlRecord, type ICustomAddButtonProps, type ICustomWidgetProps, type IDefinition, type IDimensionSelection, type IDimensionSelectionByFormula, type IDisplayConditionControl, type IDisplayPredicate, type IDisplayRule, type IDivePanelDescription, type IDividerRecord, type IEdge, type IEventsColorControl, type IEventsPickerControl, type IExportColumnOrder, type IFillSettings, type IFilterControl, type IFormattingControl, type IFormattingTemplateControl, type IFormulaControl, type IFormulaFilterValue, type IGeneralCalculator, type IGeneralCalculatorExportInput, type IGeneralCalculatorInput, type IGeneralCalculatorOutput, type IGlobalContext, type IGraphElement, type IGroupSetDescription, type IGroupSetRecord, type IGroupSettings, type IHistogramBin, type IHistogramCalculator, type IHistogramCalculatorInput, type IHistogramCalculatorOutput, type IIndicatorLink, type IInitialSettings, type IInputControl, type IInputMarkdownControl, type IInputNumberControl, type IInputRangeControl, type ILens, type IMarkdownMeasure, type IMeasureAddButtonProps, type IPanelDescription, type IPanelDescriptionCreator, type IPieCalculator, type IPieCalculatorInput, type IPieCalculatorOutput, type IProcessEventFilterValue, type IProcessEventIndicator, type IProcessFilterPreviewParams, type IProcessGraphCalculator, type IProcessGraphCalculatorInput, type IProcessGraphCalculatorOutput, type IProcessIndicator, type IProcessTransitionFilterValue, type IProcessTransitionIndicator, type IRadioIconGroupControl, type IRange, type ISelectBranchOption, type ISelectControl, type ISelectDividerOption, type ISelectGroupOption, type ISelectLeafOption, type ISelectNode, type ISelectOption, type ISelectSystemOption, type ISettingsMigratorParams, type ISizeControl, type ISortOrder, type ISortingAddButtonProps, type IStagesFilterValue, type IStaticListLabeledOption, type ISwitchControl, type ITagSetControl, type ITwoLimitsCalculator, type ITwoLimitsCalculatorExportInput, type ITwoLimitsCalculatorInput, type ITwoLimitsCalculatorOutput, type ITypeCalculator, type ITypeCalculatorInput, type ITypeCalculatorOutput, type ITypeCalculatorOutputItem, type ITypedFormulaControl, type IVertex, type IViewContext, type IWidget, type IWidgetAction, type IWidgetColumnIndicator, type IWidgetColumnListVariable, type IWidgetDimension, type IWidgetDimensionHierarchy, type IWidgetDynamicListVariable, type IWidgetEntity, type IWidgetFilter, type IWidgetFiltration, type IWidgetFormatting, type IWidgetIndicator, type IWidgetIndicatorAddButtonProps, type IWidgetManifest, type IWidgetMeasure, type IWidgetMigrator, type IWidgetPersistValue, type IWidgetPlaceholderController, type IWidgetPlaceholderValues, type IWidgetPresetSettings, type IWidgetProcess, type IWidgetProps, type IWidgetSortingIndicator, type IWidgetStaticListVariable, type IWidgetStaticVariable, type IWidgetStruct, type IWidgetTable, type IWidgetTableColumn, OuterAggregation, type TAction, type TActionOnClickParameter, type TActionOpenView, type TActionValidator, type TActionsOnClick, type TAddButton, type TAppearanceSettings, type TBoundedContentWithIndicator, type TColor, type TColorBase, type TColorRule, type TColumnIndicatorValue, type TContextMenu, type TContextMenuButton, type TContextMenuButtonActions, type TContextMenuButtonApply, type TContextMenuButtonClose, type TContextMenuButtonCustom, type TContextMenuButtonGroup, type TContextMenuButtonOptions, type TContextMenuList, type TContextMenuPositionUnit, type TContextMenuRow, type TControlUnion, type TCustomAddButtonSelectOption, type TDefineWidgetOptions, type TDisplayCondition, type TDisplayMode, type TEmptyRecord, type TExtendedFormulaFilterValue, type TFiltrationAccessibility, type TGroupLevelRecord, type TLaunchActionParams, type TMeasureAddButtonSelectOption, type TMigrateProcessor, type TMigrationStruct, type TProcessIndicatorValue, type TRecordAccessor, type TSelectChildOptions, type TSelectFetchNodes, type TSelectivePartial, type TSortDirection, type TUpdateSelection, type TValuePath, type TVersion, type TWidgetActionParameter, type TWidgetContainer, type TWidgetDimensionData, type TWidgetFilterValue, type TWidgetFiltering, type TWidgetIndicatorAggregationValue, type TWidgetIndicatorConversionValue, type TWidgetIndicatorData, type TWidgetIndicatorDurationValue, type TWidgetIndicatorTimeValue, type TWidgetLevelRecord, type TWidgetSortingValue, type TWidgetVariable, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, clearMultiLineComments, clearSingleLineComments, colors, conversionTemplate, convertFiltersToFormula, convertToFormulasChain, countExecutionsTemplate, dashboardLinkRegExp, dimensionAggregationTemplates, dimensionTemplateFormulas, displayConditionTemplate, durationTemplates, escapeSpecialCharacters, eventMeasureTemplateFormulas, fillTemplateString, formattingConfig, formulaFilterMethods, generateColumnFormula, getColorByIndex, getDefaultSortOrders, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getRuleColor, getTransitionMeasureFormula, isDimensionsHierarchy, isFormulaFilterValue, isValidColor, linkNameRegExp, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, measureAggregationTemplates, measureTemplateFormulas, parseClickHouseType, parseIndicatorLink, prepareConversionParams, prepareDimensionAggregationParams, prepareDurationParams, prepareFormulaForSql, prepareMeasureAggregationParams, prepareSortOrders, prepareTimeParams, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, timeTemplates, transitionMeasureTemplateFormulas, unescapeSpecialCharacters, updateDefaultModeSelection, updateMultiModeSelection, updateSingleModeSelection, workspaceLinkRegExp };

package/dist/index.esm.js

@@ -340,6 +340,7 @@ var EFormatTypes;
     EFormatTypes["WEEK"] = "WEEK";
     /** Логический */
     EFormatTypes["BOOLEAN"] = "BOOLEAN";
+    EFormatTypes["PERCENT"] = "PERCENT";
 })(EFormatTypes || (EFormatTypes = {}));
 var EFormattingPresets;
 (function (EFormattingPresets) {
@@ -446,7 +447,7 @@ var formattingConfig = {
         return _a = {},
             _a[ESimpleDataType.OTHER] = [EFormatTypes.STRING],
             _a[ESimpleDataType.STRING] = [EFormatTypes.STRING],
-            _a[ESimpleDataType.FLOAT] = [EFormatTypes.NUMBER, EFormatTypes.DURATION],
+            _a[ESimpleDataType.FLOAT] = [EFormatTypes.NUMBER, EFormatTypes.DURATION, EFormatTypes.PERCENT],
             _a[ESimpleDataType.INTEGER] = [
                 EFormatTypes.NUMBER,
                 EFormatTypes.DURATION,
@@ -454,6 +455,7 @@ var formattingConfig = {
                 EFormatTypes.MONTH_YEAR,
                 EFormatTypes.MONTH,
                 EFormatTypes.DAY_OF_WEEK,
+                EFormatTypes.PERCENT,
             ],
             _a[ESimpleDataType.DATE] = [EFormatTypes.DATE],
             _a[ESimpleDataType.DATETIME] = [EFormatTypes.DATETIME],
@@ -588,200 +590,15 @@ var formattingConfig = {
             _a[EFormatTypes.WEEK] = [],
             _a[EFormatTypes.YEAR] = [],
             _a[EFormatTypes.BOOLEAN] = [],
+            _a[EFormatTypes.PERCENT] = [
+                EFormattingPresets.AUTO,
+                EFormattingPresets["x.x[%]"],
+                EFormattingPresets["zx.xx[%]"],
+            ],
             _a;
     },
 };
 
-var ELastTimeUnit;
-(function (ELastTimeUnit) {
-    ELastTimeUnit["DAYS"] = "DAYS";
-    ELastTimeUnit["MONTHS"] = "MONTHS";
-    ELastTimeUnit["YEARS"] = "YEARS";
-})(ELastTimeUnit || (ELastTimeUnit = {}));
-var EDurationUnit;
-(function (EDurationUnit) {
-    EDurationUnit["DAYS"] = "DAYS";
-    EDurationUnit["HOURS"] = "HOURS";
-    EDurationUnit["MINUTES"] = "MINUTES";
-    EDurationUnit["SECONDS"] = "SECONDS";
-})(EDurationUnit || (EDurationUnit = {}));
-var isRangeFilteringMethod = function (filteringMethod) {
-    return filteringMethod === formulaFilterMethods.IN_RANGE ||
-        filteringMethod === formulaFilterMethods.NOT_IN_RANGE;
-};
-var convertDateToClickHouse = function (date, showTime) {
-    var twoDigitValue = function (value) { return ("0" + value).slice(-2); };
-    var year = date.getFullYear();
-    var month = twoDigitValue(date.getMonth() + 1);
-    var day = twoDigitValue(date.getDate());
-    var hours = twoDigitValue(date.getHours());
-    var minutes = twoDigitValue(date.getMinutes());
-    var seconds = twoDigitValue(date.getSeconds());
-    var timeString = "".concat(hours, ":").concat(minutes, ":").concat(seconds);
-    var dateString = "".concat(year, "-").concat(month, "-").concat(day);
-    return showTime ? "".concat(dateString, " ").concat(timeString) : "".concat(dateString);
-};
-var subtractDurationFromDate = function (date, value, unitTime) {
-    switch (unitTime) {
-        case ELastTimeUnit.DAYS:
-            date.setDate(date.getDate() - value);
-            break;
-        case ELastTimeUnit.MONTHS:
-            date.setMonth(date.getMonth() - value);
-            break;
-        case ELastTimeUnit.YEARS:
-            date.setFullYear(date.getFullYear() - value);
-            break;
-    }
-    return date;
-};
-var convertToSeconds = function (value, rangeUnit) {
-    if (rangeUnit === undefined) {
-        return value;
-    }
-    switch (rangeUnit) {
-        case EDurationUnit.DAYS:
-            return value * 86400;
-        case EDurationUnit.HOURS:
-            return value * 3600;
-        case EDurationUnit.MINUTES:
-            return value * 60;
-    }
-    return value;
-};
-// todo: покрыть тестами
-var getFormulaFilterValues = function (filterValue) {
-    var _a;
-    var format = filterValue.format, filteringMethod = filterValue.filteringMethod, formValues = filterValue.formValues, checkedValues = filterValue.checkedValues;
-    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) {
-            if (isNil(value)) {
-                return String(index === 0 ? -Infinity : Infinity);
-            }
-            return String(value);
-        });
-    }
-    function convertDurationRangeToSecond(range, rangeUnit) {
-        if (range === void 0) { range = [undefined, undefined]; }
-        return range.map(function (value, index) {
-            if (isNil(value)) {
-                return String(index === 0 ? -Infinity : Infinity);
-            }
-            return String(convertToSeconds(value, rangeUnit));
-        });
-    }
-    switch (format) {
-        case EFormatTypes.DATE:
-        case EFormatTypes.DATETIME:
-            var _b = formValues, _c = EFormulaFilterFieldKeys.date, datePickerValue = _b[_c], _d = EFormulaFilterFieldKeys.dateRange, rangePickerValue = _b[_d], _e = EFormulaFilterFieldKeys.lastTimeValue, lastTimeValue = _b[_e], _f = EFormulaFilterFieldKeys.lastTimeUnit, lastTimeUnit = _b[_f];
-            if (isRangeFilteringMethod(filteringMethod)) {
-                return compact(rangePickerValue);
-            }
-            if (filteringMethod === formulaFilterMethods.LAST_TIME) {
-                var showTime = format === EFormatTypes.DATETIME;
-                return compact([
-                    convertDateToClickHouse(subtractDurationFromDate(new Date(), lastTimeValue !== null && lastTimeValue !== void 0 ? lastTimeValue : 0, lastTimeUnit), showTime),
-                    convertDateToClickHouse(new Date(), showTime),
-                ]);
-            }
-            return compact([datePickerValue]);
-        case EFormatTypes.STRING:
-            return compact([(_a = formValues[EFormulaFilterFieldKeys.string]) !== null && _a !== void 0 ? _a : null]);
-        case EFormatTypes.NUMBER:
-        case EFormatTypes.YEAR:
-        case EFormatTypes.DAY_OF_MONTH:
-        case EFormatTypes.WEEK:
-        case EFormatTypes.HOUR:
-            var _g = formValues, _h = EFormulaFilterFieldKeys.numberRange, numberRange = _g[_h];
-            return isRangeFilteringMethod(filteringMethod) ? stringifyNumbersRange(numberRange) : [];
-        case EFormatTypes.DURATION:
-            var _j = formValues, _k = EFormulaFilterFieldKeys.numberRange, durationRange = _j[_k], _l = EFormulaFilterFieldKeys.durationUnit, durationUnit = _j[_l];
-            return isRangeFilteringMethod(filteringMethod)
-                ? convertDurationRangeToSecond(durationRange, durationUnit)
-                : [];
-    }
-    return [];
-};
-var mapFormulaFilterToCalculatorInput = function (filterValue) {
-    if (!filterValue) {
-        return null;
-    }
-    if (!isFormulaFilterValue(filterValue)) {
-        return {
-            dbDataType: EClickHouseBaseTypes.Bool,
-            formula: filterValue.formula,
-            values: ["1"],
-            filteringMethod: formulaFilterMethods.EQUAL_TO,
-        };
-    }
-    var formula = filterValue.formula, filteringMethod = filterValue.filteringMethod, dbDataType = filterValue.dbDataType;
-    return {
-        formula: formula,
-        filteringMethod: filteringMethod,
-        dbDataType: dbDataType,
-        values: getFormulaFilterValues(filterValue),
-    };
-};
-var mapFormulaFiltersToInputs = function (filters) {
-    return compactMap(filters, mapFormulaFilterToCalculatorInput);
-};
-
-// Типы, используемые в значениях элементов управления.
-var EWidgetFilterMode;
-(function (EWidgetFilterMode) {
-    EWidgetFilterMode["DEFAULT"] = "DEFAULT";
-    EWidgetFilterMode["SINGLE"] = "SINGLE";
-    /** @deprecated Отказ от режима фильтрации "Множественный выбор"*/
-    EWidgetFilterMode["MULTI"] = "MULTI";
-    EWidgetFilterMode["DISABLED"] = "DISABLED";
-})(EWidgetFilterMode || (EWidgetFilterMode = {}));
-var EMarkdownDisplayMode;
-(function (EMarkdownDisplayMode) {
-    EMarkdownDisplayMode["NONE"] = "NONE";
-    EMarkdownDisplayMode["INDICATOR"] = "INDICATOR";
-})(EMarkdownDisplayMode || (EMarkdownDisplayMode = {}));
-var EDisplayConditionMode;
-(function (EDisplayConditionMode) {
-    EDisplayConditionMode["DISABLED"] = "DISABLED";
-    EDisplayConditionMode["FORMULA"] = "FORMULA";
-    EDisplayConditionMode["VARIABLE"] = "VARIABLE";
-})(EDisplayConditionMode || (EDisplayConditionMode = {}));
-var EFontWeight;
-(function (EFontWeight) {
-    EFontWeight["NORMAL"] = "NORMAL";
-    EFontWeight["BOLD"] = "BOLD";
-})(EFontWeight || (EFontWeight = {}));
-
-function checkDisplayCondition(displayCondition, variables) {
-    var _a;
-    if ((displayCondition === null || displayCondition === void 0 ? void 0 : displayCondition.mode) === EDisplayConditionMode.VARIABLE) {
-        var variableName = displayCondition.variableName, variableValue = displayCondition.variableValue;
-        var currentVariableValue = variableName && ((_a = variables.get(variableName)) === null || _a === void 0 ? void 0 : _a.value);
-        var isCurrentVariableMatch = Array.isArray(currentVariableValue)
-            ? !!variableValue && (currentVariableValue === null || currentVariableValue === void 0 ? void 0 : currentVariableValue.includes(variableValue))
-            : currentVariableValue === variableValue;
-        if (!isCurrentVariableMatch) {
-            return false;
-        }
-    }
-    return true;
-}
-function getDisplayConditionFormula(displayCondition) {
-    if ((displayCondition === null || displayCondition === void 0 ? void 0 : displayCondition.mode) === EDisplayConditionMode.FORMULA) {
-        return displayCondition.formula;
-    }
-}
-var replaceDisplayCondition = function (dimension, displayCondition) {
-    return isNil(displayCondition) ? dimension : __assign(__assign({}, dimension), { displayCondition: displayCondition });
-};
-
 var _a$5;
 var EDimensionTemplateNames;
 (function (EDimensionTemplateNames) {
@@ -829,6 +646,7 @@ var EOuterAggregation;
     EOuterAggregation["min"] = "min";
     EOuterAggregation["max"] = "max";
     EOuterAggregation["sum"] = "sum";
+    EOuterAggregation["top"] = "top";
 })(EOuterAggregation || (EOuterAggregation = {}));
 /** Режимы значения показателя (на основе чего генерируется формула) */
 var EWidgetIndicatorValueModes;
@@ -1172,21 +990,32 @@ var EMeasureAggregationTemplateName;
     EMeasureAggregationTemplateName["countExecutions"] = "countExecutions";
     EMeasureAggregationTemplateName["countReworks"] = "countReworks";
 })(EMeasureAggregationTemplateName || (EMeasureAggregationTemplateName = {}));
+function createAggregationTemplate(fn, additionalFn) {
+    return "{outerAggregation}If(process(".concat(fn, "(").concat(additionalFn ? additionalFn + " " : "", "{columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}), {objectFilters})");
+}
 /** Шаблоны процессных метрик меры с режимом AGGREGATION */
 var measureAggregationTemplates = (_a$3 = {},
-    _a$3[EMeasureAggregationTemplateName.agvIf] = "{outerAggregation}If(process(avgIf({columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}), {objectFilters})",
-    _a$3[EMeasureAggregationTemplateName.medianIf] = "{outerAggregation}If(process(medianIf({columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}), {objectFilters})",
-    _a$3[EMeasureAggregationTemplateName.countIf] = "{outerAggregation}If(process(countIf({columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}), {objectFilters})",
-    _a$3[EMeasureAggregationTemplateName.countIfDistinct] = "{outerAggregation}If(process(countIf(distinct {columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}), {objectFilters})",
-    _a$3[EMeasureAggregationTemplateName.minIf] = "{outerAggregation}If(process(minIf({columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}), {objectFilters})",
-    _a$3[EMeasureAggregationTemplateName.maxIf] = "{outerAggregation}If(process(maxIf({columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}), {objectFilters})",
-    _a$3[EMeasureAggregationTemplateName.sumIf] = "{outerAggregation}If(process(sumIf({columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}), {objectFilters})",
-    _a$3[EMeasureAggregationTemplateName.top] = "{outerAggregation}If(".concat(topTemplate, ", {objectFilters})"),
-    _a$3[EMeasureAggregationTemplateName.firstValue] = "{outerAggregation}If(".concat(firstValueTemplate, ", {objectFilters})"),
-    _a$3[EMeasureAggregationTemplateName.lastValue] = "{outerAggregation}If(".concat(lastValueTemplate, ", {objectFilters})"),
+    _a$3[EMeasureAggregationTemplateName.agvIf] = createAggregationTemplate("avgIf"),
+    _a$3[EMeasureAggregationTemplateName.medianIf] = createAggregationTemplate("medianIf"),
+    _a$3[EMeasureAggregationTemplateName.countIf] = createAggregationTemplate("countIf"),
+    _a$3[EMeasureAggregationTemplateName.countIfDistinct] = createAggregationTemplate("countIf", "distinct"),
+    _a$3[EMeasureAggregationTemplateName.minIf] = createAggregationTemplate("minIf"),
+    _a$3[EMeasureAggregationTemplateName.maxIf] = createAggregationTemplate("maxIf"),
+    _a$3[EMeasureAggregationTemplateName.sumIf] = createAggregationTemplate("sumIf"),
+    _a$3[EMeasureAggregationTemplateName.top] = createTopLikeTemplate(topTemplate),
+    _a$3[EMeasureAggregationTemplateName.firstValue] = createTopLikeTemplate(firstValueTemplate),
+    _a$3[EMeasureAggregationTemplateName.lastValue] = createTopLikeTemplate(lastValueTemplate),
     _a$3[EMeasureAggregationTemplateName.countExecutions] = "{outerAggregation}If(".concat(countExecutionsTemplate, ",{objectFilters})"),
     _a$3[EMeasureAggregationTemplateName.countReworks] = "{outerAggregation}If(".concat(countReworksTemplate, ",{objectFilters})"),
     _a$3);
+/** Вспомогательная функция для шаблонов top/firstValue/lastValue */
+function createTopLikeTemplate(template) {
+    return function (outerAggregation) {
+        return outerAggregation === EOuterAggregation.top
+            ? "{outerAggregation}KIf(1)(".concat(template, ", {objectFilters})[1]")
+            : "{outerAggregation}If(".concat(template, ", {objectFilters})");
+    };
+}
 /** На основе значения режима AGGREGATION подготовить параметры для подстановки в шаблонную формулу */
 var prepareMeasureAggregationParams = function (value) {
     if (!value.eventName ||
@@ -1246,7 +1075,7 @@ var measureTemplateFormulas = (_a$2 = {},
     _a$2);
 
 /** Шаблон процессной метрики меры с режимом CONVERSION */
-var conversionTemplate = "countIf(\n    process(\n        minIf(\n            {startEventTimeFormula}, \n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) < \n    process(\n        maxIf(\n            {endEventTimeFormula}, \n            {endEventNameFormula} = '{endEventName}'{endEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) \n    and \n    process(\n        countIf(\n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n) * 100 / countIf(\n    process(\n        countIf(\n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n)";
+var conversionTemplate = "countIf(\n    process(\n        minIf(\n            {startEventTimeFormula}, \n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) < \n    process(\n        maxIf(\n            {endEventTimeFormula}, \n            {endEventNameFormula} = '{endEventName}'{endEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) \n    and \n    process(\n        countIf(\n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n) / countIf(\n    process(\n        countIf(\n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n)";
 /** На основе значения режима CONVERSION подготовить параметры для подстановки в шаблонную формулу */
 var prepareConversionParams = function (value) {
     if (!value.startEventName ||
@@ -1335,12 +1164,17 @@ function getMeasureFormula(_a) {
         });
     }
     if (value.mode === EWidgetIndicatorValueModes.AGGREGATION) {
-        var preparedParams = prepareMeasureAggregationParams(value);
-        if (!preparedParams) {
+        var preparedParams_1 = prepareMeasureAggregationParams(value);
+        if (!preparedParams_1) {
             return "";
         }
-        var templateFormula = measureAggregationTemplates[value.templateName];
-        return fillTemplateString(templateFormula, preparedParams);
+        var getTemplateFormula = function () {
+            var templateFormula = measureAggregationTemplates[value.templateName];
+            return typeof templateFormula === "function"
+                ? templateFormula(preparedParams_1.outerAggregation)
+                : templateFormula;
+        };
+        return fillTemplateString(getTemplateFormula(), preparedParams_1);
     }
     if (value.mode === EWidgetIndicatorValueModes.CONVERSION) {
         var preparedParams = prepareConversionParams(value);
@@ -1445,6 +1279,219 @@ var parseIndicatorLink = function (formula) {
     return null;
 };
 
+// Типы, используемые в значениях элементов управления.
+var EWidgetFilterMode;
+(function (EWidgetFilterMode) {
+    EWidgetFilterMode["DEFAULT"] = "DEFAULT";
+    EWidgetFilterMode["SINGLE"] = "SINGLE";
+    /** @deprecated Отказ от режима фильтрации "Множественный выбор"*/
+    EWidgetFilterMode["MULTI"] = "MULTI";
+    EWidgetFilterMode["DISABLED"] = "DISABLED";
+})(EWidgetFilterMode || (EWidgetFilterMode = {}));
+var EMarkdownDisplayMode;
+(function (EMarkdownDisplayMode) {
+    EMarkdownDisplayMode["NONE"] = "NONE";
+    EMarkdownDisplayMode["INDICATOR"] = "INDICATOR";
+})(EMarkdownDisplayMode || (EMarkdownDisplayMode = {}));
+var EDisplayConditionMode;
+(function (EDisplayConditionMode) {
+    EDisplayConditionMode["DISABLED"] = "DISABLED";
+    EDisplayConditionMode["FORMULA"] = "FORMULA";
+    EDisplayConditionMode["VARIABLE"] = "VARIABLE";
+})(EDisplayConditionMode || (EDisplayConditionMode = {}));
+var EFontWeight;
+(function (EFontWeight) {
+    EFontWeight["NORMAL"] = "NORMAL";
+    EFontWeight["BOLD"] = "BOLD";
+})(EFontWeight || (EFontWeight = {}));
+
+function checkDisplayCondition(displayCondition, variables) {
+    var _a;
+    if ((displayCondition === null || displayCondition === void 0 ? void 0 : displayCondition.mode) === EDisplayConditionMode.VARIABLE) {
+        var variableName = displayCondition.variableName, variableValue = displayCondition.variableValue;
+        var currentVariableValue = variableName && ((_a = variables.get(variableName)) === null || _a === void 0 ? void 0 : _a.value);
+        var isCurrentVariableMatch = Array.isArray(currentVariableValue)
+            ? !!variableValue && (currentVariableValue === null || currentVariableValue === void 0 ? void 0 : currentVariableValue.includes(variableValue))
+            : currentVariableValue === variableValue;
+        if (!isCurrentVariableMatch) {
+            return false;
+        }
+    }
+    return true;
+}
+function getDisplayConditionFormula(displayCondition) {
+    if ((displayCondition === null || displayCondition === void 0 ? void 0 : displayCondition.mode) === EDisplayConditionMode.FORMULA) {
+        return displayCondition.formula;
+    }
+}
+var replaceDisplayCondition = function (dimension, displayCondition) {
+    return isNil(displayCondition) ? dimension : __assign(__assign({}, dimension), { displayCondition: displayCondition });
+};
+/**
+ * Шаблон формулы для проверки условия отображения.
+ *
+ * - 0 -> false
+ * - 1 -> true
+ * - 15 -> true
+ * - '0' ->	false
+ * - '1' -> true
+ * - '15' ->	true (значение по умолчанию, т.к. не преобразуется к Boolean)
+ * - 'false' -> false
+ * - 'true' -> true
+ * - 'abc' -> true (значение по умолчанию, т.к. не преобразуется к Boolean)
+ * - null -> true (значение по умолчанию, т.к. не преобразуется к Boolean)
+ */
+var displayConditionTemplate = "accurateCastOrDefault({formula}, 'Boolean', true)";
+
+var ELastTimeUnit;
+(function (ELastTimeUnit) {
+    ELastTimeUnit["DAYS"] = "DAYS";
+    ELastTimeUnit["MONTHS"] = "MONTHS";
+    ELastTimeUnit["YEARS"] = "YEARS";
+})(ELastTimeUnit || (ELastTimeUnit = {}));
+var EDurationUnit;
+(function (EDurationUnit) {
+    EDurationUnit["DAYS"] = "DAYS";
+    EDurationUnit["HOURS"] = "HOURS";
+    EDurationUnit["MINUTES"] = "MINUTES";
+    EDurationUnit["SECONDS"] = "SECONDS";
+})(EDurationUnit || (EDurationUnit = {}));
+var isRangeFilteringMethod = function (filteringMethod) {
+    return filteringMethod === formulaFilterMethods.IN_RANGE ||
+        filteringMethod === formulaFilterMethods.NOT_IN_RANGE;
+};
+var convertDateToClickHouse = function (date, showTime) {
+    var twoDigitValue = function (value) { return ("0" + value).slice(-2); };
+    var year = date.getFullYear();
+    var month = twoDigitValue(date.getMonth() + 1);
+    var day = twoDigitValue(date.getDate());
+    var hours = twoDigitValue(date.getHours());
+    var minutes = twoDigitValue(date.getMinutes());
+    var seconds = twoDigitValue(date.getSeconds());
+    var timeString = "".concat(hours, ":").concat(minutes, ":").concat(seconds);
+    var dateString = "".concat(year, "-").concat(month, "-").concat(day);
+    return showTime ? "".concat(dateString, " ").concat(timeString) : "".concat(dateString);
+};
+var subtractDurationFromDate = function (date, value, unitTime) {
+    switch (unitTime) {
+        case ELastTimeUnit.DAYS:
+            date.setDate(date.getDate() - value);
+            break;
+        case ELastTimeUnit.MONTHS:
+            date.setMonth(date.getMonth() - value);
+            break;
+        case ELastTimeUnit.YEARS:
+            date.setFullYear(date.getFullYear() - value);
+            break;
+    }
+    return date;
+};
+var convertToSeconds = function (value, rangeUnit) {
+    if (rangeUnit === undefined) {
+        return value;
+    }
+    switch (rangeUnit) {
+        case EDurationUnit.DAYS:
+            return value * 86400;
+        case EDurationUnit.HOURS:
+            return value * 3600;
+        case EDurationUnit.MINUTES:
+            return value * 60;
+    }
+    return value;
+};
+// todo: покрыть тестами
+var getFormulaFilterValues = function (filterValue) {
+    var _a;
+    var format = filterValue.format, filteringMethod = filterValue.filteringMethod, formValues = filterValue.formValues, checkedValues = filterValue.checkedValues;
+    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) {
+            if (isNil(value)) {
+                return String(index === 0 ? -Infinity : Infinity);
+            }
+            return String(value);
+        });
+    }
+    function convertDurationRangeToSecond(range, rangeUnit) {
+        if (range === void 0) { range = [undefined, undefined]; }
+        return range.map(function (value, index) {
+            if (isNil(value)) {
+                return String(index === 0 ? -Infinity : Infinity);
+            }
+            return String(convertToSeconds(value, rangeUnit));
+        });
+    }
+    switch (format) {
+        case EFormatTypes.DATE:
+        case EFormatTypes.DATETIME:
+            var _b = formValues, _c = EFormulaFilterFieldKeys.date, datePickerValue = _b[_c], _d = EFormulaFilterFieldKeys.dateRange, rangePickerValue = _b[_d], _e = EFormulaFilterFieldKeys.lastTimeValue, lastTimeValue = _b[_e], _f = EFormulaFilterFieldKeys.lastTimeUnit, lastTimeUnit = _b[_f];
+            if (isRangeFilteringMethod(filteringMethod)) {
+                return compact(rangePickerValue);
+            }
+            if (filteringMethod === formulaFilterMethods.LAST_TIME) {
+                var showTime = format === EFormatTypes.DATETIME;
+                return compact([
+                    convertDateToClickHouse(subtractDurationFromDate(new Date(), lastTimeValue !== null && lastTimeValue !== void 0 ? lastTimeValue : 0, lastTimeUnit), showTime),
+                    convertDateToClickHouse(new Date(), showTime),
+                ]);
+            }
+            return compact([datePickerValue]);
+        case EFormatTypes.STRING:
+            return compact([(_a = formValues[EFormulaFilterFieldKeys.string]) !== null && _a !== void 0 ? _a : null]);
+        case EFormatTypes.NUMBER:
+        case EFormatTypes.YEAR:
+        case EFormatTypes.DAY_OF_MONTH:
+        case EFormatTypes.WEEK:
+        case EFormatTypes.HOUR:
+            var _g = formValues, _h = EFormulaFilterFieldKeys.numberRange, numberRange = _g[_h];
+            return isRangeFilteringMethod(filteringMethod) ? stringifyNumbersRange(numberRange) : [];
+        case EFormatTypes.DURATION:
+            var _j = formValues, _k = EFormulaFilterFieldKeys.numberRange, durationRange = _j[_k], _l = EFormulaFilterFieldKeys.durationUnit, durationUnit = _j[_l];
+            return isRangeFilteringMethod(filteringMethod)
+                ? convertDurationRangeToSecond(durationRange, durationUnit)
+                : [];
+    }
+    return [];
+};
+var mapFormulaFilterToCalculatorInput = function (filterValue) {
+    if (!filterValue) {
+        return null;
+    }
+    if (!isFormulaFilterValue(filterValue)) {
+        return {
+            dbDataType: EClickHouseBaseTypes.Bool,
+            formula: fillTemplateString(displayConditionTemplate, { formula: filterValue.formula }),
+            values: ["true"],
+            filteringMethod: formulaFilterMethods.EQUAL_TO,
+        };
+    }
+    var formula = filterValue.formula, filteringMethod = filterValue.filteringMethod;
+    var dbDataType = filterValue.dbDataType;
+    if (filteringMethod === formulaFilterMethods.IN_RANGE ||
+        filteringMethod === formulaFilterMethods.NOT_IN_RANGE) {
+        var simpleType = parseClickHouseType(dbDataType).simpleType;
+        if (simpleType === ESimpleDataType.INTEGER) {
+            dbDataType = EClickHouseBaseTypes.Float64;
+        }
+    }
+    return {
+        formula: formula,
+        filteringMethod: filteringMethod,
+        dbDataType: dbDataType,
+        values: getFormulaFilterValues(filterValue),
+    };
+};
+var mapFormulaFiltersToInputs = function (filters) {
+    return compactMap(filters, mapFormulaFilterToCalculatorInput);
+};
+
 function mapMeasureToInput(measure, variables, addFormulas) {
     if (addFormulas === void 0) { addFormulas = function () { return new Map(); }; }
     var mainFormula = getMeasureFormula(measure);
@@ -1613,10 +1660,14 @@ var getDefaultSortOrders = function (_a) {
     if (measures.length > 0) {
         var firstMeasure = measures[0];
         if (firstMeasure) {
+            var formula = getMeasureFormula(firstMeasure);
+            if (!formula) {
+                return [];
+            }
             return [
                 {
                     direction: ESortDirection.descend,
-                    formula: getMeasureFormula(firstMeasure),
+                    formula: formula,
                     dbDataType: firstMeasure.dbDataType,
                 },
             ];
@@ -1945,4 +1996,4 @@ var getColorByIndex = function (index) {
     return color;
 };
 
-export { EActionButtonsTypes, EActionTypes, EAutoUpdateMode, EBlockingConditionMode, ECalculatorFilterMethods, EClickHouseBaseTypes, EColorMode, EControlType, ECustomSelectTemplates, EDimensionAggregationTemplateName, EDimensionTemplateNames, EDisplayConditionMode, EDrawerPlacement, EDurationTemplateName, EDurationUnit, EEventAppearances, EEventMeasureTemplateNames, EFontWeight, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMarkdownDisplayMode, EMeasureAggregationTemplateName, EMeasureTemplateNames, EOuterAggregation, EProcessFilterNames, ESelectOptionTypes, ESimpleDataType, ESimpleInputType, ESortDirection, ESortingValueModes, ESystemRecordKey, ETransitionMeasureTemplateNames, EUnitMode, EViewMode, EViewOpenIn, EWidgetActionInputMethod, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, OuterAggregation, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, clearMultiLineComments, clearSingleLineComments, colors, conversionTemplate, convertFiltersToFormula, convertToFormulasChain, countExecutionsTemplate, dashboardLinkRegExp, dimensionAggregationTemplates, dimensionTemplateFormulas, durationTemplates, escapeSpecialCharacters, eventMeasureTemplateFormulas, fillTemplateString, formattingConfig, formulaFilterMethods, generateColumnFormula, getColorByIndex, getDefaultSortOrders, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getRuleColor, getTransitionMeasureFormula, isDimensionsHierarchy, isFormulaFilterValue, isValidColor, linkNameRegExp, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, measureAggregationTemplates, measureTemplateFormulas, parseClickHouseType, parseIndicatorLink, prepareConversionParams, prepareDimensionAggregationParams, prepareDurationParams, prepareFormulaForSql, prepareMeasureAggregationParams, prepareSortOrders, prepareTimeParams, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, timeTemplates, transitionMeasureTemplateFormulas, unescapeSpecialCharacters, updateDefaultModeSelection, updateMultiModeSelection, updateSingleModeSelection, workspaceLinkRegExp };
+export { EActionButtonsTypes, EActionTypes, EAutoUpdateMode, EBlockingConditionMode, ECalculatorFilterMethods, EClickHouseBaseTypes, EColorMode, EControlType, ECustomSelectTemplates, EDimensionAggregationTemplateName, EDimensionTemplateNames, EDisplayConditionMode, EDrawerPlacement, EDurationTemplateName, EDurationUnit, EEventAppearances, EEventMeasureTemplateNames, EFontWeight, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMarkdownDisplayMode, EMeasureAggregationTemplateName, EMeasureTemplateNames, EOuterAggregation, EProcessFilterNames, ESelectOptionTypes, ESimpleDataType, ESimpleInputType, ESortDirection, ESortingValueModes, ESystemRecordKey, ETransitionMeasureTemplateNames, EUnitMode, EViewMode, EViewOpenIn, EWidgetActionInputMethod, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, OuterAggregation, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, clearMultiLineComments, clearSingleLineComments, colors, conversionTemplate, convertFiltersToFormula, convertToFormulasChain, countExecutionsTemplate, dashboardLinkRegExp, dimensionAggregationTemplates, dimensionTemplateFormulas, displayConditionTemplate, durationTemplates, escapeSpecialCharacters, eventMeasureTemplateFormulas, fillTemplateString, formattingConfig, formulaFilterMethods, generateColumnFormula, getColorByIndex, getDefaultSortOrders, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getRuleColor, getTransitionMeasureFormula, isDimensionsHierarchy, isFormulaFilterValue, isValidColor, linkNameRegExp, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, measureAggregationTemplates, measureTemplateFormulas, parseClickHouseType, parseIndicatorLink, prepareConversionParams, prepareDimensionAggregationParams, prepareDurationParams, prepareFormulaForSql, prepareMeasureAggregationParams, prepareSortOrders, prepareTimeParams, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, timeTemplates, transitionMeasureTemplateFormulas, unescapeSpecialCharacters, updateDefaultModeSelection, updateMultiModeSelection, updateSingleModeSelection, workspaceLinkRegExp };

package/dist/index.js

@@ -341,6 +341,7 @@ exports.EFormatTypes = void 0;
     EFormatTypes["WEEK"] = "WEEK";
     /** Логический */
     EFormatTypes["BOOLEAN"] = "BOOLEAN";
+    EFormatTypes["PERCENT"] = "PERCENT";
 })(exports.EFormatTypes || (exports.EFormatTypes = {}));
 exports.EFormattingPresets = void 0;
 (function (EFormattingPresets) {
@@ -447,7 +448,7 @@ var formattingConfig = {
         return _a = {},
             _a[exports.ESimpleDataType.OTHER] = [exports.EFormatTypes.STRING],
             _a[exports.ESimpleDataType.STRING] = [exports.EFormatTypes.STRING],
-            _a[exports.ESimpleDataType.FLOAT] = [exports.EFormatTypes.NUMBER, exports.EFormatTypes.DURATION],
+            _a[exports.ESimpleDataType.FLOAT] = [exports.EFormatTypes.NUMBER, exports.EFormatTypes.DURATION, exports.EFormatTypes.PERCENT],
             _a[exports.ESimpleDataType.INTEGER] = [
                 exports.EFormatTypes.NUMBER,
                 exports.EFormatTypes.DURATION,
@@ -455,6 +456,7 @@ var formattingConfig = {
                 exports.EFormatTypes.MONTH_YEAR,
                 exports.EFormatTypes.MONTH,
                 exports.EFormatTypes.DAY_OF_WEEK,
+                exports.EFormatTypes.PERCENT,
             ],
             _a[exports.ESimpleDataType.DATE] = [exports.EFormatTypes.DATE],
             _a[exports.ESimpleDataType.DATETIME] = [exports.EFormatTypes.DATETIME],
@@ -589,200 +591,15 @@ var formattingConfig = {
             _a[exports.EFormatTypes.WEEK] = [],
             _a[exports.EFormatTypes.YEAR] = [],
             _a[exports.EFormatTypes.BOOLEAN] = [],
+            _a[exports.EFormatTypes.PERCENT] = [
+                exports.EFormattingPresets.AUTO,
+                exports.EFormattingPresets["x.x[%]"],
+                exports.EFormattingPresets["zx.xx[%]"],
+            ],
             _a;
     },
 };
 
-exports.ELastTimeUnit = void 0;
-(function (ELastTimeUnit) {
-    ELastTimeUnit["DAYS"] = "DAYS";
-    ELastTimeUnit["MONTHS"] = "MONTHS";
-    ELastTimeUnit["YEARS"] = "YEARS";
-})(exports.ELastTimeUnit || (exports.ELastTimeUnit = {}));
-exports.EDurationUnit = void 0;
-(function (EDurationUnit) {
-    EDurationUnit["DAYS"] = "DAYS";
-    EDurationUnit["HOURS"] = "HOURS";
-    EDurationUnit["MINUTES"] = "MINUTES";
-    EDurationUnit["SECONDS"] = "SECONDS";
-})(exports.EDurationUnit || (exports.EDurationUnit = {}));
-var isRangeFilteringMethod = function (filteringMethod) {
-    return filteringMethod === formulaFilterMethods.IN_RANGE ||
-        filteringMethod === formulaFilterMethods.NOT_IN_RANGE;
-};
-var convertDateToClickHouse = function (date, showTime) {
-    var twoDigitValue = function (value) { return ("0" + value).slice(-2); };
-    var year = date.getFullYear();
-    var month = twoDigitValue(date.getMonth() + 1);
-    var day = twoDigitValue(date.getDate());
-    var hours = twoDigitValue(date.getHours());
-    var minutes = twoDigitValue(date.getMinutes());
-    var seconds = twoDigitValue(date.getSeconds());
-    var timeString = "".concat(hours, ":").concat(minutes, ":").concat(seconds);
-    var dateString = "".concat(year, "-").concat(month, "-").concat(day);
-    return showTime ? "".concat(dateString, " ").concat(timeString) : "".concat(dateString);
-};
-var subtractDurationFromDate = function (date, value, unitTime) {
-    switch (unitTime) {
-        case exports.ELastTimeUnit.DAYS:
-            date.setDate(date.getDate() - value);
-            break;
-        case exports.ELastTimeUnit.MONTHS:
-            date.setMonth(date.getMonth() - value);
-            break;
-        case exports.ELastTimeUnit.YEARS:
-            date.setFullYear(date.getFullYear() - value);
-            break;
-    }
-    return date;
-};
-var convertToSeconds = function (value, rangeUnit) {
-    if (rangeUnit === undefined) {
-        return value;
-    }
-    switch (rangeUnit) {
-        case exports.EDurationUnit.DAYS:
-            return value * 86400;
-        case exports.EDurationUnit.HOURS:
-            return value * 3600;
-        case exports.EDurationUnit.MINUTES:
-            return value * 60;
-    }
-    return value;
-};
-// todo: покрыть тестами
-var getFormulaFilterValues = function (filterValue) {
-    var _a;
-    var format = filterValue.format, filteringMethod = filterValue.filteringMethod, formValues = filterValue.formValues, checkedValues = filterValue.checkedValues;
-    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) {
-            if (isNil(value)) {
-                return String(index === 0 ? -Infinity : Infinity);
-            }
-            return String(value);
-        });
-    }
-    function convertDurationRangeToSecond(range, rangeUnit) {
-        if (range === void 0) { range = [undefined, undefined]; }
-        return range.map(function (value, index) {
-            if (isNil(value)) {
-                return String(index === 0 ? -Infinity : Infinity);
-            }
-            return String(convertToSeconds(value, rangeUnit));
-        });
-    }
-    switch (format) {
-        case exports.EFormatTypes.DATE:
-        case exports.EFormatTypes.DATETIME:
-            var _b = formValues, _c = exports.EFormulaFilterFieldKeys.date, datePickerValue = _b[_c], _d = exports.EFormulaFilterFieldKeys.dateRange, rangePickerValue = _b[_d], _e = exports.EFormulaFilterFieldKeys.lastTimeValue, lastTimeValue = _b[_e], _f = exports.EFormulaFilterFieldKeys.lastTimeUnit, lastTimeUnit = _b[_f];
-            if (isRangeFilteringMethod(filteringMethod)) {
-                return compact(rangePickerValue);
-            }
-            if (filteringMethod === formulaFilterMethods.LAST_TIME) {
-                var showTime = format === exports.EFormatTypes.DATETIME;
-                return compact([
-                    convertDateToClickHouse(subtractDurationFromDate(new Date(), lastTimeValue !== null && lastTimeValue !== void 0 ? lastTimeValue : 0, lastTimeUnit), showTime),
-                    convertDateToClickHouse(new Date(), showTime),
-                ]);
-            }
-            return compact([datePickerValue]);
-        case exports.EFormatTypes.STRING:
-            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:
-        case exports.EFormatTypes.WEEK:
-        case exports.EFormatTypes.HOUR:
-            var _g = formValues, _h = exports.EFormulaFilterFieldKeys.numberRange, numberRange = _g[_h];
-            return isRangeFilteringMethod(filteringMethod) ? stringifyNumbersRange(numberRange) : [];
-        case exports.EFormatTypes.DURATION:
-            var _j = formValues, _k = exports.EFormulaFilterFieldKeys.numberRange, durationRange = _j[_k], _l = exports.EFormulaFilterFieldKeys.durationUnit, durationUnit = _j[_l];
-            return isRangeFilteringMethod(filteringMethod)
-                ? convertDurationRangeToSecond(durationRange, durationUnit)
-                : [];
-    }
-    return [];
-};
-var mapFormulaFilterToCalculatorInput = function (filterValue) {
-    if (!filterValue) {
-        return null;
-    }
-    if (!isFormulaFilterValue(filterValue)) {
-        return {
-            dbDataType: exports.EClickHouseBaseTypes.Bool,
-            formula: filterValue.formula,
-            values: ["1"],
-            filteringMethod: formulaFilterMethods.EQUAL_TO,
-        };
-    }
-    var formula = filterValue.formula, filteringMethod = filterValue.filteringMethod, dbDataType = filterValue.dbDataType;
-    return {
-        formula: formula,
-        filteringMethod: filteringMethod,
-        dbDataType: dbDataType,
-        values: getFormulaFilterValues(filterValue),
-    };
-};
-var mapFormulaFiltersToInputs = function (filters) {
-    return compactMap(filters, mapFormulaFilterToCalculatorInput);
-};
-
-// Типы, используемые в значениях элементов управления.
-exports.EWidgetFilterMode = void 0;
-(function (EWidgetFilterMode) {
-    EWidgetFilterMode["DEFAULT"] = "DEFAULT";
-    EWidgetFilterMode["SINGLE"] = "SINGLE";
-    /** @deprecated Отказ от режима фильтрации "Множественный выбор"*/
-    EWidgetFilterMode["MULTI"] = "MULTI";
-    EWidgetFilterMode["DISABLED"] = "DISABLED";
-})(exports.EWidgetFilterMode || (exports.EWidgetFilterMode = {}));
-exports.EMarkdownDisplayMode = void 0;
-(function (EMarkdownDisplayMode) {
-    EMarkdownDisplayMode["NONE"] = "NONE";
-    EMarkdownDisplayMode["INDICATOR"] = "INDICATOR";
-})(exports.EMarkdownDisplayMode || (exports.EMarkdownDisplayMode = {}));
-exports.EDisplayConditionMode = void 0;
-(function (EDisplayConditionMode) {
-    EDisplayConditionMode["DISABLED"] = "DISABLED";
-    EDisplayConditionMode["FORMULA"] = "FORMULA";
-    EDisplayConditionMode["VARIABLE"] = "VARIABLE";
-})(exports.EDisplayConditionMode || (exports.EDisplayConditionMode = {}));
-exports.EFontWeight = void 0;
-(function (EFontWeight) {
-    EFontWeight["NORMAL"] = "NORMAL";
-    EFontWeight["BOLD"] = "BOLD";
-})(exports.EFontWeight || (exports.EFontWeight = {}));
-
-function checkDisplayCondition(displayCondition, variables) {
-    var _a;
-    if ((displayCondition === null || displayCondition === void 0 ? void 0 : displayCondition.mode) === exports.EDisplayConditionMode.VARIABLE) {
-        var variableName = displayCondition.variableName, variableValue = displayCondition.variableValue;
-        var currentVariableValue = variableName && ((_a = variables.get(variableName)) === null || _a === void 0 ? void 0 : _a.value);
-        var isCurrentVariableMatch = Array.isArray(currentVariableValue)
-            ? !!variableValue && (currentVariableValue === null || currentVariableValue === void 0 ? void 0 : currentVariableValue.includes(variableValue))
-            : currentVariableValue === variableValue;
-        if (!isCurrentVariableMatch) {
-            return false;
-        }
-    }
-    return true;
-}
-function getDisplayConditionFormula(displayCondition) {
-    if ((displayCondition === null || displayCondition === void 0 ? void 0 : displayCondition.mode) === exports.EDisplayConditionMode.FORMULA) {
-        return displayCondition.formula;
-    }
-}
-var replaceDisplayCondition = function (dimension, displayCondition) {
-    return isNil(displayCondition) ? dimension : __assign(__assign({}, dimension), { displayCondition: displayCondition });
-};
-
 var _a$5;
 exports.EDimensionTemplateNames = void 0;
 (function (EDimensionTemplateNames) {
@@ -830,6 +647,7 @@ exports.EOuterAggregation = void 0;
     EOuterAggregation["min"] = "min";
     EOuterAggregation["max"] = "max";
     EOuterAggregation["sum"] = "sum";
+    EOuterAggregation["top"] = "top";
 })(exports.EOuterAggregation || (exports.EOuterAggregation = {}));
 /** Режимы значения показателя (на основе чего генерируется формула) */
 exports.EWidgetIndicatorValueModes = void 0;
@@ -1173,21 +991,32 @@ exports.EMeasureAggregationTemplateName = void 0;
     EMeasureAggregationTemplateName["countExecutions"] = "countExecutions";
     EMeasureAggregationTemplateName["countReworks"] = "countReworks";
 })(exports.EMeasureAggregationTemplateName || (exports.EMeasureAggregationTemplateName = {}));
+function createAggregationTemplate(fn, additionalFn) {
+    return "{outerAggregation}If(process(".concat(fn, "(").concat(additionalFn ? additionalFn + " " : "", "{columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}), {objectFilters})");
+}
 /** Шаблоны процессных метрик меры с режимом AGGREGATION */
 var measureAggregationTemplates = (_a$3 = {},
-    _a$3[exports.EMeasureAggregationTemplateName.agvIf] = "{outerAggregation}If(process(avgIf({columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}), {objectFilters})",
-    _a$3[exports.EMeasureAggregationTemplateName.medianIf] = "{outerAggregation}If(process(medianIf({columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}), {objectFilters})",
-    _a$3[exports.EMeasureAggregationTemplateName.countIf] = "{outerAggregation}If(process(countIf({columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}), {objectFilters})",
-    _a$3[exports.EMeasureAggregationTemplateName.countIfDistinct] = "{outerAggregation}If(process(countIf(distinct {columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}), {objectFilters})",
-    _a$3[exports.EMeasureAggregationTemplateName.minIf] = "{outerAggregation}If(process(minIf({columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}), {objectFilters})",
-    _a$3[exports.EMeasureAggregationTemplateName.maxIf] = "{outerAggregation}If(process(maxIf({columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}), {objectFilters})",
-    _a$3[exports.EMeasureAggregationTemplateName.sumIf] = "{outerAggregation}If(process(sumIf({columnFormula}, {eventNameFormula} = '{eventName}'{filters}), {caseCaseIdFormula}), {objectFilters})",
-    _a$3[exports.EMeasureAggregationTemplateName.top] = "{outerAggregation}If(".concat(topTemplate, ", {objectFilters})"),
-    _a$3[exports.EMeasureAggregationTemplateName.firstValue] = "{outerAggregation}If(".concat(firstValueTemplate, ", {objectFilters})"),
-    _a$3[exports.EMeasureAggregationTemplateName.lastValue] = "{outerAggregation}If(".concat(lastValueTemplate, ", {objectFilters})"),
+    _a$3[exports.EMeasureAggregationTemplateName.agvIf] = createAggregationTemplate("avgIf"),
+    _a$3[exports.EMeasureAggregationTemplateName.medianIf] = createAggregationTemplate("medianIf"),
+    _a$3[exports.EMeasureAggregationTemplateName.countIf] = createAggregationTemplate("countIf"),
+    _a$3[exports.EMeasureAggregationTemplateName.countIfDistinct] = createAggregationTemplate("countIf", "distinct"),
+    _a$3[exports.EMeasureAggregationTemplateName.minIf] = createAggregationTemplate("minIf"),
+    _a$3[exports.EMeasureAggregationTemplateName.maxIf] = createAggregationTemplate("maxIf"),
+    _a$3[exports.EMeasureAggregationTemplateName.sumIf] = createAggregationTemplate("sumIf"),
+    _a$3[exports.EMeasureAggregationTemplateName.top] = createTopLikeTemplate(topTemplate),
+    _a$3[exports.EMeasureAggregationTemplateName.firstValue] = createTopLikeTemplate(firstValueTemplate),
+    _a$3[exports.EMeasureAggregationTemplateName.lastValue] = createTopLikeTemplate(lastValueTemplate),
     _a$3[exports.EMeasureAggregationTemplateName.countExecutions] = "{outerAggregation}If(".concat(countExecutionsTemplate, ",{objectFilters})"),
     _a$3[exports.EMeasureAggregationTemplateName.countReworks] = "{outerAggregation}If(".concat(countReworksTemplate, ",{objectFilters})"),
     _a$3);
+/** Вспомогательная функция для шаблонов top/firstValue/lastValue */
+function createTopLikeTemplate(template) {
+    return function (outerAggregation) {
+        return outerAggregation === exports.EOuterAggregation.top
+            ? "{outerAggregation}KIf(1)(".concat(template, ", {objectFilters})[1]")
+            : "{outerAggregation}If(".concat(template, ", {objectFilters})");
+    };
+}
 /** На основе значения режима AGGREGATION подготовить параметры для подстановки в шаблонную формулу */
 var prepareMeasureAggregationParams = function (value) {
     if (!value.eventName ||
@@ -1247,7 +1076,7 @@ var measureTemplateFormulas = (_a$2 = {},
     _a$2);
 
 /** Шаблон процессной метрики меры с режимом CONVERSION */
-var conversionTemplate = "countIf(\n    process(\n        minIf(\n            {startEventTimeFormula}, \n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) < \n    process(\n        maxIf(\n            {endEventTimeFormula}, \n            {endEventNameFormula} = '{endEventName}'{endEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) \n    and \n    process(\n        countIf(\n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n) * 100 / countIf(\n    process(\n        countIf(\n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n)";
+var conversionTemplate = "countIf(\n    process(\n        minIf(\n            {startEventTimeFormula}, \n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) < \n    process(\n        maxIf(\n            {endEventTimeFormula}, \n            {endEventNameFormula} = '{endEventName}'{endEventFilters}\n        ), \n        {endCaseCaseIdFormula}\n    ) \n    and \n    process(\n        countIf(\n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n) / countIf(\n    process(\n        countIf(\n            {startEventNameFormula} = '{startEventName}'{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n)";
 /** На основе значения режима CONVERSION подготовить параметры для подстановки в шаблонную формулу */
 var prepareConversionParams = function (value) {
     if (!value.startEventName ||
@@ -1336,12 +1165,17 @@ function getMeasureFormula(_a) {
         });
     }
     if (value.mode === exports.EWidgetIndicatorValueModes.AGGREGATION) {
-        var preparedParams = prepareMeasureAggregationParams(value);
-        if (!preparedParams) {
+        var preparedParams_1 = prepareMeasureAggregationParams(value);
+        if (!preparedParams_1) {
             return "";
         }
-        var templateFormula = measureAggregationTemplates[value.templateName];
-        return fillTemplateString(templateFormula, preparedParams);
+        var getTemplateFormula = function () {
+            var templateFormula = measureAggregationTemplates[value.templateName];
+            return typeof templateFormula === "function"
+                ? templateFormula(preparedParams_1.outerAggregation)
+                : templateFormula;
+        };
+        return fillTemplateString(getTemplateFormula(), preparedParams_1);
     }
     if (value.mode === exports.EWidgetIndicatorValueModes.CONVERSION) {
         var preparedParams = prepareConversionParams(value);
@@ -1446,6 +1280,219 @@ var parseIndicatorLink = function (formula) {
     return null;
 };
 
+// Типы, используемые в значениях элементов управления.
+exports.EWidgetFilterMode = void 0;
+(function (EWidgetFilterMode) {
+    EWidgetFilterMode["DEFAULT"] = "DEFAULT";
+    EWidgetFilterMode["SINGLE"] = "SINGLE";
+    /** @deprecated Отказ от режима фильтрации "Множественный выбор"*/
+    EWidgetFilterMode["MULTI"] = "MULTI";
+    EWidgetFilterMode["DISABLED"] = "DISABLED";
+})(exports.EWidgetFilterMode || (exports.EWidgetFilterMode = {}));
+exports.EMarkdownDisplayMode = void 0;
+(function (EMarkdownDisplayMode) {
+    EMarkdownDisplayMode["NONE"] = "NONE";
+    EMarkdownDisplayMode["INDICATOR"] = "INDICATOR";
+})(exports.EMarkdownDisplayMode || (exports.EMarkdownDisplayMode = {}));
+exports.EDisplayConditionMode = void 0;
+(function (EDisplayConditionMode) {
+    EDisplayConditionMode["DISABLED"] = "DISABLED";
+    EDisplayConditionMode["FORMULA"] = "FORMULA";
+    EDisplayConditionMode["VARIABLE"] = "VARIABLE";
+})(exports.EDisplayConditionMode || (exports.EDisplayConditionMode = {}));
+exports.EFontWeight = void 0;
+(function (EFontWeight) {
+    EFontWeight["NORMAL"] = "NORMAL";
+    EFontWeight["BOLD"] = "BOLD";
+})(exports.EFontWeight || (exports.EFontWeight = {}));
+
+function checkDisplayCondition(displayCondition, variables) {
+    var _a;
+    if ((displayCondition === null || displayCondition === void 0 ? void 0 : displayCondition.mode) === exports.EDisplayConditionMode.VARIABLE) {
+        var variableName = displayCondition.variableName, variableValue = displayCondition.variableValue;
+        var currentVariableValue = variableName && ((_a = variables.get(variableName)) === null || _a === void 0 ? void 0 : _a.value);
+        var isCurrentVariableMatch = Array.isArray(currentVariableValue)
+            ? !!variableValue && (currentVariableValue === null || currentVariableValue === void 0 ? void 0 : currentVariableValue.includes(variableValue))
+            : currentVariableValue === variableValue;
+        if (!isCurrentVariableMatch) {
+            return false;
+        }
+    }
+    return true;
+}
+function getDisplayConditionFormula(displayCondition) {
+    if ((displayCondition === null || displayCondition === void 0 ? void 0 : displayCondition.mode) === exports.EDisplayConditionMode.FORMULA) {
+        return displayCondition.formula;
+    }
+}
+var replaceDisplayCondition = function (dimension, displayCondition) {
+    return isNil(displayCondition) ? dimension : __assign(__assign({}, dimension), { displayCondition: displayCondition });
+};
+/**
+ * Шаблон формулы для проверки условия отображения.
+ *
+ * - 0 -> false
+ * - 1 -> true
+ * - 15 -> true
+ * - '0' ->	false
+ * - '1' -> true
+ * - '15' ->	true (значение по умолчанию, т.к. не преобразуется к Boolean)
+ * - 'false' -> false
+ * - 'true' -> true
+ * - 'abc' -> true (значение по умолчанию, т.к. не преобразуется к Boolean)
+ * - null -> true (значение по умолчанию, т.к. не преобразуется к Boolean)
+ */
+var displayConditionTemplate = "accurateCastOrDefault({formula}, 'Boolean', true)";
+
+exports.ELastTimeUnit = void 0;
+(function (ELastTimeUnit) {
+    ELastTimeUnit["DAYS"] = "DAYS";
+    ELastTimeUnit["MONTHS"] = "MONTHS";
+    ELastTimeUnit["YEARS"] = "YEARS";
+})(exports.ELastTimeUnit || (exports.ELastTimeUnit = {}));
+exports.EDurationUnit = void 0;
+(function (EDurationUnit) {
+    EDurationUnit["DAYS"] = "DAYS";
+    EDurationUnit["HOURS"] = "HOURS";
+    EDurationUnit["MINUTES"] = "MINUTES";
+    EDurationUnit["SECONDS"] = "SECONDS";
+})(exports.EDurationUnit || (exports.EDurationUnit = {}));
+var isRangeFilteringMethod = function (filteringMethod) {
+    return filteringMethod === formulaFilterMethods.IN_RANGE ||
+        filteringMethod === formulaFilterMethods.NOT_IN_RANGE;
+};
+var convertDateToClickHouse = function (date, showTime) {
+    var twoDigitValue = function (value) { return ("0" + value).slice(-2); };
+    var year = date.getFullYear();
+    var month = twoDigitValue(date.getMonth() + 1);
+    var day = twoDigitValue(date.getDate());
+    var hours = twoDigitValue(date.getHours());
+    var minutes = twoDigitValue(date.getMinutes());
+    var seconds = twoDigitValue(date.getSeconds());
+    var timeString = "".concat(hours, ":").concat(minutes, ":").concat(seconds);
+    var dateString = "".concat(year, "-").concat(month, "-").concat(day);
+    return showTime ? "".concat(dateString, " ").concat(timeString) : "".concat(dateString);
+};
+var subtractDurationFromDate = function (date, value, unitTime) {
+    switch (unitTime) {
+        case exports.ELastTimeUnit.DAYS:
+            date.setDate(date.getDate() - value);
+            break;
+        case exports.ELastTimeUnit.MONTHS:
+            date.setMonth(date.getMonth() - value);
+            break;
+        case exports.ELastTimeUnit.YEARS:
+            date.setFullYear(date.getFullYear() - value);
+            break;
+    }
+    return date;
+};
+var convertToSeconds = function (value, rangeUnit) {
+    if (rangeUnit === undefined) {
+        return value;
+    }
+    switch (rangeUnit) {
+        case exports.EDurationUnit.DAYS:
+            return value * 86400;
+        case exports.EDurationUnit.HOURS:
+            return value * 3600;
+        case exports.EDurationUnit.MINUTES:
+            return value * 60;
+    }
+    return value;
+};
+// todo: покрыть тестами
+var getFormulaFilterValues = function (filterValue) {
+    var _a;
+    var format = filterValue.format, filteringMethod = filterValue.filteringMethod, formValues = filterValue.formValues, checkedValues = filterValue.checkedValues;
+    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) {
+            if (isNil(value)) {
+                return String(index === 0 ? -Infinity : Infinity);
+            }
+            return String(value);
+        });
+    }
+    function convertDurationRangeToSecond(range, rangeUnit) {
+        if (range === void 0) { range = [undefined, undefined]; }
+        return range.map(function (value, index) {
+            if (isNil(value)) {
+                return String(index === 0 ? -Infinity : Infinity);
+            }
+            return String(convertToSeconds(value, rangeUnit));
+        });
+    }
+    switch (format) {
+        case exports.EFormatTypes.DATE:
+        case exports.EFormatTypes.DATETIME:
+            var _b = formValues, _c = exports.EFormulaFilterFieldKeys.date, datePickerValue = _b[_c], _d = exports.EFormulaFilterFieldKeys.dateRange, rangePickerValue = _b[_d], _e = exports.EFormulaFilterFieldKeys.lastTimeValue, lastTimeValue = _b[_e], _f = exports.EFormulaFilterFieldKeys.lastTimeUnit, lastTimeUnit = _b[_f];
+            if (isRangeFilteringMethod(filteringMethod)) {
+                return compact(rangePickerValue);
+            }
+            if (filteringMethod === formulaFilterMethods.LAST_TIME) {
+                var showTime = format === exports.EFormatTypes.DATETIME;
+                return compact([
+                    convertDateToClickHouse(subtractDurationFromDate(new Date(), lastTimeValue !== null && lastTimeValue !== void 0 ? lastTimeValue : 0, lastTimeUnit), showTime),
+                    convertDateToClickHouse(new Date(), showTime),
+                ]);
+            }
+            return compact([datePickerValue]);
+        case exports.EFormatTypes.STRING:
+            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:
+        case exports.EFormatTypes.WEEK:
+        case exports.EFormatTypes.HOUR:
+            var _g = formValues, _h = exports.EFormulaFilterFieldKeys.numberRange, numberRange = _g[_h];
+            return isRangeFilteringMethod(filteringMethod) ? stringifyNumbersRange(numberRange) : [];
+        case exports.EFormatTypes.DURATION:
+            var _j = formValues, _k = exports.EFormulaFilterFieldKeys.numberRange, durationRange = _j[_k], _l = exports.EFormulaFilterFieldKeys.durationUnit, durationUnit = _j[_l];
+            return isRangeFilteringMethod(filteringMethod)
+                ? convertDurationRangeToSecond(durationRange, durationUnit)
+                : [];
+    }
+    return [];
+};
+var mapFormulaFilterToCalculatorInput = function (filterValue) {
+    if (!filterValue) {
+        return null;
+    }
+    if (!isFormulaFilterValue(filterValue)) {
+        return {
+            dbDataType: exports.EClickHouseBaseTypes.Bool,
+            formula: fillTemplateString(displayConditionTemplate, { formula: filterValue.formula }),
+            values: ["true"],
+            filteringMethod: formulaFilterMethods.EQUAL_TO,
+        };
+    }
+    var formula = filterValue.formula, filteringMethod = filterValue.filteringMethod;
+    var dbDataType = filterValue.dbDataType;
+    if (filteringMethod === formulaFilterMethods.IN_RANGE ||
+        filteringMethod === formulaFilterMethods.NOT_IN_RANGE) {
+        var simpleType = parseClickHouseType(dbDataType).simpleType;
+        if (simpleType === exports.ESimpleDataType.INTEGER) {
+            dbDataType = exports.EClickHouseBaseTypes.Float64;
+        }
+    }
+    return {
+        formula: formula,
+        filteringMethod: filteringMethod,
+        dbDataType: dbDataType,
+        values: getFormulaFilterValues(filterValue),
+    };
+};
+var mapFormulaFiltersToInputs = function (filters) {
+    return compactMap(filters, mapFormulaFilterToCalculatorInput);
+};
+
 function mapMeasureToInput(measure, variables, addFormulas) {
     if (addFormulas === void 0) { addFormulas = function () { return new Map(); }; }
     var mainFormula = getMeasureFormula(measure);
@@ -1614,10 +1661,14 @@ var getDefaultSortOrders = function (_a) {
     if (measures.length > 0) {
         var firstMeasure = measures[0];
         if (firstMeasure) {
+            var formula = getMeasureFormula(firstMeasure);
+            if (!formula) {
+                return [];
+            }
             return [
                 {
                     direction: exports.ESortDirection.descend,
-                    formula: getMeasureFormula(firstMeasure),
+                    formula: formula,
                     dbDataType: firstMeasure.dbDataType,
                 },
             ];
@@ -1967,6 +2018,7 @@ exports.countExecutionsTemplate = countExecutionsTemplate;
 exports.dashboardLinkRegExp = dashboardLinkRegExp;
 exports.dimensionAggregationTemplates = dimensionAggregationTemplates;
 exports.dimensionTemplateFormulas = dimensionTemplateFormulas;
+exports.displayConditionTemplate = displayConditionTemplate;
 exports.durationTemplates = durationTemplates;
 exports.escapeSpecialCharacters = escapeSpecialCharacters;
 exports.eventMeasureTemplateFormulas = eventMeasureTemplateFormulas;

package/package.json

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