@infomaximum/widget-sdk 6.0.0-view-theme.9 → 6.0.0-view-theme.11

package/dist/index.esm.js

@@ -79,22 +79,22 @@ var AutoIdentifiedArrayItemSchema = function (z) {
 };
 var BaseWidgetSettingsSchema = function (z) {
     return z.object({
-        title: z.string().optional(),
-        titleSize: z.number().optional(),
-        titleColor: ColorSchema(z).optional(),
-        titleWeight: z.enum(EFontWeight).optional(),
-        stateName: z.string().nullable().optional(),
-        showMarkdown: z.boolean().optional(),
-        markdownMeasures: z.array(MarkdownMeasureSchema(z)).optional(),
-        markdownText: z.string().optional(),
-        markdownTextSize: z.number().optional(),
-        filters: z.array(SettingsFilterSchema(z)).optional(),
-        filterMode: z.enum(EWidgetFilterMode).optional(),
-        ignoreFilters: z.boolean().optional(),
-        sorting: z.array(WidgetSortingIndicatorSchema(z)).optional(),
-        actionButtons: z.array(ActionButtonSchema(z)).optional(),
-        paddings: z.union([z.number(), z.string()]).optional(),
-        viewTheme: z.boolean().optional(),
+        title: z.string().default(""),
+        titleSize: z.number().default(14),
+        titleColor: ColorSchema(z).default({ mode: EColorMode.AUTO }),
+        titleWeight: z.enum(EFontWeight).default(EFontWeight.NORMAL),
+        stateName: z.string().nullable().default(null),
+        showMarkdown: z.boolean().default(false),
+        markdownMeasures: z.array(MarkdownMeasureSchema(z)).default([]),
+        markdownText: z.string().default(""),
+        markdownTextSize: z.number().default(14),
+        filters: z.array(SettingsFilterSchema(z)).default([]),
+        filterMode: z.enum(EWidgetFilterMode).default(EWidgetFilterMode.DEFAULT),
+        ignoreFilters: z.boolean().default(false),
+        sorting: z.array(WidgetSortingIndicatorSchema(z)).default([]),
+        actionButtons: z.array(ActionButtonSchema(z)).default([]),
+        paddings: z.union([z.number(), z.string()]).default(8),
+        viewTheme: z.boolean().default(false),
     });
 };
 
@@ -615,24 +615,43 @@ var WidgetColumnIndicatorSchema = function (z) {
         dbDataType: z.string().optional(),
         format: FormatSchema(z).optional(),
         formatting: FormattingSchema(z).optional(),
-        displayCondition: DisplayConditionSchema(z).optional(),
+        displayCondition: DisplayConditionSchema(z).default({ mode: EDisplayConditionMode.DISABLED }),
         onClick: z.array(ActionsOnClickSchema(z)).optional(),
     });
 };
+var WidgetIndicatorFormulaValueSchema = function (z) {
+    return z.object({
+        mode: z.literal(EWidgetIndicatorValueModes.FORMULA),
+        formula: z.string().optional(),
+    });
+};
+var WidgetIndicatorTemplateValueSchema = function (z) {
+    return z.object({
+        mode: z.literal(EWidgetIndicatorValueModes.TEMPLATE),
+        /** Имя шаблонной формулы, использующей колонку таблицы */
+        templateName: z.string().optional(),
+        /** Имя таблицы */
+        tableName: z.string().optional(),
+        /** Имя колонки */
+        columnName: z.string().optional(),
+    });
+};
 var ColumnIndicatorValueSchema = function (z) {
+    return z.union([MeasureValueSchema(z), DimensionValueSchema(z)]);
+};
+var MeasureValueSchema = function (z) {
     return z.discriminatedUnion("mode", [
-        z.object({
-            mode: z.literal(EWidgetIndicatorValueModes.FORMULA),
-            formula: z.string().optional(),
+        WidgetIndicatorFormulaValueSchema(z),
+        WidgetIndicatorTemplateValueSchema(z).extend({
+            innerTemplateName: z.enum(EMeasureInnerTemplateNames).optional(),
         }),
-        z.object({
-            mode: z.literal(EWidgetIndicatorValueModes.TEMPLATE),
-            /** Имя шаблонной формулы, использующей колонку таблицы */
-            templateName: z.string().optional(),
-            /** Имя таблицы */
-            tableName: z.string().optional(),
-            /** Имя колонки */
-            columnName: z.string().optional(),
+    ]);
+};
+var DimensionValueSchema = function (z) {
+    return z.discriminatedUnion("mode", [
+        WidgetIndicatorFormulaValueSchema(z),
+        WidgetIndicatorTemplateValueSchema(z).extend({
+            innerTemplateName: z.never().optional(),
         }),
     ]);
 };
@@ -670,7 +689,7 @@ var WidgetDimensionSchema = function (z) {
     return WidgetColumnIndicatorSchema(z).extend({
         value: z
             .discriminatedUnion("mode", [
-            ColumnIndicatorValueSchema(z),
+            DimensionValueSchema(z),
             WidgetIndicatorAggregationValueSchema(z).extend({
                 innerTemplateName: z.string().optional(),
             }),
@@ -684,7 +703,7 @@ var WidgetDimensionHierarchySchema = function (z, dimensionSchema) {
     return AutoIdentifiedArrayItemSchema(z).extend({
         name: z.string(),
         hierarchyDimensions: z.array(dimensionSchema).default([]),
-        displayCondition: DisplayConditionSchema(z).optional(),
+        displayCondition: DisplayConditionSchema(z).default({ mode: EDisplayConditionMode.DISABLED }),
     });
 };
 var WidgetIndicatorConversionValue = function (z) {
@@ -715,7 +734,7 @@ var WidgetMeasureSchema = function (z) {
     return WidgetColumnIndicatorSchema(z).extend({
         value: z
             .discriminatedUnion("mode", [
-            ColumnIndicatorValueSchema(z),
+            MeasureValueSchema(z),
             WidgetIndicatorAggregationValueSchema(z).extend({
                 outerAggregation: z.enum(EOuterAggregation),
             }),
@@ -755,7 +774,7 @@ var ProcessIndicatorSchema = function (z) {
         dbDataType: z.string().optional(),
         format: FormatSchema(z).optional(),
         formatting: FormattingSchema(z).optional(),
-        displayCondition: DisplayConditionSchema(z).optional(),
+        displayCondition: DisplayConditionSchema(z).default({ mode: EDisplayConditionMode.DISABLED }),
     });
 };
 
@@ -886,8 +905,8 @@ var ParameterFromManualInputSchema = function (z) {
 var ParameterFromStaticListSchema = function (z) {
     return z.object({
         inputMethod: z.literal(EWidgetActionInputMethod.STATIC_LIST),
-        options: z.string(),
-        defaultValue: z.union([z.string(), z.array(z.string())]),
+        options: z.string().default(""),
+        defaultValue: z.union([z.string(), z.array(z.string())]).default(""),
         acceptEmptyValue: z.boolean().optional(),
     });
 };
@@ -970,7 +989,7 @@ var ActivateConditionSchema = function (z) {
 var ActionRunScriptSchema = function (z) {
     return ActionCommonSchema(z).extend({
         type: z.literal(EActionTypes.EXECUTE_SCRIPT),
-        parameters: z.array(ActionOnClickParameterSchema(z)),
+        parameters: z.array(ActionOnClickParameterSchema(z)).default([]),
         scriptKey: z.string(),
         autoUpdate: z.enum(EAutoUpdateMode),
         hideInactiveButton: z.boolean().optional(),
@@ -1015,13 +1034,13 @@ var ActionOpenViewSchema = function (z) {
         ActionOpenViewCommonSchema(z).extend({
             mode: z.literal(EViewMode.GENERATED_BY_SCRIPT),
             scriptKey: z.string(),
-            parameters: z.array(ActionOnClickParameterSchema(z)),
+            parameters: z.array(ActionOnClickParameterSchema(z)).default([]),
             displayName: z.string(),
         }),
         ActionOpenViewCommonSchema(z).extend({
             mode: z.literal(EViewMode.EXISTED_VIEW),
             viewKey: z.string(),
-            parameters: z.array(ActionOnClickParameterSchema(z)),
+            parameters: z.array(ActionOnClickParameterSchema(z)).default([]),
         }),
         ActionOpenViewCommonSchema(z).extend({
             mode: z.literal(EViewMode.EMPTY),
@@ -1059,7 +1078,7 @@ var WidgetActionParameterSchema = function (z) {
 };
 var WidgetActionSchema = function (z) {
     return ActionCommonSchema(z).extend({
-        parameters: z.array(WidgetActionParameterSchema(z)),
+        parameters: z.array(WidgetActionParameterSchema(z)).default([]),
         type: z.literal(EActionTypes.EXECUTE_SCRIPT),
         scriptKey: z.string(),
         autoUpdate: z.enum(EAutoUpdateMode),
@@ -1080,7 +1099,7 @@ var ViewActionSchema = function (z) {
         name: z.string(),
         buttonType: z.enum(EActionButtonsTypes).default(EActionButtonsTypes.BASE),
         type: z.literal(EActionTypes.EXECUTE_SCRIPT).default(EActionTypes.EXECUTE_SCRIPT),
-        parameters: z.array(ViewActionParameterSchema(z)),
+        parameters: z.array(ViewActionParameterSchema(z)).default([]),
         scriptKey: z.string().nullable(),
         autoUpdate: z
             .union([z.literal(EAutoUpdateMode.NONE), z.literal(EAutoUpdateMode.ALL_VIEWS)])
@@ -1830,7 +1849,7 @@ var prepareMeasureAggregationParams = function (value) {
     return columnParams;
 };
 
-var _a$3;
+var _a$3, _b;
 var EMeasureTemplateNames;
 (function (EMeasureTemplateNames) {
     EMeasureTemplateNames["avg"] = "avg";
@@ -1841,6 +1860,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})",
@@ -1851,6 +1875,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)";
@@ -1993,13 +2021,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) {
@@ -2519,9 +2552,9 @@ function mapSortingToInputs(_a) {
             return;
         }
         if (getIndicatorType(value.group, indicator) === EWidgetIndicatorType.DIMENSION) {
-            var activeDimensions = isDimensionsHierarchy(indicator)
+            var activeDimensions = (isDimensionsHierarchy(indicator)
                 ? selectDimensionFromHierarchy(indicator, filters)
-                : indicator;
+                : indicator);
             var formula = activeDimensions && getDimensionFormula(activeDimensions);
             if (!formula || !checkDisplayCondition(indicator.displayCondition, variables)) {
                 return;
@@ -2535,10 +2568,11 @@ function mapSortingToInputs(_a) {
                     : undefined,
             };
         }
+        var measure = indicator;
         return {
-            formula: getMeasureFormula(indicator),
+            formula: getMeasureFormula(measure),
             direction: direction,
-            dbDataType: indicator.dbDataType,
+            dbDataType: measure.dbDataType,
         };
     });
     return sortOrder;
@@ -2813,15 +2847,18 @@ var getColorByIndex = function (index) {
 };
 
 var WidgetPresetSettingsSchema = function (z) {
-    return z.object({
-        filterMode: z.enum(EWidgetFilterMode).default(EWidgetFilterMode.DEFAULT),
-        ignoreFilters: z.boolean().default(false),
-        stateName: z.string().nullable().default(null),
-        titleColor: ColorSchema(z).default({ mode: EColorMode.AUTO }),
-        titleSize: z.number().default(14),
-        titleWeight: z.enum(EFontWeight).default(EFontWeight.NORMAL),
+    return BaseWidgetSettingsSchema(z)
+        .pick({
+        filterMode: true,
+        ignoreFilters: true,
+        stateName: true,
+        titleColor: true,
+        titleSize: true,
+        titleWeight: true,
+        paddings: true,
+    })
+        .extend({
         textSize: z.number().default(12),
-        paddings: z.union([z.number(), z.string()]).default(8),
     });
 };
 
@@ -2918,4 +2955,4 @@ var ColorSchema = function (z) {
     ]);
 };
 
-export { ActionButtonSchema, ActionGoToURLSchema, ActionOnClickParameterSchema, ActionOpenInSchema, ActionOpenViewSchema, ActionRunScriptSchema, ActionSchema, ActionUpdateVariableSchema, ActionsOnClickSchema, AutoIdentifiedArrayItemSchema, BaseWidgetSettingsSchema, ColorAutoSchema, ColorBaseSchema, ColorByDimensionSchema, ColorDisabledSchema, ColorFormulaSchema, ColorGradientSchema, ColorRuleSchema, ColorSchema, ColorValuesSchema, ColoredValueSchema, ColumnIndicatorValueSchema, DimensionProcessFilterSchema, DisplayConditionSchema, EActionButtonsTypes, EActionTypes, EActivateConditionMode, EAutoUpdateMode, ECalculatorFilterMethods, EClickHouseBaseTypes, EColorMode, EControlType, ECustomSelectTemplates, EDataModelOption, EDimensionAggregationTemplateName, EDimensionProcessFilterTimeUnit, EDimensionTemplateNames, EDisplayConditionMode, EDrawerPlacement, EDurationTemplateName, EDurationUnit, EEventAppearances, EEventMeasureTemplateNames, EFontWeight, EFormatOrFormattingMode, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EHeightMode, EIndicatorType, ELastTimeUnit, EMarkdownDisplayMode, EMeasureAggregationTemplateName, EMeasureTemplateNames, EOuterAggregation, EProcessFilterNames, ESelectOptionTypes, ESimpleDataType, ESimpleInputType, ESortDirection, ESortingValueModes, ESystemRecordKey, ETransitionMeasureTemplateNames, EUnitMode, EViewMode, EViewOpenIn, EWidgetActionInputMethod, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, ExtendedFormulaFilterValueSchema, FormatSchema, FormattingSchema, FormulaFilterValueSchema, MarkdownMeasureSchema, OuterAggregation, ParameterColumnListSchema, ParameterFromAggregationSchema, ParameterFromColumnSchema, ParameterFromDynamicListSchema, ParameterFromEndEventSchema, ParameterFromEventSchema, ParameterFromFormulaSchema, ParameterFromManualInputSchema, ParameterFromStartEventSchema, ParameterFromStaticListSchema, ParameterFromVariableSchema, ParameterTableListSchema, ProcessIndicatorSchema, ProcessIndicatorValueSchema, RangeSchema, SettingsFilterSchema, SortDirectionSchema, SortOrderSchema, ViewActionParameterSchema, ViewActionSchema, WidgetActionParameterSchema, WidgetActionSchema, WidgetColumnIndicatorSchema, WidgetDimensionHierarchySchema, WidgetDimensionSchema, WidgetIndicatorAggregationValueSchema, WidgetIndicatorConversionValue, WidgetIndicatorDurationValue, WidgetIndicatorSchema, WidgetIndicatorTimeValueSchema, WidgetMeasureSchema, WidgetPresetSettingsSchema, WidgetSortingIndicatorSchema, WidgetSortingValueSchema, 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, themeValueMetaKey, themed, timeTemplates, transitionMeasureTemplateFormulas, unescapeSpecialCharacters, updateDefaultModeSelection, updateSingleModeSelection, workspaceLinkRegExp };
+export { ActionButtonSchema, ActionGoToURLSchema, ActionOnClickParameterSchema, ActionOpenInSchema, ActionOpenViewSchema, ActionRunScriptSchema, ActionSchema, ActionUpdateVariableSchema, ActionsOnClickSchema, AutoIdentifiedArrayItemSchema, BaseWidgetSettingsSchema, ColorAutoSchema, ColorBaseSchema, ColorByDimensionSchema, ColorDisabledSchema, ColorFormulaSchema, ColorGradientSchema, ColorRuleSchema, ColorSchema, ColorValuesSchema, ColoredValueSchema, ColumnIndicatorValueSchema, DimensionProcessFilterSchema, DimensionValueSchema, DisplayConditionSchema, EActionButtonsTypes, EActionTypes, EActivateConditionMode, EAutoUpdateMode, ECalculatorFilterMethods, EClickHouseBaseTypes, EColorMode, EControlType, ECustomSelectTemplates, EDataModelOption, EDimensionAggregationTemplateName, EDimensionProcessFilterTimeUnit, EDimensionTemplateNames, EDisplayConditionMode, EDrawerPlacement, EDurationTemplateName, EDurationUnit, EEventAppearances, EEventMeasureTemplateNames, EFontWeight, EFormatOrFormattingMode, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EHeightMode, EIndicatorType, ELastTimeUnit, EMarkdownDisplayMode, EMeasureAggregationTemplateName, EMeasureInnerTemplateNames, EMeasureTemplateNames, EOuterAggregation, EProcessFilterNames, ESelectOptionTypes, ESimpleDataType, ESimpleInputType, ESortDirection, ESortingValueModes, ESystemRecordKey, ETransitionMeasureTemplateNames, EUnitMode, EViewMode, EViewOpenIn, EWidgetActionInputMethod, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, ExtendedFormulaFilterValueSchema, FormatSchema, FormattingSchema, FormulaFilterValueSchema, MarkdownMeasureSchema, MeasureValueSchema, OuterAggregation, ParameterColumnListSchema, ParameterFromAggregationSchema, ParameterFromColumnSchema, ParameterFromDynamicListSchema, ParameterFromEndEventSchema, ParameterFromEventSchema, ParameterFromFormulaSchema, ParameterFromManualInputSchema, ParameterFromStartEventSchema, ParameterFromStaticListSchema, ParameterFromVariableSchema, ParameterTableListSchema, ProcessIndicatorSchema, ProcessIndicatorValueSchema, RangeSchema, SettingsFilterSchema, SortDirectionSchema, SortOrderSchema, ViewActionParameterSchema, ViewActionSchema, WidgetActionParameterSchema, WidgetActionSchema, WidgetColumnIndicatorSchema, WidgetDimensionHierarchySchema, WidgetDimensionSchema, WidgetIndicatorAggregationValueSchema, WidgetIndicatorConversionValue, WidgetIndicatorDurationValue, WidgetIndicatorFormulaValueSchema, WidgetIndicatorSchema, WidgetIndicatorTemplateValueSchema, WidgetIndicatorTimeValueSchema, WidgetMeasureSchema, WidgetPresetSettingsSchema, WidgetSortingIndicatorSchema, WidgetSortingValueSchema, 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, themeValueMetaKey, themed, timeTemplates, transitionMeasureTemplateFormulas, unescapeSpecialCharacters, updateDefaultModeSelection, updateSingleModeSelection, workspaceLinkRegExp };

package/dist/index.js

@@ -80,22 +80,22 @@ var AutoIdentifiedArrayItemSchema = function (z) {
 };
 var BaseWidgetSettingsSchema = function (z) {
     return z.object({
-        title: z.string().optional(),
-        titleSize: z.number().optional(),
-        titleColor: ColorSchema(z).optional(),
-        titleWeight: z.enum(exports.EFontWeight).optional(),
-        stateName: z.string().nullable().optional(),
-        showMarkdown: z.boolean().optional(),
-        markdownMeasures: z.array(MarkdownMeasureSchema(z)).optional(),
-        markdownText: z.string().optional(),
-        markdownTextSize: z.number().optional(),
-        filters: z.array(SettingsFilterSchema(z)).optional(),
-        filterMode: z.enum(exports.EWidgetFilterMode).optional(),
-        ignoreFilters: z.boolean().optional(),
-        sorting: z.array(WidgetSortingIndicatorSchema(z)).optional(),
-        actionButtons: z.array(ActionButtonSchema(z)).optional(),
-        paddings: z.union([z.number(), z.string()]).optional(),
-        viewTheme: z.boolean().optional(),
+        title: z.string().default(""),
+        titleSize: z.number().default(14),
+        titleColor: ColorSchema(z).default({ mode: exports.EColorMode.AUTO }),
+        titleWeight: z.enum(exports.EFontWeight).default(exports.EFontWeight.NORMAL),
+        stateName: z.string().nullable().default(null),
+        showMarkdown: z.boolean().default(false),
+        markdownMeasures: z.array(MarkdownMeasureSchema(z)).default([]),
+        markdownText: z.string().default(""),
+        markdownTextSize: z.number().default(14),
+        filters: z.array(SettingsFilterSchema(z)).default([]),
+        filterMode: z.enum(exports.EWidgetFilterMode).default(exports.EWidgetFilterMode.DEFAULT),
+        ignoreFilters: z.boolean().default(false),
+        sorting: z.array(WidgetSortingIndicatorSchema(z)).default([]),
+        actionButtons: z.array(ActionButtonSchema(z)).default([]),
+        paddings: z.union([z.number(), z.string()]).default(8),
+        viewTheme: z.boolean().default(false),
     });
 };
 
@@ -616,24 +616,43 @@ var WidgetColumnIndicatorSchema = function (z) {
         dbDataType: z.string().optional(),
         format: FormatSchema(z).optional(),
         formatting: FormattingSchema(z).optional(),
-        displayCondition: DisplayConditionSchema(z).optional(),
+        displayCondition: DisplayConditionSchema(z).default({ mode: exports.EDisplayConditionMode.DISABLED }),
         onClick: z.array(ActionsOnClickSchema(z)).optional(),
     });
 };
+var WidgetIndicatorFormulaValueSchema = function (z) {
+    return z.object({
+        mode: z.literal(exports.EWidgetIndicatorValueModes.FORMULA),
+        formula: z.string().optional(),
+    });
+};
+var WidgetIndicatorTemplateValueSchema = function (z) {
+    return z.object({
+        mode: z.literal(exports.EWidgetIndicatorValueModes.TEMPLATE),
+        /** Имя шаблонной формулы, использующей колонку таблицы */
+        templateName: z.string().optional(),
+        /** Имя таблицы */
+        tableName: z.string().optional(),
+        /** Имя колонки */
+        columnName: z.string().optional(),
+    });
+};
 var ColumnIndicatorValueSchema = function (z) {
+    return z.union([MeasureValueSchema(z), DimensionValueSchema(z)]);
+};
+var MeasureValueSchema = function (z) {
     return z.discriminatedUnion("mode", [
-        z.object({
-            mode: z.literal(exports.EWidgetIndicatorValueModes.FORMULA),
-            formula: z.string().optional(),
+        WidgetIndicatorFormulaValueSchema(z),
+        WidgetIndicatorTemplateValueSchema(z).extend({
+            innerTemplateName: z.enum(exports.EMeasureInnerTemplateNames).optional(),
         }),
-        z.object({
-            mode: z.literal(exports.EWidgetIndicatorValueModes.TEMPLATE),
-            /** Имя шаблонной формулы, использующей колонку таблицы */
-            templateName: z.string().optional(),
-            /** Имя таблицы */
-            tableName: z.string().optional(),
-            /** Имя колонки */
-            columnName: z.string().optional(),
+    ]);
+};
+var DimensionValueSchema = function (z) {
+    return z.discriminatedUnion("mode", [
+        WidgetIndicatorFormulaValueSchema(z),
+        WidgetIndicatorTemplateValueSchema(z).extend({
+            innerTemplateName: z.never().optional(),
         }),
     ]);
 };
@@ -671,7 +690,7 @@ var WidgetDimensionSchema = function (z) {
     return WidgetColumnIndicatorSchema(z).extend({
         value: z
             .discriminatedUnion("mode", [
-            ColumnIndicatorValueSchema(z),
+            DimensionValueSchema(z),
             WidgetIndicatorAggregationValueSchema(z).extend({
                 innerTemplateName: z.string().optional(),
             }),
@@ -685,7 +704,7 @@ var WidgetDimensionHierarchySchema = function (z, dimensionSchema) {
     return AutoIdentifiedArrayItemSchema(z).extend({
         name: z.string(),
         hierarchyDimensions: z.array(dimensionSchema).default([]),
-        displayCondition: DisplayConditionSchema(z).optional(),
+        displayCondition: DisplayConditionSchema(z).default({ mode: exports.EDisplayConditionMode.DISABLED }),
     });
 };
 var WidgetIndicatorConversionValue = function (z) {
@@ -716,7 +735,7 @@ var WidgetMeasureSchema = function (z) {
     return WidgetColumnIndicatorSchema(z).extend({
         value: z
             .discriminatedUnion("mode", [
-            ColumnIndicatorValueSchema(z),
+            MeasureValueSchema(z),
             WidgetIndicatorAggregationValueSchema(z).extend({
                 outerAggregation: z.enum(exports.EOuterAggregation),
             }),
@@ -756,7 +775,7 @@ var ProcessIndicatorSchema = function (z) {
         dbDataType: z.string().optional(),
         format: FormatSchema(z).optional(),
         formatting: FormattingSchema(z).optional(),
-        displayCondition: DisplayConditionSchema(z).optional(),
+        displayCondition: DisplayConditionSchema(z).default({ mode: exports.EDisplayConditionMode.DISABLED }),
     });
 };
 
@@ -887,8 +906,8 @@ var ParameterFromManualInputSchema = function (z) {
 var ParameterFromStaticListSchema = function (z) {
     return z.object({
         inputMethod: z.literal(exports.EWidgetActionInputMethod.STATIC_LIST),
-        options: z.string(),
-        defaultValue: z.union([z.string(), z.array(z.string())]),
+        options: z.string().default(""),
+        defaultValue: z.union([z.string(), z.array(z.string())]).default(""),
         acceptEmptyValue: z.boolean().optional(),
     });
 };
@@ -971,7 +990,7 @@ var ActivateConditionSchema = function (z) {
 var ActionRunScriptSchema = function (z) {
     return ActionCommonSchema(z).extend({
         type: z.literal(exports.EActionTypes.EXECUTE_SCRIPT),
-        parameters: z.array(ActionOnClickParameterSchema(z)),
+        parameters: z.array(ActionOnClickParameterSchema(z)).default([]),
         scriptKey: z.string(),
         autoUpdate: z.enum(exports.EAutoUpdateMode),
         hideInactiveButton: z.boolean().optional(),
@@ -1016,13 +1035,13 @@ var ActionOpenViewSchema = function (z) {
         ActionOpenViewCommonSchema(z).extend({
             mode: z.literal(exports.EViewMode.GENERATED_BY_SCRIPT),
             scriptKey: z.string(),
-            parameters: z.array(ActionOnClickParameterSchema(z)),
+            parameters: z.array(ActionOnClickParameterSchema(z)).default([]),
             displayName: z.string(),
         }),
         ActionOpenViewCommonSchema(z).extend({
             mode: z.literal(exports.EViewMode.EXISTED_VIEW),
             viewKey: z.string(),
-            parameters: z.array(ActionOnClickParameterSchema(z)),
+            parameters: z.array(ActionOnClickParameterSchema(z)).default([]),
         }),
         ActionOpenViewCommonSchema(z).extend({
             mode: z.literal(exports.EViewMode.EMPTY),
@@ -1060,7 +1079,7 @@ var WidgetActionParameterSchema = function (z) {
 };
 var WidgetActionSchema = function (z) {
     return ActionCommonSchema(z).extend({
-        parameters: z.array(WidgetActionParameterSchema(z)),
+        parameters: z.array(WidgetActionParameterSchema(z)).default([]),
         type: z.literal(exports.EActionTypes.EXECUTE_SCRIPT),
         scriptKey: z.string(),
         autoUpdate: z.enum(exports.EAutoUpdateMode),
@@ -1081,7 +1100,7 @@ var ViewActionSchema = function (z) {
         name: z.string(),
         buttonType: z.enum(exports.EActionButtonsTypes).default(exports.EActionButtonsTypes.BASE),
         type: z.literal(exports.EActionTypes.EXECUTE_SCRIPT).default(exports.EActionTypes.EXECUTE_SCRIPT),
-        parameters: z.array(ViewActionParameterSchema(z)),
+        parameters: z.array(ViewActionParameterSchema(z)).default([]),
         scriptKey: z.string().nullable(),
         autoUpdate: z
             .union([z.literal(exports.EAutoUpdateMode.NONE), z.literal(exports.EAutoUpdateMode.ALL_VIEWS)])
@@ -1831,7 +1850,7 @@ var prepareMeasureAggregationParams = function (value) {
     return columnParams;
 };
 
-var _a$3;
+var _a$3, _b;
 exports.EMeasureTemplateNames = void 0;
 (function (EMeasureTemplateNames) {
     EMeasureTemplateNames["avg"] = "avg";
@@ -1842,6 +1861,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})",
@@ -1852,6 +1876,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)";
@@ -1994,13 +2022,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) {
@@ -2520,9 +2553,9 @@ function mapSortingToInputs(_a) {
             return;
         }
         if (getIndicatorType(value.group, indicator) === exports.EWidgetIndicatorType.DIMENSION) {
-            var activeDimensions = isDimensionsHierarchy(indicator)
+            var activeDimensions = (isDimensionsHierarchy(indicator)
                 ? selectDimensionFromHierarchy(indicator, filters)
-                : indicator;
+                : indicator);
             var formula = activeDimensions && getDimensionFormula(activeDimensions);
             if (!formula || !checkDisplayCondition(indicator.displayCondition, variables)) {
                 return;
@@ -2536,10 +2569,11 @@ function mapSortingToInputs(_a) {
                     : undefined,
             };
         }
+        var measure = indicator;
         return {
-            formula: getMeasureFormula(indicator),
+            formula: getMeasureFormula(measure),
             direction: direction,
-            dbDataType: indicator.dbDataType,
+            dbDataType: measure.dbDataType,
         };
     });
     return sortOrder;
@@ -2814,15 +2848,18 @@ var getColorByIndex = function (index) {
 };
 
 var WidgetPresetSettingsSchema = function (z) {
-    return z.object({
-        filterMode: z.enum(exports.EWidgetFilterMode).default(exports.EWidgetFilterMode.DEFAULT),
-        ignoreFilters: z.boolean().default(false),
-        stateName: z.string().nullable().default(null),
-        titleColor: ColorSchema(z).default({ mode: exports.EColorMode.AUTO }),
-        titleSize: z.number().default(14),
-        titleWeight: z.enum(exports.EFontWeight).default(exports.EFontWeight.NORMAL),
+    return BaseWidgetSettingsSchema(z)
+        .pick({
+        filterMode: true,
+        ignoreFilters: true,
+        stateName: true,
+        titleColor: true,
+        titleSize: true,
+        titleWeight: true,
+        paddings: true,
+    })
+        .extend({
         textSize: z.number().default(12),
-        paddings: z.union([z.number(), z.string()]).default(8),
     });
 };
 
@@ -2950,12 +2987,14 @@ exports.ColorValuesSchema = ColorValuesSchema;
 exports.ColoredValueSchema = ColoredValueSchema;
 exports.ColumnIndicatorValueSchema = ColumnIndicatorValueSchema;
 exports.DimensionProcessFilterSchema = DimensionProcessFilterSchema;
+exports.DimensionValueSchema = DimensionValueSchema;
 exports.DisplayConditionSchema = DisplayConditionSchema;
 exports.ExtendedFormulaFilterValueSchema = ExtendedFormulaFilterValueSchema;
 exports.FormatSchema = FormatSchema;
 exports.FormattingSchema = FormattingSchema;
 exports.FormulaFilterValueSchema = FormulaFilterValueSchema;
 exports.MarkdownMeasureSchema = MarkdownMeasureSchema;
+exports.MeasureValueSchema = MeasureValueSchema;
 exports.ParameterColumnListSchema = ParameterColumnListSchema;
 exports.ParameterFromAggregationSchema = ParameterFromAggregationSchema;
 exports.ParameterFromColumnSchema = ParameterFromColumnSchema;
@@ -2984,7 +3023,9 @@ exports.WidgetDimensionSchema = WidgetDimensionSchema;
 exports.WidgetIndicatorAggregationValueSchema = WidgetIndicatorAggregationValueSchema;
 exports.WidgetIndicatorConversionValue = WidgetIndicatorConversionValue;
 exports.WidgetIndicatorDurationValue = WidgetIndicatorDurationValue;
+exports.WidgetIndicatorFormulaValueSchema = WidgetIndicatorFormulaValueSchema;
 exports.WidgetIndicatorSchema = WidgetIndicatorSchema;
+exports.WidgetIndicatorTemplateValueSchema = WidgetIndicatorTemplateValueSchema;
 exports.WidgetIndicatorTimeValueSchema = WidgetIndicatorTimeValueSchema;
 exports.WidgetMeasureSchema = WidgetMeasureSchema;
 exports.WidgetPresetSettingsSchema = WidgetPresetSettingsSchema;
@@ -3040,6 +3081,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-view-theme.9",
+  "version": "6.0.0-view-theme.11",
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",