@infomaximum/widget-sdk 3.39.0 → 3.40.1

package/dist/index.d.ts

@@ -1094,7 +1094,7 @@ declare function mapEventMeasuresToInputs<T extends IProcessIndicator>(indicator
  * @param measuresInOriginalOrder меры виджета (конкретная мера будет браться по индексу)
  * @returns
  */
-declare function mapSortingToInputs(sortingIndicators: IWidgetSortingIndicator[] | undefined, dimensionsInOriginalOrder: IWidgetDimension[] | undefined, measuresInOriginalOrder: IWidgetMeasure[] | undefined, variables: Map<string, TWidgetVariable>): ISortOrder[];
+declare function mapSortingToInputs(sortingIndicators: IWidgetSortingIndicator[] | undefined, dimensionsInOriginalOrder: IWidgetDimension[] | undefined, measuresInOriginalOrder: IWidgetMeasure[] | undefined, variables: Map<string, TWidgetVariable>, withDefaultSortOrder?: boolean): ISortOrder[];
 
 /**
  * Выбрать активный разрез иерархии на основе активных фильтров.

package/dist/index.esm.js

@@ -841,6 +841,55 @@ function mapEventMeasuresToInputs(indicators, process, variables, addFormulas) {
     });
 }
 
+var ESortDirection;
+(function (ESortDirection) {
+    ESortDirection["descend"] = "DESC";
+    ESortDirection["ascend"] = "ASC";
+    ESortDirection["ASC"] = "ascend";
+    ESortDirection["DESC"] = "descend";
+})(ESortDirection || (ESortDirection = {}));
+
+var getDefaultSortOrder = function (dimensions, measures) {
+    /** Если есть условие отображения, то не делаем автосортировку */
+    if (dimensions.some(function (dimension) {
+        return dimension.displayCondition &&
+            dimension.displayCondition.mode !== EDisplayConditionMode.DISABLED;
+    })) {
+        return [];
+    }
+    /** Если есть временной разрез, то автосортировка по первому такому разрезу (по возрастанию) */
+    var timeDimension = dimensions.find(function (dimension) {
+        return dimension.format &&
+            [
+                EFormatTypes.DATE,
+                EFormatTypes.MONTH,
+                EFormatTypes.DATETIME,
+                EFormatTypes.DAY_OF_WEEK,
+                EFormatTypes.HOUR,
+                EFormatTypes.MONTH_YEAR,
+                EFormatTypes.YEAR,
+                EFormatTypes.QUARTER,
+                EFormatTypes.QUARTER_YEAR,
+                EFormatTypes.DAY_OF_MONTH,
+                EFormatTypes.WEEK,
+            ].includes(dimension.format);
+    });
+    if (timeDimension) {
+        return [{ formula: getDimensionFormula(timeDimension), direction: ESortDirection.ascend }];
+    }
+    if (measures.length > 0) {
+        var firstMeasure = measures[0];
+        if (firstMeasure) {
+            return [
+                {
+                    direction: ESortDirection.descend,
+                    formula: getMeasureFormula(firstMeasure),
+                },
+            ];
+        }
+    }
+    return [];
+};
 /**
  * Преобразовать объекты сортировок из settings виджета в sortOrders вычислителя
  * @param sortingIndicators объекты сортировок из settings виджета
@@ -848,11 +897,12 @@ function mapEventMeasuresToInputs(indicators, process, variables, addFormulas) {
  * @param measuresInOriginalOrder меры виджета (конкретная мера будет браться по индексу)
  * @returns
  */
-function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measuresInOriginalOrder, variables) {
+function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measuresInOriginalOrder, variables, withDefaultSortOrder) {
     if (sortingIndicators === void 0) { sortingIndicators = []; }
     if (dimensionsInOriginalOrder === void 0) { dimensionsInOriginalOrder = []; }
     if (measuresInOriginalOrder === void 0) { measuresInOriginalOrder = []; }
-    return compactMap(sortingIndicators, function (_a) {
+    if (withDefaultSortOrder === void 0) { withDefaultSortOrder = true; }
+    var sortOrder = compactMap(sortingIndicators, function (_a) {
         var _b;
         var value = _a.value, direction = _a.direction;
         if (value.mode === ESortingValueModes.FORMULA ||
@@ -884,6 +934,9 @@ function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measur
             return measure && { formula: getMeasureFormula(measure), direction: direction };
         }
     });
+    return withDefaultSortOrder && sortOrder.length === 0
+        ? getDefaultSortOrder(dimensionsInOriginalOrder, measuresInOriginalOrder)
+        : sortOrder;
 }
 
 /**
@@ -977,14 +1030,6 @@ var ECustomSelectTemplates;
     ECustomSelectTemplates["DIMENSION_GROUPS"] = "DIMENSION_GROUPS";
 })(ECustomSelectTemplates || (ECustomSelectTemplates = {}));
 
-var ESortDirection;
-(function (ESortDirection) {
-    ESortDirection["descend"] = "DESC";
-    ESortDirection["ascend"] = "ASC";
-    ESortDirection["ASC"] = "ascend";
-    ESortDirection["DESC"] = "descend";
-})(ESortDirection || (ESortDirection = {}));
-
 var findFilterByFormula = function (filters, formula) {
     var _a;
     return ((_a = filters.find(function (filter) {

package/dist/index.js

@@ -842,6 +842,55 @@ function mapEventMeasuresToInputs(indicators, process, variables, addFormulas) {
     });
 }
 
+exports.ESortDirection = void 0;
+(function (ESortDirection) {
+    ESortDirection["descend"] = "DESC";
+    ESortDirection["ascend"] = "ASC";
+    ESortDirection["ASC"] = "ascend";
+    ESortDirection["DESC"] = "descend";
+})(exports.ESortDirection || (exports.ESortDirection = {}));
+
+var getDefaultSortOrder = function (dimensions, measures) {
+    /** Если есть условие отображения, то не делаем автосортировку */
+    if (dimensions.some(function (dimension) {
+        return dimension.displayCondition &&
+            dimension.displayCondition.mode !== exports.EDisplayConditionMode.DISABLED;
+    })) {
+        return [];
+    }
+    /** Если есть временной разрез, то автосортировка по первому такому разрезу (по возрастанию) */
+    var timeDimension = dimensions.find(function (dimension) {
+        return dimension.format &&
+            [
+                exports.EFormatTypes.DATE,
+                exports.EFormatTypes.MONTH,
+                exports.EFormatTypes.DATETIME,
+                exports.EFormatTypes.DAY_OF_WEEK,
+                exports.EFormatTypes.HOUR,
+                exports.EFormatTypes.MONTH_YEAR,
+                exports.EFormatTypes.YEAR,
+                exports.EFormatTypes.QUARTER,
+                exports.EFormatTypes.QUARTER_YEAR,
+                exports.EFormatTypes.DAY_OF_MONTH,
+                exports.EFormatTypes.WEEK,
+            ].includes(dimension.format);
+    });
+    if (timeDimension) {
+        return [{ formula: getDimensionFormula(timeDimension), direction: exports.ESortDirection.ascend }];
+    }
+    if (measures.length > 0) {
+        var firstMeasure = measures[0];
+        if (firstMeasure) {
+            return [
+                {
+                    direction: exports.ESortDirection.descend,
+                    formula: getMeasureFormula(firstMeasure),
+                },
+            ];
+        }
+    }
+    return [];
+};
 /**
  * Преобразовать объекты сортировок из settings виджета в sortOrders вычислителя
  * @param sortingIndicators объекты сортировок из settings виджета
@@ -849,11 +898,12 @@ function mapEventMeasuresToInputs(indicators, process, variables, addFormulas) {
  * @param measuresInOriginalOrder меры виджета (конкретная мера будет браться по индексу)
  * @returns
  */
-function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measuresInOriginalOrder, variables) {
+function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measuresInOriginalOrder, variables, withDefaultSortOrder) {
     if (sortingIndicators === void 0) { sortingIndicators = []; }
     if (dimensionsInOriginalOrder === void 0) { dimensionsInOriginalOrder = []; }
     if (measuresInOriginalOrder === void 0) { measuresInOriginalOrder = []; }
-    return compactMap(sortingIndicators, function (_a) {
+    if (withDefaultSortOrder === void 0) { withDefaultSortOrder = true; }
+    var sortOrder = compactMap(sortingIndicators, function (_a) {
         var _b;
         var value = _a.value, direction = _a.direction;
         if (value.mode === exports.ESortingValueModes.FORMULA ||
@@ -885,6 +935,9 @@ function mapSortingToInputs(sortingIndicators, dimensionsInOriginalOrder, measur
             return measure && { formula: getMeasureFormula(measure), direction: direction };
         }
     });
+    return withDefaultSortOrder && sortOrder.length === 0
+        ? getDefaultSortOrder(dimensionsInOriginalOrder, measuresInOriginalOrder)
+        : sortOrder;
 }
 
 /**
@@ -978,14 +1031,6 @@ exports.ECustomSelectTemplates = void 0;
     ECustomSelectTemplates["DIMENSION_GROUPS"] = "DIMENSION_GROUPS";
 })(exports.ECustomSelectTemplates || (exports.ECustomSelectTemplates = {}));
 
-exports.ESortDirection = void 0;
-(function (ESortDirection) {
-    ESortDirection["descend"] = "DESC";
-    ESortDirection["ascend"] = "ASC";
-    ESortDirection["ASC"] = "ascend";
-    ESortDirection["DESC"] = "descend";
-})(exports.ESortDirection || (exports.ESortDirection = {}));
-
 var findFilterByFormula = function (filters, formula) {
     var _a;
     return ((_a = filters.find(function (filter) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infomaximum/widget-sdk",
-  "version": "3.39.0",
+  "version": "3.40.1",
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",
@@ -12,8 +12,9 @@
   "scripts": {
     "build": "rollup -c",
     "lint": "tsc --noEmit",
-    "release": "tsc --noEmit && standard-version && rollup -c",
-    "format": "prettier --find-config-path --write 'src/**/*'"
+    "release": "npm run lint && standard-version && npm run build",
+    "format": "prettier --find-config-path --write 'src/**/*'",
+    "prepublishOnly": "npm run build"
   },
   "dependencies": {
     "@infomaximum/base-filter": "^1.1.0",
@@ -25,6 +26,7 @@
     "@rollup/plugin-commonjs": "25.0.7",
     "@rollup/plugin-node-resolve": "15.2.3",
     "@rollup/plugin-typescript": "11.1.5",
+    "core-js": "^3.38.0",
     "prettier": "3.2.5",
     "rollup": "4.14.3",
     "rollup-plugin-delete": "2.0.0",