@easyquery/enterprise 7.1.3-beta02 → 7.2.0-rc01

package/dist/bundles/easyquery.enterprise.js

@@ -180,8 +180,17 @@ var browserUtils;
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+// ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, "EqServerAggregatesCalculator", function() { return /* reexport */ eqs_aggr_calculator_EqServerAggregatesCalculator; });
+__webpack_require__.d(__webpack_exports__, "QueryEx", function() { return /* reexport */ query_ex_QueryEx; });
+__webpack_require__.d(__webpack_exports__, "QueryColumnEx", function() { return /* reexport */ query_column_ex_QueryColumnEx; });
+__webpack_require__.d(__webpack_exports__, "ConditionEx", function() { return /* reexport */ condition_ex_ConditionEx; });
+__webpack_require__.d(__webpack_exports__, "DataModelEx", function() { return /* reexport */ model_ex_DataModelEx; });
+__webpack_require__.d(__webpack_exports__, "EqServerQueryStorage", function() { return /* reexport */ EqServerQueryStorage; });
+
 // EXTERNAL MODULE: external "easyqueryCore"
 var external_easyqueryCore_ = __webpack_require__(0);
 
@@ -835,7 +844,7 @@ var i18n_i18n;
 var utils_utils;
 (function (utils) {
     function getAllDataTypes() {
-        return Object.values(DataType);
+        return Object.values(DataType).filter(function (item) { return typeof item === "number"; });
     }
     utils.getAllDataTypes = getAllDataTypes;
     function getDateDataTypes() {
@@ -843,12 +852,16 @@ var utils_utils;
     }
     utils.getDateDataTypes = getDateDataTypes;
     function getStringDataTypes() {
-        return [DataType.String, DataType.Memo];
+        return [DataType.String, DataType.Memo, DataType.FixedChar];
     }
     utils.getStringDataTypes = getStringDataTypes;
     var _numericTypes = [DataType.Byte, DataType.Word, DataType.Int32,
-        DataType.Int64, DataType.Float, DataType.Currency];
-    var _intTypes = [DataType.Byte, DataType.Word, DataType.Int32, DataType.Int64];
+        DataType.Int64, DataType.Float, DataType.Currency, DataType.Autoinc];
+    function getNumericDataTypes() {
+        return _numericTypes;
+    }
+    utils.getNumericDataTypes = getNumericDataTypes;
+    var _intTypes = [DataType.Byte, DataType.Word, DataType.Int32, DataType.Int64, DataType.Autoinc];
     //-------------- object functions -------------------
     /**
      * Copy the content of all objests passed in `args` parameters into `target`
@@ -913,7 +926,7 @@ var utils_utils;
                                     hashSet.set(sourceVal, target[key]);
                                 }
                                 else {
-                                    if (typeof target[key] == 'undefined') {
+                                    if (typeof target[key] == 'undefined' || target[key] == null) {
                                         target[key] = Object.create(Object.getPrototypeOf(sourceVal));
                                     }
                                     hashSet.set(sourceVal, target[key]);
@@ -1442,7 +1455,7 @@ var http_client_HttpClient = /** @class */ (function () {
         var desc = {
             method: method,
             url: url,
-            headers: __assign({}, this.defaultHeaders, options.headers || {}),
+            headers: __assign(__assign({}, this.defaultHeaders), options.headers || {}),
             queryParams: options.queryParams || {},
             data: data
         };
@@ -1588,6 +1601,12 @@ var MetaEntity = /** @class */ (function () {
         };
         internalProcessEntity(this);
     };
+    MetaEntity.prototype.getFirstPrimaryAttr = function () {
+        return this.getPrimaryAttrs()[0];
+    };
+    MetaEntity.prototype.getPrimaryAttrs = function () {
+        return this.attributes.filter(function (attr) { return attr.isPrimaryKey; });
+    };
     return MetaEntity;
 }());
 
@@ -2206,9 +2225,9 @@ var meta_data_MetaData = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=meta_data.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/data/aggr_calculator.js
-var aggr_calculator_assign = (undefined && undefined.__assign) || function () {
-    aggr_calculator_assign = Object.assign || function(t) {
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/data/aggr_settings.js
+var aggr_settings_assign = (undefined && undefined.__assign) || function () {
+    aggr_settings_assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
             s = arguments[i];
             for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
@@ -2216,7 +2235,7 @@ var aggr_calculator_assign = (undefined && undefined.__assign) || function () {
         }
         return t;
     };
-    return aggr_calculator_assign.apply(this, arguments);
+    return aggr_settings_assign.apply(this, arguments);
 };
 /**
  * Defines aggregations settings for the current context.
@@ -2229,16 +2248,32 @@ var AggregationSettings = /** @class */ (function () {
         this.groups = [];
         this.useGrandTotals = false;
         this.useRecordCount = false;
-        this.caseSensitiveGroups = false;
+        this._caseSensitiveGroups = false;
         this.COUNT_FIELD_NAME = 'GRPRECCNT';
     }
+    Object.defineProperty(AggregationSettings.prototype, "caseSensitiveGroups", {
+        get: function () {
+            return this._caseSensitiveGroups;
+        },
+        set: function (value) {
+            this._caseSensitiveGroups = value;
+            this.updateCompareProc();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    AggregationSettings.prototype.updateCompareProc = function () {
+        this.compareValues = this._caseSensitiveGroups
+            ? this.strictCompare
+            : this.caseInsensitiveCompare;
+    };
     AggregationSettings.prototype.addGroup = function (settings) {
         var cols = settings.columns || this.colStore.getColumnIds(settings.from, settings.to);
         if (!this.colStore.validateColumns(cols))
             throw "Invalid columns: " + cols;
         if (this.hasColumnsInUse(cols))
             throw "Can't add same columns to different groups/aggregates";
-        this.groups.push(aggr_calculator_assign({ columns: cols, aggregates: null }, settings));
+        this.groups.push(aggr_settings_assign({ columns: cols }, settings));
         return this;
     };
     AggregationSettings.prototype.addAggregateColumn = function (colIndexOrId, funcId) {
@@ -2263,7 +2298,7 @@ var AggregationSettings = /** @class */ (function () {
         var cols = [];
         var mappedGrops = this.groups.map(function (grp) {
             cols = cols.concat(grp.columns);
-            return aggr_calculator_assign({}, grp, { columns: Array.from(cols), aggregates: Array.from(_this.aggregates) });
+            return aggr_settings_assign(aggr_settings_assign({}, grp), { columns: Array.from(cols), aggregates: Array.from(_this.aggregates) });
         });
         return mappedGrops;
     };
@@ -2355,10 +2390,35 @@ var AggregationSettings = /** @class */ (function () {
             }
         }
     };
+    AggregationSettings.prototype.buildGroupKey = function (group, row) {
+        var caseInsensitive = !this.caseSensitiveGroups;
+        var result = {};
+        if (group) {
+            for (var _i = 0, _a = group.columns; _i < _a.length; _i++) {
+                var colId = _a[_i];
+                var keyVal = row.getValue(colId);
+                if (caseInsensitive && typeof (keyVal) === 'string') {
+                    keyVal = keyVal.toLowerCase();
+                }
+                result[colId] = keyVal;
+            }
+        }
+        return result;
+    };
+    //returns true if value1 == value2
+    AggregationSettings.prototype.strictCompare = function (value1, value2) {
+        return value1 === value2;
+    };
+    //makes a case insensative comparision of two values and return true if there are equal
+    AggregationSettings.prototype.caseInsensitiveCompare = function (value1, value2) {
+        var val1 = (typeof value1 === 'string') ? value1.toLowerCase() : value1;
+        var val2 = (typeof value2 === 'string') ? value2.toLowerCase() : value2;
+        return val1 === val2;
+    };
     return AggregationSettings;
 }());
 
-//# sourceMappingURL=aggr_calculator.js.map
+//# sourceMappingURL=aggr_settings.js.map
 // CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/data/data_column.js
 
 
@@ -2386,6 +2446,7 @@ var data_column_DataColumn = /** @class */ (function () {
         this.groupFooterColumnTemplate = desc.gfct;
         this.style = desc.style || {};
         this.description = desc.description;
+        this.calculatedWidth = 0;
     }
     return DataColumn;
 }());
@@ -2425,9 +2486,10 @@ var data_column_DataColumnList = /** @class */ (function () {
             .map(function (col, index) { return index; });
     };
     DataColumnList.prototype.put = function (index, col) {
-        //!!!!!!!!!check on "out of index"
-        this.items[index] = col;
-        this.updateDateColumnIdx();
+        if (index >= 0 && index < this.count) {
+            this.items[index] = col;
+            this.updateDateColumnIdx();
+        }
     };
     DataColumnList.prototype.move = function (col, newIndex) {
         var oldIndex = this.items.indexOf(col);
@@ -2437,8 +2499,12 @@ var data_column_DataColumnList = /** @class */ (function () {
         }
     };
     DataColumnList.prototype.get = function (index) {
-        //!!!!!!!!!check on "out of index"
-        return this.items[index];
+        if (index >= 0 && index < this.count) {
+            return this.items[index];
+        }
+        else {
+            return null;
+        }
     };
     DataColumnList.prototype.getIndex = function (id) {
         return this.mapper[id];
@@ -2522,16 +2588,23 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
     function EasyDataTable(options) {
         this._chunkSize = 1000;
         this._elasticChunks = false;
-        // object keeps number keys sorted
-        this.chunkMap = {};
+        this.cachedRows = [];
         this.total = 0;
         this.loader = null;
         this.needTotal = true;
+        this.isInMemory = false;
         options = options || {};
         this._chunkSize = options.chunkSize || this._chunkSize;
         this._elasticChunks = options.elasticChunks || this._elasticChunks;
         this.loader = options.loader;
+        if (typeof options.inMemory !== 'undefined') {
+            this.isInMemory = options.inMemory;
+        }
+        if (this.isInMemory) {
+            this.needTotal = false;
+        }
         this._columns = new data_column_DataColumnList();
+        this.onUpdate = options.onUpdate;
         if (options.columns) {
             for (var _i = 0, _a = options.columns; _i < _a.length; _i++) {
                 var colDesc = _a[_i];
@@ -2562,7 +2635,7 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
             this._chunkSize = value;
             this.total = 0;
             this.needTotal = !this.elasticChunks;
-            this.chunkMap = {};
+            this.cachedRows = [];
         },
         enumerable: true,
         configurable: true
@@ -2575,7 +2648,7 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
             this._elasticChunks = value;
             this.total = 0;
             this.needTotal = !this.elasticChunks;
-            this.chunkMap = {};
+            this.cachedRows = [];
         },
         enumerable: true,
         configurable: true
@@ -2603,22 +2676,12 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
                 endIndex = this.total;
             }
         }
-        var lbChunk = Math.trunc(fromIndex / this._chunkSize);
-        var ubChunk = Math.trunc((endIndex - 1) / this._chunkSize);
-        var allChunksCached = true;
-        for (var i = lbChunk; i <= ubChunk; i++) {
-            if (!this.chunkMap[i]) {
-                allChunksCached = false;
-                break;
-            }
+        if (this.isInMemory && endIndex > this.cachedRows.length) {
+            endIndex = this.cachedRows.length;
         }
+        var allChunksCached = endIndex <= this.cachedRows.length;
         if (allChunksCached) {
-            var resultArr = [];
-            for (var i = lbChunk; i <= ubChunk; i++) {
-                resultArr = resultArr.concat(this.chunkMap[i].rows);
-            }
-            var firstChunkOffset = this.chunkMap[lbChunk].offset;
-            return Promise.resolve(resultArr.slice(fromIndex - firstChunkOffset, endIndex - firstChunkOffset));
+            return Promise.resolve(this.cachedRows.slice(fromIndex, endIndex));
         }
         //if loader is not defined
         if (!this.loader) {
@@ -2629,53 +2692,34 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
         if (this.needTotal) {
             this.needTotal = false;
         }
-        var limit = this._chunkSize * (ubChunk - lbChunk + 1);
-        if (this.elasticChunks)
-            limit++;
-        return this.loader.loadChunk({
-            offset: lbChunk * this._chunkSize,
+        var offset = this.cachedRows.length;
+        var limit = endIndex - offset;
+        if (limit < this._chunkSize) {
+            limit = this._chunkSize;
+        }
+        var resultPromise = this.loader.loadChunk({
+            offset: offset,
             limit: limit,
             needTotal: needTotal
         })
             .then(function (result) {
-            var chunks = result.table.getCachedChunks();
             if (needTotal) {
                 _this.total = result.total;
-                if (endIndex > _this.total) {
-                    endIndex = _this.total;
-                }
             }
-            var index = lbChunk;
-            for (var _i = 0, chunks_1 = chunks; _i < chunks_1.length; _i++) {
-                var chunk = chunks_1[_i];
-                _this.chunkMap[index] = {
-                    offset: index * _this._chunkSize,
-                    rows: chunk.rows
-                };
-                index++;
+            Array.prototype.push.apply(_this.cachedRows, result.table.getCachedRows());
+            if (endIndex > _this.cachedRows.length) {
+                endIndex = _this.cachedRows.length;
             }
             if (_this.elasticChunks) {
                 var count_1 = result.table.getCachedCount();
-                if (count_1 > 0) {
-                    var chunk = _this.chunkMap[index - 1];
-                    if (count_1 === limit) {
-                        chunk.rows.splice(chunk.rows.length - 1, 1);
-                        if (chunk.rows.length == 0) {
-                            delete _this.chunkMap[index - 1];
-                        }
-                    }
-                    if (count_1 < limit) {
-                        _this.total = _this.getCachedCount();
-                    }
+                if (count_1 < limit) {
+                    _this.total = _this.cachedRows.length;
                 }
             }
-            var resultArr = [];
-            for (var i = lbChunk; i <= ubChunk; i++) {
-                resultArr = resultArr.concat(_this.chunkMap[i].rows);
-            }
-            var firstChunkOffset = _this.chunkMap[lbChunk].offset;
-            return resultArr.slice(fromIndex - firstChunkOffset, endIndex - firstChunkOffset);
+            _this.fireUpdated();
+            return _this.cachedRows.slice(fromIndex, endIndex);
         });
+        return resultPromise;
     };
     EasyDataTable.prototype.getRow = function (index) {
         return this.getRows({ offset: index, limit: 1 })
@@ -2687,14 +2731,13 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
     EasyDataTable.prototype.setTotal = function (total) {
         this.total = total;
         this.needTotal = false;
-        this.chunkMap = {};
     };
     EasyDataTable.prototype.getCachedCount = function () {
-        return this.getCachedRows().length;
+        return this.cachedRows.length;
     };
     EasyDataTable.prototype.clear = function () {
         this.columns.clear();
-        this.chunkMap = {};
+        this.cachedRows = [];
         this.total = 0;
         this.needTotal = !this._elasticChunks;
     };
@@ -2727,60 +2770,33 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
         }
         return null;
     };
-    EasyDataTable.prototype.addRow = function (rowOrValue) {
+    EasyDataTable.prototype.addRow = function (rowOrValues) {
         var newRow;
-        if (Array.isArray(rowOrValue)) {
+        if (Array.isArray(rowOrValues)) {
+            var values = rowOrValues;
             var dateIdx = this._columns.getDateColumnIndexes();
             if (dateIdx.length > 0) {
                 for (var _i = 0, dateIdx_1 = dateIdx; _i < dateIdx_1.length; _i++) {
                     var idx = dateIdx_1[_i];
-                    if (rowOrValue[idx]) {
-                        rowOrValue[idx] = this.mapDate(rowOrValue[idx], this._columns.get(idx).type);
+                    if (values[idx]) {
+                        values[idx] = this.mapDate(values[idx], this._columns.get(idx).type);
                     }
                 }
             }
-            newRow = new DataRow(this._columns, rowOrValue);
+            newRow = new DataRow(this._columns, values);
         }
         else {
-            newRow = this.createRow(rowOrValue);
-        }
-        var lastChunk = this.getLastChunk();
-        if (!lastChunk || lastChunk.rows.length >= this._chunkSize) {
-            lastChunk = this.createChunk();
+            newRow = this.createRow(rowOrValues);
         }
-        lastChunk.rows.push(newRow);
+        this.cachedRows.push(newRow);
         var cachedTotal = this.getCachedCount();
         if (cachedTotal > this.total) {
             this.total = cachedTotal;
         }
         return newRow;
     };
-    EasyDataTable.prototype.createChunk = function (index) {
-        if (typeof index == 'undefined') {
-            index = this.getLastChunkIndex() + 1;
-        }
-        var chunk = { offset: index * this._chunkSize, rows: [] };
-        this.chunkMap[index] = chunk;
-        return chunk;
-    };
-    EasyDataTable.prototype.getLastChunkIndex = function () {
-        var keys = Object.keys(this.chunkMap);
-        return keys.length > 0
-            ? parseInt(keys[keys.length - 1])
-            : -1;
-    };
-    EasyDataTable.prototype.getLastChunk = function () {
-        var index = this.getLastChunkIndex();
-        return index > -1
-            ? this.chunkMap[index]
-            : null;
-    };
     EasyDataTable.prototype.getCachedRows = function () {
-        return this.getCachedChunks()
-            .reduce(function (acc, v) { return acc.concat(v.rows); }, []);
-    };
-    EasyDataTable.prototype.getCachedChunks = function () {
-        return Object.values(this.chunkMap);
+        return this.cachedRows;
     };
     EasyDataTable.prototype.totalIsKnown = function () {
         if (this.elasticChunks) {
@@ -2789,6 +2805,11 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
         }
         return !this.needTotal;
     };
+    EasyDataTable.prototype.fireUpdated = function () {
+        if (this.onUpdate) {
+            this.onUpdate(this);
+        }
+    };
     return EasyDataTable;
 }());
 
@@ -2973,7 +2994,6 @@ i18n_i18n.resetLocales();
 
 
 
-//data
 
 
 
@@ -3347,6 +3367,13 @@ var dom_elem_builder_extends = (undefined && undefined.__extends) || (function (
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __spreadArrays = (undefined && undefined.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
 
 var DomElementBuilder = /** @class */ (function () {
     function DomElementBuilder(tag, parent) {
@@ -3417,7 +3444,7 @@ var DomElementBuilder = /** @class */ (function () {
             classNames[_i - 1] = arguments[_i];
         }
         if (className) {
-            var fullList = className.trim().split(" ").concat(classNames);
+            var fullList = __spreadArrays(className.trim().split(" "), classNames);
             for (var i = 0; i < fullList.length; i++)
                 this.element.classList.add(fullList[i]);
         }
@@ -3429,7 +3456,7 @@ var DomElementBuilder = /** @class */ (function () {
             classNames[_i - 1] = arguments[_i];
         }
         if (className) {
-            var fullList = className.trim().split(" ").concat(classNames);
+            var fullList = __spreadArrays(className.trim().split(" "), classNames);
             for (var i = 0; i < fullList.length; i++)
                 this.element.classList.remove(fullList[i]);
         }
@@ -3996,6 +4023,14 @@ var drag_manager_DragManager = /** @class */ (function () {
 //global variable
 var eqDragManager = new drag_manager_DragManager();
 //# sourceMappingURL=drag_manager.js.map
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_options.js
+var AutoResizeColumns;
+(function (AutoResizeColumns) {
+    AutoResizeColumns[AutoResizeColumns["Always"] = 0] = "Always";
+    AutoResizeColumns[AutoResizeColumns["Once"] = 1] = "Once";
+    AutoResizeColumns[AutoResizeColumns["Never"] = 2] = "Never";
+})(AutoResizeColumns || (AutoResizeColumns = {}));
+//# sourceMappingURL=easy_grid_options.js.map
 // CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_cell_renderer.js
 
 
@@ -4147,13 +4182,7 @@ var easy_grid_cell_renderer_GridCellRendererStore = /** @class */ (function () {
 // CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_columns.js
 
 
-var DEFAULT_WIDTH = 150;
-var DEFAULT_WIDTH_NUMBER = 120;
-var DEFAULT_WIDTH_DATE = 200;
-var DEFAULT_WIDTH_BOOL = 80;
 var DEFAULT_WIDTH_STRING = 250;
-var MIN_WIDTH_STRING = 100;
-var MAX_WIDTH_STRING = 500;
 var ROW_NUM_WIDTH = 60;
 var GridColumnAlign;
 (function (GridColumnAlign) {
@@ -4185,31 +4214,18 @@ var easy_grid_columns_GridColumn = /** @class */ (function () {
         this.isRowNum = false;
         this.dataColumn = column;
         this.grid = grid;
+        var widthOptions = grid.options.columnWidths || {};
         if (column) {
             if (column.style.alignment) {
                 this.align = MapAlignment(column.style.alignment);
             }
-            var coltype = column.type;
-            var cellType = this.grid.cellRendererStore.getCellType(coltype);
-            switch (cellType) {
-                case CellRendererType.NUMBER:
-                    this.width = DEFAULT_WIDTH_NUMBER;
-                    break;
-                case CellRendererType.DATETIME:
-                    this.width = DEFAULT_WIDTH_DATE;
-                    break;
-                case CellRendererType.BOOL:
-                    this.width = DEFAULT_WIDTH_BOOL;
-                    break;
-                default:
-                    this.width = DEFAULT_WIDTH_STRING;
-            }
+            this.width = (widthOptions && widthOptions[this.type]) ? widthOptions[this.type].default : DEFAULT_WIDTH_STRING;
             this.cellRenderer = this.grid.cellRendererStore.getDefaultRenderer(column.type);
             this._description = column.description;
         }
         else if (isRowNum) {
             this.isRowNum = true;
-            this.width = ROW_NUM_WIDTH;
+            this.width = (widthOptions && widthOptions.rowNumColumn) ? widthOptions.rowNumColumn.default : ROW_NUM_WIDTH;
             this._label = '';
             this.cellRenderer = this.grid.cellRendererStore.getDefaultRendererByType(CellRendererType.NUMBER);
         }
@@ -4255,9 +4271,10 @@ var easy_grid_columns_GridColumnList = /** @class */ (function () {
     GridColumnList.prototype.sync = function (columnList, hasRowNumCol) {
         if (hasRowNumCol === void 0) { hasRowNumCol = true; }
         this.clear();
-        if (hasRowNumCol) {
-            var rowNumCol = new easy_grid_columns_GridColumn(null, this.grid, true);
-            this.add(rowNumCol);
+        var rowNumCol = new easy_grid_columns_GridColumn(null, this.grid, true);
+        this.add(rowNumCol);
+        if (!hasRowNumCol) {
+            rowNumCol.isVisible = false;
         }
         if (columnList) {
             for (var _i = 0, _a = columnList.getItems(); _i < _a.length; _i++) {
@@ -4331,6 +4348,14 @@ var easy_grid_assign = (undefined && undefined.__assign) || function () {
     };
     return easy_grid_assign.apply(this, arguments);
 };
+var easy_grid_spreadArrays = (undefined && undefined.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
+
 
 
 
@@ -4363,6 +4388,35 @@ var easy_grid_EasyGrid = /** @class */ (function () {
                 pageSize: 30,
                 pageSizeItems: [20, 30, 50, 100, 200]
             },
+            columnWidths: {
+                autoResize: AutoResizeColumns.Once,
+                stringColumns: {
+                    min: 100,
+                    max: 500,
+                    default: 250
+                },
+                numberColumns: {
+                    min: 60,
+                    default: 120
+                },
+                boolColumns: {
+                    min: 50,
+                    default: 80
+                },
+                dateColumns: {
+                    min: 80,
+                    default: 200
+                },
+                otherColumns: {
+                    min: 100,
+                    max: 500,
+                    default: 250
+                },
+                rowNumColumn: {
+                    min: 40,
+                    default: 60
+                }
+            },
             addColumns: false,
             viewportRowsCount: null,
             showActiveRow: true
@@ -4370,7 +4424,6 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         this.rowsOnPagePromise = null;
         this.containerInitialHeight = 0;
         this.firstRender = true;
-        this.compareValues = this.strictCompare;
         this.prevRowTotals = null;
         this.landingIndex = -1;
         this.landingSlot = domel('div')
@@ -4382,7 +4435,8 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         if (options && options.paging) {
             options.paging = utils_utils.assign(this.defaultDataGridOptions.paging, options.paging);
         }
-        this.options = easy_grid_assign({}, this.defaultDataGridOptions, options);
+        this.options = this.mergeOptions(options);
+        this.processColumnWidthsOptions();
         if (!this.options.slot)
             throw Error('"slot" parameter is required to initialize EasyDataGrid');
         if (!this.options.dataTable)
@@ -4394,6 +4448,42 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         this.setSlot(this.options.slot);
         this.init(this.options);
     }
+    EasyGrid.prototype.mergeOptions = function (options) {
+        var colWidthOptions = utils_utils.assignDeep({}, this.defaultDataGridOptions.columnWidths, options.columnWidths);
+        var pagingOptions = utils_utils.assignDeep({}, this.defaultDataGridOptions.paging, options.paging);
+        var result = utils_utils.assign({}, this.defaultDataGridOptions, options);
+        result.columnWidths = colWidthOptions;
+        result.paging = pagingOptions;
+        return result;
+    };
+    EasyGrid.prototype.processColumnWidthsOptions = function () {
+        var widthOptions = this.options.columnWidths;
+        if (!widthOptions)
+            return;
+        //string columns
+        utils_utils.getStringDataTypes().forEach(function (dataType) {
+            widthOptions[dataType] = easy_grid_assign(easy_grid_assign({}, widthOptions.stringColumns), widthOptions[dataType]);
+        });
+        //numeric columns
+        utils_utils.getNumericDataTypes().forEach(function (dataType) {
+            widthOptions[dataType] = easy_grid_assign(easy_grid_assign({}, widthOptions.numberColumns), widthOptions[dataType]);
+        });
+        //bool columns
+        widthOptions[DataType.Bool] = easy_grid_assign(easy_grid_assign({}, widthOptions.boolColumns), widthOptions[DataType.Bool]);
+        //date columns
+        utils_utils.getDateDataTypes().forEach(function (dataType) {
+            widthOptions[dataType] = easy_grid_assign(easy_grid_assign({}, widthOptions.dateColumns), widthOptions[dataType]);
+        });
+        //other columns
+        var knownTypes = easy_grid_spreadArrays(utils_utils.getStringDataTypes(), utils_utils.getNumericDataTypes(), utils_utils.getDateDataTypes(), [
+            DataType.Bool
+        ]);
+        utils_utils.getAllDataTypes().forEach(function (dataType) {
+            if (!(dataType in knownTypes)) {
+                widthOptions[dataType] = easy_grid_assign(easy_grid_assign({}, widthOptions.otherColumns), widthOptions[dataType]);
+            }
+        });
+    };
     EasyGrid.prototype.setSlot = function (slot) {
         if (typeof slot === 'string') {
             if (slot.length) {
@@ -4530,18 +4620,27 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         gridContainer.classList.add(this.cssPrefix + "-container");
         gridContainer.appendChild(this.rootDiv);
         this.slot.appendChild(gridContainer);
+        var needAutoResize = this.options.columnWidths.autoResize !== AutoResizeColumns.Never;
         if (this.rowsOnPagePromise) {
             this.rowsOnPagePromise
                 .then(function () { return _this.updateHeight(); })
                 .then(function () {
                 _this.firstRender = false;
                 _this.rowsOnPagePromise = null;
+                if (needAutoResize) {
+                    _this.resizeColumns();
+                }
             });
         }
         else {
             setTimeout(function () {
-                _this.updateHeight();
-                _this.firstRender = false;
+                _this.updateHeight()
+                    .then(function () {
+                    _this.firstRender = false;
+                    if (needAutoResize) {
+                        _this.resizeColumns();
+                    }
+                });
             }, 100);
         }
     };
@@ -4620,7 +4719,7 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         var _this = this;
         var colBuilder = domel('div')
             .addClass(this.cssPrefix + "-header-cell")
-            .data('col-idx', "" + (index + 1))
+            .data('col-idx', "" + index)
             .setStyle('width', column.width + "px");
         if (column.dataColumn) {
             colBuilder
@@ -4658,14 +4757,6 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         }
         return colDiv;
     };
-    EasyGrid.prototype.strictCompare = function (value1, value2) {
-        return value1 !== value2;
-    };
-    EasyGrid.prototype.caseInsensitiveCompare = function (value1, value2) {
-        var val1 = (typeof value1 === 'string') ? value1.toLowerCase() : value1;
-        var val2 = (typeof value2 === 'string') ? value2.toLowerCase() : value2;
-        return val1 !== val2;
-    };
     EasyGrid.prototype.renderBody = function () {
         var _this = this;
         this.bodyDiv = domel('div')
@@ -4679,10 +4770,6 @@ var easy_grid_EasyGrid = /** @class */ (function () {
             .addClass(this.cssPrefix + "-cell-container")
             .toDOM();
         var showAggrs = this.canShowAggregates();
-        this.compareValues = this.caseInsensitiveCompare;
-        if (showAggrs && this.options.aggregates.settings.caseSensitiveGroups) {
-            this.compareValues = this.strictCompare;
-        }
         if (this.dataTable) {
             this.showProgress();
             this.rowsOnPagePromise = this.getRowsToRender()
@@ -4692,15 +4779,22 @@ var easy_grid_EasyGrid = /** @class */ (function () {
                 //prevent double rendering (bad solution, we have to figure out how to avoid this behavior properly)
                 _this.bodyCellContainerDiv.innerHTML = '';
                 _this.prevRowTotals = null;
+                var rowsToRender = 0;
                 if (rows.length) {
                     var groups_1 = showAggrs
                         ? _this.options.aggregates.settings.getGroups()
                         : [];
+                    rowsToRender = (rows.length < _this.pagination.pageSize)
+                        ? rows.length
+                        : _this.pagination.pageSize;
                     rows.forEach(function (row, index) {
                         if (showAggrs)
                             _this.updateTotalsState(groups_1, row);
-                        var tr = _this.renderRow(row, index);
-                        _this.bodyCellContainerDiv.appendChild(tr);
+                        //we don't actually render the last row
+                        if (index < rowsToRender) {
+                            var tr = _this.renderRow(row, index);
+                            _this.bodyCellContainerDiv.appendChild(tr);
+                        }
                     });
                     var showGrandTotalsOnEachPage = _this.options.aggregates && _this.options.aggregates.showGrandTotalsOnEachPage;
                     if (showAggrs && (_this.isLastPage() || showGrandTotalsOnEachPage)) {
@@ -4711,7 +4805,7 @@ var easy_grid_EasyGrid = /** @class */ (function () {
                 var containerWidth = _this.getContainerWidth();
                 domel(_this.bodyCellContainerDiv)
                     .setStyle('width', containerWidth + "px");
-                return rows.length;
+                return rowsToRender;
             })
                 .catch(function (error) { console.error(error); return 0; });
         }
@@ -4719,7 +4813,7 @@ var easy_grid_EasyGrid = /** @class */ (function () {
             domel(_this.headerViewportDiv)
                 .setStyle('margin-left', "-" + _this.bodyViewportDiv.scrollLeft + "px");
         });
-        this.bodyViewportDiv.addEventListener('keydown', this.onVieportKeydown.bind(this));
+        this.bodyViewportDiv.addEventListener('keydown', this.onViewportKeydown.bind(this));
     };
     EasyGrid.prototype.isLastPage = function () {
         if (this.dataTable.elasticChunks) {
@@ -4745,7 +4839,7 @@ var easy_grid_EasyGrid = /** @class */ (function () {
                 var group = groups[level - 1];
                 for (var _i = 0, _a = group.columns; _i < _a.length; _i++) {
                     var col = _a[_i];
-                    if (this.compareValues(this.prevRowTotals.getValue(col), newRow.getValue(col))) {
+                    if (!aggrSettings.compareValues(this.prevRowTotals.getValue(col), newRow.getValue(col))) {
                         changeLevel = level;
                         break;
                     }
@@ -4806,8 +4900,8 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         });
         var aggrContainer = this.options.aggregates.calculator.getAggrContainer();
         var aggrCols = aggrSettings.getAggregates().map(function (c) { return c.colId; });
-        var key = this.buildGroupKey(group, row);
-        aggrContainer.getAggregates(level, key)
+        var key = aggrSettings.buildGroupKey(group, row);
+        aggrContainer.getAggregateData(level, key)
             .then(function (values) {
             for (var _i = 0, aggrCols_1 = aggrCols; _i < aggrCols_1.length; _i++) {
                 var aggrColId = aggrCols_1[_i];
@@ -4848,34 +4942,20 @@ var easy_grid_EasyGrid = /** @class */ (function () {
                         }
                     }
                     if (groupFooterTemplate) {
-                        var cellDiv_1 = _this.renderCell(column, colIndex, val, rowElement);
+                        var cellDiv_1 = _this.renderCell(column, index, val, rowElement);
                         var innerCell = cellDiv_1.firstChild;
                         val = innerCell.innerHTML;
                         val = _this.applyGroupColumnTemplate(groupFooterTemplate, val, values[aggrSettings.COUNT_FIELD_NAME]);
                     }
                 }
-                var cellDiv = _this.renderCell(column, colIndex, val, rowElement);
+                var cellDiv = _this.renderCell(column, index, val, rowElement);
                 rowElement.appendChild(cellDiv);
             });
         })
             .catch(function (error) { return console.error(error); });
         return rowElement;
     };
-    EasyGrid.prototype.buildGroupKey = function (group, row) {
-        var aggrSettings = this.options.aggregates.settings;
-        var caseInsensitive = aggrSettings && !aggrSettings.caseSensitiveGroups;
-        var result = {};
-        for (var _i = 0, _a = group.columns; _i < _a.length; _i++) {
-            var colId = _a[_i];
-            var keyVal = row.getValue(colId);
-            if (caseInsensitive && typeof (keyVal) === 'string') {
-                keyVal = keyVal.toLowerCase();
-            }
-            result[colId] = keyVal;
-        }
-        return result;
-    };
-    EasyGrid.prototype.onVieportKeydown = function (ev) {
+    EasyGrid.prototype.onViewportKeydown = function (ev) {
         if (this.options.showActiveRow) {
             var rowCount = this.bodyCellContainerDiv.querySelectorAll("." + this.cssPrefix + "-row").length;
             var newValue = void 0;
@@ -4929,13 +5009,17 @@ var easy_grid_EasyGrid = /** @class */ (function () {
             }
         }
     };
+    /** Returns a promise with the list of the rows to render on one page.
+     * The list contains pageSize+1 row to make it possible
+     * to render the totals row (if it appears to be on the edge between pages)
+     */
     EasyGrid.prototype.getRowsToRender = function () {
         if (this.options.paging.enabled === false) {
             return Promise.resolve(this.dataTable.getCachedRows());
         }
         return this.dataTable.getRows({
-            page: this.pagination.page,
-            pageSize: this.pagination.pageSize
+            offset: (this.pagination.page - 1) * this.pagination.pageSize,
+            limit: this.pagination.pageSize + 1
         })
             .catch(function (error) {
             console.error(error);
@@ -5031,13 +5115,13 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         if (this.options.showActiveRow && index == this.activeRowIndex) {
             rowBuilder.addClass(this.cssPrefix + "-row-active");
         }
-        this.columns.getItems().forEach(function (column) {
+        this.columns.getItems().forEach(function (column, index) {
             if (!column.isVisible) {
                 return;
             }
             var colindex = column.isRowNum ? -1 : _this.dataTable.columns.getIndex(column.dataColumn.id);
             var val = column.isRowNum ? indexGlobal + 1 : row.getValue(colindex);
-            rowElement.appendChild(_this.renderCell(column, colindex, val, rowElement));
+            rowElement.appendChild(_this.renderCell(column, index, val, rowElement));
         });
         return rowElement;
     };
@@ -5309,6 +5393,97 @@ var easy_grid_EasyGrid = /** @class */ (function () {
     EasyGrid.prototype.focus = function () {
         this.bodyViewportDiv.focus();
     };
+    EasyGrid.prototype.resizeColumns = function () {
+        if (this.options.columnWidths.autoResize === AutoResizeColumns.Never)
+            return;
+        var containerWidth = this.bodyCellContainerDiv.style.width;
+        this.bodyCellContainerDiv.style.visibility = 'hidden';
+        this.bodyCellContainerDiv.style.width = '1px';
+        //this.headerRowDiv.style.visibility = 'hidden';
+        this.headerRowDiv.style.width = '1px';
+        var sumWidth = 0;
+        var columns = this.columns.getItems();
+        var headerCells = this.headerCellContainerDiv.querySelectorAll("." + this.cssPrefix + "-header-cell");
+        var headerIdx = 0;
+        var _loop_1 = function (idx) {
+            var column = columns[idx];
+            if (!column.isVisible)
+                return "continue";
+            var calculatedWidth = this_1.options.columnWidths.autoResize !== AutoResizeColumns.Always && column.dataColumn
+                ? column.dataColumn.calculatedWidth
+                : 0;
+            var cellValues = this_1.bodyCellContainerDiv.querySelectorAll("." + this_1.cssPrefix + "-cell[data-col-idx=\"" + idx + "\"] > ." + this_1.cssPrefix + "-cell-value");
+            var maxWidth = 0;
+            if (calculatedWidth > 0) {
+                sumWidth += calculatedWidth;
+                column.width = calculatedWidth;
+                cellValues.forEach(function (value) {
+                    value.parentElement.style.width = calculatedWidth + "px";
+                });
+                headerCells[headerIdx].style.width = calculatedWidth + "px";
+            }
+            else {
+                if (cellValues.length == 0) {
+                    headerCells[headerIdx].style.width = null;
+                    headerCells[headerIdx].style.whiteSpace = 'nowrap';
+                }
+                maxWidth = headerCells[headerIdx].offsetWidth;
+                if (cellValues.length > 0) {
+                    cellValues.forEach(function (value) {
+                        value.parentElement.style.width = null;
+                        var width = value.parentElement.offsetWidth;
+                        if (width > maxWidth) {
+                            maxWidth = width;
+                        }
+                    });
+                    maxWidth += 3;
+                    var maxOption = column.isRowNum
+                        ? this_1.options.columnWidths.rowNumColumn.max || 500
+                        : this_1.options.columnWidths[column.dataColumn.type].max || 2000;
+                    var minOption = column.isRowNum
+                        ? this_1.options.columnWidths.rowNumColumn.min || 0
+                        : this_1.options.columnWidths[column.dataColumn.type].min || 20;
+                    if (maxWidth > maxOption) {
+                        maxWidth = maxOption;
+                    }
+                    if (maxWidth < minOption) {
+                        maxWidth = minOption;
+                    }
+                    if (utils_utils.isNumericType(column.type)) {
+                        //increase the calculated width in 1.3 times for numeric columns
+                        maxWidth = Math.round(maxWidth * 1.3);
+                    }
+                    sumWidth += maxWidth;
+                    column.width = maxWidth;
+                    cellValues.forEach(function (value) {
+                        value.parentElement.style.width = maxWidth + "px";
+                    });
+                    headerCells[headerIdx].style.width = maxWidth + "px";
+                    if (column.dataColumn) {
+                        column.dataColumn.calculatedWidth = maxWidth;
+                    }
+                }
+                else {
+                    sumWidth += maxWidth;
+                }
+            }
+            headerIdx++;
+        };
+        var this_1 = this;
+        for (var idx = 0; idx < this.columns.count; idx++) {
+            _loop_1(idx);
+        }
+        if (sumWidth > 0) {
+            this.bodyCellContainerDiv.style.width = sumWidth + "px";
+            this.headerCellContainerDiv.style.width = sumWidth + "px";
+        }
+        else {
+            this.bodyCellContainerDiv.style.width = containerWidth;
+            this.headerCellContainerDiv.style.width = containerWidth;
+        }
+        this.bodyCellContainerDiv.style.visibility = null;
+        this.headerRowDiv.removeAttribute('style');
+    };
     return EasyGrid;
 }());
 
@@ -6495,6 +6670,7 @@ addEasyDataUITexts();
 
 
 
+
 //datetimepicker
 
 
@@ -7107,167 +7283,168 @@ var model_ex_DataModelEx = /** @class */ (function (_super) {
 }(external_easyqueryCore_["DataModel"]));
 
 
-// CONCATENATED MODULE: ./src/data/eqs_aggr_calculator.ts
-var eqs_aggr_calculator_assign = (undefined && undefined.__assign) || function () {
-    eqs_aggr_calculator_assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return eqs_aggr_calculator_assign.apply(this, arguments);
-};
-
+// CONCATENATED MODULE: ./src/data/data_table_aggr_calculator.ts
 
-var eqs_aggr_calculator_EqAggregatesCalculator = /** @class */ (function () {
-    function EqAggregatesCalculator(context) {
+var data_table_aggr_calculator_DataTableAggregatesCalculator = /** @class */ (function () {
+    function DataTableAggregatesCalculator(context) {
         this.context = context;
+        //stores current totals by level (group) number
+        this.levelsTotals = [];
+        this.prevRow = null;
         this.aggrContainer = new external_easyqueryCore_["EqAggregatesContainer"](context);
     }
-    EqAggregatesCalculator.prototype.getAggrContainer = function () {
+    DataTableAggregatesCalculator.prototype.getAggrContainer = function () {
         return this.aggrContainer;
     };
-    EqAggregatesCalculator.prototype.calculate = function (options) {
+    DataTableAggregatesCalculator.prototype.initObjects = function () {
+        var _this = this;
+        this.aggrSettings = this.context.getQuery().getAggregationSettings();
+        this.groups = this.aggrSettings.getGroups();
+        this.aggregates = this.aggrSettings.getAggregates();
+        this.aggrColIds = this.aggrSettings.getAggregates().map(function (a) { return a.colId; });
+        this.aggrCols = this.context.resultTable.columns.getItems()
+            .filter(function (col) { return _this.aggrColIds.indexOf(col.id) >= 0; });
+        this.levelsTotals = [];
+        this.prevRow = null;
+    };
+    DataTableAggregatesCalculator.prototype.createColumnAggregatesObject = function () {
+        return {
+            sum: 0,
+            min: Number.MAX_VALUE,
+            max: Number.MIN_VALUE
+        };
+    };
+    DataTableAggregatesCalculator.prototype.calculate = function (options) {
+        this.initObjects();
         this.aggrContainer.clear();
         options = options || {};
         options.maxLevel = options.maxLevel >= 0
             ? options.maxLevel : 0;
-        var levelPromises = [];
-        var query = this.context.createQuery();
-        query.loadFromData(this.context.getQuery().toJSONData());
-        var settings = this.context.getQuery().getAggregationSettings();
-        var aggregates = settings.getAggregates();
-        var aggrColIds = settings.getAggregates().map(function (a) { return a.colId; });
-        var aggrCols = query.getColumns()
-            .filter(function (col) { return aggrColIds.indexOf(col.id) >= 0; });
-        var _loop_1 = function (col) {
-            query.changeColumnType(col, external_easyqueryCore_["ExprTag"].AggregateFunction, { funcId: aggregates.filter(function (a) { return a.colId == col.id; })[0].funcId });
-        };
-        for (var _i = 0, aggrCols_1 = aggrCols; _i < aggrCols_1.length; _i++) {
-            var col = aggrCols_1[_i];
-            _loop_1(col);
+        var levelNumber = this.groups.length + 1; //number of groups plus grand totals
+        for (var levelIndex = 0; levelIndex < levelNumber; levelIndex++) {
+            var levelTotals = { count: 0, columns: {} };
+            this.resetLevelTotals(levelTotals);
+            this.levelsTotals.push(levelTotals);
         }
-        //get all non-aggregate columns
-        var queryCols = query.getColumns()
-            .filter(function (c) { return c.expr.tag !== external_easyqueryCore_["ExprTag"].AggregateFunction; });
-        for (var _a = 0, queryCols_1 = queryCols; _a < queryCols_1.length; _a++) {
-            var col = queryCols_1[_a];
-            col.setHidden(true);
+        var allRows = this.context.resultTable.getCachedRows();
+        for (var _i = 0, allRows_1 = allRows; _i < allRows_1.length; _i++) {
+            var row = allRows_1[_i];
+            this.processDataRow(row);
         }
-        if (settings.hasRecordCount()) {
-            var col = query.createColumn();
-            col.caption = settings.COUNT_FIELD_NAME;
-            col['_id'] = settings.COUNT_FIELD_NAME;
-            var sqlText = 'COUNT(*)';
-            var customSqlExpr = new external_easyqueryCore_["Expression"](col);
-            customSqlExpr.tag = external_easyqueryCore_["ExprTag"].CustomSql;
-            customSqlExpr.sql = sqlText;
-            customSqlExpr.baseAttrId = null;
-            col.expr = customSqlExpr;
-            query.getColumns().push(col);
-        }
-        if (settings.hasGrandTotals()) {
-            levelPromises.push(this.processLevel({
-                query: query,
-                level: 0,
-                groupName: 'Grand Totals',
-                resultObtainedCallback: options.resultObtained,
-                errorOccurredCallback: options.errorOccurred
-            }));
+        //flusing the totals for all group levels
+        for (var levelIndex = 1; levelIndex < levelNumber; levelIndex++) {
+            this.flushLevelTotals(levelIndex);
         }
-        var groups = settings.getGroups();
-        for (var level = 1; level <= groups.length; level++) {
-            var group = groups[level - 1];
-            for (var _b = 0, queryCols_2 = queryCols; _b < queryCols_2.length; _b++) {
-                var col = queryCols_2[_b];
-                col.setHidden(group.columns.indexOf(col.id) < 0);
-            }
-            levelPromises.push(this.processLevel({
-                query: query,
-                level: level,
-                groupName: group.name,
-                resultObtainedCallback: options.resultObtained,
-                errorOccurredCallback: options.errorOccurred
-            }));
+        //flusing the grand totals (if they are turned on)
+        if (this.aggrSettings.hasGrandTotals()) {
+            this.flushLevelTotals(0);
         }
-        return Promise.all(levelPromises)
-            .then(function () { return; })
-            .catch(function (error) { return console.error(error); });
+        return Promise.resolve();
     };
-    EqAggregatesCalculator.prototype.processLevel = function (options) {
-        var _this = this;
-        var fetcher = this.context.getServices()
-            .getDataFetcher();
-        var fetchOptions = {
-            aux: true,
-            query: options.query
-        };
-        if (this.context.debugMode) {
-            fetchOptions.debug = "Fetching group data. Group: '" + options.groupName + "', level: " + options.level;
+    DataTableAggregatesCalculator.prototype.resetLevelTotals = function (rowTotals) {
+        for (var _i = 0, _a = this.aggrCols; _i < _a.length; _i++) {
+            var aggrCol = _a[_i];
+            rowTotals.columns[aggrCol.id] = this.createColumnAggregatesObject();
         }
-        var resultPromise = fetcher.fetchData(fetchOptions)
-            .then(function (result) {
-            var dataTable = new easy_data_table_EasyDataTable({
-                elasticChunks: true
-            });
-            var resultSet = result.resultSet;
-            for (var _i = 0, _a = resultSet.cols; _i < _a.length; _i++) {
-                var col = _a[_i];
-                dataTable.columns.add(col);
-            }
-            for (var _b = 0, _c = resultSet.rows; _b < _c.length; _b++) {
-                var row = _c[_b];
-                dataTable.addRow(row);
-            }
-            var levelData = _this.buildLevelData(options.level, dataTable);
-            _this.aggrContainer.setAggregates(options.level, levelData);
-            if (options.resultObtainedCallback) {
-                options.resultObtainedCallback(result, options.level);
+        rowTotals.count = 0;
+    };
+    DataTableAggregatesCalculator.prototype.processDataRow = function (row) {
+        var levelIndexChanged = this.checkLevelChange(row);
+        if (levelIndexChanged >= 0) {
+            for (var levelIndex_1 = levelIndexChanged; levelIndex_1 < this.levelsTotals.length; levelIndex_1++) {
+                this.flushLevelTotals(levelIndex_1);
             }
-        })
-            .catch(function (error) {
-            if (options.errorOccurredCallback) {
-                options.errorOccurredCallback(eqs_aggr_calculator_assign({}, error, { level: options.level }));
+        }
+        if (this.aggrSettings.hasGrandTotals()) {
+            this.updateLevelTotals(0, row);
+        }
+        var levelIndex = 1;
+        for (var _i = 0, _a = this.groups; _i < _a.length; _i++) {
+            var group = _a[_i];
+            this.updateLevelTotals(levelIndex, row);
+            levelIndex++;
+        }
+        this.prevRow = row;
+    };
+    /** Checks if the values in group columns were changed
+        and return the level number they were */
+    DataTableAggregatesCalculator.prototype.checkLevelChange = function (row) {
+        if (this.prevRow == null)
+            return -1;
+        for (var groupIndex = 0; groupIndex < this.groups.length; groupIndex++) {
+            var group = this.groups[groupIndex];
+            for (var _i = 0, _a = group.columns; _i < _a.length; _i++) {
+                var colId = _a[_i];
+                var value = row.getValue(colId);
+                var prevValue = this.prevRow.getValue(colId);
+                if (!this.aggrSettings.compareValues(prevValue, value)) {
+                    return groupIndex + 1;
+                }
             }
-        });
-        return resultPromise;
+        }
+        return -1;
     };
-    EqAggregatesCalculator.prototype.buildLevelData = function (level, dataTable) {
-        var aggrSettings = this.context.getQuery().getAggregationSettings();
-        var keyColumns = level > 0
-            ? aggrSettings.getGroups()[level - 1].columns
-            : [];
-        var valueColumns = aggrSettings.getAggregates().map(function (a) { return a.colId; });
-        if (aggrSettings.hasRecordCount()) {
-            valueColumns.push(aggrSettings.COUNT_FIELD_NAME);
+    /** Saves the current values in levelData for the specified level to AggregateContainer
+        and then reset the data row for that level
+    */
+    DataTableAggregatesCalculator.prototype.flushLevelTotals = function (levelIndex) {
+        var levelTotals = this.levelsTotals[levelIndex];
+        var group = levelIndex > 0 ? this.groups[levelIndex - 1] : null;
+        var groupKey = this.aggrSettings.buildGroupKey(group, this.prevRow);
+        var groupTotals = {};
+        for (var _i = 0, _a = this.aggregates; _i < _a.length; _i++) {
+            var aggr = _a[_i];
+            var columnTotals = levelTotals.columns[aggr.colId];
+            switch (aggr.funcId) {
+                case "SUM":
+                    groupTotals[aggr.colId] = columnTotals.sum;
+                    break;
+                case "AVG":
+                    groupTotals[aggr.colId] = columnTotals.sum / levelTotals.count;
+                    break;
+                case "COUNT":
+                case "CNTDST":
+                    groupTotals[aggr.colId] = levelTotals.count;
+                    break;
+                case "MIN":
+                    groupTotals[aggr.colId] = columnTotals.min;
+                    break;
+                case "MAX":
+                    groupTotals[aggr.colId] = columnTotals.max;
+                    break;
+            }
         }
-        var data = new Map();
-        for (var _i = 0, _a = dataTable.getCachedRows(); _i < _a.length; _i++) {
-            var row = _a[_i];
-            var key = {};
-            var value = {};
-            for (var _b = 0, keyColumns_1 = keyColumns; _b < keyColumns_1.length; _b++) {
-                var keyCol = keyColumns_1[_b];
-                var colIdx = dataTable.columns.getIndex(keyCol);
-                if (colIdx >= 0) {
-                    var keyVal = row.getValue(keyCol);
-                    if (!aggrSettings.caseSensitiveGroups && typeof (keyVal) === 'string') {
-                        keyVal = keyVal.toLowerCase();
-                    }
-                    key[keyCol] = keyVal;
-                }
+        if (this.aggrSettings.hasRecordCount()) {
+            groupTotals[this.aggrSettings.COUNT_FIELD_NAME] = levelTotals.count;
+        }
+        this.aggrContainer.updateAggregateData(levelIndex, groupKey, groupTotals);
+        this.resetLevelTotals(levelTotals);
+    };
+    /** Updates the totals by values in the current DataRow
+     * and according to the specified aggregate
+    */
+    DataTableAggregatesCalculator.prototype.updateLevelTotals = function (levelIndex, row) {
+        var levelTotals = this.levelsTotals[levelIndex];
+        levelTotals.count += 1;
+        for (var _i = 0, _a = this.aggregates; _i < _a.length; _i++) {
+            var aggr = _a[_i];
+            var value = row.getValue(aggr.colId);
+            var columnTotals = levelTotals.columns[aggr.colId];
+            columnTotals.sum += value;
+            if (value < columnTotals.min) {
+                columnTotals.min = value;
             }
-            for (var _c = 0, valueColumns_1 = valueColumns; _c < valueColumns_1.length; _c++) {
-                var valueCol = valueColumns_1[_c];
-                value[valueCol] = row.getValue(valueCol);
+            if (value > columnTotals.max) {
+                columnTotals.max = value;
             }
-            data.set(JSON.stringify(key), value);
         }
-        return data;
     };
-    return EqAggregatesCalculator;
+    DataTableAggregatesCalculator.prototype.needRecalculation = function () {
+        return true;
+    };
+    DataTableAggregatesCalculator.prototype.reset = function () {
+    };
+    return DataTableAggregatesCalculator;
 }());
 
 
@@ -7293,7 +7470,7 @@ external_easyqueryCore_["EqContext"].prototype.useEnterprise = function (keyOrIn
             services.registerDataModelResolver(function (context) { return new model_ex_DataModelEx(); });
             services.registerQueryResolver(function (context) { return new query_ex_QueryEx(context.getModel()); });
             services.registerQueryStorageResolver(function (context) { return new EqServerQueryStorage(context); });
-            services.registerAggregatesCalculator(function (context) { return new eqs_aggr_calculator_EqAggregatesCalculator(context); });
+            services.registerAggregatesCalculator(function (context) { return new data_table_aggr_calculator_DataTableAggregatesCalculator(context); });
             if (lcv.__kt === 2) {
                 console.warn('EasyQuery.JS is working in the TRIAL MODE!\n'
                     + 'Please order a license (https://korzh.com/eq) to get a proper product key.');
@@ -7422,13 +7599,182 @@ function hideTrialWM() {
     }
 }
 
+// CONCATENATED MODULE: ./src/data/eqs_aggr_calculator.ts
+var eqs_aggr_calculator_assign = (undefined && undefined.__assign) || function () {
+    eqs_aggr_calculator_assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return eqs_aggr_calculator_assign.apply(this, arguments);
+};
+
+
+var eqs_aggr_calculator_EqServerAggregatesCalculator = /** @class */ (function () {
+    function EqServerAggregatesCalculator(context) {
+        this.context = context;
+        this._needRecalculation = true;
+        this.aggrContainer = new external_easyqueryCore_["EqAggregatesContainer"](context);
+    }
+    EqServerAggregatesCalculator.prototype.getAggrContainer = function () {
+        return this.aggrContainer;
+    };
+    EqServerAggregatesCalculator.prototype.calculate = function (options) {
+        this._needRecalculation = false;
+        this.aggrContainer.clear();
+        options = options || {};
+        options.maxLevel = options.maxLevel >= 0
+            ? options.maxLevel : 0;
+        var levelPromises = [];
+        var query = this.context.createQuery();
+        query.loadFromData(this.context.getQuery().toJSONData());
+        var settings = this.context.getQuery().getAggregationSettings();
+        var aggregates = settings.getAggregates();
+        var aggrColIds = settings.getAggregates().map(function (a) { return a.colId; });
+        var aggrCols = query.getColumns()
+            .filter(function (col) { return aggrColIds.indexOf(col.id) >= 0; });
+        var _loop_1 = function (col) {
+            query.changeColumnType(col, external_easyqueryCore_["ExprTag"].AggregateFunction, { funcId: aggregates.filter(function (a) { return a.colId == col.id; })[0].funcId });
+        };
+        for (var _i = 0, aggrCols_1 = aggrCols; _i < aggrCols_1.length; _i++) {
+            var col = aggrCols_1[_i];
+            _loop_1(col);
+        }
+        //get all non-aggregate columns
+        var queryCols = query.getColumns()
+            .filter(function (c) { return c.expr.tag !== external_easyqueryCore_["ExprTag"].AggregateFunction; });
+        for (var _a = 0, queryCols_1 = queryCols; _a < queryCols_1.length; _a++) {
+            var col = queryCols_1[_a];
+            col.setHidden(true);
+        }
+        if (settings.hasRecordCount()) {
+            var col = query.createColumn();
+            col.caption = settings.COUNT_FIELD_NAME;
+            col['_id'] = settings.COUNT_FIELD_NAME;
+            var sqlText = 'COUNT(*)';
+            var customSqlExpr = new external_easyqueryCore_["Expression"](col);
+            customSqlExpr.tag = external_easyqueryCore_["ExprTag"].CustomSql;
+            customSqlExpr.sql = sqlText;
+            customSqlExpr.baseAttrId = null;
+            col.expr = customSqlExpr;
+            query.getColumns().push(col);
+        }
+        if (settings.hasGrandTotals()) {
+            levelPromises.push(this.processLevel({
+                query: query,
+                level: 0,
+                groupName: 'Grand Totals',
+                resultObtainedCallback: options.resultObtained,
+                errorOccurredCallback: options.errorOccurred
+            }));
+        }
+        var groups = settings.getGroups();
+        for (var level = 1; level <= groups.length; level++) {
+            var group = groups[level - 1];
+            for (var _b = 0, queryCols_2 = queryCols; _b < queryCols_2.length; _b++) {
+                var col = queryCols_2[_b];
+                col.setHidden(group.columns.indexOf(col.id) < 0);
+            }
+            levelPromises.push(this.processLevel({
+                query: query,
+                level: level,
+                groupName: group.name,
+                resultObtainedCallback: options.resultObtained,
+                errorOccurredCallback: options.errorOccurred
+            }));
+        }
+        return Promise.all(levelPromises)
+            .then(function () {
+            return;
+        })
+            .catch(function (error) { return console.error(error); });
+    };
+    EqServerAggregatesCalculator.prototype.processLevel = function (options) {
+        var _this = this;
+        var fetcher = this.context.getServices()
+            .getDataFetcher();
+        var fetchOptions = {
+            aux: true,
+            query: options.query
+        };
+        if (this.context.debugMode) {
+            fetchOptions.debug = "Fetching group data. Group: '" + options.groupName + "', level: " + options.level;
+        }
+        var resultPromise = fetcher.fetchData(fetchOptions)
+            .then(function (result) {
+            var dataTable = new easy_data_table_EasyDataTable({
+                elasticChunks: true
+            });
+            var resultSet = result.resultSet;
+            for (var _i = 0, _a = resultSet.cols; _i < _a.length; _i++) {
+                var col = _a[_i];
+                dataTable.columns.add(col);
+            }
+            for (var _b = 0, _c = resultSet.rows; _b < _c.length; _b++) {
+                var row = _c[_b];
+                dataTable.addRow(row);
+            }
+            var levelData = _this.buildLevelData(options.level, dataTable);
+            console.log('Level', options.level, levelData);
+            _this.aggrContainer.setAggregateData(options.level, levelData);
+            if (options.resultObtainedCallback) {
+                options.resultObtainedCallback(result, options.level);
+            }
+        })
+            .catch(function (error) {
+            if (options.errorOccurredCallback) {
+                options.errorOccurredCallback(eqs_aggr_calculator_assign(eqs_aggr_calculator_assign({}, error), { level: options.level }));
+            }
+        });
+        return resultPromise;
+    };
+    EqServerAggregatesCalculator.prototype.buildLevelData = function (level, dataTable) {
+        var aggrSettings = this.context.getQuery().getAggregationSettings();
+        var keyColumns = level > 0
+            ? aggrSettings.getGroups()[level - 1].columns
+            : [];
+        var valueColumns = aggrSettings.getAggregates().map(function (a) { return a.colId; });
+        if (aggrSettings.hasRecordCount()) {
+            valueColumns.push(aggrSettings.COUNT_FIELD_NAME);
+        }
+        var data = new Map();
+        for (var _i = 0, _a = dataTable.getCachedRows(); _i < _a.length; _i++) {
+            var row = _a[_i];
+            var key = {};
+            var value = {};
+            for (var _b = 0, keyColumns_1 = keyColumns; _b < keyColumns_1.length; _b++) {
+                var keyCol = keyColumns_1[_b];
+                var colIdx = dataTable.columns.getIndex(keyCol);
+                if (colIdx >= 0) {
+                    var keyVal = row.getValue(keyCol);
+                    if (!aggrSettings.caseSensitiveGroups && typeof (keyVal) === 'string') {
+                        keyVal = keyVal.toLowerCase();
+                    }
+                    key[keyCol] = keyVal;
+                }
+            }
+            for (var _c = 0, valueColumns_1 = valueColumns; _c < valueColumns_1.length; _c++) {
+                var valueCol = valueColumns_1[_c];
+                value[valueCol] = row.getValue(valueCol);
+            }
+            data.set(JSON.stringify(key), value);
+        }
+        return data;
+    };
+    EqServerAggregatesCalculator.prototype.needRecalculation = function () {
+        return this._needRecalculation;
+    };
+    EqServerAggregatesCalculator.prototype.reset = function () {
+        this._needRecalculation = true;
+    };
+    return EqServerAggregatesCalculator;
+}());
+
+
 // CONCATENATED MODULE: ./src/public_api.ts
-/* concated harmony reexport EqAggregatesCalculator */__webpack_require__.d(__webpack_exports__, "EqAggregatesCalculator", function() { return eqs_aggr_calculator_EqAggregatesCalculator; });
-/* concated harmony reexport QueryEx */__webpack_require__.d(__webpack_exports__, "QueryEx", function() { return query_ex_QueryEx; });
-/* concated harmony reexport QueryColumnEx */__webpack_require__.d(__webpack_exports__, "QueryColumnEx", function() { return query_column_ex_QueryColumnEx; });
-/* concated harmony reexport ConditionEx */__webpack_require__.d(__webpack_exports__, "ConditionEx", function() { return condition_ex_ConditionEx; });
-/* concated harmony reexport DataModelEx */__webpack_require__.d(__webpack_exports__, "DataModelEx", function() { return model_ex_DataModelEx; });
-/* concated harmony reexport EqServerQueryStorage */__webpack_require__.d(__webpack_exports__, "EqServerQueryStorage", function() { return EqServerQueryStorage; });