@infomaximum/widget-sdk 6.0.0-16 → 6.0.0-18

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 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.
 
+## [6.0.0-18](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-17...v6.0.0-18) (2025-12-16)
+
+
+### Bug Fixes
+
+* исправлено формирование формулы для разреза типа массив ([cc0b7a6](https://github.com/Infomaximum/widget-sdk/commit/cc0b7a6f82706326afdd556d5dcb4b0af184759e))
+
+## [6.0.0-17](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-16...v6.0.0-17) (2025-11-19)
+
+
+### Features
+
+* добавлен innerTemplateName для шаблонов ([7980b8a](https://github.com/Infomaximum/widget-sdk/commit/7980b8a9a18b166c74b77f8ef5cf8f9e13ca711a))
+* добавлена возможность изменять список селлекта условий отображения ([dd0c1d7](https://github.com/Infomaximum/widget-sdk/commit/dd0c1d7b8df655ad23eea77c16cbb1baa44192f7))
+
 ## [6.0.0-16](https://github.com/Infomaximum/widget-sdk/compare/v6.0.0-15...v6.0.0-16) (2025-11-13)
 
 

package/dist/index.d.ts

@@ -73,6 +73,216 @@ interface IExportColumnOrder {
     exportName: string;
 }
 
+declare enum EDimensionTemplateNames {
+    dateTime = "dateTime",
+    date = "date",
+    year = "year",
+    yearAndQuarter = "yearAndQuarter",
+    quarter = "quarter",
+    yearAndMonth = "yearAndMonth",
+    dayOfMonth = "dayOfMonth",
+    month = "month",
+    week = "week",
+    dayOfWeek = "dayOfWeek",
+    hour = "hour"
+}
+/** Стандартные шаблоны разреза */
+declare const dimensionTemplateFormulas: Record<EDimensionTemplateNames, string>;
+
+declare function getDimensionFormula({ value }: IWidgetDimension): string;
+declare function getProcessDimensionValueFormula(value: (TWidgetIndicatorAggregationValue & {
+    innerTemplateName?: string;
+}) | TWidgetIndicatorTimeValue): string | undefined;
+
+declare enum EDimensionAggregationTemplateName {
+    avg = "avg",
+    median = "median",
+    count = "count",
+    countDistinct = "countDistinct",
+    min = "min",
+    max = "max",
+    sum = "sum",
+    top = "top",
+    firstValue = "firstValue",
+    lastValue = "lastValue",
+    countExecutions = "countExecutions",
+    countReworks = "countReworks"
+}
+/** Шаблоны процессных метрик разреза с режимом AGGREGATION */
+declare const dimensionAggregationTemplates: Record<EDimensionAggregationTemplateName, string>;
+/** На основе значения режима AGGREGATION подготовить параметры для подстановки в шаблонную формулу */
+declare const prepareDimensionAggregationParams: (value: Extract<IWidgetDimension["value"], {
+    mode: EWidgetIndicatorValueModes.AGGREGATION;
+}>) => {
+    eventNameFormula: string;
+    caseCaseIdFormula: string;
+    eventName: string;
+    filters: string;
+    eventTimeFormula: string;
+    columnFormula: string;
+} | null;
+
+/** Шаблоны процессных метрик разреза с режимами START_TIME/END_TIME */
+declare const timeTemplates: {
+    START_TIME: Record<EDimensionTemplateNames, string>;
+    END_TIME: Record<EDimensionTemplateNames, string>;
+};
+/** На основе значения режимов START_TIME/END_TIME подготовить параметры для подстановки в шаблонную формулу */
+declare const prepareTimeParams: (value: TWidgetIndicatorTimeValue) => {
+    eventTimeFormula: string;
+    eventNameFormula: string;
+    caseCaseIdFormula: string;
+    filters: string;
+    eventName: string;
+} | undefined;
+
+declare function getMeasureFormula({ value }: IWidgetMeasure): string;
+
+declare enum EMeasureTemplateNames {
+    avg = "avg",
+    median = "median",
+    count = "count",
+    countDistinct = "countDistinct",
+    min = "min",
+    max = "max",
+    sum = "sum"
+}
+declare enum EMeasureInnerTemplateNames {
+    begin = "begin",
+    end = "end"
+}
+/** Стандартные шаблоны меры */
+declare const measureTemplateFormulas: {
+    readonly avg: "avg({columnFormula})";
+    readonly count: "count({columnFormula})";
+    readonly countDistinct: "count(distinct {columnFormula})";
+    readonly median: "medianExact({columnFormula})";
+    readonly min: "min({columnFormula})";
+    readonly max: "max({columnFormula})";
+    readonly sum: "sum({columnFormula})";
+};
+declare const measureInnerTemplateFormulas: {
+    readonly begin: "begin({columnFormula})";
+    readonly end: "end({columnFormula})";
+};
+
+declare enum EMeasureAggregationTemplateName {
+    agvIf = "agvIf",
+    medianIf = "medianIf",
+    countIf = "countIf",
+    countIfDistinct = "countIfDistinct",
+    minIf = "minIf",
+    maxIf = "maxIf",
+    sumIf = "sumIf",
+    top = "top",
+    firstValue = "firstValue",
+    lastValue = "lastValue",
+    countExecutions = "countExecutions",
+    countReworks = "countReworks"
+}
+/** На основе значения режима AGGREGATION подготовить параметры для подстановки в шаблонную формулу */
+declare const prepareMeasureAggregationParams: (value: Extract<IWidgetMeasure["value"], {
+    mode: EWidgetIndicatorValueModes.AGGREGATION;
+}>) => {
+    outerAggregation: EOuterAggregation;
+    eventNameFormula: string;
+    caseCaseIdFormula: string;
+    eventName: string;
+    filters: string;
+    eventTimeFormula: string;
+    columnFormula: string;
+} | 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) / countIf(\n    process(\n        countIf(\n            {startEventNameFormula} = {startEventName}{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n)";
+/** На основе значения режима CONVERSION подготовить параметры для подстановки в шаблонную формулу */
+declare const prepareConversionParams: (value: TWidgetIndicatorConversionValue) => {
+    startEventTimeFormula: string;
+    startEventNameFormula: string;
+    startEventFilters: string;
+    startEventName: string;
+    endEventTimeFormula: string;
+    endCaseCaseIdFormula: string;
+    endEventNameFormula: string;
+    endEventName: string;
+    endEventFilters: string;
+} | null;
+
+declare function createAggregationTemplate(templateName: EMeasureAggregationTemplateName, { outerAggregation, anyEvent, }: Pick<TWidgetIndicatorAggregationValue, "anyEvent"> & {
+    outerAggregation: EOuterAggregation;
+}): string;
+
+/** Шаблоны процессных метрик меры с режимом DURATION */
+declare const durationTemplates: Record<EDurationTemplateName, string>;
+/** На основе значения режима DURATION подготовить параметры для подстановки в шаблонную формулу */
+declare const prepareDurationParams: (value: TWidgetIndicatorDurationValue) => {
+    startEventTimeFormula: string;
+    startEventNameFormula: string;
+    startEventFilters: string;
+    startEventName: string;
+    startEventAggregationName: string;
+    endEventTimeFormula: string;
+    endCaseCaseIdFormula: string;
+    endEventNameFormula: string;
+    endEventName: string;
+    endEventFilters: string;
+    endEventAggregationName: string;
+} | null;
+
+declare function getEventMeasureFormula({ value }: IProcessIndicator, process: Omit<IWidgetProcess, "isValid">): string;
+
+declare enum EEventMeasureTemplateNames {
+    eventsCount = "eventsCount",
+    reworksCount = "reworksCount"
+}
+declare const eventMeasureTemplateFormulas: {
+    readonly eventsCount: "count()";
+    readonly reworksCount: "count() - uniqExact({caseCaseIdFormula})";
+};
+
+declare function getTransitionMeasureFormula({ value }: IProcessIndicator, process: Omit<IWidgetProcess, "isValid">): string;
+
+declare enum ETransitionMeasureTemplateNames {
+    transitionsCount = "transitionsCount",
+    medianTime = "medianTime"
+}
+declare const transitionMeasureTemplateFormulas: {
+    readonly transitionsCount: "count()";
+    readonly medianTime: "medianExact(date_diff(second, begin({eventTimeFormula}), end({eventTimeFormula})))";
+};
+
+declare const countExecutionsTemplate = "process(countIf({eventNameFormula} in {eventName}{filters}), {caseCaseIdFormula})";
+
+/** @deprecated - следует использовать fillTemplateSql */
+declare function fillTemplateString(templateString: string, params: Record<string, any>): string;
+/** Функция для безопасного заполнения SQL шаблонов с защитой от однострочных SQL комментариев в подставляемых значениях. */
+declare function fillTemplateSql(templateString: string, params: Record<string, string>): string;
+
+declare function generateColumnFormula(tableName: string, columnName: string): string;
+
+/**
+ * Паттерн подстроки, валидной для использования внутри фигурных скобок.
+ * Требование к подстроке - отсутствие закрывающих фигурных скобок (кроме экранированных).
+ */
+declare const curlyBracketsContentPattern: string;
+/**
+ * Паттерн подстроки, валидной для использования внутри двойных кавычек.
+ * Требование к подстроке - отсутствие двойных кавычек (кроме экранированных).
+ */
+declare const doubleQuoteContentPattern: string;
+declare const dashboardLinkRegExp: RegExp;
+declare const workspaceLinkRegExp: RegExp;
+/** Экранирование спец.символов при подстановке названий таблиц и колонок */
+declare const escapeDoubleQuoteLinkName: (str: string) => string;
+/** Экранирование спец.символов при подстановке названий переменных и показателей */
+declare const escapeCurlyBracketLinkName: (str: string) => string;
+interface IIndicatorLink {
+    /** string - имя группы пространства, null - используется текущий отчет */
+    scopeName: string | null;
+    indicatorName: string;
+}
+declare const parseIndicatorLink: (formula: string) => IIndicatorLink | null;
+
 declare enum EWidgetFilterMode {
     DEFAULT = "DEFAULT",
     SINGLE = "SINGLE",
@@ -364,10 +574,11 @@ interface ICommonDimensions {
     name: string;
     formula: string;
 }
-type TColumnIndicatorValue = {
+type TWidgetIndicatorFormulaValue = {
     mode: EWidgetIndicatorValueModes.FORMULA;
     formula?: string;
-} | {
+};
+type TWidgetIndicatorTemplateValue = {
     mode: EWidgetIndicatorValueModes.TEMPLATE;
     /** Имя шаблонной формулы, использующей колонку таблицы */
     templateName?: string;
@@ -376,6 +587,13 @@ type TColumnIndicatorValue = {
     /** Имя колонки */
     columnName?: string;
 };
+type TMeasureValue = TWidgetIndicatorFormulaValue | (TWidgetIndicatorTemplateValue & {
+    innerTemplateName?: EMeasureInnerTemplateNames;
+});
+type TDimensionValue = TWidgetIndicatorFormulaValue | (TWidgetIndicatorTemplateValue & {
+    innerTemplateName?: never;
+});
+type TColumnIndicatorValue = TMeasureValue | TDimensionValue;
 declare enum EFormatOrFormattingMode {
     BASE = "BASE",
     TEMPLATE = "TEMPLATE"
@@ -1472,6 +1690,7 @@ interface IFormulaControl {
         indicatorConfig?: ({
             type: "measure";
             templates?: TWidgetMeasureData["templates"];
+            innerTemplateNames?: EMeasureInnerTemplateNames[];
         } & {
             /** @deprecated временное решение для виджета "Воронка", не следует использовать [BI-14710] */
             allowClear?: boolean;
@@ -1556,6 +1775,7 @@ interface IDisplayConditionControl {
     props: {
         isInMeasure?: boolean;
         labelFontSize?: number;
+        modes?: EDisplayConditionMode[];
     };
 }
 interface IColorPickerControl {
@@ -1917,208 +2137,6 @@ interface ICalculatorFactory {
     type: (options?: ICalculatorOptions) => ITypeCalculator;
 }
 
-declare enum EDimensionTemplateNames {
-    dateTime = "dateTime",
-    date = "date",
-    year = "year",
-    yearAndQuarter = "yearAndQuarter",
-    quarter = "quarter",
-    yearAndMonth = "yearAndMonth",
-    dayOfMonth = "dayOfMonth",
-    month = "month",
-    week = "week",
-    dayOfWeek = "dayOfWeek",
-    hour = "hour"
-}
-/** Стандартные шаблоны разреза */
-declare const dimensionTemplateFormulas: Record<EDimensionTemplateNames, string>;
-
-declare function getDimensionFormula({ value }: IWidgetDimension): string;
-declare function getProcessDimensionValueFormula(value: (TWidgetIndicatorAggregationValue & {
-    innerTemplateName?: string;
-}) | TWidgetIndicatorTimeValue): string | undefined;
-
-declare enum EDimensionAggregationTemplateName {
-    avg = "avg",
-    median = "median",
-    count = "count",
-    countDistinct = "countDistinct",
-    min = "min",
-    max = "max",
-    sum = "sum",
-    top = "top",
-    firstValue = "firstValue",
-    lastValue = "lastValue",
-    countExecutions = "countExecutions",
-    countReworks = "countReworks"
-}
-/** Шаблоны процессных метрик разреза с режимом AGGREGATION */
-declare const dimensionAggregationTemplates: Record<EDimensionAggregationTemplateName, string>;
-/** На основе значения режима AGGREGATION подготовить параметры для подстановки в шаблонную формулу */
-declare const prepareDimensionAggregationParams: (value: Extract<IWidgetDimension["value"], {
-    mode: EWidgetIndicatorValueModes.AGGREGATION;
-}>) => {
-    eventNameFormula: string;
-    caseCaseIdFormula: string;
-    eventName: string;
-    filters: string;
-    eventTimeFormula: string;
-    columnFormula: string;
-} | null;
-
-/** Шаблоны процессных метрик разреза с режимами START_TIME/END_TIME */
-declare const timeTemplates: {
-    START_TIME: Record<EDimensionTemplateNames, string>;
-    END_TIME: Record<EDimensionTemplateNames, string>;
-};
-/** На основе значения режимов START_TIME/END_TIME подготовить параметры для подстановки в шаблонную формулу */
-declare const prepareTimeParams: (value: TWidgetIndicatorTimeValue) => {
-    eventTimeFormula: string;
-    eventNameFormula: string;
-    caseCaseIdFormula: string;
-    filters: string;
-    eventName: string;
-} | undefined;
-
-declare function getMeasureFormula({ value }: IWidgetMeasure): string;
-
-declare enum EMeasureTemplateNames {
-    avg = "avg",
-    median = "median",
-    count = "count",
-    countDistinct = "countDistinct",
-    min = "min",
-    max = "max",
-    sum = "sum"
-}
-/** Стандартные шаблоны меры */
-declare const measureTemplateFormulas: {
-    readonly avg: "avg({columnFormula})";
-    readonly count: "count({columnFormula})";
-    readonly countDistinct: "count(distinct {columnFormula})";
-    readonly median: "medianExact({columnFormula})";
-    readonly min: "min({columnFormula})";
-    readonly max: "max({columnFormula})";
-    readonly sum: "sum({columnFormula})";
-};
-
-declare enum EMeasureAggregationTemplateName {
-    agvIf = "agvIf",
-    medianIf = "medianIf",
-    countIf = "countIf",
-    countIfDistinct = "countIfDistinct",
-    minIf = "minIf",
-    maxIf = "maxIf",
-    sumIf = "sumIf",
-    top = "top",
-    firstValue = "firstValue",
-    lastValue = "lastValue",
-    countExecutions = "countExecutions",
-    countReworks = "countReworks"
-}
-/** На основе значения режима AGGREGATION подготовить параметры для подстановки в шаблонную формулу */
-declare const prepareMeasureAggregationParams: (value: Extract<IWidgetMeasure["value"], {
-    mode: EWidgetIndicatorValueModes.AGGREGATION;
-}>) => {
-    outerAggregation: EOuterAggregation;
-    eventNameFormula: string;
-    caseCaseIdFormula: string;
-    eventName: string;
-    filters: string;
-    eventTimeFormula: string;
-    columnFormula: string;
-} | 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) / countIf(\n    process(\n        countIf(\n            {startEventNameFormula} = {startEventName}{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n)";
-/** На основе значения режима CONVERSION подготовить параметры для подстановки в шаблонную формулу */
-declare const prepareConversionParams: (value: TWidgetIndicatorConversionValue) => {
-    startEventTimeFormula: string;
-    startEventNameFormula: string;
-    startEventFilters: string;
-    startEventName: string;
-    endEventTimeFormula: string;
-    endCaseCaseIdFormula: string;
-    endEventNameFormula: string;
-    endEventName: string;
-    endEventFilters: string;
-} | null;
-
-declare function createAggregationTemplate(templateName: EMeasureAggregationTemplateName, { outerAggregation, anyEvent, }: Pick<TWidgetIndicatorAggregationValue, "anyEvent"> & {
-    outerAggregation: EOuterAggregation;
-}): string;
-
-/** Шаблоны процессных метрик меры с режимом DURATION */
-declare const durationTemplates: Record<EDurationTemplateName, string>;
-/** На основе значения режима DURATION подготовить параметры для подстановки в шаблонную формулу */
-declare const prepareDurationParams: (value: TWidgetIndicatorDurationValue) => {
-    startEventTimeFormula: string;
-    startEventNameFormula: string;
-    startEventFilters: string;
-    startEventName: string;
-    startEventAggregationName: string;
-    endEventTimeFormula: string;
-    endCaseCaseIdFormula: string;
-    endEventNameFormula: string;
-    endEventName: string;
-    endEventFilters: string;
-    endEventAggregationName: string;
-} | null;
-
-declare function getEventMeasureFormula({ value }: IProcessIndicator, process: Omit<IWidgetProcess, "isValid">): string;
-
-declare enum EEventMeasureTemplateNames {
-    eventsCount = "eventsCount",
-    reworksCount = "reworksCount"
-}
-declare const eventMeasureTemplateFormulas: {
-    readonly eventsCount: "count()";
-    readonly reworksCount: "count() - uniqExact({caseCaseIdFormula})";
-};
-
-declare function getTransitionMeasureFormula({ value }: IProcessIndicator, process: Omit<IWidgetProcess, "isValid">): string;
-
-declare enum ETransitionMeasureTemplateNames {
-    transitionsCount = "transitionsCount",
-    medianTime = "medianTime"
-}
-declare const transitionMeasureTemplateFormulas: {
-    readonly transitionsCount: "count()";
-    readonly medianTime: "medianExact(date_diff(second, begin({eventTimeFormula}), end({eventTimeFormula})))";
-};
-
-declare const countExecutionsTemplate = "process(countIf({eventNameFormula} in {eventName}{filters}), {caseCaseIdFormula})";
-
-/** @deprecated - следует использовать fillTemplateSql */
-declare function fillTemplateString(templateString: string, params: Record<string, any>): string;
-/** Функция для безопасного заполнения SQL шаблонов с защитой от однострочных SQL комментариев в подставляемых значениях. */
-declare function fillTemplateSql(templateString: string, params: Record<string, string>): string;
-
-declare function generateColumnFormula(tableName: string, columnName: string): string;
-
-/**
- * Паттерн подстроки, валидной для использования внутри фигурных скобок.
- * Требование к подстроке - отсутствие закрывающих фигурных скобок (кроме экранированных).
- */
-declare const curlyBracketsContentPattern: string;
-/**
- * Паттерн подстроки, валидной для использования внутри двойных кавычек.
- * Требование к подстроке - отсутствие двойных кавычек (кроме экранированных).
- */
-declare const doubleQuoteContentPattern: string;
-declare const dashboardLinkRegExp: RegExp;
-declare const workspaceLinkRegExp: RegExp;
-/** Экранирование спец.символов при подстановке названий таблиц и колонок */
-declare const escapeDoubleQuoteLinkName: (str: string) => string;
-/** Экранирование спец.символов при подстановке названий переменных и показателей */
-declare const escapeCurlyBracketLinkName: (str: string) => string;
-interface IIndicatorLink {
-    /** string - имя группы пространства, null - используется текущий отчет */
-    scopeName: string | null;
-    indicatorName: string;
-}
-declare const parseIndicatorLink: (formula: string) => IIndicatorLink | null;
-
 interface ILens<T extends TNullable<object>, Value> {
     get(obj: T): TNullable<Value>;
     set(obj: T, value: Value): void;
@@ -2755,4 +2773,4 @@ declare global {
     }
 }
 
-export { EActionButtonsTypes, EActionTypes, EActivateConditionMode, EAutoUpdateMode, ECalculatorFilterMethods, EClickHouseBaseTypes, EColorMode, EControlType, ECustomSelectTemplates, EDataModelOption, EDimensionAggregationTemplateName, EDimensionProcessFilterTimeUnit, EDimensionTemplateNames, EDisplayConditionMode, EDrawerPlacement, EDurationTemplateName, EDurationUnit, EEventAppearances, EEventMeasureTemplateNames, EFontWeight, EFormatOrFormattingMode, 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 IActionButton, 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 ICalculatorOptions, type ICollapseRecord, type IColorPickerControl, type IColoredValue, type ICommonDimensions, type ICommonMeasures, type ICommonState, type IControlRecord, type ICustomAddButtonProps, type ICustomWidgetProps, type IDefinition, type IDimensionProcessFilter, 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 IInputTemplatedControl, type ILens, type IMarkdownMeasure, type IMeasureAddButtonProps, type IPanelDescription, type IPanelDescriptionCreator, type IParameterColumnList, type IParameterFromAggregation, type IParameterFromColumn, type IParameterFromDynamicList, type IParameterFromEndEvent, type IParameterFromEvent, type IParameterFromFormula, type IParameterFromManualInput, type IParameterFromStartEvent, type IParameterFromStaticList, type IParameterFromVariable, type IParameterTableList, 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 IViewAction, 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 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 THintPlacement, type TLaunchActionParams, type TMeasureAddButtonSelectOption, type TMigrateProcessor, type TMigrationStruct, type TParameterFromDataModel, type TProcessIndicatorValue, type TRecordAccessor, type TSelectChildOptions, type TSelectFetchNodes, type TSelectivePartial, type TSettingsFilter, type TSortDirection, type TUpdateSelection, type TValuePath, type TVersion, type TViewActionParameter, type TWidgetActionParameter, type TWidgetContainer, type TWidgetDimensionData, type TWidgetFilterValue, type TWidgetFiltering, type TWidgetIndicatorAggregationValue, type TWidgetIndicatorConversionValue, type TWidgetIndicatorDurationValue, type TWidgetIndicatorTimeValue, type TWidgetLevelRecord, type TWidgetMeasureData, type TWidgetSortingValue, type TWidgetVariable, applyIndexToArrayFormula, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, clearMultiLineComments, clearSingleLineComments, colors, conversionTemplate, convertFiltersToFormula, convertToFormulasChain, countExecutionsTemplate, createEscaper, createAggregationTemplate as createMeasureAggregationTemplate, curlyBracketsContentPattern, dashboardLinkRegExp, dimensionAggregationTemplates, dimensionTemplateFormulas, displayConditionTemplate, doubleQuoteContentPattern, durationTemplates, escapeCurlyBracketLinkName, escapeDoubleQuoteLinkName, eventMeasureTemplateFormulas, fillTemplateSql, fillTemplateString, formattingConfig, formulaFilterMethods, generateColumnFormula, getColorByIndex, getDefaultSortOrders, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getProcessDimensionValueFormula, getRuleColor, getTransitionMeasureFormula, isDimensionProcessFilter, isDimensionsHierarchy, isFormulaFilterValue, isValidColor, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSettingsFiltersToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, measureTemplateFormulas, parseClickHouseType, parseIndicatorLink, prepareConversionParams, prepareDimensionAggregationParams, prepareDurationParams, prepareFormulaForSql, prepareMeasureAggregationParams, prepareSortOrders, prepareTimeParams, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, timeTemplates, transitionMeasureTemplateFormulas, unescapeSpecialCharacters, updateDefaultModeSelection, updateSingleModeSelection, workspaceLinkRegExp };
+export { EActionButtonsTypes, EActionTypes, EActivateConditionMode, EAutoUpdateMode, ECalculatorFilterMethods, EClickHouseBaseTypes, EColorMode, EControlType, ECustomSelectTemplates, EDataModelOption, EDimensionAggregationTemplateName, EDimensionProcessFilterTimeUnit, EDimensionTemplateNames, EDisplayConditionMode, EDrawerPlacement, EDurationTemplateName, EDurationUnit, EEventAppearances, EEventMeasureTemplateNames, EFontWeight, EFormatOrFormattingMode, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMarkdownDisplayMode, EMeasureAggregationTemplateName, EMeasureInnerTemplateNames, EMeasureTemplateNames, EOuterAggregation, EProcessFilterNames, ESelectOptionTypes, ESimpleDataType, ESimpleInputType, ESortDirection, ESortingValueModes, ESystemRecordKey, ETransitionMeasureTemplateNames, EUnitMode, EViewMode, EViewOpenIn, EWidgetActionInputMethod, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, type IActionButton, 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 ICalculatorOptions, type ICollapseRecord, type IColorPickerControl, type IColoredValue, type ICommonDimensions, type ICommonMeasures, type ICommonState, type IControlRecord, type ICustomAddButtonProps, type ICustomWidgetProps, type IDefinition, type IDimensionProcessFilter, 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 IInputTemplatedControl, type ILens, type IMarkdownMeasure, type IMeasureAddButtonProps, type IPanelDescription, type IPanelDescriptionCreator, type IParameterColumnList, type IParameterFromAggregation, type IParameterFromColumn, type IParameterFromDynamicList, type IParameterFromEndEvent, type IParameterFromEvent, type IParameterFromFormula, type IParameterFromManualInput, type IParameterFromStartEvent, type IParameterFromStaticList, type IParameterFromVariable, type IParameterTableList, 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 IViewAction, 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 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 TDimensionValue, type TDisplayCondition, type TDisplayMode, type TEmptyRecord, type TExtendedFormulaFilterValue, type TFiltrationAccessibility, type TGroupLevelRecord, type THintPlacement, type TLaunchActionParams, type TMeasureAddButtonSelectOption, type TMeasureValue, type TMigrateProcessor, type TMigrationStruct, type TParameterFromDataModel, type TProcessIndicatorValue, type TRecordAccessor, type TSelectChildOptions, type TSelectFetchNodes, type TSelectivePartial, type TSettingsFilter, type TSortDirection, type TUpdateSelection, type TValuePath, type TVersion, type TViewActionParameter, type TWidgetActionParameter, type TWidgetContainer, type TWidgetDimensionData, type TWidgetFilterValue, type TWidgetFiltering, type TWidgetIndicatorAggregationValue, type TWidgetIndicatorConversionValue, type TWidgetIndicatorDurationValue, type TWidgetIndicatorFormulaValue, type TWidgetIndicatorTemplateValue, type TWidgetIndicatorTimeValue, type TWidgetLevelRecord, type TWidgetMeasureData, type TWidgetSortingValue, type TWidgetVariable, applyIndexToArrayFormula, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, clearMultiLineComments, clearSingleLineComments, colors, conversionTemplate, convertFiltersToFormula, convertToFormulasChain, countExecutionsTemplate, createEscaper, createAggregationTemplate as createMeasureAggregationTemplate, curlyBracketsContentPattern, dashboardLinkRegExp, dimensionAggregationTemplates, dimensionTemplateFormulas, displayConditionTemplate, doubleQuoteContentPattern, durationTemplates, escapeCurlyBracketLinkName, escapeDoubleQuoteLinkName, eventMeasureTemplateFormulas, fillTemplateSql, fillTemplateString, formattingConfig, formulaFilterMethods, generateColumnFormula, getColorByIndex, getDefaultSortOrders, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getProcessDimensionValueFormula, getRuleColor, getTransitionMeasureFormula, isDimensionProcessFilter, isDimensionsHierarchy, isFormulaFilterValue, isValidColor, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSettingsFiltersToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, measureInnerTemplateFormulas, measureTemplateFormulas, parseClickHouseType, parseIndicatorLink, prepareConversionParams, prepareDimensionAggregationParams, prepareDurationParams, prepareFormulaForSql, prepareMeasureAggregationParams, prepareSortOrders, prepareTimeParams, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, timeTemplates, transitionMeasureTemplateFormulas, unescapeSpecialCharacters, updateDefaultModeSelection, updateSingleModeSelection, workspaceLinkRegExp };

package/dist/index.esm.js

@@ -1203,7 +1203,7 @@ var prepareMeasureAggregationParams = function (value) {
     return columnParams;
 };
 
-var _a$3;
+var _a$3, _b;
 var EMeasureTemplateNames;
 (function (EMeasureTemplateNames) {
     EMeasureTemplateNames["avg"] = "avg";
@@ -1214,6 +1214,11 @@ var EMeasureTemplateNames;
     EMeasureTemplateNames["max"] = "max";
     EMeasureTemplateNames["sum"] = "sum";
 })(EMeasureTemplateNames || (EMeasureTemplateNames = {}));
+var EMeasureInnerTemplateNames;
+(function (EMeasureInnerTemplateNames) {
+    EMeasureInnerTemplateNames["begin"] = "begin";
+    EMeasureInnerTemplateNames["end"] = "end";
+})(EMeasureInnerTemplateNames || (EMeasureInnerTemplateNames = {}));
 /** Стандартные шаблоны меры */
 var measureTemplateFormulas = (_a$3 = {},
     _a$3[EMeasureTemplateNames.avg] = "avg({columnFormula})",
@@ -1224,6 +1229,10 @@ var measureTemplateFormulas = (_a$3 = {},
     _a$3[EMeasureTemplateNames.max] = "max({columnFormula})",
     _a$3[EMeasureTemplateNames.sum] = "sum({columnFormula})",
     _a$3);
+var measureInnerTemplateFormulas = (_b = {},
+    _b[EMeasureInnerTemplateNames.begin] = "begin({columnFormula})",
+    _b[EMeasureInnerTemplateNames.end] = "end({columnFormula})",
+    _b);
 
 /** Шаблон процессной метрики меры с режимом 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) / countIf(\n    process(\n        countIf(\n            {startEventNameFormula} = {startEventName}{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n)";
@@ -1366,13 +1375,18 @@ function getMeasureFormula(_a) {
         return (_b = value.formula) !== null && _b !== void 0 ? _b : "";
     }
     if (value.mode === EWidgetIndicatorValueModes.TEMPLATE) {
-        var templateName = value.templateName, tableName = value.tableName, columnName = value.columnName;
+        var templateName = value.templateName, tableName = value.tableName, columnName = value.columnName, innerTemplateName = value.innerTemplateName;
         var templateFormula = measureTemplateFormulas[templateName];
         if (!templateFormula || !tableName || !columnName) {
             return "";
         }
+        var columnFormula = innerTemplateName
+            ? fillTemplateSql(measureInnerTemplateFormulas[innerTemplateName], {
+                columnFormula: generateColumnFormula(tableName, columnName),
+            })
+            : generateColumnFormula(tableName, columnName);
         return fillTemplateSql(templateFormula, {
-            columnFormula: generateColumnFormula(tableName, columnName),
+            columnFormula: columnFormula,
         });
     }
     if (value.mode === EWidgetIndicatorValueModes.AGGREGATION) {
@@ -1632,7 +1646,9 @@ var getFormulaFilterValues = function (filterValue) {
     }
     return [];
 };
-var applyIndexToArrayFormula = function (formula, index) { return "".concat(formula, "[").concat(index, "]"); };
+var applyIndexToArrayFormula = function (formula, index) {
+    return "(".concat(formula, ")[").concat(index, "]");
+};
 var mapFormulaFilterToCalculatorInput = function (filterValue) {
     if (!filterValue) {
         return null;
@@ -2209,4 +2225,4 @@ var getColorByIndex = function (index) {
     return color;
 };
 
-export { EActionButtonsTypes, EActionTypes, EActivateConditionMode, EAutoUpdateMode, ECalculatorFilterMethods, EClickHouseBaseTypes, EColorMode, EControlType, ECustomSelectTemplates, EDataModelOption, EDimensionAggregationTemplateName, EDimensionProcessFilterTimeUnit, EDimensionTemplateNames, EDisplayConditionMode, EDrawerPlacement, EDurationTemplateName, EDurationUnit, EEventAppearances, EEventMeasureTemplateNames, EFontWeight, EFormatOrFormattingMode, 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, applyIndexToArrayFormula, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, clearMultiLineComments, clearSingleLineComments, colors, conversionTemplate, convertFiltersToFormula, convertToFormulasChain, countExecutionsTemplate, createEscaper, createAggregationTemplate as createMeasureAggregationTemplate, curlyBracketsContentPattern, dashboardLinkRegExp, dimensionAggregationTemplates, dimensionTemplateFormulas, displayConditionTemplate, doubleQuoteContentPattern, durationTemplates, escapeCurlyBracketLinkName, escapeDoubleQuoteLinkName, eventMeasureTemplateFormulas, fillTemplateSql, fillTemplateString, formattingConfig, formulaFilterMethods, generateColumnFormula, getColorByIndex, getDefaultSortOrders, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getProcessDimensionValueFormula, getRuleColor, getTransitionMeasureFormula, isDimensionProcessFilter, isDimensionsHierarchy, isFormulaFilterValue, isValidColor, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSettingsFiltersToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, measureTemplateFormulas, parseClickHouseType, parseIndicatorLink, prepareConversionParams, prepareDimensionAggregationParams, prepareDurationParams, prepareFormulaForSql, prepareMeasureAggregationParams, prepareSortOrders, prepareTimeParams, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, timeTemplates, transitionMeasureTemplateFormulas, unescapeSpecialCharacters, updateDefaultModeSelection, updateSingleModeSelection, workspaceLinkRegExp };
+export { EActionButtonsTypes, EActionTypes, EActivateConditionMode, EAutoUpdateMode, ECalculatorFilterMethods, EClickHouseBaseTypes, EColorMode, EControlType, ECustomSelectTemplates, EDataModelOption, EDimensionAggregationTemplateName, EDimensionProcessFilterTimeUnit, EDimensionTemplateNames, EDisplayConditionMode, EDrawerPlacement, EDurationTemplateName, EDurationUnit, EEventAppearances, EEventMeasureTemplateNames, EFontWeight, EFormatOrFormattingMode, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMarkdownDisplayMode, EMeasureAggregationTemplateName, EMeasureInnerTemplateNames, EMeasureTemplateNames, EOuterAggregation, EProcessFilterNames, ESelectOptionTypes, ESimpleDataType, ESimpleInputType, ESortDirection, ESortingValueModes, ESystemRecordKey, ETransitionMeasureTemplateNames, EUnitMode, EViewMode, EViewOpenIn, EWidgetActionInputMethod, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, OuterAggregation, applyIndexToArrayFormula, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, clearMultiLineComments, clearSingleLineComments, colors, conversionTemplate, convertFiltersToFormula, convertToFormulasChain, countExecutionsTemplate, createEscaper, createAggregationTemplate as createMeasureAggregationTemplate, curlyBracketsContentPattern, dashboardLinkRegExp, dimensionAggregationTemplates, dimensionTemplateFormulas, displayConditionTemplate, doubleQuoteContentPattern, durationTemplates, escapeCurlyBracketLinkName, escapeDoubleQuoteLinkName, eventMeasureTemplateFormulas, fillTemplateSql, fillTemplateString, formattingConfig, formulaFilterMethods, generateColumnFormula, getColorByIndex, getDefaultSortOrders, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getProcessDimensionValueFormula, getRuleColor, getTransitionMeasureFormula, isDimensionProcessFilter, isDimensionsHierarchy, isFormulaFilterValue, isValidColor, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSettingsFiltersToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, measureInnerTemplateFormulas, measureTemplateFormulas, parseClickHouseType, parseIndicatorLink, prepareConversionParams, prepareDimensionAggregationParams, prepareDurationParams, prepareFormulaForSql, prepareMeasureAggregationParams, prepareSortOrders, prepareTimeParams, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, timeTemplates, transitionMeasureTemplateFormulas, unescapeSpecialCharacters, updateDefaultModeSelection, updateSingleModeSelection, workspaceLinkRegExp };

package/dist/index.js

@@ -1204,7 +1204,7 @@ var prepareMeasureAggregationParams = function (value) {
     return columnParams;
 };
 
-var _a$3;
+var _a$3, _b;
 exports.EMeasureTemplateNames = void 0;
 (function (EMeasureTemplateNames) {
     EMeasureTemplateNames["avg"] = "avg";
@@ -1215,6 +1215,11 @@ exports.EMeasureTemplateNames = void 0;
     EMeasureTemplateNames["max"] = "max";
     EMeasureTemplateNames["sum"] = "sum";
 })(exports.EMeasureTemplateNames || (exports.EMeasureTemplateNames = {}));
+exports.EMeasureInnerTemplateNames = void 0;
+(function (EMeasureInnerTemplateNames) {
+    EMeasureInnerTemplateNames["begin"] = "begin";
+    EMeasureInnerTemplateNames["end"] = "end";
+})(exports.EMeasureInnerTemplateNames || (exports.EMeasureInnerTemplateNames = {}));
 /** Стандартные шаблоны меры */
 var measureTemplateFormulas = (_a$3 = {},
     _a$3[exports.EMeasureTemplateNames.avg] = "avg({columnFormula})",
@@ -1225,6 +1230,10 @@ var measureTemplateFormulas = (_a$3 = {},
     _a$3[exports.EMeasureTemplateNames.max] = "max({columnFormula})",
     _a$3[exports.EMeasureTemplateNames.sum] = "sum({columnFormula})",
     _a$3);
+var measureInnerTemplateFormulas = (_b = {},
+    _b[exports.EMeasureInnerTemplateNames.begin] = "begin({columnFormula})",
+    _b[exports.EMeasureInnerTemplateNames.end] = "end({columnFormula})",
+    _b);
 
 /** Шаблон процессной метрики меры с режимом 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) / countIf(\n    process(\n        countIf(\n            {startEventNameFormula} = {startEventName}{startEventFilters}\n        ) != 0, \n        {endCaseCaseIdFormula}\n    ) != 0\n)";
@@ -1367,13 +1376,18 @@ function getMeasureFormula(_a) {
         return (_b = value.formula) !== null && _b !== void 0 ? _b : "";
     }
     if (value.mode === exports.EWidgetIndicatorValueModes.TEMPLATE) {
-        var templateName = value.templateName, tableName = value.tableName, columnName = value.columnName;
+        var templateName = value.templateName, tableName = value.tableName, columnName = value.columnName, innerTemplateName = value.innerTemplateName;
         var templateFormula = measureTemplateFormulas[templateName];
         if (!templateFormula || !tableName || !columnName) {
             return "";
         }
+        var columnFormula = innerTemplateName
+            ? fillTemplateSql(measureInnerTemplateFormulas[innerTemplateName], {
+                columnFormula: generateColumnFormula(tableName, columnName),
+            })
+            : generateColumnFormula(tableName, columnName);
         return fillTemplateSql(templateFormula, {
-            columnFormula: generateColumnFormula(tableName, columnName),
+            columnFormula: columnFormula,
         });
     }
     if (value.mode === exports.EWidgetIndicatorValueModes.AGGREGATION) {
@@ -1633,7 +1647,9 @@ var getFormulaFilterValues = function (filterValue) {
     }
     return [];
 };
-var applyIndexToArrayFormula = function (formula, index) { return "".concat(formula, "[").concat(index, "]"); };
+var applyIndexToArrayFormula = function (formula, index) {
+    return "(".concat(formula, ")[").concat(index, "]");
+};
 var mapFormulaFilterToCalculatorInput = function (filterValue) {
     if (!filterValue) {
         return null;
@@ -2268,6 +2284,7 @@ exports.mapMeasuresToInputs = mapMeasuresToInputs;
 exports.mapSettingsFiltersToInputs = mapSettingsFiltersToInputs;
 exports.mapSortingToInputs = mapSortingToInputs;
 exports.mapTransitionMeasuresToInputs = mapTransitionMeasuresToInputs;
+exports.measureInnerTemplateFormulas = measureInnerTemplateFormulas;
 exports.measureTemplateFormulas = measureTemplateFormulas;
 exports.parseClickHouseType = parseClickHouseType;
 exports.parseIndicatorLink = parseIndicatorLink;

package/package.json

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