@infomaximum/widget-sdk 4.0.0-beta11 → 4.0.0-beta12

package/dist/index.d.ts

@@ -79,6 +79,9 @@ interface ICalculatorIndicatorOutput {
 interface ICalculatorDimensionInput extends ICalculatorIndicatorInput {
     formula: string;
     hideEmpty?: boolean;
+    /** Временно поддерживается обратная совместимость с форматом { alias: string; formula: string }[] */
+    /** Появилась необходимость в ленточном графике, т.к. разрез длительность используется, как мера */
+    additionalFormulas?: Map<string, string>;
 }
 interface ICalculatorDimensionOutput extends ICalculatorIndicatorOutput {
 }
@@ -418,25 +421,62 @@ type TWidgetFiltering = {
     mode: EWidgetFilterMode;
 };
 declare enum EColorMode {
+    DISABLED = "DISABLED",
     FORMULA = "FORMULA",
     BASE = "BASE",
     GRADIENT = "GRADIENT",
-    AUTO = "AUTO"
+    AUTO = "AUTO",
+    RULE = "RULE",
+    VALUES = "VALUES",
+    BY_DIMENSION = "BY_DIMENSION"
 }
-/** Настройка цвета */
-type TColor = {
-    mode: EColorMode.FORMULA;
-    formula: string;
-} | {
+type TColorBase = {
     mode: EColorMode.BASE;
     value?: string;
     defaultColor?: string;
+};
+declare enum EColorScope {
+    WORKSPACE = "WORKSPACE",
+    DASHBOARD = "DASHBOARD"
+}
+type TColorRuleCommon = {
+    mode: EColorMode.RULE;
+    ruleName: string;
+};
+type TColorRule = ({
+    scope: EColorScope.DASHBOARD | null;
 } | {
+    scope: EColorScope.WORKSPACE;
+    workspaceGroupId: number | null;
+}) & TColorRuleCommon;
+interface IColoredValue {
+    value: string;
+    color: TColorBase | TColorRule;
+}
+declare enum EMarkdownDisplayMode {
+    NONE = "NONE",
+    INDICATOR = "INDICATOR"
+}
+/** Настройка цвета */
+type TColor = {
+    mode: EColorMode.FORMULA;
+    formula: string;
+} | TColorBase | {
     mode: EColorMode.GRADIENT;
     startValue: string;
     endValue: string;
 } | {
     mode: EColorMode.AUTO;
+} | TColorRule | {
+    mode: EColorMode.VALUES;
+    dimensionFormula: string;
+    items: IColoredValue[];
+} | {
+    mode: EColorMode.BY_DIMENSION;
+    dimensionName: string;
+    items: IColoredValue[];
+} | {
+    mode: EColorMode.DISABLED;
 };
 declare enum EDisplayConditionMode {
     DISABLED = "DISABLED",
@@ -470,6 +510,7 @@ type TSortDirection = ESortDirection.ascend | ESortDirection.descend;
 interface ISortOrder {
     formula: string;
     direction: TSortDirection;
+    displayCondition?: TNullable<string>;
 }
 type TWidgetSortingValueRelatedWidgetMeasure = {
     mode: ESortingValueModes.MEASURE_IN_WIDGET;
@@ -613,6 +654,10 @@ interface IWidgetDimension extends IWidgetColumnIndicator {
 interface IWidgetMeasure extends IWidgetColumnIndicator {
     type: EWidgetIndicatorType.MEASURE;
 }
+interface IMarkdownMeasure extends IWidgetMeasure {
+    format: EFormatTypes;
+    displayMode: EMarkdownDisplayMode;
+}
 /** Тип показателя */
 declare enum EIndicatorType {
     /** Показатели процесса */
@@ -700,6 +745,9 @@ interface IWidgetTable {
  * full - полный
  */
 type TDisplayMode = "preview" | "full";
+interface IDisplayRule {
+    color: TColor;
+}
 interface IWidgetsContext {
     /** используемый язык в системе */
     language: ELanguages;
@@ -722,6 +770,8 @@ interface IWidgetsContext {
     userLogin: string;
     scripts: Map<string, IActionScript>;
     tables: Set<string>;
+    reportDisplayRules: Map<string, IDisplayRule>;
+    workspaceDisplayRules: Map<number, Map<string, IDisplayRule>>;
 }
 
 declare enum EWidgetActionInputMode {
@@ -822,6 +872,9 @@ interface IBaseWidgetSettings {
     header?: string;
     headerSize?: number;
     stateName?: string | null;
+    showMarkdown?: boolean;
+    markdownMeasures?: IMarkdownMeasure[];
+    markdownText?: string;
     filters?: (IFormulaFilterValue | string)[];
     filterMode?: EWidgetFilterMode;
     ignoreFilters?: boolean;
@@ -905,6 +958,10 @@ interface IGroupSetDescription<Settings extends object, GroupSettings extends ob
 }
 /** Конфигурация левой панели */
 interface IPanelDescription<Settings extends object, GroupSettings extends IGroupSettings = IGroupSettings> {
+    /** Добавить заголовок для виджета */
+    useHeader?: boolean;
+    /** Добавить описание для виджета */
+    useMarkdown?: boolean;
     /** Конфигурация настроек данных виджета */
     dataRecords?: TWidgetLevelRecord<Settings>[];
     /** Конфигурация настроек отображения виджета */
@@ -1156,7 +1213,7 @@ declare const replaceDisplayCondition: <I extends IWidgetColumnIndicator>(dimens
 declare function mapMeasuresToInputs<T extends IWidgetMeasure>(measures: T[], variables: Map<string, TWidgetVariable>, addFormulas?: (measure: T) => Map<string, string>): ICalculatorMeasureInput[];
 
 /** Конвертировать разрезы виджета во входы для вычислителя */
-declare function mapDimensionsToInputs(dimensions: IWidgetDimension[], variables: Map<string, TWidgetVariable>): ICalculatorDimensionInput[];
+declare function mapDimensionsToInputs<T extends IWidgetDimension>(dimensions: T[], variables: Map<string, TWidgetVariable>, addFormulas?: (dimension: T) => Map<string, string>): ICalculatorDimensionInput[];
 
 /** Конвертировать процессные показатели виджета во входы для вычислителя */
 declare function mapTransitionMeasuresToInputs<T extends IProcessIndicator>(indicators: T[], process: IWidgetProcess, variables: Map<string, TWidgetVariable>, addFormulas?: (indicator: T) => Map<string, string>): ICalculatorMeasureInput[];
@@ -1171,7 +1228,7 @@ declare function mapEventMeasuresToInputs<T extends IProcessIndicator>(indicator
  * @param measuresInOriginalOrder меры виджета (конкретная мера будет браться по индексу)
  * @returns
  */
-declare function mapSortingToInputs(sortingIndicators?: IWidgetSortingIndicator[], dimensionsInOriginalOrder?: IWidgetDimension[], measuresInOriginalOrder?: IWidgetMeasure[]): ISortOrder[];
+declare function mapSortingToInputs(sortingIndicators: IWidgetSortingIndicator[] | undefined, dimensionsInOriginalOrder: IWidgetDimension[] | undefined, measuresInOriginalOrder: IWidgetMeasure[] | undefined, variables: Map<string, TWidgetVariable>): ISortOrder[];
 
 /**
  * Выбрать активный разрез иерархии на основе активных фильтров.
@@ -1424,4 +1481,4 @@ declare global {
     }
 }
 
-export { EActionTypes, ECalculatorFilterMethods, EColorMode, EControlType, EDbType, EDimensionTemplateNames, EDisplayConditionMode, EDrawerPlacement, EDurationUnit, EEventMeasureTemplateNames, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMeasureTemplateNames, EOpenViewMode, EProcessFilterNames, ESimpleDataType, ESortDirection, ESortingValueModes, ETransitionMeasureTemplateNames, EViewType, EWidgetActionInputMode, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, type IActionCommon, type IActionGoToUrl, type IActionOpenView, type IActionRunScript, type IActionScript, type IActionScriptField, type IActionUpdateVariable, type IAddDurationOfTransitionFilter, type IAddPresenceOfEventFilter, type IAddPresenceOfTransitionFilter, type IAddRepetitionOfEventFilter, type IBaseDimensionsAndMeasuresCalculator, type IBaseDimensionsAndMeasuresCalculatorInput, type IBaseDimensionsAndMeasuresCalculatorOutput, type IBaseWidgetSettings, type ICalculator, type ICalculatorDimensionInput, type ICalculatorDimensionOutput, type ICalculatorFactory, type ICalculatorFilter, type ICalculatorIndicatorInput, type ICalculatorIndicatorOutput, type ICalculatorMeasureInput, type ICalculatorMeasureOutput, type ICalculatorVariable, type ICalculatorVariablesValues, type ICommonColumnIndicator, type IControlRecord, type ICustomAddButtonProps, type ICustomWidgetProps, type IDefinition, type IDimensionSelection, type IDimensionSelectionByFormula, type IDisplayPredicate, type IDivePanelDescription, type IDividerRecord, type IEdge, type IExportColumnOrder, type IFillSettings, type IFormulaFilterValue, type IGeneralCalculator, type IGeneralCalculatorExportInput, type IGeneralCalculatorInput, type IGeneralCalculatorOutput, type IGraphElement, type IGroupSetDescription, type IGroupSetRecord, type IGroupSettings, type IHistogramBin, type IHistogramCalculator, type IHistogramCalculatorInput, type IHistogramCalculatorOutput, type ILens, type IPanelDescription, type IPanelDescriptionCreator, type IPieCalculator, type IPieCalculatorInput, type IPieCalculatorOutput, type IProcessEventFilterValue, type IProcessEventIndicator, type IProcessGraphCalculator, type IProcessGraphCalculatorInput, type IProcessGraphCalculatorOutput, type IProcessIndicator, type IProcessTransitionFilterValue, type IProcessTransitionIndicator, type IRange, type ISelectOption, type ISortOrder, type IStagesFilterValue, type ITwoLimitsCalculator, type ITwoLimitsCalculatorExportInput, type ITwoLimitsCalculatorInput, type ITwoLimitsCalculatorOutput, type ITypeCalculator, type ITypeCalculatorInput, type ITypeCalculatorOutput, type IVertex, type IWidget, type IWidgetActionInput, type IWidgetColumnIndicator, type IWidgetDimension, type IWidgetDimensionHierarchy, type IWidgetEntity, type IWidgetFilter, type IWidgetFiltration, type IWidgetFormatting, type IWidgetFormulaFilterValue, type IWidgetIndicator, type IWidgetMeasure, type IWidgetPlaceholderController, type IWidgetProcess, type IWidgetProps, type IWidgetSortingIndicator, type IWidgetTable, type IWidgetTableColumn, type IWidgetsContext, type TActionsOnClick, type TBoundedContentWithIndicator, type TColor, type TColumnIndicatorValue, type TDefineWidgetOptions, type TDisplayCondition, type TDisplayMode, type TEmptyRecord, type TGroupLevelRecord, type TLaunchActionParams, type TProcessIndicatorValue, type TRecordAccessor, type TSelectivePartial, type TSortDirection, type TUpdateSelection, type TValuePath, type TWidgetActionInputValue, type TWidgetContainer, type TWidgetFilterValue, type TWidgetFiltering, type TWidgetLevelRecord, type TWidgetSortingValue, type TWidgetSortingValueRelatedWidgetDimension, type TWidgetSortingValueRelatedWidgetIndicator, type TWidgetSortingValueRelatedWidgetMeasure, type TWidgetVariable, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, dimensionTemplateFormulas, escapeSpecialCharacters, eventMeasureTemplateFormulas, fillTemplateString, formulaFilterMethods, generateColumnFormula, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getTransitionMeasureFormula, isActionValid, isHierarchy, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, mapVariablesToInputs, measureTemplateFormulas, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, transitionMeasureTemplateFormulas, updateDefaultModeSelection, updateMultiModeSelection, updateSingleModeSelection };
+export { EActionTypes, ECalculatorFilterMethods, EColorMode, EColorScope, EControlType, EDbType, EDimensionTemplateNames, EDisplayConditionMode, EDrawerPlacement, EDurationUnit, EEventMeasureTemplateNames, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMarkdownDisplayMode, EMeasureTemplateNames, EOpenViewMode, EProcessFilterNames, ESimpleDataType, ESortDirection, ESortingValueModes, ETransitionMeasureTemplateNames, EViewType, EWidgetActionInputMode, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, type IActionCommon, type IActionGoToUrl, type IActionOpenView, type IActionRunScript, type IActionScript, type IActionScriptField, type IActionUpdateVariable, type IAddDurationOfTransitionFilter, type IAddPresenceOfEventFilter, type IAddPresenceOfTransitionFilter, type IAddRepetitionOfEventFilter, type IBaseDimensionsAndMeasuresCalculator, type IBaseDimensionsAndMeasuresCalculatorInput, type IBaseDimensionsAndMeasuresCalculatorOutput, type IBaseWidgetSettings, type ICalculator, type ICalculatorDimensionInput, type ICalculatorDimensionOutput, type ICalculatorFactory, type ICalculatorFilter, type ICalculatorIndicatorInput, type ICalculatorIndicatorOutput, type ICalculatorMeasureInput, type ICalculatorMeasureOutput, type ICalculatorVariable, type ICalculatorVariablesValues, type IColoredValue, type ICommonColumnIndicator, type IControlRecord, type ICustomAddButtonProps, type ICustomWidgetProps, type IDefinition, type IDimensionSelection, type IDimensionSelectionByFormula, type IDisplayPredicate, type IDisplayRule, type IDivePanelDescription, type IDividerRecord, type IEdge, type IExportColumnOrder, type IFillSettings, type IFormulaFilterValue, type IGeneralCalculator, type IGeneralCalculatorExportInput, type IGeneralCalculatorInput, type IGeneralCalculatorOutput, type IGraphElement, type IGroupSetDescription, type IGroupSetRecord, type IGroupSettings, type IHistogramBin, type IHistogramCalculator, type IHistogramCalculatorInput, type IHistogramCalculatorOutput, type ILens, type IMarkdownMeasure, type IPanelDescription, type IPanelDescriptionCreator, type IPieCalculator, type IPieCalculatorInput, type IPieCalculatorOutput, type IProcessEventFilterValue, type IProcessEventIndicator, type IProcessGraphCalculator, type IProcessGraphCalculatorInput, type IProcessGraphCalculatorOutput, type IProcessIndicator, type IProcessTransitionFilterValue, type IProcessTransitionIndicator, type IRange, type ISelectOption, type ISortOrder, type IStagesFilterValue, type ITwoLimitsCalculator, type ITwoLimitsCalculatorExportInput, type ITwoLimitsCalculatorInput, type ITwoLimitsCalculatorOutput, type ITypeCalculator, type ITypeCalculatorInput, type ITypeCalculatorOutput, type IVertex, type IWidget, type IWidgetActionInput, type IWidgetColumnIndicator, type IWidgetDimension, type IWidgetDimensionHierarchy, type IWidgetEntity, type IWidgetFilter, type IWidgetFiltration, type IWidgetFormatting, type IWidgetFormulaFilterValue, type IWidgetIndicator, type IWidgetMeasure, type IWidgetPlaceholderController, type IWidgetProcess, type IWidgetProps, type IWidgetSortingIndicator, type IWidgetTable, type IWidgetTableColumn, type IWidgetsContext, type TActionsOnClick, type TBoundedContentWithIndicator, type TColor, type TColorRule, type TColumnIndicatorValue, type TDefineWidgetOptions, type TDisplayCondition, type TDisplayMode, type TEmptyRecord, type TGroupLevelRecord, type TLaunchActionParams, type TProcessIndicatorValue, type TRecordAccessor, type TSelectivePartial, type TSortDirection, type TUpdateSelection, type TValuePath, type TWidgetActionInputValue, type TWidgetContainer, type TWidgetFilterValue, type TWidgetFiltering, type TWidgetLevelRecord, type TWidgetSortingValue, type TWidgetSortingValueRelatedWidgetDimension, type TWidgetSortingValueRelatedWidgetIndicator, type TWidgetSortingValueRelatedWidgetMeasure, type TWidgetVariable, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, dimensionTemplateFormulas, escapeSpecialCharacters, eventMeasureTemplateFormulas, fillTemplateString, formulaFilterMethods, generateColumnFormula, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getTransitionMeasureFormula, isActionValid, isHierarchy, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, mapVariablesToInputs, measureTemplateFormulas, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, transitionMeasureTemplateFormulas, updateDefaultModeSelection, updateMultiModeSelection, updateSingleModeSelection };

package/dist/index.esm.js

@@ -502,11 +502,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";
@@ -782,7 +796,8 @@ function mapMeasuresToInputs(measures, 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;
@@ -796,11 +811,14 @@ function mapDimensionToInput(dimension, variables) {
         dataType: dimension.dataType,
         hideEmpty: dimension.hideEmptyValues,
         displayConditionFormula: getDisplayConditionFormula(dimension.displayCondition),
+        additionalFormulas: addFormulas(dimension),
     };
 }
 /** Конвертировать разрезы виджета во входы для вычислителя */
-function mapDimensionsToInputs(dimensions, variables) {
-    return compactMap(dimensions, function (dimension) { return mapDimensionToInput(dimension, variables); });
+function mapDimensionsToInputs(dimensions, variables, addFormulas) {
+    return compactMap(dimensions, function (dimension) {
+        return mapDimensionToInput(dimension, variables, addFormulas);
+    });
 }
 
 function mapTransitionMeasureToInput(indicator, process, variables, addFormulas) {
@@ -858,11 +876,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 ||
@@ -873,7 +892,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];
@@ -1061,4 +1093,4 @@ var getLocalizedText = function (language, locObj, props) {
     return localization.getLocalized(locObj, props);
 };
 
-export { EActionTypes, ECalculatorFilterMethods, EColorMode, EControlType, EDbType, EDimensionTemplateNames, EDisplayConditionMode, EDrawerPlacement, EDurationUnit, EEventMeasureTemplateNames, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMeasureTemplateNames, EOpenViewMode, EProcessFilterNames, 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, mapVariablesToInputs, measureTemplateFormulas, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, transitionMeasureTemplateFormulas, updateDefaultModeSelection, updateMultiModeSelection, updateSingleModeSelection };
+export { EActionTypes, ECalculatorFilterMethods, EColorMode, EColorScope, EControlType, EDbType, EDimensionTemplateNames, EDisplayConditionMode, EDrawerPlacement, EDurationUnit, EEventMeasureTemplateNames, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMarkdownDisplayMode, EMeasureTemplateNames, EOpenViewMode, EProcessFilterNames, 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, mapVariablesToInputs, measureTemplateFormulas, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, transitionMeasureTemplateFormulas, updateDefaultModeSelection, updateMultiModeSelection, updateSingleModeSelection };

package/dist/index.js

@@ -503,11 +503,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";
@@ -783,7 +797,8 @@ function mapMeasuresToInputs(measures, 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;
@@ -797,11 +812,14 @@ function mapDimensionToInput(dimension, variables) {
         dataType: dimension.dataType,
         hideEmpty: dimension.hideEmptyValues,
         displayConditionFormula: getDisplayConditionFormula(dimension.displayCondition),
+        additionalFormulas: addFormulas(dimension),
     };
 }
 /** Конвертировать разрезы виджета во входы для вычислителя */
-function mapDimensionsToInputs(dimensions, variables) {
-    return compactMap(dimensions, function (dimension) { return mapDimensionToInput(dimension, variables); });
+function mapDimensionsToInputs(dimensions, variables, addFormulas) {
+    return compactMap(dimensions, function (dimension) {
+        return mapDimensionToInput(dimension, variables, addFormulas);
+    });
 }
 
 function mapTransitionMeasureToInput(indicator, process, variables, addFormulas) {
@@ -859,11 +877,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 ||
@@ -874,7 +893,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];

package/package.json

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