@infomaximum/widget-sdk 4.0.0-beta4 → 4.0.0-beta40

package/dist/index.esm.js

@@ -71,24 +71,51 @@ var EWidgetActionInputMode;
     EWidgetActionInputMode["FORMULA"] = "FORMULA";
     EWidgetActionInputMode["MANUALLY"] = "MANUALLY";
 })(EWidgetActionInputMode || (EWidgetActionInputMode = {}));
+var EActionTypes;
+(function (EActionTypes) {
+    EActionTypes["URL"] = "URL";
+    EActionTypes["UPDATE_VARIABLE"] = "UPDATE_VARIABLE";
+    EActionTypes["RUN_SCRIPT"] = "RUN_SCRIPT";
+    EActionTypes["OPEN_VIEW"] = "OPEN_VIEW";
+})(EActionTypes || (EActionTypes = {}));
+var EViewType;
+(function (EViewType) {
+    EViewType["CREATED_VIEW"] = "CREATED_VIEW";
+    EViewType["GENERATED_BY_SCRIPT"] = "GENERATED_BY_SCRIPT";
+})(EViewType || (EViewType = {}));
+var EOpenViewMode;
+(function (EOpenViewMode) {
+    EOpenViewMode["NEW_WINDOW"] = "NEW_WINDOW";
+    EOpenViewMode["PLACEHOLDER"] = "PLACEHOLDER";
+    EOpenViewMode["MODAL"] = "MODAL";
+    EOpenViewMode["DRAWER"] = "DRAWER";
+})(EOpenViewMode || (EOpenViewMode = {}));
+var EDrawerPlacement;
+(function (EDrawerPlacement) {
+    EDrawerPlacement["LEFT"] = "LEFT";
+    EDrawerPlacement["RIGHT"] = "RIGHT";
+})(EDrawerPlacement || (EDrawerPlacement = {}));
 var isActionValid = function (action, _a) {
     var _b;
-    var scripts = _a.scripts, tables = _a.tables;
-    var currentScript = scripts.get((_b = action.scriptGuid) !== null && _b !== void 0 ? _b : "");
+    var scripts = _a.scripts, tables = _a.tables, variables = _a.variables;
+    if (action.type !== EActionTypes.RUN_SCRIPT) {
+        return false;
+    }
+    var currentScript = scripts.get((_b = action.scriptName) !== null && _b !== void 0 ? _b : "");
     if (!currentScript) {
         return false;
     }
-    var actionInputsMap = new Map(action.inputs.map(function (input) { return [input.guid, input]; }));
-    if (actionInputsMap.size < currentScript.fieldsGuids.size) {
+    var actionInputsMap = new Map(action.inputs.map(function (input) { return [input.name, input]; }));
+    if (actionInputsMap.size < currentScript.fieldsNames.size) {
         return false;
     }
-    return __spreadArray([], __read(currentScript.fieldsGuids), false).every(function (guid) {
-        var actionInput = actionInputsMap.get(guid !== null && guid !== void 0 ? guid : "");
+    return __spreadArray([], __read(currentScript.fieldsNames), false).every(function (name) {
+        var actionInput = actionInputsMap.get(name !== null && name !== void 0 ? name : "");
         if (!actionInput) {
             return false;
         }
         var value = actionInput.value;
-        if (value.mode === EWidgetActionInputMode.FROM_VARIABLE && !value.guid) {
+        if (value.mode === EWidgetActionInputMode.FROM_VARIABLE && !variables.has(value.sourceVariable)) {
             return false;
         }
         if (value.mode === EWidgetActionInputMode.FORMULA && !value.formula) {
@@ -97,8 +124,7 @@ var isActionValid = function (action, _a) {
         if (value.mode === EWidgetActionInputMode.DYNAMIC_LIST && !value.formula) {
             return false;
         }
-        if (value.mode === EWidgetActionInputMode.FROM_COLUMN &&
-            !tables.has(value.tableName)) {
+        if (value.mode === EWidgetActionInputMode.FROM_COLUMN && !tables.has(value.tableName)) {
             return false;
         }
         return true;
@@ -123,9 +149,7 @@ var prepareValuesForSql = function (dataType, values) {
         dataType === ESimpleDataType.BOOLEAN
         ? values
         : values.map(function (value) {
-            return value === null
-                ? null
-                : "'".concat(escapeSingularQuotes(escapeReverseSlash(value)), "'");
+            return value === null ? null : "'".concat(escapeSingularQuotes(escapeReverseSlash(value)), "'");
         });
 };
 var escapeReverseSlash = function (formula) {
@@ -135,19 +159,6 @@ var escapeSingularQuotes = function (formula) {
     return formula.replaceAll("'", "\\'");
 };
 
-var compact = function (items) { return ((items === null || items === void 0 ? void 0 : items.filter(Boolean)) || []); };
-var compactMap = function (items, f) { return compact(items === null || items === void 0 ? void 0 : items.map(f)); };
-var isNil = function (value) {
-    return value === null || value === undefined;
-};
-
-function mapVariablesToInputs(variables) {
-    return new Map(compactMap(__spreadArray([], __read(variables.values()), false), function (_a) {
-        var name = _a.name, dataType = _a.dataType, value = _a.value;
-        return !isNil(value) ? [name, { dataType: dataType, value: value }] : null;
-    }));
-}
-
 var ECalculatorFilterMethods;
 (function (ECalculatorFilterMethods) {
     ECalculatorFilterMethods["EQUAL_TO"] = "EQUAL_TO";
@@ -193,6 +204,14 @@ var EFormulaFilterFieldKeys;
     EFormulaFilterFieldKeys["durationUnit"] = "durationUnit";
 })(EFormulaFilterFieldKeys || (EFormulaFilterFieldKeys = {}));
 
+var compact = function (items) { return ((items === null || items === void 0 ? void 0 : items.filter(Boolean)) || []); };
+var compactMap = function (items, f) {
+    return compact(items === null || items === void 0 ? void 0 : items.map(f));
+};
+var isNil = function (value) {
+    return value === null || value === undefined;
+};
+
 var EFormatTypes;
 (function (EFormatTypes) {
     /** Дата */
@@ -476,11 +495,25 @@ var EWidgetFilterMode;
 })(EWidgetFilterMode || (EWidgetFilterMode = {}));
 var EColorMode;
 (function (EColorMode) {
+    EColorMode["DISABLED"] = "DISABLED";
     EColorMode["FORMULA"] = "FORMULA";
     EColorMode["BASE"] = "BASE";
     EColorMode["GRADIENT"] = "GRADIENT";
     EColorMode["AUTO"] = "AUTO";
+    EColorMode["RULE"] = "RULE";
+    EColorMode["VALUES"] = "VALUES";
+    EColorMode["BY_DIMENSION"] = "BY_DIMENSION";
 })(EColorMode || (EColorMode = {}));
+var EColorScope;
+(function (EColorScope) {
+    EColorScope["WORKSPACE"] = "WORKSPACE";
+    EColorScope["DASHBOARD"] = "DASHBOARD";
+})(EColorScope || (EColorScope = {}));
+var EMarkdownDisplayMode;
+(function (EMarkdownDisplayMode) {
+    EMarkdownDisplayMode["NONE"] = "NONE";
+    EMarkdownDisplayMode["INDICATOR"] = "INDICATOR";
+})(EMarkdownDisplayMode || (EMarkdownDisplayMode = {}));
 var EDisplayConditionMode;
 (function (EDisplayConditionMode) {
     EDisplayConditionMode["DISABLED"] = "DISABLED";
@@ -491,8 +524,8 @@ var EDisplayConditionMode;
 function checkDisplayCondition(displayCondition, variables) {
     var _a;
     if ((displayCondition === null || displayCondition === void 0 ? void 0 : displayCondition.mode) === EDisplayConditionMode.VARIABLE) {
-        var variableGuid = displayCondition.variableGuid, variableValue = displayCondition.variableValue;
-        var currentVariableValue = variableGuid && ((_a = variables.get(variableGuid)) === null || _a === void 0 ? void 0 : _a.value);
+        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;
@@ -508,17 +541,14 @@ function getDisplayConditionFormula(displayCondition) {
     }
 }
 var replaceDisplayCondition = function (dimension, displayCondition) {
-    return isNil(displayCondition)
-        ? dimension
-        : __assign(__assign({}, dimension), { displayCondition: displayCondition });
+    return isNil(displayCondition) ? dimension : __assign(__assign({}, dimension), { displayCondition: displayCondition });
 };
 
 var escapeSpecialCharacters = function (formula) {
     return formula
         .replaceAll("\\", "\\\\")
         .replaceAll('"', '\\"')
-        .replaceAll("`", "\\`")
-        .replaceAll("-", "\\-");
+        .replaceAll("`", "\\`");
 };
 
 function generateColumnFormula(tableName, columnName) {
@@ -755,12 +785,11 @@ function mapMeasureToInput(measure, variables, addFormulas) {
 }
 /** Конвертировать меры виджета во входы для вычислителя */
 function mapMeasuresToInputs(measures, variables, addFormulas) {
-    return compactMap(measures, function (measure) {
-        return mapMeasureToInput(measure, variables, addFormulas);
-    });
+    return compactMap(measures, function (measure) { return mapMeasureToInput(measure, variables, addFormulas); });
 }
 
-function mapDimensionToInput(dimension, variables) {
+function mapDimensionToInput(dimension, variables, addFormulas) {
+    if (addFormulas === void 0) { addFormulas = function () { return new Map(); }; }
     var formula = getDimensionFormula(dimension);
     if (!formula) {
         return null;
@@ -774,12 +803,13 @@ function mapDimensionToInput(dimension, variables) {
         dataType: dimension.dataType,
         hideEmpty: dimension.hideEmptyValues,
         displayConditionFormula: getDisplayConditionFormula(dimension.displayCondition),
+        additionalFormulas: addFormulas(dimension),
     };
 }
 /** Конвертировать разрезы виджета во входы для вычислителя */
-function mapDimensionsToInputs(dimensions, variables) {
+function mapDimensionsToInputs(dimensions, variables, addFormulas) {
     return compactMap(dimensions, function (dimension) {
-        return mapDimensionToInput(dimension, variables);
+        return mapDimensionToInput(dimension, variables, addFormulas);
     });
 }
 
@@ -838,11 +868,12 @@ function mapEventMeasuresToInputs(indicators, process, variables, addFormulas) {
  * @param measuresInOriginalOrder меры виджета (конкретная мера будет браться по индексу)
  * @returns
  */
-function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measuresInOriginalOrder) {
+function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measuresInOriginalOrder, variables) {
     if (sortingIndicators === void 0) { sortingIndicators = []; }
     if (dimensionsInOriginalOrder === void 0) { dimensionsInOriginalOrder = []; }
     if (measuresInOriginalOrder === void 0) { measuresInOriginalOrder = []; }
     return compactMap(sortingIndicators, function (_a) {
+        var _b;
         var value = _a.value, direction = _a.direction;
         if (value.mode === ESortingValueModes.FORMULA ||
             value.mode === ESortingValueModes.QUANTITY ||
@@ -853,7 +884,20 @@ function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measur
         if (value.mode === ESortingValueModes.DIMENSION_IN_WIDGET ||
             value.mode === ESortingValueModes.HIERARCHY) {
             var dimension = dimensionsInOriginalOrder[value.index];
-            return (dimension && { formula: getDimensionFormula(dimension), direction: direction });
+            if (!dimension) {
+                return;
+            }
+            var formula = getDimensionFormula(dimension);
+            if (!formula || !checkDisplayCondition(dimension.displayCondition, variables)) {
+                return;
+            }
+            return {
+                formula: getDimensionFormula(dimension),
+                direction: direction,
+                displayCondition: ((_b = dimension.displayCondition) === null || _b === void 0 ? void 0 : _b.mode) === EDisplayConditionMode.FORMULA
+                    ? dimension.displayCondition.formula
+                    : undefined,
+            };
         }
         if (value.mode === ESortingValueModes.MEASURE_IN_WIDGET) {
             var measure = measuresInOriginalOrder[value.index];
@@ -881,9 +925,7 @@ function selectDimensionFromHierarchy(_a, filters) {
         if (!matchedFilter) {
             return "continue";
         }
-        var selectionIndex = matchedFilter.values.length > 1
-            ? i
-            : Math.min(i + 1, dimensions.length - 1);
+        var selectionIndex = matchedFilter.values.length > 1 ? i : Math.min(i + 1, dimensions.length - 1);
         return { value: dimensions[selectionIndex] };
     };
     for (var i = dimensions.length - 1; i >= 0; i--) {
@@ -898,8 +940,7 @@ var replaceHierarchiesWithDimensions = function (dimensions, filters) {
     return compactMap(dimensions, function (indicator) {
         if (isHierarchy(indicator)) {
             var selectedDimension = selectDimensionFromHierarchy(indicator, filters);
-            return (selectedDimension &&
-                replaceDisplayCondition(selectedDimension, indicator.displayCondition));
+            return (selectedDimension && replaceDisplayCondition(selectedDimension, indicator.displayCondition));
         }
         return indicator;
     });
@@ -916,9 +957,12 @@ function bindContentWithIndicator(outputs, indicator) {
  * Массив объектов, каждый из которых содержит показатель и его контент
  */
 function bindContentsWithIndicators(outputs, indicators) {
-    return compactMap(indicators, function (indicator) {
-        return bindContentWithIndicator(outputs, indicator);
-    });
+    return compactMap(indicators, function (indicator) { return bindContentWithIndicator(outputs, indicator); });
+}
+
+/** Удалить из строки символы экранирования */
+function unescapeSpecialCharacters(str) {
+    return str.replace(/\\(?!\\)/g, "").replace(/\\\\/g, "\\");
 }
 
 var EControlType;
@@ -941,8 +985,23 @@ var EControlType;
     EControlType["inputMarkdown"] = "inputMarkdown";
     EControlType["filter"] = "filter";
     EControlType["actionOnClick"] = "actionOnClick";
+    EControlType["eventsPicker"] = "eventsPicker";
 })(EControlType || (EControlType = {}));
 
+var ESelectOptionTypes;
+(function (ESelectOptionTypes) {
+    ESelectOptionTypes["DIVIDER"] = "DIVIDER";
+    ESelectOptionTypes["SYSTEM"] = "SYSTEM";
+    ESelectOptionTypes["GROUP"] = "GROUP";
+    ESelectOptionTypes["BRANCH"] = "BRANCH";
+    ESelectOptionTypes["LEAF"] = "LEAF";
+})(ESelectOptionTypes || (ESelectOptionTypes = {}));
+var ECustomSelectTemplates;
+(function (ECustomSelectTemplates) {
+    ECustomSelectTemplates["FORMULA"] = "FORMULA";
+    ECustomSelectTemplates["DIMENSION_GROUPS"] = "DIMENSION_GROUPS";
+})(ECustomSelectTemplates || (ECustomSelectTemplates = {}));
+
 var ESortDirection;
 (function (ESortDirection) {
     ESortDirection["descend"] = "DESC";
@@ -1045,4 +1104,4 @@ var getLocalizedText = function (language, locObj, props) {
     return localization.getLocalized(locObj, props);
 };
 
-export { ECalculatorFilterMethods, EColorMode, EControlType, EDbType, EDimensionTemplateNames, EDisplayConditionMode, EDurationUnit, EEventMeasureTemplateNames, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMeasureTemplateNames, EProcessFilterNames, ESimpleDataType, ESortDirection, ESortingValueModes, ETransitionMeasureTemplateNames, EWidgetActionInputMode, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, dimensionTemplateFormulas, escapeSpecialCharacters, eventMeasureTemplateFormulas, fillTemplateString, formulaFilterMethods, generateColumnFormula, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getTransitionMeasureFormula, isActionValid, isHierarchy, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, mapVariablesToInputs, measureTemplateFormulas, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, transitionMeasureTemplateFormulas, updateDefaultModeSelection, updateMultiModeSelection, updateSingleModeSelection };
+export { EActionTypes, ECalculatorFilterMethods, EColorMode, EColorScope, EControlType, ECustomSelectTemplates, EDbType, EDimensionTemplateNames, EDisplayConditionMode, EDrawerPlacement, EDurationUnit, EEventMeasureTemplateNames, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMarkdownDisplayMode, EMeasureTemplateNames, EOpenViewMode, EProcessFilterNames, ESelectOptionTypes, ESimpleDataType, ESortDirection, ESortingValueModes, ETransitionMeasureTemplateNames, EViewType, EWidgetActionInputMode, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, dimensionTemplateFormulas, escapeSpecialCharacters, eventMeasureTemplateFormulas, fillTemplateString, formulaFilterMethods, generateColumnFormula, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getTransitionMeasureFormula, isActionValid, isHierarchy, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, measureTemplateFormulas, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, transitionMeasureTemplateFormulas, unescapeSpecialCharacters, updateDefaultModeSelection, updateMultiModeSelection, updateSingleModeSelection };

package/dist/index.js

@@ -72,24 +72,51 @@ exports.EWidgetActionInputMode = void 0;
     EWidgetActionInputMode["FORMULA"] = "FORMULA";
     EWidgetActionInputMode["MANUALLY"] = "MANUALLY";
 })(exports.EWidgetActionInputMode || (exports.EWidgetActionInputMode = {}));
+exports.EActionTypes = void 0;
+(function (EActionTypes) {
+    EActionTypes["URL"] = "URL";
+    EActionTypes["UPDATE_VARIABLE"] = "UPDATE_VARIABLE";
+    EActionTypes["RUN_SCRIPT"] = "RUN_SCRIPT";
+    EActionTypes["OPEN_VIEW"] = "OPEN_VIEW";
+})(exports.EActionTypes || (exports.EActionTypes = {}));
+exports.EViewType = void 0;
+(function (EViewType) {
+    EViewType["CREATED_VIEW"] = "CREATED_VIEW";
+    EViewType["GENERATED_BY_SCRIPT"] = "GENERATED_BY_SCRIPT";
+})(exports.EViewType || (exports.EViewType = {}));
+exports.EOpenViewMode = void 0;
+(function (EOpenViewMode) {
+    EOpenViewMode["NEW_WINDOW"] = "NEW_WINDOW";
+    EOpenViewMode["PLACEHOLDER"] = "PLACEHOLDER";
+    EOpenViewMode["MODAL"] = "MODAL";
+    EOpenViewMode["DRAWER"] = "DRAWER";
+})(exports.EOpenViewMode || (exports.EOpenViewMode = {}));
+exports.EDrawerPlacement = void 0;
+(function (EDrawerPlacement) {
+    EDrawerPlacement["LEFT"] = "LEFT";
+    EDrawerPlacement["RIGHT"] = "RIGHT";
+})(exports.EDrawerPlacement || (exports.EDrawerPlacement = {}));
 var isActionValid = function (action, _a) {
     var _b;
-    var scripts = _a.scripts, tables = _a.tables;
-    var currentScript = scripts.get((_b = action.scriptGuid) !== null && _b !== void 0 ? _b : "");
+    var scripts = _a.scripts, tables = _a.tables, variables = _a.variables;
+    if (action.type !== exports.EActionTypes.RUN_SCRIPT) {
+        return false;
+    }
+    var currentScript = scripts.get((_b = action.scriptName) !== null && _b !== void 0 ? _b : "");
     if (!currentScript) {
         return false;
     }
-    var actionInputsMap = new Map(action.inputs.map(function (input) { return [input.guid, input]; }));
-    if (actionInputsMap.size < currentScript.fieldsGuids.size) {
+    var actionInputsMap = new Map(action.inputs.map(function (input) { return [input.name, input]; }));
+    if (actionInputsMap.size < currentScript.fieldsNames.size) {
         return false;
     }
-    return __spreadArray([], __read(currentScript.fieldsGuids), false).every(function (guid) {
-        var actionInput = actionInputsMap.get(guid !== null && guid !== void 0 ? guid : "");
+    return __spreadArray([], __read(currentScript.fieldsNames), false).every(function (name) {
+        var actionInput = actionInputsMap.get(name !== null && name !== void 0 ? name : "");
         if (!actionInput) {
             return false;
         }
         var value = actionInput.value;
-        if (value.mode === exports.EWidgetActionInputMode.FROM_VARIABLE && !value.guid) {
+        if (value.mode === exports.EWidgetActionInputMode.FROM_VARIABLE && !variables.has(value.sourceVariable)) {
             return false;
         }
         if (value.mode === exports.EWidgetActionInputMode.FORMULA && !value.formula) {
@@ -98,8 +125,7 @@ var isActionValid = function (action, _a) {
         if (value.mode === exports.EWidgetActionInputMode.DYNAMIC_LIST && !value.formula) {
             return false;
         }
-        if (value.mode === exports.EWidgetActionInputMode.FROM_COLUMN &&
-            !tables.has(value.tableName)) {
+        if (value.mode === exports.EWidgetActionInputMode.FROM_COLUMN && !tables.has(value.tableName)) {
             return false;
         }
         return true;
@@ -124,9 +150,7 @@ var prepareValuesForSql = function (dataType, values) {
         dataType === exports.ESimpleDataType.BOOLEAN
         ? values
         : values.map(function (value) {
-            return value === null
-                ? null
-                : "'".concat(escapeSingularQuotes(escapeReverseSlash(value)), "'");
+            return value === null ? null : "'".concat(escapeSingularQuotes(escapeReverseSlash(value)), "'");
         });
 };
 var escapeReverseSlash = function (formula) {
@@ -136,19 +160,6 @@ var escapeSingularQuotes = function (formula) {
     return formula.replaceAll("'", "\\'");
 };
 
-var compact = function (items) { return ((items === null || items === void 0 ? void 0 : items.filter(Boolean)) || []); };
-var compactMap = function (items, f) { return compact(items === null || items === void 0 ? void 0 : items.map(f)); };
-var isNil = function (value) {
-    return value === null || value === undefined;
-};
-
-function mapVariablesToInputs(variables) {
-    return new Map(compactMap(__spreadArray([], __read(variables.values()), false), function (_a) {
-        var name = _a.name, dataType = _a.dataType, value = _a.value;
-        return !isNil(value) ? [name, { dataType: dataType, value: value }] : null;
-    }));
-}
-
 exports.ECalculatorFilterMethods = void 0;
 (function (ECalculatorFilterMethods) {
     ECalculatorFilterMethods["EQUAL_TO"] = "EQUAL_TO";
@@ -194,6 +205,14 @@ exports.EFormulaFilterFieldKeys = void 0;
     EFormulaFilterFieldKeys["durationUnit"] = "durationUnit";
 })(exports.EFormulaFilterFieldKeys || (exports.EFormulaFilterFieldKeys = {}));
 
+var compact = function (items) { return ((items === null || items === void 0 ? void 0 : items.filter(Boolean)) || []); };
+var compactMap = function (items, f) {
+    return compact(items === null || items === void 0 ? void 0 : items.map(f));
+};
+var isNil = function (value) {
+    return value === null || value === undefined;
+};
+
 exports.EFormatTypes = void 0;
 (function (EFormatTypes) {
     /** Дата */
@@ -477,11 +496,25 @@ exports.EWidgetFilterMode = void 0;
 })(exports.EWidgetFilterMode || (exports.EWidgetFilterMode = {}));
 exports.EColorMode = void 0;
 (function (EColorMode) {
+    EColorMode["DISABLED"] = "DISABLED";
     EColorMode["FORMULA"] = "FORMULA";
     EColorMode["BASE"] = "BASE";
     EColorMode["GRADIENT"] = "GRADIENT";
     EColorMode["AUTO"] = "AUTO";
+    EColorMode["RULE"] = "RULE";
+    EColorMode["VALUES"] = "VALUES";
+    EColorMode["BY_DIMENSION"] = "BY_DIMENSION";
 })(exports.EColorMode || (exports.EColorMode = {}));
+exports.EColorScope = void 0;
+(function (EColorScope) {
+    EColorScope["WORKSPACE"] = "WORKSPACE";
+    EColorScope["DASHBOARD"] = "DASHBOARD";
+})(exports.EColorScope || (exports.EColorScope = {}));
+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";
@@ -492,8 +525,8 @@ exports.EDisplayConditionMode = void 0;
 function checkDisplayCondition(displayCondition, variables) {
     var _a;
     if ((displayCondition === null || displayCondition === void 0 ? void 0 : displayCondition.mode) === exports.EDisplayConditionMode.VARIABLE) {
-        var variableGuid = displayCondition.variableGuid, variableValue = displayCondition.variableValue;
-        var currentVariableValue = variableGuid && ((_a = variables.get(variableGuid)) === null || _a === void 0 ? void 0 : _a.value);
+        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;
@@ -509,17 +542,14 @@ function getDisplayConditionFormula(displayCondition) {
     }
 }
 var replaceDisplayCondition = function (dimension, displayCondition) {
-    return isNil(displayCondition)
-        ? dimension
-        : __assign(__assign({}, dimension), { displayCondition: displayCondition });
+    return isNil(displayCondition) ? dimension : __assign(__assign({}, dimension), { displayCondition: displayCondition });
 };
 
 var escapeSpecialCharacters = function (formula) {
     return formula
         .replaceAll("\\", "\\\\")
         .replaceAll('"', '\\"')
-        .replaceAll("`", "\\`")
-        .replaceAll("-", "\\-");
+        .replaceAll("`", "\\`");
 };
 
 function generateColumnFormula(tableName, columnName) {
@@ -756,12 +786,11 @@ function mapMeasureToInput(measure, variables, addFormulas) {
 }
 /** Конвертировать меры виджета во входы для вычислителя */
 function mapMeasuresToInputs(measures, variables, addFormulas) {
-    return compactMap(measures, function (measure) {
-        return mapMeasureToInput(measure, variables, addFormulas);
-    });
+    return compactMap(measures, function (measure) { return mapMeasureToInput(measure, variables, addFormulas); });
 }
 
-function mapDimensionToInput(dimension, variables) {
+function mapDimensionToInput(dimension, variables, addFormulas) {
+    if (addFormulas === void 0) { addFormulas = function () { return new Map(); }; }
     var formula = getDimensionFormula(dimension);
     if (!formula) {
         return null;
@@ -775,12 +804,13 @@ function mapDimensionToInput(dimension, variables) {
         dataType: dimension.dataType,
         hideEmpty: dimension.hideEmptyValues,
         displayConditionFormula: getDisplayConditionFormula(dimension.displayCondition),
+        additionalFormulas: addFormulas(dimension),
     };
 }
 /** Конвертировать разрезы виджета во входы для вычислителя */
-function mapDimensionsToInputs(dimensions, variables) {
+function mapDimensionsToInputs(dimensions, variables, addFormulas) {
     return compactMap(dimensions, function (dimension) {
-        return mapDimensionToInput(dimension, variables);
+        return mapDimensionToInput(dimension, variables, addFormulas);
     });
 }
 
@@ -839,11 +869,12 @@ function mapEventMeasuresToInputs(indicators, process, variables, addFormulas) {
  * @param measuresInOriginalOrder меры виджета (конкретная мера будет браться по индексу)
  * @returns
  */
-function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measuresInOriginalOrder) {
+function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measuresInOriginalOrder, variables) {
     if (sortingIndicators === void 0) { sortingIndicators = []; }
     if (dimensionsInOriginalOrder === void 0) { dimensionsInOriginalOrder = []; }
     if (measuresInOriginalOrder === void 0) { measuresInOriginalOrder = []; }
     return compactMap(sortingIndicators, function (_a) {
+        var _b;
         var value = _a.value, direction = _a.direction;
         if (value.mode === exports.ESortingValueModes.FORMULA ||
             value.mode === exports.ESortingValueModes.QUANTITY ||
@@ -854,7 +885,20 @@ function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measur
         if (value.mode === exports.ESortingValueModes.DIMENSION_IN_WIDGET ||
             value.mode === exports.ESortingValueModes.HIERARCHY) {
             var dimension = dimensionsInOriginalOrder[value.index];
-            return (dimension && { formula: getDimensionFormula(dimension), direction: direction });
+            if (!dimension) {
+                return;
+            }
+            var formula = getDimensionFormula(dimension);
+            if (!formula || !checkDisplayCondition(dimension.displayCondition, variables)) {
+                return;
+            }
+            return {
+                formula: getDimensionFormula(dimension),
+                direction: direction,
+                displayCondition: ((_b = dimension.displayCondition) === null || _b === void 0 ? void 0 : _b.mode) === exports.EDisplayConditionMode.FORMULA
+                    ? dimension.displayCondition.formula
+                    : undefined,
+            };
         }
         if (value.mode === exports.ESortingValueModes.MEASURE_IN_WIDGET) {
             var measure = measuresInOriginalOrder[value.index];
@@ -882,9 +926,7 @@ function selectDimensionFromHierarchy(_a, filters) {
         if (!matchedFilter) {
             return "continue";
         }
-        var selectionIndex = matchedFilter.values.length > 1
-            ? i
-            : Math.min(i + 1, dimensions.length - 1);
+        var selectionIndex = matchedFilter.values.length > 1 ? i : Math.min(i + 1, dimensions.length - 1);
         return { value: dimensions[selectionIndex] };
     };
     for (var i = dimensions.length - 1; i >= 0; i--) {
@@ -899,8 +941,7 @@ var replaceHierarchiesWithDimensions = function (dimensions, filters) {
     return compactMap(dimensions, function (indicator) {
         if (isHierarchy(indicator)) {
             var selectedDimension = selectDimensionFromHierarchy(indicator, filters);
-            return (selectedDimension &&
-                replaceDisplayCondition(selectedDimension, indicator.displayCondition));
+            return (selectedDimension && replaceDisplayCondition(selectedDimension, indicator.displayCondition));
         }
         return indicator;
     });
@@ -917,9 +958,12 @@ function bindContentWithIndicator(outputs, indicator) {
  * Массив объектов, каждый из которых содержит показатель и его контент
  */
 function bindContentsWithIndicators(outputs, indicators) {
-    return compactMap(indicators, function (indicator) {
-        return bindContentWithIndicator(outputs, indicator);
-    });
+    return compactMap(indicators, function (indicator) { return bindContentWithIndicator(outputs, indicator); });
+}
+
+/** Удалить из строки символы экранирования */
+function unescapeSpecialCharacters(str) {
+    return str.replace(/\\(?!\\)/g, "").replace(/\\\\/g, "\\");
 }
 
 exports.EControlType = void 0;
@@ -942,8 +986,23 @@ exports.EControlType = void 0;
     EControlType["inputMarkdown"] = "inputMarkdown";
     EControlType["filter"] = "filter";
     EControlType["actionOnClick"] = "actionOnClick";
+    EControlType["eventsPicker"] = "eventsPicker";
 })(exports.EControlType || (exports.EControlType = {}));
 
+exports.ESelectOptionTypes = void 0;
+(function (ESelectOptionTypes) {
+    ESelectOptionTypes["DIVIDER"] = "DIVIDER";
+    ESelectOptionTypes["SYSTEM"] = "SYSTEM";
+    ESelectOptionTypes["GROUP"] = "GROUP";
+    ESelectOptionTypes["BRANCH"] = "BRANCH";
+    ESelectOptionTypes["LEAF"] = "LEAF";
+})(exports.ESelectOptionTypes || (exports.ESelectOptionTypes = {}));
+exports.ECustomSelectTemplates = void 0;
+(function (ECustomSelectTemplates) {
+    ECustomSelectTemplates["FORMULA"] = "FORMULA";
+    ECustomSelectTemplates["DIMENSION_GROUPS"] = "DIMENSION_GROUPS";
+})(exports.ECustomSelectTemplates || (exports.ECustomSelectTemplates = {}));
+
 exports.ESortDirection = void 0;
 (function (ESortDirection) {
     ESortDirection["descend"] = "DESC";
@@ -1046,11 +1105,11 @@ var getLocalizedText = function (language, locObj, props) {
     return localization.getLocalized(locObj, props);
 };
 
-Object.defineProperty(exports, 'ELanguages', {
+Object.defineProperty(exports, "ELanguages", {
     enumerable: true,
     get: function () { return localization$1.ELanguages; }
 });
-Object.defineProperty(exports, 'EFilteringMethodValues', {
+Object.defineProperty(exports, "EFilteringMethodValues", {
     enumerable: true,
     get: function () { return baseFilter.EFilteringMethodValues; }
 });
@@ -1078,7 +1137,6 @@ exports.mapFormulaFiltersToInputs = mapFormulaFiltersToInputs;
 exports.mapMeasuresToInputs = mapMeasuresToInputs;
 exports.mapSortingToInputs = mapSortingToInputs;
 exports.mapTransitionMeasuresToInputs = mapTransitionMeasuresToInputs;
-exports.mapVariablesToInputs = mapVariablesToInputs;
 exports.measureTemplateFormulas = measureTemplateFormulas;
 exports.prepareValuesForSql = prepareValuesForSql;
 exports.replaceDisplayCondition = replaceDisplayCondition;
@@ -1086,6 +1144,7 @@ exports.replaceFiltersBySelection = replaceFiltersBySelection;
 exports.replaceHierarchiesWithDimensions = replaceHierarchiesWithDimensions;
 exports.selectDimensionFromHierarchy = selectDimensionFromHierarchy;
 exports.transitionMeasureTemplateFormulas = transitionMeasureTemplateFormulas;
+exports.unescapeSpecialCharacters = unescapeSpecialCharacters;
 exports.updateDefaultModeSelection = updateDefaultModeSelection;
 exports.updateMultiModeSelection = updateMultiModeSelection;
 exports.updateSingleModeSelection = updateSingleModeSelection;