@easyquery/ui 7.1.3-beta02 → 7.2.0-rc04

package/dist/browser/eq.community.js

@@ -1,6 +1,6 @@
 /** 
- * EasyQuery.JS Community 7.1.3-beta02 (https://korzh.com/easyquery/javascript)
- * Copyright 2021 Korzh.com. All rights reserved.
+ * EasyQuery.JS Community 7.2.0-rc04 (https://korzh.com/easyquery/javascript)
+ * Copyright 2022 Korzh.com. All rights reserved.
  * 
  * EasyQuery.JS commercial licenses may be obtained at
  * https://korzh.com/easyquery/javascript#LIC or as a part of 
@@ -90,7 +90,7 @@ window["easyquery"] =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 106);
+/******/ 	return __webpack_require__(__webpack_require__.s = 108);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -160,10 +160,10 @@ var EditorTag = {
 var http_method = __webpack_require__(36);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/http/http_request.js
-var http_request = __webpack_require__(54);
+var http_request = __webpack_require__(55);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/http/http_client.js
-var http_client = __webpack_require__(98);
+var http_client = __webpack_require__(99);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/i18n/i18n.js
 var i18n = __webpack_require__(17);
@@ -247,6 +247,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;
 }());
 
@@ -865,7 +871,7 @@ 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
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/data/aggr_settings.js
 var __assign = (undefined && undefined.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -888,16 +894,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(__assign({ columns: cols, aggregates: null }, settings));
+        this.groups.push(__assign({ columns: cols }, settings));
         return this;
     };
     AggregationSettings.prototype.addAggregateColumn = function (colIndexOrId, funcId) {
@@ -922,7 +944,7 @@ var AggregationSettings = /** @class */ (function () {
         var cols = [];
         var mappedGrops = this.groups.map(function (grp) {
             cols = cols.concat(grp.columns);
-            return __assign({}, grp, { columns: Array.from(cols), aggregates: Array.from(_this.aggregates) });
+            return __assign(__assign({}, grp), { columns: Array.from(cols), aggregates: Array.from(_this.aggregates) });
         });
         return mappedGrops;
     };
@@ -1014,18 +1036,43 @@ 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
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/data/data_column.js
-var data_column = __webpack_require__(55);
+var data_column = __webpack_require__(56);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/data/data_row.js
-var data_row = __webpack_require__(48);
+var data_row = __webpack_require__(49);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/data/easy_data_table.js
-var easy_data_table = __webpack_require__(100);
+var easy_data_table = __webpack_require__(101);
 
 // CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/utils/easy_guid.js
 /**
@@ -1175,7 +1222,7 @@ var event_emitter_EventEmitter = /** @class */ (function () {
 
 //# sourceMappingURL=event_emitter.js.map
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/utils/string_utils.js
-var string_utils = __webpack_require__(47);
+var string_utils = __webpack_require__(48);
 
 // CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/utils/liquid.js
 var liquid;
@@ -1210,7 +1257,6 @@ i18n["a" /* i18n */].resetLocales();
 
 
 
-//data
 
 
 
@@ -1253,6 +1299,7 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, "EasyGrid", function() { return /* reexport */ easy_grid["a" /* EasyGrid */]; });
+__webpack_require__.d(__webpack_exports__, "AutoResizeColumns", function() { return /* reexport */ easy_grid_options["a" /* AutoResizeColumns */]; });
 __webpack_require__.d(__webpack_exports__, "GridColumnAlign", function() { return /* reexport */ easy_grid_columns["b" /* GridColumnAlign */]; });
 __webpack_require__.d(__webpack_exports__, "GridColumn", function() { return /* reexport */ easy_grid_columns["a" /* GridColumn */]; });
 __webpack_require__.d(__webpack_exports__, "GridColumnList", function() { return /* reexport */ easy_grid_columns["c" /* GridColumnList */]; });
@@ -1301,13 +1348,16 @@ __webpack_require__.d(__webpack_exports__, "DialogFooterAlignment", function() {
 __webpack_require__.d(__webpack_exports__, "dialogs", function() { return /* binding */ dialogs; });
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid.js
-var easy_grid = __webpack_require__(102);
+var easy_grid = __webpack_require__(104);
+
+// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_options.js
+var easy_grid_options = __webpack_require__(34);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_columns.js
 var easy_grid_columns = __webpack_require__(21);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_cell_renderer.js
-var easy_grid_cell_renderer = __webpack_require__(28);
+var easy_grid_cell_renderer = __webpack_require__(39);
 
 // CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/datetimepicker/calendar.js
 var Calendar = /** @class */ (function () {
@@ -1960,19 +2010,19 @@ var default_date_time_picker_DefaultDateTimePicker = /** @class */ (function (_s
 
 //# sourceMappingURL=default_date_time_picker.js.map
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/utils/browser_utils.js
-var browser_utils = __webpack_require__(65);
+var browser_utils = __webpack_require__(66);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/utils/drag_manager.js
 var drag_manager = __webpack_require__(37);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/utils/mask.js
-var mask = __webpack_require__(66);
+var mask = __webpack_require__(67);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/dialogs/default_dialog_service.js
-var default_dialog_service = __webpack_require__(67);
+var default_dialog_service = __webpack_require__(68);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/dialogs/dialog_service.js
-var dialog_service = __webpack_require__(68);
+var dialog_service = __webpack_require__(69);
 
 // CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/i18n/text_resources.js
 
@@ -1994,6 +2044,7 @@ addEasyDataUITexts();
 
 
 
+
 //datetimepicker
 
 
@@ -2050,6 +2101,7 @@ __webpack_require__.d(__webpack_exports__, "Operand", function() { return /* ree
 __webpack_require__.d(__webpack_exports__, "EqValueEditor", function() { return /* reexport */ value_editor["a" /* EqValueEditor */]; });
 __webpack_require__.d(__webpack_exports__, "EqAction", function() { return /* reexport */ EqAction; });
 __webpack_require__.d(__webpack_exports__, "EqModelLoader", function() { return /* reexport */ model_loader["a" /* EqModelLoader */]; });
+__webpack_require__.d(__webpack_exports__, "InMemoryModelStorage", function() { return /* reexport */ model_storage["a" /* InMemoryModelStorage */]; });
 __webpack_require__.d(__webpack_exports__, "BrowserQueryStorage", function() { return /* reexport */ query_storage["a" /* BrowserQueryStorage */]; });
 __webpack_require__.d(__webpack_exports__, "EqContext", function() { return /* reexport */ context_EqContext; });
 __webpack_require__.d(__webpack_exports__, "Widget", function() { return /* reexport */ widget_Widget; });
@@ -2131,16 +2183,16 @@ var eqconsts;
 var public_api = __webpack_require__(0);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/query/query.js
-var query_query = __webpack_require__(30);
+var query_query = __webpack_require__(29);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/dm/data_model.js
 var data_model = __webpack_require__(38);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/main/query_storage.js
-var query_storage = __webpack_require__(60);
+var query_storage = __webpack_require__(61);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/main/model_loader.js
-var model_loader = __webpack_require__(61);
+var model_loader = __webpack_require__(62);
 
 // CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/eqs/eqs_model_loader.js
 var __extends = (undefined && undefined.__extends) || (function () {
@@ -2299,9 +2351,9 @@ var EqQueryFileLoader = /** @class */ (function () {
                 fileName = options.fileName
                     + fileName.substring(fileName.lastIndexOf('.'));
             }
-            if (window.navigator.msSaveOrOpenBlob) {
+            if (window.navigator['msSaveOrOpenBlob']) {
                 // Internet Explorer
-                window.navigator.msSaveOrOpenBlob(blob, fileName);
+                window.navigator['msSaveOrOpenBlob'](blob, fileName);
             }
             else {
                 var a = document.createElement("a");
@@ -2332,7 +2384,7 @@ var EqQueryFileLoader = /** @class */ (function () {
 
 //# sourceMappingURL=eqs_query_file_loader.js.map
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/data/eq_aggr_container.js
-var eq_aggr_container = __webpack_require__(62);
+var eq_aggr_container = __webpack_require__(63);
 
 // CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/common/eq_services.js
 
@@ -2356,8 +2408,9 @@ var eq_services_EqServiceProvider = /** @class */ (function () {
         this.queryFileLoader = null;
         this.aggrCalculator = null;
         this.httpClient = new public_api["HttpClient"]();
-        this.httpClient.defaultHeaders['x-eqjs-version'] = '7.1.0';
+        this.httpClient.defaultHeaders['x-eqjs-version'] = '7.2.0';
         this.modelResolver = function (_) { return new data_model["a" /* DataModel */](); };
+        this.modelStorageResolver = null;
         this.queryResolver = function (context) { return new query_query["b" /* Query */](context.getModel()); };
         this.modelLoaderResolver = function (context) { return new EqServerModelLoader(context); };
         this.queryStorageResolver = function (context) { return new query_storage["a" /* BrowserQueryStorage */](context); };
@@ -2368,6 +2421,7 @@ var eq_services_EqServiceProvider = /** @class */ (function () {
         this.aggrCalculatoResolver = function (context) { return new eq_aggr_container["a" /* DefaultAggregatesCalculator */](context); };
     }
     EqServiceProvider.prototype.reset = function () {
+        this.modelStorage = null;
         this.modelLoader = null;
         this.queryStorage = null;
         this.querySynchronizer = null;
@@ -2396,6 +2450,15 @@ var eq_services_EqServiceProvider = /** @class */ (function () {
         }
         return this.modelLoader;
     };
+    EqServiceProvider.prototype.getModelStorage = function () {
+        if (!this.modelStorage) {
+            if (!this.modelStorageResolver) {
+                throw 'ModelStorageResolver is not defined';
+            }
+            this.modelStorage = this.modelStorageResolver(this.context);
+        }
+        return this.modelStorage;
+    };
     EqServiceProvider.prototype.getQueryStorage = function () {
         if (!this.queryStorage) {
             if (!this.queryStorageResolver) {
@@ -2444,7 +2507,7 @@ var eq_services_EqServiceProvider = /** @class */ (function () {
     EqServiceProvider.prototype.getAggregatesCalculator = function () {
         if (!this.aggrCalculator) {
             if (!this.aggrCalculatoResolver) {
-                throw 'Resolver for TotalCalculator is not defined';
+                throw 'Resolver for AggregatesCalculator is not defined';
             }
             this.aggrCalculator = this.aggrCalculatoResolver(this.context);
         }
@@ -2459,6 +2522,9 @@ var eq_services_EqServiceProvider = /** @class */ (function () {
     EqServiceProvider.prototype.registerModelLoaderResolver = function (resolver) {
         this.modelLoaderResolver = resolver;
     };
+    EqServiceProvider.prototype.registerModelStorageResolver = function (resolver) {
+        this.modelStorageResolver = resolver;
+    };
     EqServiceProvider.prototype.registerQueryStorageResolver = function (resolver) {
         this.queryStorageResolver = resolver;
     };
@@ -2482,13 +2548,13 @@ var eq_services_EqServiceProvider = /** @class */ (function () {
 
 //# sourceMappingURL=eq_services.js.map
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/common/tree.js
-var tree = __webpack_require__(58);
+var tree = __webpack_require__(59);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/data/eq_data_loader.js
-var eq_data_loader = __webpack_require__(63);
+var eq_data_loader = __webpack_require__(64);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/data/google_data_converter.js
-var google_data_converter = __webpack_require__(101);
+var google_data_converter = __webpack_require__(102);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/types/data_kind.js
 var data_kind = __webpack_require__(12);
@@ -2500,7 +2566,7 @@ var link_type = __webpack_require__(16);
 var cond_tag = __webpack_require__(19);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/types/cond_part.js
-var cond_part = __webpack_require__(59);
+var cond_part = __webpack_require__(60);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/types/expr_tag.js
 var expr_tag = __webpack_require__(8);
@@ -2529,13 +2595,13 @@ var WidgetGroup;
 })(WidgetGroup || (WidgetGroup = {}));
 //# sourceMappingURL=widget_group.js.map
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/dm/aggr_function.js
-var aggr_function = __webpack_require__(57);
+var aggr_function = __webpack_require__(58);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/dm/entity.js
 var entity = __webpack_require__(22);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/dm/operator.js
-var operator = __webpack_require__(34);
+var operator = __webpack_require__(33);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/dm/value_editor.js
 var value_editor = __webpack_require__(27);
@@ -2557,8 +2623,11 @@ var EqAction;
     EqAction["UploadQueryFile"] = "UploadQueryFile";
 })(EqAction || (EqAction = {}));
 //# sourceMappingURL=eq_actions.js.map
+// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/main/model_storage.js
+var model_storage = __webpack_require__(103);
+
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/query/query_events.js
-var query_events = __webpack_require__(13);
+var query_events = __webpack_require__(14);
 
 // CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/main/action.js
 var EqActionResult;
@@ -2598,9 +2667,9 @@ var EqServerExporter = /** @class */ (function () {
             var blob = new Blob([responseData]);
             var filename = request.getXMLHttpRequest()
                 .getResponseHeader("Content-Disposition").match(/filename="(.*)"/)[1];
-            if (window.navigator.msSaveOrOpenBlob) {
+            if (window.navigator['msSaveOrOpenBlob']) {
                 // Internet Explorer
-                window.navigator.msSaveOrOpenBlob(blob, filename);
+                window.navigator['msSaveOrOpenBlob'](blob, filename);
             }
             else {
                 var a = document.createElement("a");
@@ -2739,7 +2808,8 @@ var context_EqContext = /** @class */ (function () {
         this.endpoints = new Map();
         this.dataLoader = new eq_data_loader["a" /* EasyQueryDataLoader */](this);
         this.resultTable = new public_api["EasyDataTable"]({
-            loader: this.dataLoader
+            loader: this.dataLoader,
+            onUpdate: this.onResultTableUpdate.bind(this)
         });
         this.resultTable.id = 'ResultTable';
         this.errorHandlerId = this.addEventListener('error', function (context, status) {
@@ -2860,10 +2930,14 @@ var context_EqContext = /** @class */ (function () {
         }
         if (options.endpoint) {
             this.baseEndpoint = options.endpoint;
-            console.warn('The `endpoint` option is deprecated and will be ignored.\n'
+            console.warn('The `endpoint` option is deprecated.\n'
                 + 'Please use `context.useEndpoint(endpointURL)` function instead.');
         }
         this.setDefaultEndpoints(this.baseEndpoint);
+        if (options.modelStorageResolver) {
+            var eqServices = this.getServices();
+            eqServices.registerModelStorageResolver(options.modelStorageResolver);
+        }
         this.loadQueryOnStart = false;
         if (options.loadQueryOnStart) {
             this.loadQueryOnStart = options.loadQueryOnStart;
@@ -3715,17 +3789,24 @@ var context_EqContext = /** @class */ (function () {
         })) {
             return;
         }
+        //just to support the old way of catching "group fetch" operation finish
+        if (options.groupFetchSuccess) {
+            this.afterGroupFetch = options.groupFetchSuccess;
+        }
         if (this.resultTable.elasticChunks) {
             options.chunk.limit++;
         }
-        this.fetchDataChunk(__assign({}, options, { success: function (result) {
+        this.fetchDataChunk(__assign(__assign({}, options), { success: function (result) {
                 if (result.statement) {
                     _this.resultStatement = result.statement;
                     _this.refreshWidgets(WidgetGroup.Statement);
                 }
+                var aggrCalculator = _this.getServices().getAggregatesCalculator();
+                aggrCalculator.reset();
                 _this.resultContent = result;
                 if (result.resultSet) {
                     _this.resultTable.clear();
+                    _this.resultTable.id = _this.query.getId();
                     var resultSet = result.resultSet;
                     for (var _i = 0, _a = resultSet.cols; _i < _a.length; _i++) {
                         var col = _a[_i];
@@ -3747,6 +3828,7 @@ var context_EqContext = /** @class */ (function () {
                             ? resultSet.rows.length
                             : 0;
                     }
+                    _this.resultTable.fireUpdated();
                 }
                 if (options.success) {
                     options.success(result);
@@ -3822,55 +3904,30 @@ var context_EqContext = /** @class */ (function () {
     };
     EqContext.prototype.fetchDataChunk = function (options) {
         var _this = this;
-        if (this.beforeFetchData) {
-            this.beforeFetchData(this, options);
-        }
         var queryId = this.getQuery().getId();
         var fetchOptions = options || {};
         if (this.useStoredQueryOnFetch) {
             fetchOptions.queryId = this.query.getId();
         }
+        if (this.beforeFetchData) {
+            this.beforeFetchData(this, fetchOptions);
+        }
         this.startProcess({
             action: EqAction.FetchData,
             text: 'Fetching data for the query: ' + queryId
         }, WidgetGroup.Result);
         var dataFetcher = this.eqServices.getDataFetcher();
-        dataFetcher.fetchData(options)
+        dataFetcher.fetchData(fetchOptions)
             .then(function (result) {
             if (result.statement) {
                 _this.resultStatement = result.statement;
             }
             _this.resultContent = result;
-            if (!options.skipAggr) {
-                var aggrSettings = _this.query.getAggregationSettings();
-                if (aggrSettings.needAggrCalculation()) {
-                    var calculator = _this.getServices().getAggregatesCalculator();
-                    calculator.calculate({
-                        maxLevel: aggrSettings.getGroups().length + 1,
-                        resultObtained: function (result, level) {
-                            if (options.groupFetchSucess) {
-                                options.groupFetchSucess(result);
-                            }
-                        },
-                        errorOccurred: function (error) {
-                            var errorMessage = "Data fetching error on group level " + error.level + " query. \n" + error.message;
-                            _this.throwError({
-                                action: EqAction.FetchData,
-                                text: errorMessage,
-                                sourceError: error
-                            });
-                            if (options.error) {
-                                options.error(errorMessage, EqAction.FetchData);
-                            }
-                        }
-                    });
-                }
-            }
             // we need to call success callback before firing fetchData,
             // because otherwise, it won't update the result table 
             // in the context before afterFetchData callback is called.
-            if (options.success) {
-                options.success(result);
+            if (fetchOptions.success) {
+                fetchOptions.success(result);
             }
             _this.fireEvent('fetchData');
             _this.endProcess({
@@ -3887,11 +3944,34 @@ var context_EqContext = /** @class */ (function () {
                 text: errorMessage,
                 sourceError: error
             }, WidgetGroup.Result);
-            if (options.error) {
-                options.error(errorMessage, EqAction.FetchData);
+            if (fetchOptions.error) {
+                fetchOptions.error(errorMessage, EqAction.FetchData);
             }
         });
     };
+    EqContext.prototype.onResultTableUpdate = function () {
+        var _this = this;
+        var aggrSettings = this.query.getAggregationSettings();
+        var calculator = this.getServices().getAggregatesCalculator();
+        if (aggrSettings.needAggrCalculation() && calculator.needRecalculation()) {
+            calculator.calculate({
+                maxLevel: aggrSettings.getGroups().length + 1,
+                resultObtained: function (result, level) {
+                    if (_this.afterGroupFetch) {
+                        _this.afterGroupFetch(result);
+                    }
+                },
+                errorOccurred: function (error) {
+                    var errorMessage = "Data fetching error on group level " + error.level + " query. \n" + error.message;
+                    _this.throwError({
+                        action: EqAction.FetchData,
+                        text: errorMessage,
+                        sourceError: error
+                    });
+                }
+            });
+        }
+    };
     /**
      * Fetches the data for a drill-down query (if defined) and processes the result.
      * @param options
@@ -4113,16 +4193,16 @@ var widget_Widget = /** @class */ (function () {
 
 //# sourceMappingURL=widget.js.map
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/query/query_column.js
-var query_column = __webpack_require__(29);
+var query_column = __webpack_require__(28);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/query/condition.js
-var condition = __webpack_require__(49);
+var condition = __webpack_require__(50);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/query/expression.js
 var expression = __webpack_require__(20);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/utils/format_parser.js
-var format_parser = __webpack_require__(56);
+var format_parser = __webpack_require__(57);
 
 // CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/utils/version_info.js
 var EqVersionInfo = /** @class */ (function () {
@@ -4203,6 +4283,7 @@ addEasyQueryCoreTexts();
 
 
 
+
 
 
 //for backward compatibility
@@ -4376,7 +4457,7 @@ var ChartType;
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return DomInputElementBuilder; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return DomSelectElementBuilder; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return domel; });
-/* harmony import */ var _mask__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(66);
+/* harmony import */ var _mask__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(67);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -4390,6 +4471,13 @@ var __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) {
@@ -4460,7 +4548,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]);
         }
@@ -4472,7 +4560,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]);
         }
@@ -6051,7 +6139,7 @@ var QPEditablePart;
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return utils; });
-/* harmony import */ var _string_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(47);
+/* harmony import */ var _string_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(48);
 /* harmony import */ var _types_data_type__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(7);
 /* harmony import */ var _i18n_i18n__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(17);
 
@@ -6060,7 +6148,7 @@ var QPEditablePart;
 var utils;
 (function (utils) {
     function getAllDataTypes() {
-        return Object.values(_types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"]);
+        return Object.values(_types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"]).filter(function (item) { return typeof item === "number"; });
     }
     utils.getAllDataTypes = getAllDataTypes;
     function getDateDataTypes() {
@@ -6068,12 +6156,16 @@ var utils;
     }
     utils.getDateDataTypes = getDateDataTypes;
     function getStringDataTypes() {
-        return [_types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].String, _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Memo];
+        return [_types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].String, _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Memo, _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].FixedChar];
     }
     utils.getStringDataTypes = getStringDataTypes;
     var _numericTypes = [_types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Byte, _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Word, _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Int32,
-        _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Int64, _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Float, _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Currency];
-    var _intTypes = [_types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Byte, _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Word, _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Int32, _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Int64];
+        _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Int64, _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Float, _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Currency, _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Autoinc];
+    function getNumericDataTypes() {
+        return _numericTypes;
+    }
+    utils.getNumericDataTypes = getNumericDataTypes;
+    var _intTypes = [_types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Byte, _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Word, _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Int32, _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Int64, _types_data_type__WEBPACK_IMPORTED_MODULE_1__[/* DataType */ "a"].Autoinc];
     //-------------- object functions -------------------
     /**
      * Copy the content of all objests passed in `args` parameters into `target`
@@ -6138,7 +6230,7 @@ var 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]);
@@ -6599,6 +6691,20 @@ var DataKind;
 /* 13 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return FacetType; });
+var FacetType;
+(function (FacetType) {
+    FacetType["DataGrid"] = "DATA_GRID";
+    FacetType["Chart"] = "CHART";
+    FacetType["PivotTable"] = "PIVOT_TABLE";
+})(FacetType || (FacetType = {}));
+//# sourceMappingURL=facet_type.js.map
+
+/***/ }),
+/* 14 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return QueryChangePart; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return QueryChangeAction; });
@@ -6623,20 +6729,6 @@ var QueryChangeAction;
 })(QueryChangeAction || (QueryChangeAction = {}));
 //# sourceMappingURL=query_events.js.map
 
-/***/ }),
-/* 14 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return FacetType; });
-var FacetType;
-(function (FacetType) {
-    FacetType["DataGrid"] = "DATA_GRID";
-    FacetType["Chart"] = "CHART";
-    FacetType["PivotTable"] = "PIVOT_TABLE";
-})(FacetType || (FacetType = {}));
-//# sourceMappingURL=facet_type.js.map
-
 /***/ }),
 /* 15 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -6644,7 +6736,7 @@ var FacetType;
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return equtils; });
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
-/* harmony import */ var _format_parser__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(56);
+/* harmony import */ var _format_parser__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(57);
 /* harmony import */ var _types_link_type__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(16);
 
 
@@ -7275,7 +7367,7 @@ var i18n;
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "o", function() { return slideUp; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return eqCssPrefix; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return eqCssMobile; });
-/* harmony import */ var _browser_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(65);
+/* harmony import */ var _browser_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(66);
 
 /**
  * Wraps all the elements inside "parent" by "wrapper" element
@@ -7748,16 +7840,10 @@ var Expression = /** @class */ (function () {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return GridColumn; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return GridColumnList; });
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
-/* harmony import */ var _easy_grid_cell_renderer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28);
+/* harmony import */ var _easy_grid_cell_renderer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(39);
 
 
-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) {
@@ -7789,31 +7875,18 @@ var 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 _easy_grid_cell_renderer__WEBPACK_IMPORTED_MODULE_1__[/* CellRendererType */ "a"].NUMBER:
-                    this.width = DEFAULT_WIDTH_NUMBER;
-                    break;
-                case _easy_grid_cell_renderer__WEBPACK_IMPORTED_MODULE_1__[/* CellRendererType */ "a"].DATETIME:
-                    this.width = DEFAULT_WIDTH_DATE;
-                    break;
-                case _easy_grid_cell_renderer__WEBPACK_IMPORTED_MODULE_1__[/* CellRendererType */ "a"].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(_easy_grid_cell_renderer__WEBPACK_IMPORTED_MODULE_1__[/* CellRendererType */ "a"].NUMBER);
         }
@@ -7859,9 +7932,10 @@ var GridColumnList = /** @class */ (function () {
     GridColumnList.prototype.sync = function (columnList, hasRowNumCol) {
         if (hasRowNumCol === void 0) { hasRowNumCol = true; }
         this.clear();
-        if (hasRowNumCol) {
-            var rowNumCol = new GridColumn(null, this.grid, true);
-            this.add(rowNumCol);
+        var rowNumCol = new 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++) {
@@ -8030,7 +8104,7 @@ var EntityAttr = /** @class */ (function (_super) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ExpressionRenderer; });
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
 /* harmony import */ var _easyquery_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
-/* harmony import */ var _base_element_renderer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(41);
+/* harmony import */ var _base_element_renderer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(42);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -8150,28 +8224,28 @@ var popup_menu = __webpack_require__(9);
 var condition_renderer = __webpack_require__(35);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/condition_group_renderer.js
-var condition_group_renderer = __webpack_require__(75);
+var condition_group_renderer = __webpack_require__(76);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/input_expression_renderer.js
-var input_expression_renderer = __webpack_require__(77);
+var input_expression_renderer = __webpack_require__(78);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/attribute_expression_renderer.js
-var attribute_expression_renderer = __webpack_require__(50);
+var attribute_expression_renderer = __webpack_require__(52);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/addrow_renderer.js
-var addrow_renderer = __webpack_require__(78);
+var addrow_renderer = __webpack_require__(79);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/list_expression_renderer.js
 var list_expression_renderer = __webpack_require__(25);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/operator_renderer.js
-var operator_renderer = __webpack_require__(79);
+var operator_renderer = __webpack_require__(80);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/datetime_expression_render.js
-var datetime_expression_render = __webpack_require__(80);
+var datetime_expression_render = __webpack_require__(81);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/subquery_expression_renderer.js
-var subquery_expression_renderer = __webpack_require__(81);
+var subquery_expression_renderer = __webpack_require__(82);
 
 // EXTERNAL MODULE: ./dist/lib/utils/utils.js
 var utils = __webpack_require__(4);
@@ -8578,11 +8652,12 @@ var query_panel_QueryPanel = /** @class */ (function (_super) {
                     addrowRenderer.render();
             }
         }
-        catch (e) {
+        catch (err) {
+            var error = err;
             this.context.throwError({
                 action: "QueryPanel rendering",
-                text: e.message,
-                sourceError: e
+                text: error.message,
+                sourceError: error
             });
         }
     };
@@ -9220,7 +9295,7 @@ var __assign = (undefined && undefined.__assign) || function () {
 };
 
 /** Represents editor tags*/
-var EqEditorTag = __assign({}, _easydata_core__WEBPACK_IMPORTED_MODULE_0__["EditorTag"], { 
+var EqEditorTag = __assign(__assign({}, _easydata_core__WEBPACK_IMPORTED_MODULE_0__["EditorTag"]), { 
     /** SqlList tag value */
     SqlList: "SQLLIST", 
     /** SubQuery tag value */
@@ -9283,171 +9358,12 @@ var EqValueEditor = /** @class */ (function (_super) {
 /* 28 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return DFMT_REGEX; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return CellRendererType; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return GridCellRendererStore; });
-/* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
-/* harmony import */ var _easy_grid_columns__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(21);
-/* harmony import */ var _utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(6);
-
-
-
-var cssPrefix = "keg";
-var DFMT_REGEX = /{0:(.*?)}/g;
-var CellRendererType;
-(function (CellRendererType) {
-    CellRendererType[CellRendererType["STRING"] = 1] = "STRING";
-    CellRendererType[CellRendererType["NUMBER"] = 2] = "NUMBER";
-    CellRendererType[CellRendererType["DATETIME"] = 3] = "DATETIME";
-    CellRendererType[CellRendererType["BOOL"] = 4] = "BOOL";
-})(CellRendererType || (CellRendererType = {}));
-var StringCellRendererDefault = function (value, column, cellElement, rowElement) {
-    var text = value ? value.toString().replace(/\n/g, '\u21B5 ') : '';
-    var builder = Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])('div', cellElement)
-        .addClass(cssPrefix + "-cell-value")
-        .addHtml(text)
-        .title(value || '');
-    if (column.align == _easy_grid_columns__WEBPACK_IMPORTED_MODULE_1__[/* GridColumnAlign */ "b"].NONE) {
-        builder.addClass(cssPrefix + "-cell-value-align-left");
-    }
-};
-var NumberCellRendererDefault = function (value, column, cellElement, rowElement) {
-    var strValue = (value || '').toString();
-    if (typeof value == 'number') {
-        if (column.dataColumn && column.dataColumn.displayFormat
-            && DFMT_REGEX.test(column.dataColumn.displayFormat)) {
-            strValue = column.dataColumn.displayFormat.replace(DFMT_REGEX, function (_, $1) {
-                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__["i18n"].numberToStr(value, $1);
-            });
-        }
-        else {
-            strValue = value.toLocaleString();
-        }
-    }
-    var builder = Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])('div', cellElement)
-        .addClass(cssPrefix + "-cell-value")
-        .addHtml(strValue)
-        .title(strValue);
-    if (column.align == _easy_grid_columns__WEBPACK_IMPORTED_MODULE_1__[/* GridColumnAlign */ "b"].NONE) {
-        builder.addClass(cssPrefix + "-cell-value-align-right");
-    }
-};
-var DateTimeCellRendererDefault = function (value, column, cellElement, rowElement) {
-    var isDate = Object.prototype.toString.call(value) === '[object Date]';
-    var strValue = (value || '').toString();
-    if (isDate) {
-        if (column.dataColumn && column.dataColumn.displayFormat
-            && DFMT_REGEX.test(column.dataColumn.displayFormat)) {
-            strValue = column.dataColumn.displayFormat.replace(DFMT_REGEX, function (_, $1) {
-                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__["i18n"].dateTimeToStr(value, column.type, $1);
-            });
-        }
-        else {
-            var locale = _easydata_core__WEBPACK_IMPORTED_MODULE_0__["i18n"].getCurrentLocale();
-            var timeOptions = { hour: 'numeric', minute: 'numeric', second: 'numeric' };
-            switch (column.type) {
-                case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Date:
-                    strValue = value.toLocaleDateString(locale);
-                    break;
-                case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Time:
-                    strValue = value.toLocaleTimeString(locale, timeOptions);
-                    break;
-                case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].DateTime:
-                    strValue = value.toLocaleDateString(locale) + " " + value.toLocaleTimeString(locale, timeOptions);
-                    break;
-            }
-        }
-    }
-    var builder = Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])('div', cellElement)
-        .addClass(cssPrefix + "-cell-value")
-        .addHtml(strValue)
-        .title(strValue);
-    if (column.align == _easy_grid_columns__WEBPACK_IMPORTED_MODULE_1__[/* GridColumnAlign */ "b"].NONE) {
-        builder.addClass(cssPrefix + "-cell-value-align-right");
-    }
-};
-var BoolCellRendererDefault = function (value, column, cellElement, rowElement) {
-    if (column.dataColumn && column.dataColumn.displayFormat
-        && DFMT_REGEX.test(column.dataColumn.displayFormat)) {
-        var strValue = column.dataColumn.displayFormat.replace(DFMT_REGEX, function (_, $1) {
-            return _easydata_core__WEBPACK_IMPORTED_MODULE_0__["i18n"].booleanToStr(value, $1);
-        });
-        return StringCellRendererDefault(strValue, column, cellElement, rowElement);
-    }
-    else {
-        Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])('div', cellElement)
-            .addClass(cssPrefix + "-cell-value")
-            .addClass(cssPrefix + "-cell-value-bool")
-            .addClass(cssPrefix + "-" + (value ? 'cell-value-true' : 'cell-value-false'));
-    }
-};
-var GridCellRendererStore = /** @class */ (function () {
-    function GridCellRendererStore(options) {
-        this.renderers = {};
-        this.defaultRenderers = {};
-        this.registerRenderer('StringDefault', StringCellRendererDefault);
-        this.setDefaultRenderer(CellRendererType.STRING, StringCellRendererDefault);
-        this.registerRenderer('NumberDefault', NumberCellRendererDefault);
-        this.setDefaultRenderer(CellRendererType.NUMBER, NumberCellRendererDefault);
-        this.registerRenderer('DateTimeDefault', DateTimeCellRendererDefault);
-        this.setDefaultRenderer(CellRendererType.DATETIME, DateTimeCellRendererDefault);
-        this.registerRenderer('BoolDefault', BoolCellRendererDefault);
-        this.setDefaultRenderer(CellRendererType.BOOL, BoolCellRendererDefault);
-    }
-    GridCellRendererStore.prototype.getDefaultRenderer = function (columnType) {
-        var cellType = this.getCellType(columnType);
-        return this.defaultRenderers[CellRendererType[cellType]];
-    };
-    GridCellRendererStore.prototype.getDefaultRendererByType = function (rendererType) {
-        return this.defaultRenderers[CellRendererType[rendererType]];
-    };
-    GridCellRendererStore.prototype.setDefaultRenderer = function (cellType, renderer) {
-        if (renderer) {
-            this.defaultRenderers[CellRendererType[cellType]] = renderer;
-        }
-    };
-    GridCellRendererStore.prototype.getRenderer = function (name) {
-        return this.renderers[name];
-    };
-    GridCellRendererStore.prototype.registerRenderer = function (name, renderer) {
-        this.renderers[name] = renderer;
-    };
-    GridCellRendererStore.prototype.getCellType = function (dataType) {
-        switch (dataType) {
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Autoinc:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Byte:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Word:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Currency:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Float:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Int32:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Int64:
-                return CellRendererType.NUMBER;
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Date:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].DateTime:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Time:
-                return CellRendererType.DATETIME;
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Bool:
-                return CellRendererType.BOOL;
-            default:
-                return CellRendererType.STRING;
-        }
-    };
-    return GridCellRendererStore;
-}());
-
-//# sourceMappingURL=easy_grid_cell_renderer.js.map
-
-/***/ }),
-/* 29 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return SortDirection; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return QueryColumn; });
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
 /* harmony import */ var _expression__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(20);
-/* harmony import */ var _query_events__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(13);
+/* harmony import */ var _query_events__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(14);
 
 
 
@@ -9608,7 +9524,7 @@ var QueryColumn = /** @class */ (function () {
 //# sourceMappingURL=query_column.js.map
 
 /***/ }),
-/* 30 */
+/* 29 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -9618,13 +9534,13 @@ var QueryColumn = /** @class */ (function () {
 /* harmony import */ var _utils_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(15);
 /* harmony import */ var _dm_data_model__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(38);
 /* harmony import */ var _expression__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(20);
-/* harmony import */ var _query_column__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(29);
-/* harmony import */ var _condition__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(49);
+/* harmony import */ var _query_column__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(28);
+/* harmony import */ var _condition__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(50);
 /* harmony import */ var _types_data_kind__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(12);
 /* harmony import */ var _types_link_type__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(16);
 /* harmony import */ var _types_expr_tag__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(8);
 /* harmony import */ var _types_cond_tag__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(19);
-/* harmony import */ var _query_events__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(13);
+/* harmony import */ var _query_events__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(14);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -9742,20 +9658,19 @@ var Query = /** @class */ (function () {
                 this.processQueryForAggregation();
                 var aggrCols = this.columns.filter(function (c) { return c.enabled
                     && c.expr.tag == _types_expr_tag__WEBPACK_IMPORTED_MODULE_8__[/* ExprTag */ "a"].AggregateFunction; });
-                // query contains aggregate columns
-                if (aggrCols.length) {
-                    for (var _i = 0, aggrCols_1 = aggrCols; _i < aggrCols_1.length; _i++) {
-                        var col = aggrCols_1[_i];
-                        var attr = this.model.getAttributeById(col.expr.args[0].value);
-                        this.changeColumnType(col, _types_expr_tag__WEBPACK_IMPORTED_MODULE_8__[/* ExprTag */ "a"].EntityAttribute, {
-                            caption: this.model.getAttributeText(attr, "{attr}")
-                        });
-                    }
-                    this.fireChangedEvent({
-                        part: _query_events__WEBPACK_IMPORTED_MODULE_10__[/* QueryChangePart */ "b"].Columns,
-                        wasModified: true
-                    });
-                }
+                // // query contains aggregate columns
+                // if (aggrCols.length) {
+                //     for (const col of aggrCols) {
+                //         const attr = this.model.getAttributeById(col.expr.args[0].value);
+                //         this.changeColumnType(col, ExprTag.EntityAttribute, {
+                //             caption: this.model.getAttributeText(attr, `{attr}`)
+                //         });
+                //     }
+                //     this.fireChangedEvent({
+                //         part: QueryChangePart.Columns,
+                //         wasModified: true
+                //     });
+                // }    
             }
             if (!this._enableAggregation) {
                 this.aggrSettings.clear();
@@ -9790,8 +9705,8 @@ var Query = /** @class */ (function () {
                 var colsToGroup = _this.columns.filter(function (c) { return c.enabled
                     && c.expr.tag == _types_expr_tag__WEBPACK_IMPORTED_MODULE_8__[/* ExprTag */ "a"].EntityAttribute; });
                 var aggrsToAdd = [];
-                for (var _i = 0, aggrCols_2 = aggrCols; _i < aggrCols_2.length; _i++) {
-                    var col = aggrCols_2[_i];
+                for (var _i = 0, aggrCols_1 = aggrCols; _i < aggrCols_1.length; _i++) {
+                    var col = aggrCols_1[_i];
                     aggrsToAdd.push({ id: col.id, func: col.expr.func });
                     _this.changeColumnType(col, _types_expr_tag__WEBPACK_IMPORTED_MODULE_8__[/* ExprTag */ "a"].EntityAttribute);
                 }
@@ -10989,7 +10904,7 @@ var Query = /** @class */ (function () {
 //# sourceMappingURL=query.js.map
 
 /***/ }),
-/* 31 */
+/* 30 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -10997,7 +10912,7 @@ var Query = /** @class */ (function () {
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
 /* harmony import */ var _easyquery_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
 /* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(1);
-/* harmony import */ var _column_renderer_cp__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(70);
+/* harmony import */ var _column_renderer_cp__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(71);
 /* harmony import */ var _utils_browser_utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(3);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -11182,7 +11097,7 @@ var SimpleColumnRendererCP = /** @class */ (function (_super) {
 //# sourceMappingURL=simple_column_renderer.js.map
 
 /***/ }),
-/* 32 */
+/* 31 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -11191,10 +11106,11 @@ var SimpleColumnRendererCP = /** @class */ (function (_super) {
 /* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(1);
 /* harmony import */ var _utils_browser_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3);
 var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -11240,7 +11156,7 @@ var ResultFacet = /** @class */ (function () {
         this.downloadAllClickHandler = function () {
             var resultTable = _this.getContext().resultTable;
             if (!resultTable.elasticChunks) {
-                var chunksToLoad = _this.getChunksForLoading();
+                var nextChunkStart_1 = resultTable.getCachedRows().length;
                 var recordsToLoad_1 = resultTable.getTotal() - resultTable.getCachedCount();
                 var ds = _this.getDialogService();
                 var dlg_1 = ds.openProgress({
@@ -11252,27 +11168,21 @@ var ResultFacet = /** @class */ (function () {
                     determinated: true
                 });
                 var loadedRecords_1 = 0;
-                var _loop_1 = function (chunk) {
-                    setTimeout(function () {
-                        resultTable.getRows({ offset: chunk.offset, limit: resultTable.chunkSize })
-                            .then(function (_) {
-                            loadedRecords_1 += _.length;
-                            var progress = loadedRecords_1 / recordsToLoad_1;
-                            dlg_1.updateContent(_easydata_core__WEBPACK_IMPORTED_MODULE_0__["i18n"].getText('Facets', 'LoadDataDlgContent')
-                                .replace('{loadedRecs}', "" + loadedRecords_1)
-                                .replace('{totalRecs}', "" + recordsToLoad_1));
-                            dlg_1.updateProgress(progress);
-                        })
-                            .catch(function (error) {
-                            dlg_1.submit();
-                            _this.getContext().throwError(error);
-                        });
-                    }, 10);
-                };
-                for (var _i = 0, chunksToLoad_1 = chunksToLoad; _i < chunksToLoad_1.length; _i++) {
-                    var chunk = chunksToLoad_1[_i];
-                    _loop_1(chunk);
-                }
+                setTimeout(function () {
+                    resultTable.getRows({ offset: nextChunkStart_1, limit: recordsToLoad_1 })
+                        .then(function (_) {
+                        loadedRecords_1 += _.length;
+                        var progress = loadedRecords_1 / recordsToLoad_1;
+                        dlg_1.updateContent(_easydata_core__WEBPACK_IMPORTED_MODULE_0__["i18n"].getText('Facets', 'LoadDataDlgContent')
+                            .replace('{loadedRecs}', "" + loadedRecords_1)
+                            .replace('{totalRecs}', "" + recordsToLoad_1));
+                        dlg_1.updateProgress(progress);
+                    })
+                        .catch(function (error) {
+                        dlg_1.submit();
+                        _this.getContext().throwError(error);
+                    });
+                }, 10);
             }
             else {
                 var ds = _this.getDialogService();
@@ -11373,6 +11283,11 @@ var ResultFacet = /** @class */ (function () {
         var resultTable = context.resultTable;
         return (resultTable.getCachedCount() == resultTable.getTotal());
     };
+    ResultFacet.prototype.showErrorMessage = function (message) {
+        this.displayMessageDiv.innerHTML = message;
+        this.displayMessageDiv.classList.add(this.cssPrefix + "-error-message");
+        Object(_easydata_ui__WEBPACK_IMPORTED_MODULE_1__["domel"])(this.displayMessageDiv).show();
+    };
     ResultFacet.prototype.showUnableDisplayMessage = function (message) {
         var context = this.getContext();
         var resultTable = context.resultTable;
@@ -11416,14 +11331,13 @@ var ResultFacet = /** @class */ (function () {
     };
     ResultFacet.prototype.loadElasticChunk = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var resultTable, chunks, lastChunk;
+            var resultTable, nextChunkStart;
             var _this = this;
             return __generator(this, function (_a) {
                 resultTable = this.getContext().resultTable;
-                chunks = resultTable.getCachedChunks();
-                lastChunk = chunks[chunks.length - 1];
+                nextChunkStart = resultTable.getCachedRows().length;
                 //next chunk
-                return [2 /*return*/, resultTable.getRows({ offset: lastChunk.offset + resultTable.chunkSize, limit: resultTable.chunkSize })
+                return [2 /*return*/, resultTable.getRows({ offset: nextChunkStart, limit: resultTable.chunkSize })
                         .then(function (_) {
                         return resultTable.totalIsKnown()
                             ? Promise.resolve()
@@ -11432,43 +11346,16 @@ var ResultFacet = /** @class */ (function () {
             });
         });
     };
-    ResultFacet.prototype.getChunksForLoading = function () {
-        var resultTable = this.getContext().resultTable;
-        var chunkSize = resultTable.chunkSize;
-        var cachedChunks = resultTable.getCachedChunks();
-        var chunksToLoad = [];
-        if (cachedChunks[0].offset != 0) {
-            chunksToLoad.push({ offset: 0 });
-        }
-        for (var i = 1; i < cachedChunks.length; i++) {
-            var diffOffset = cachedChunks[i].offset - cachedChunks[i - 1].offset - chunkSize;
-            if (diffOffset >= chunkSize) {
-                var numbOfChunks = diffOffset / chunkSize;
-                for (var j = 1; j <= numbOfChunks; j++) {
-                    chunksToLoad.push({ offset: cachedChunks[i - 1].offset + j * chunkSize });
-                }
-            }
-        }
-        var lastChunk = cachedChunks[cachedChunks.length - 1];
-        var diff = resultTable.getTotal() - lastChunk.offset;
-        if (diff >= chunkSize) {
-            var numbOfChunks = diff / chunkSize;
-            for (var j = 1; j <= numbOfChunks; j++) {
-                chunksToLoad.push({ offset: lastChunk.offset + j * chunkSize });
-            }
-        }
-        return chunksToLoad;
-    };
     ResultFacet.prototype.onResize = function () {
     };
     return ResultFacet;
 }());
 
 //# sourceMappingURL=result_facet.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(53)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(54)))
 
 /***/ }),
-/* 33 */
+/* 32 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -11486,19 +11373,19 @@ var lib_public_api = __webpack_require__(2);
 var dist_lib_public_api = __webpack_require__(1);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/easy_grid_widget.js
-var easy_grid_widget = __webpack_require__(43);
+var easy_grid_widget = __webpack_require__(44);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/charts/chart_widget_chartjs.js
-var chart_widget_chartjs = __webpack_require__(45);
+var chart_widget_chartjs = __webpack_require__(46);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/entities_panel.js
-var entities_panel = __webpack_require__(64);
+var entities_panel = __webpack_require__(65);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/columns_panel.js
-var columns_panel = __webpack_require__(69);
+var columns_panel = __webpack_require__(70);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/columns_bar.js
-var columns_bar = __webpack_require__(39);
+var columns_bar = __webpack_require__(40);
 
 // CONCATENATED MODULE: ./dist/lib/widgets/locale_widget.js
 var __extends = (undefined && undefined.__extends) || (function () {
@@ -11583,13 +11470,13 @@ var locale_widget_LocaleWidget = /** @class */ (function (_super) {
 var query_panel = __webpack_require__(24);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/process_widget.js
-var process_widget = __webpack_require__(85);
+var process_widget = __webpack_require__(86);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/filter_bar.js
-var filter_bar = __webpack_require__(82);
+var filter_bar = __webpack_require__(83);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/sorting_bar.js + 1 modules
-var sorting_bar = __webpack_require__(94);
+var sorting_bar = __webpack_require__(95);
 
 // EXTERNAL MODULE: ./dist/lib/utils/browser_utils.js
 var browser_utils = __webpack_require__(3);
@@ -11704,19 +11591,19 @@ var queryname_widget_QueryNameWidget = /** @class */ (function (_super) {
 
 //# sourceMappingURL=queryname_widget.js.map
 // EXTERNAL MODULE: ./dist/lib/widgets/statement_panel.js
-var statement_panel = __webpack_require__(84);
+var statement_panel = __webpack_require__(85);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/result_facets_panel.js + 1 modules
-var result_facets_panel = __webpack_require__(95);
+var result_facets_panel = __webpack_require__(96);
 
 // EXTERNAL MODULE: ./dist/lib/utils/utils.js
 var utils = __webpack_require__(4);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/export_widget.js
-var export_widget = __webpack_require__(89);
+var export_widget = __webpack_require__(90);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/aggregation_bar.js
-var aggregation_bar = __webpack_require__(90);
+var aggregation_bar = __webpack_require__(91);
 
 // CONCATENATED MODULE: ./dist/lib/views/view.js
 
@@ -11998,6 +11885,10 @@ var view_View = /** @class */ (function () {
     View.prototype.fetchData = function (options) {
         var _this = this;
         options = options || { refresh: true };
+        this.context.clearResult();
+        //don't run fetch if the query is empty
+        if (this.context.getQuery().isEmpty() && !this.resultOptions.fetchEmptyQueries)
+            return;
         this.showResultSpinner();
         this.context.fetchData({
             elasticPaging: options.elasticPaging,
@@ -12271,7 +12162,7 @@ var view_View = /** @class */ (function () {
 //# sourceMappingURL=view.js.map
 
 /***/ }),
-/* 34 */
+/* 33 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -12375,6 +12266,20 @@ var Operand = /** @class */ (function () {
 
 //# sourceMappingURL=operator.js.map
 
+/***/ }),
+/* 34 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AutoResizeColumns; });
+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
+
 /***/ }),
 /* 35 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -12386,7 +12291,7 @@ var Operand = /** @class */ (function () {
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
 /* harmony import */ var _easyquery_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
 /* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(1);
-/* harmony import */ var _text_renderer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(74);
+/* harmony import */ var _text_renderer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(75);
 /* harmony import */ var _utils_browser_utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(3);
 /* harmony import */ var _types_qp_editable_part__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(10);
 var __extends = (undefined && undefined.__extends) || (function () {
@@ -13303,14 +13208,14 @@ var eqDragManager = new DragManager();
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return DataModel; });
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
-/* harmony import */ var _aggr_function__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(57);
-/* harmony import */ var _operator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(34);
+/* harmony import */ var _aggr_function__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(58);
+/* harmony import */ var _operator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(33);
 /* harmony import */ var _entity__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(22);
 /* harmony import */ var _types_data_kind__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(12);
 /* harmony import */ var _types_eq_editor_tag__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26);
-/* harmony import */ var _query_query__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(30);
+/* harmony import */ var _query_query__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(29);
 /* harmony import */ var _types_expr_tag__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(8);
-/* harmony import */ var _common_tree__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(58);
+/* harmony import */ var _common_tree__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(59);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -14241,6 +14146,165 @@ var DataModel = /** @class */ (function (_super) {
 /* 39 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return DFMT_REGEX; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return CellRendererType; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return GridCellRendererStore; });
+/* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
+/* harmony import */ var _easy_grid_columns__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(21);
+/* harmony import */ var _utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(6);
+
+
+
+var cssPrefix = "keg";
+var DFMT_REGEX = /{0:(.*?)}/g;
+var CellRendererType;
+(function (CellRendererType) {
+    CellRendererType[CellRendererType["STRING"] = 1] = "STRING";
+    CellRendererType[CellRendererType["NUMBER"] = 2] = "NUMBER";
+    CellRendererType[CellRendererType["DATETIME"] = 3] = "DATETIME";
+    CellRendererType[CellRendererType["BOOL"] = 4] = "BOOL";
+})(CellRendererType || (CellRendererType = {}));
+var StringCellRendererDefault = function (value, column, cellElement, rowElement) {
+    var text = value ? value.toString().replace(/\n/g, '\u21B5 ') : '';
+    var builder = Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])('div', cellElement)
+        .addClass(cssPrefix + "-cell-value")
+        .addHtml(text)
+        .title(value || '');
+    if (column.align == _easy_grid_columns__WEBPACK_IMPORTED_MODULE_1__[/* GridColumnAlign */ "b"].NONE) {
+        builder.addClass(cssPrefix + "-cell-value-align-left");
+    }
+};
+var NumberCellRendererDefault = function (value, column, cellElement, rowElement) {
+    var strValue = (value || '').toString();
+    if (typeof value == 'number') {
+        if (column.dataColumn && column.dataColumn.displayFormat
+            && DFMT_REGEX.test(column.dataColumn.displayFormat)) {
+            strValue = column.dataColumn.displayFormat.replace(DFMT_REGEX, function (_, $1) {
+                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__["i18n"].numberToStr(value, $1);
+            });
+        }
+        else {
+            strValue = value.toLocaleString();
+        }
+    }
+    var builder = Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])('div', cellElement)
+        .addClass(cssPrefix + "-cell-value")
+        .addHtml(strValue)
+        .title(strValue);
+    if (column.align == _easy_grid_columns__WEBPACK_IMPORTED_MODULE_1__[/* GridColumnAlign */ "b"].NONE) {
+        builder.addClass(cssPrefix + "-cell-value-align-right");
+    }
+};
+var DateTimeCellRendererDefault = function (value, column, cellElement, rowElement) {
+    var isDate = Object.prototype.toString.call(value) === '[object Date]';
+    var strValue = (value || '').toString();
+    if (isDate) {
+        if (column.dataColumn && column.dataColumn.displayFormat
+            && DFMT_REGEX.test(column.dataColumn.displayFormat)) {
+            strValue = column.dataColumn.displayFormat.replace(DFMT_REGEX, function (_, $1) {
+                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__["i18n"].dateTimeToStr(value, column.type, $1);
+            });
+        }
+        else {
+            var locale = _easydata_core__WEBPACK_IMPORTED_MODULE_0__["i18n"].getCurrentLocale();
+            var timeOptions = { hour: 'numeric', minute: 'numeric', second: 'numeric' };
+            switch (column.type) {
+                case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Date:
+                    strValue = value.toLocaleDateString(locale);
+                    break;
+                case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Time:
+                    strValue = value.toLocaleTimeString(locale, timeOptions);
+                    break;
+                case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].DateTime:
+                    strValue = value.toLocaleDateString(locale) + " " + value.toLocaleTimeString(locale, timeOptions);
+                    break;
+            }
+        }
+    }
+    var builder = Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])('div', cellElement)
+        .addClass(cssPrefix + "-cell-value")
+        .addHtml(strValue)
+        .title(strValue);
+    if (column.align == _easy_grid_columns__WEBPACK_IMPORTED_MODULE_1__[/* GridColumnAlign */ "b"].NONE) {
+        builder.addClass(cssPrefix + "-cell-value-align-right");
+    }
+};
+var BoolCellRendererDefault = function (value, column, cellElement, rowElement) {
+    if (column.dataColumn && column.dataColumn.displayFormat
+        && DFMT_REGEX.test(column.dataColumn.displayFormat)) {
+        var strValue = column.dataColumn.displayFormat.replace(DFMT_REGEX, function (_, $1) {
+            return _easydata_core__WEBPACK_IMPORTED_MODULE_0__["i18n"].booleanToStr(value, $1);
+        });
+        return StringCellRendererDefault(strValue, column, cellElement, rowElement);
+    }
+    else {
+        Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])('div', cellElement)
+            .addClass(cssPrefix + "-cell-value")
+            .addClass(cssPrefix + "-cell-value-bool")
+            .addClass(cssPrefix + "-" + (value ? 'cell-value-true' : 'cell-value-false'));
+    }
+};
+var GridCellRendererStore = /** @class */ (function () {
+    function GridCellRendererStore(options) {
+        this.renderers = {};
+        this.defaultRenderers = {};
+        this.registerRenderer('StringDefault', StringCellRendererDefault);
+        this.setDefaultRenderer(CellRendererType.STRING, StringCellRendererDefault);
+        this.registerRenderer('NumberDefault', NumberCellRendererDefault);
+        this.setDefaultRenderer(CellRendererType.NUMBER, NumberCellRendererDefault);
+        this.registerRenderer('DateTimeDefault', DateTimeCellRendererDefault);
+        this.setDefaultRenderer(CellRendererType.DATETIME, DateTimeCellRendererDefault);
+        this.registerRenderer('BoolDefault', BoolCellRendererDefault);
+        this.setDefaultRenderer(CellRendererType.BOOL, BoolCellRendererDefault);
+    }
+    GridCellRendererStore.prototype.getDefaultRenderer = function (columnType) {
+        var cellType = this.getCellType(columnType);
+        return this.defaultRenderers[CellRendererType[cellType]];
+    };
+    GridCellRendererStore.prototype.getDefaultRendererByType = function (rendererType) {
+        return this.defaultRenderers[CellRendererType[rendererType]];
+    };
+    GridCellRendererStore.prototype.setDefaultRenderer = function (cellType, renderer) {
+        if (renderer) {
+            this.defaultRenderers[CellRendererType[cellType]] = renderer;
+        }
+    };
+    GridCellRendererStore.prototype.getRenderer = function (name) {
+        return this.renderers[name];
+    };
+    GridCellRendererStore.prototype.registerRenderer = function (name, renderer) {
+        this.renderers[name] = renderer;
+    };
+    GridCellRendererStore.prototype.getCellType = function (dataType) {
+        switch (dataType) {
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Autoinc:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Byte:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Word:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Currency:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Float:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Int32:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Int64:
+                return CellRendererType.NUMBER;
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Date:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].DateTime:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Time:
+                return CellRendererType.DATETIME;
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Bool:
+                return CellRendererType.BOOL;
+            default:
+                return CellRendererType.STRING;
+        }
+    };
+    return GridCellRendererStore;
+}());
+
+//# sourceMappingURL=easy_grid_cell_renderer.js.map
+
+/***/ }),
+/* 40 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ColumnsBar; });
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
@@ -14249,8 +14313,8 @@ var DataModel = /** @class */ (function (_super) {
 /* harmony import */ var _utils_popup_menu__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(9);
 /* harmony import */ var _utils_utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(4);
 /* harmony import */ var _utils_browser_utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(3);
-/* harmony import */ var _renderers_columnsbar_aggrfunc_column_renderer__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(72);
-/* harmony import */ var _renderers_columnsbar_simple_column_renderer__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(40);
+/* harmony import */ var _renderers_columnsbar_aggrfunc_column_renderer__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(73);
+/* harmony import */ var _renderers_columnsbar_simple_column_renderer__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(41);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -14975,14 +15039,14 @@ var ColumnsBar = /** @class */ (function (_super) {
 //# sourceMappingURL=columns_bar.js.map
 
 /***/ }),
-/* 40 */
+/* 41 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return SimpleColumnRendererCB; });
 /* harmony import */ var _easyquery_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(1);
-/* harmony import */ var _column_renderer_cb__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(73);
+/* harmony import */ var _column_renderer_cb__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(74);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -15063,7 +15127,7 @@ var SimpleColumnRendererCB = /** @class */ (function (_super) {
 //# sourceMappingURL=simple_column_renderer.js.map
 
 /***/ }),
-/* 41 */
+/* 42 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -15136,12 +15200,12 @@ var BaseElementRenderer = /** @class */ (function () {
 //# sourceMappingURL=base_element_renderer.js.map
 
 /***/ }),
-/* 42 */
+/* 43 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return DropDownRenderer; });
-/* harmony import */ var _base_element_renderer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(41);
+/* harmony import */ var _base_element_renderer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(42);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -15185,7 +15249,7 @@ var DropDownRenderer = /** @class */ (function (_super) {
 //# sourceMappingURL=dropdown_renderer.js.map
 
 /***/ }),
-/* 43 */
+/* 44 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -15193,7 +15257,7 @@ var DropDownRenderer = /** @class */ (function (_super) {
 /* harmony import */ var _easyquery_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(0);
 /* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(1);
-/* harmony import */ var _grid__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(83);
+/* harmony import */ var _grid__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(84);
 /* harmony import */ var _utils_popup_menu__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(9);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -15249,9 +15313,9 @@ var EasyGridWidget = /** @class */ (function (_super) {
     EasyGridWidget.prototype.init = function (context, options) {
         var _this = this;
         _super.prototype.init.call(this, context, options);
-        var gridOptions = __assign({}, options, { slot: this.slot, dataTable: context.resultTable });
+        var gridOptions = __assign(__assign({}, options), { slot: this.slot, dataTable: context.resultTable });
         this.options = _easydata_core__WEBPACK_IMPORTED_MODULE_1__["utils"].assign(this.options, options);
-        gridOptions.onAddColumnClick = function (ev) { return _this.addColumnClickHandler(ev); };
+        gridOptions.onPlusButtonClick = function (ev) { return _this.addColumnClickHandler(ev); };
         gridOptions.onColumnMoved = function (ev) { return _this.columnMovedHandler(ev); };
         if (gridOptions.aggregates) {
             this.hasCustomTotalsSettings = true;
@@ -15440,7 +15504,7 @@ var EasyGridWidget = /** @class */ (function (_super) {
 //# sourceMappingURL=easy_grid_widget.js.map
 
 /***/ }),
-/* 44 */
+/* 45 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -15511,16 +15575,16 @@ var ExportDialog = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=export_dialog.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(53)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(54)))
 
 /***/ }),
-/* 45 */
+/* 46 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ChartJsWidget; });
 /* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var _chart_widget__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(46);
+/* harmony import */ var _chart_widget__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(47);
 /* harmony import */ var _chart_type__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(5);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -15709,7 +15773,7 @@ var ChartJsWidget = /** @class */ (function (_super) {
 //# sourceMappingURL=chart_widget_chartjs.js.map
 
 /***/ }),
-/* 46 */
+/* 47 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -16103,7 +16167,7 @@ var ChartWidget = /** @class */ (function (_super) {
 //# sourceMappingURL=chart_widget.js.map
 
 /***/ }),
-/* 47 */
+/* 48 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -16145,7 +16209,7 @@ function combinePath(path1, path2) {
 //# sourceMappingURL=string_utils.js.map
 
 /***/ }),
-/* 48 */
+/* 49 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -16197,7 +16261,7 @@ var DataRow = /** @class */ (function () {
 //# sourceMappingURL=data_row.js.map
 
 /***/ }),
-/* 49 */
+/* 50 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -16208,10 +16272,10 @@ var DataRow = /** @class */ (function () {
 /* harmony import */ var _types_link_type__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(16);
 /* harmony import */ var _types_cond_tag__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(19);
 /* harmony import */ var _types_expr_tag__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(8);
-/* harmony import */ var _query_events__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(13);
+/* harmony import */ var _query_events__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(14);
 /* harmony import */ var _dm_value_editor__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(27);
 /* harmony import */ var _types_eq_editor_tag__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(26);
-/* harmony import */ var _types_cond_part__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(59);
+/* harmony import */ var _types_cond_part__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(60);
 
 
 
@@ -16545,265 +16609,8 @@ var Condition = /** @class */ (function () {
 
 //# sourceMappingURL=condition.js.map
 
-/***/ }),
-/* 50 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AttributeExpressionRenderer; });
-/* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
-/* harmony import */ var _easyquery_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
-/* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(1);
-/* harmony import */ var _list_expression_renderer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25);
-/* harmony import */ var _utils_browser_utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(3);
-/* harmony import */ var _types_qp_editable_part__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(10);
-var __extends = (undefined && undefined.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-
-
-
-
-
-
-var AttributeExpressionRenderer = /** @class */ (function (_super) {
-    __extends(AttributeExpressionRenderer, _super);
-    function AttributeExpressionRenderer(panel, expression, entitiesMenu, slot) {
-        var _this = _super.call(this, panel, expression, null, slot) || this;
-        _this.menu = entitiesMenu;
-        return _this;
-    }
-    AttributeExpressionRenderer.prototype.renderEditor = function () {
-        //create menu
-    };
-    AttributeExpressionRenderer.prototype.getLabelText = function () {
-        var model = this.panel.getContext().getModel();
-        var attrId = this.expression.value;
-        var attrObj = attrId ? model.getAttributeByIdSafe(attrId) : null;
-        var attrFormat = this.panel.options.attrElementFormat;
-        return attrObj ? model.getAttributeText(attrObj, attrFormat) : this.getEmptyText();
-    };
-    AttributeExpressionRenderer.prototype.setValue = function (value, silent) {
-        if (silent === void 0) { silent = false; }
-        silent = silent && value !== this.expression.value;
-        var result = _super.prototype.setValue.call(this, value, true);
-        if (!silent) {
-            this.expression.getParent().fireChangedEvent(_easyquery_core__WEBPACK_IMPORTED_MODULE_1__["ConditionPart"].EntityAttr | _easyquery_core__WEBPACK_IMPORTED_MODULE_1__["ConditionPart"].Operator);
-        }
-        return result;
-    };
-    AttributeExpressionRenderer.prototype.isEditable = function () {
-        return !this.isReadOnly()
-            && ((this.panel.options.editableParts & _types_qp_editable_part__WEBPACK_IMPORTED_MODULE_5__[/* QPEditablePart */ "a"].Attribute) === _types_qp_editable_part__WEBPACK_IMPORTED_MODULE_5__[/* QPEditablePart */ "a"].Attribute);
-    };
-    AttributeExpressionRenderer.prototype.getEmptyText = function () {
-        return this.panel.options.emptyTextAttribute || _easydata_core__WEBPACK_IMPORTED_MODULE_0__["i18n"].getText('MsgEmptyAttrValue');
-    };
-    AttributeExpressionRenderer.prototype.getClassesToAdd = function () {
-        return this.cssPrefix + "-condelement " + this.cssPrefix + "-attrelement";
-    };
-    AttributeExpressionRenderer.prototype.adjustWidth = function () {
-        if (_utils_browser_utils__WEBPACK_IMPORTED_MODULE_4__[/* browserUtils */ "a"].isMobileMode()) {
-            return;
-        }
-        var elWidth = this.element.clientWidth;
-        var parWidth = this.element.parentElement.clientWidth;
-        if (elWidth > parWidth / 2) {
-            Object(_easydata_ui__WEBPACK_IMPORTED_MODULE_2__["domel"])(this.element)
-                .addClass(this.cssPrefix + "-attrelement-wide");
-        }
-    };
-    return AttributeExpressionRenderer;
-}(_list_expression_renderer__WEBPACK_IMPORTED_MODULE_3__[/* ListExpressionRenderer */ "b"]));
-
-//# sourceMappingURL=attribute_expression_renderer.js.map
-
 /***/ }),
 /* 51 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return GoogleChartWidget; });
-/* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
-/* harmony import */ var _chart_widget__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(46);
-/* harmony import */ var _chart_type__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(5);
-var __extends = (undefined && undefined.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-
-
-
-var GoogleChartWidget = /** @class */ (function (_super) {
-    __extends(GoogleChartWidget, _super);
-    /**
-     * The default constructor.
-     * @param slot The html element.
-     * @param provider The provider.
-     */
-    function GoogleChartWidget(slot) {
-        var _this = _super.call(this, slot) || this;
-        _this.hasChartTypes = [
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Column,
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Bar,
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Histogram,
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Combo,
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Area,
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Line,
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].SteppedLine,
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Pie,
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Doughnut
-        ];
-        _this.options.legend = {
-            show: true,
-            position: 'right'
-        };
-        return _this;
-    }
-    GoogleChartWidget.prototype.getWidgetType = function () {
-        return 'chartGoogle';
-    };
-    GoogleChartWidget.prototype.canDraw = function () {
-        return GoogleChartWidget.hasGoogleCharts();
-    };
-    GoogleChartWidget.hasGoogleCharts = function () {
-        return typeof google !== 'undefined' && typeof google.charts !== 'undefined';
-    };
-    GoogleChartWidget.prototype.initChart = function () {
-        if (GoogleChartWidget.hasGoogleCharts() && this.labelColumn >= 0
-            && this.dataColumns && this.dataColumns.length > 0) {
-            this.googleDataView =
-                new google.visualization.DataView(this.convertToGoogleFormat());
-            this.updateChartColumns();
-        }
-    };
-    GoogleChartWidget.prototype.convertToGoogleType = function (type) {
-        switch (type) {
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Date:
-                return "date";
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].DateTime:
-                return "datetime";
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Time:
-                return "timeofday";
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Byte:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Word:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Int32:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Int64:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Currency:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Float:
-                return "number";
-            default:
-                return "string";
-        }
-    };
-    GoogleChartWidget.prototype.convertToGoogleValue = function (value, type) {
-        switch (type) {
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Bool:
-                return value.toString();
-            default:
-                return value;
-        }
-    };
-    GoogleChartWidget.prototype.convertToGoogleFormat = function () {
-        var googleTable = new google.visualization.DataTable();
-        var columns = this.dataTable.columns;
-        for (var i = 0; i < columns.count; i++) {
-            var column = columns.get(i);
-            googleTable.addColumn(this.convertToGoogleType(column.type), column.label, column.id);
-        }
-        var rows = this.dataTable.getCachedRows();
-        googleTable.addRows(rows.length);
-        for (var i = 0; i < rows.length; i++) {
-            var row = rows[i];
-            for (var j = 0; j < columns.count; j++) {
-                googleTable.setCell(i, j, this.convertToGoogleValue(row.getValue(j), columns.get(j).type));
-            }
-        }
-        return googleTable;
-    };
-    GoogleChartWidget.prototype.drawCore = function () {
-        if (this.googleDataView != null) {
-            this.options.legend = this.options.legend || {};
-            var chartOptions = {
-                width: "100%",
-                height: "100%",
-                chartArea: { width: this.getChartAreaWidth }
-            };
-            if (this.chartType == _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Doughnut) {
-                chartOptions.pieHole = 0.4;
-            }
-            if (!this.options.legend.show) {
-                chartOptions.legend = 'none';
-            }
-            else {
-                chartOptions.legend = { position: this.options.legend.position };
-            }
-            var chart = this.createChart(this.chartDiv);
-            chart.draw(this.googleDataView, chartOptions);
-        }
-    };
-    GoogleChartWidget.prototype.getChartAreaWidth = function (chartType) {
-        if (chartType == _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Pie) {
-            return "100%";
-        }
-        else {
-            return "50%";
-        }
-    };
-    GoogleChartWidget.prototype.updateChartColumns = function () {
-        if (this.googleDataView) {
-            this.googleDataView.setColumns([].concat(this.labelColumn).concat(this.dataColumns));
-        }
-    };
-    GoogleChartWidget.prototype.createChart = function (slot) {
-        switch (this.chartType) {
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Column:
-                return new google.visualization.ColumnChart(slot);
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Histogram:
-                return new google.visualization.Histogram(slot);
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Bar:
-                return new google.visualization.BarChart(slot);
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Combo:
-                return new google.visualization.ComboChart(slot);
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Area:
-                return new google.visualization.AreaChart(slot);
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Line:
-                return new google.visualization.LineChart(slot);
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].SteppedLine:
-                return new google.visualization.SteppedAreaChart(slot);
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Pie:
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Doughnut:
-                return new google.visualization.PieChart(slot);
-            default:
-                return new google.visualization.PieChart(slot);
-        }
-    };
-    return GoogleChartWidget;
-}(_chart_widget__WEBPACK_IMPORTED_MODULE_1__[/* ChartWidget */ "a"]));
-
-//# sourceMappingURL=chart_widget_google.js.map
-
-/***/ }),
-/* 52 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* WEBPACK VAR INJECTION */(function(process, global) {/*!
@@ -17980,10 +17787,267 @@ return Promise$1;
 
 //# sourceMappingURL=es6-promise.map
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(96), __webpack_require__(97)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(97), __webpack_require__(98)))
+
+/***/ }),
+/* 52 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AttributeExpressionRenderer; });
+/* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
+/* harmony import */ var _easyquery_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
+/* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(1);
+/* harmony import */ var _list_expression_renderer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25);
+/* harmony import */ var _utils_browser_utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(3);
+/* harmony import */ var _types_qp_editable_part__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(10);
+var __extends = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+
+
+
+
+
+
+var AttributeExpressionRenderer = /** @class */ (function (_super) {
+    __extends(AttributeExpressionRenderer, _super);
+    function AttributeExpressionRenderer(panel, expression, entitiesMenu, slot) {
+        var _this = _super.call(this, panel, expression, null, slot) || this;
+        _this.menu = entitiesMenu;
+        return _this;
+    }
+    AttributeExpressionRenderer.prototype.renderEditor = function () {
+        //create menu
+    };
+    AttributeExpressionRenderer.prototype.getLabelText = function () {
+        var model = this.panel.getContext().getModel();
+        var attrId = this.expression.value;
+        var attrObj = attrId ? model.getAttributeByIdSafe(attrId) : null;
+        var attrFormat = this.panel.options.attrElementFormat;
+        return attrObj ? model.getAttributeText(attrObj, attrFormat) : this.getEmptyText();
+    };
+    AttributeExpressionRenderer.prototype.setValue = function (value, silent) {
+        if (silent === void 0) { silent = false; }
+        silent = silent && value !== this.expression.value;
+        var result = _super.prototype.setValue.call(this, value, true);
+        if (!silent) {
+            this.expression.getParent().fireChangedEvent(_easyquery_core__WEBPACK_IMPORTED_MODULE_1__["ConditionPart"].EntityAttr | _easyquery_core__WEBPACK_IMPORTED_MODULE_1__["ConditionPart"].Operator);
+        }
+        return result;
+    };
+    AttributeExpressionRenderer.prototype.isEditable = function () {
+        return !this.isReadOnly()
+            && ((this.panel.options.editableParts & _types_qp_editable_part__WEBPACK_IMPORTED_MODULE_5__[/* QPEditablePart */ "a"].Attribute) === _types_qp_editable_part__WEBPACK_IMPORTED_MODULE_5__[/* QPEditablePart */ "a"].Attribute);
+    };
+    AttributeExpressionRenderer.prototype.getEmptyText = function () {
+        return this.panel.options.emptyTextAttribute || _easydata_core__WEBPACK_IMPORTED_MODULE_0__["i18n"].getText('MsgEmptyAttrValue');
+    };
+    AttributeExpressionRenderer.prototype.getClassesToAdd = function () {
+        return this.cssPrefix + "-condelement " + this.cssPrefix + "-attrelement";
+    };
+    AttributeExpressionRenderer.prototype.adjustWidth = function () {
+        if (_utils_browser_utils__WEBPACK_IMPORTED_MODULE_4__[/* browserUtils */ "a"].isMobileMode()) {
+            return;
+        }
+        var elWidth = this.element.clientWidth;
+        var parWidth = this.element.parentElement.clientWidth;
+        if (elWidth > parWidth / 2) {
+            Object(_easydata_ui__WEBPACK_IMPORTED_MODULE_2__["domel"])(this.element)
+                .addClass(this.cssPrefix + "-attrelement-wide");
+        }
+    };
+    return AttributeExpressionRenderer;
+}(_list_expression_renderer__WEBPACK_IMPORTED_MODULE_3__[/* ListExpressionRenderer */ "b"]));
+
+//# sourceMappingURL=attribute_expression_renderer.js.map
 
 /***/ }),
 /* 53 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return GoogleChartWidget; });
+/* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
+/* harmony import */ var _chart_widget__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(47);
+/* harmony import */ var _chart_type__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(5);
+var __extends = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+
+
+
+var GoogleChartWidget = /** @class */ (function (_super) {
+    __extends(GoogleChartWidget, _super);
+    /**
+     * The default constructor.
+     * @param slot The html element.
+     * @param provider The provider.
+     */
+    function GoogleChartWidget(slot) {
+        var _this = _super.call(this, slot) || this;
+        _this.hasChartTypes = [
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Column,
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Bar,
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Histogram,
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Combo,
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Area,
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Line,
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].SteppedLine,
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Pie,
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Doughnut
+        ];
+        _this.options.legend = {
+            show: true,
+            position: 'right'
+        };
+        return _this;
+    }
+    GoogleChartWidget.prototype.getWidgetType = function () {
+        return 'chartGoogle';
+    };
+    GoogleChartWidget.prototype.canDraw = function () {
+        return GoogleChartWidget.hasGoogleCharts();
+    };
+    GoogleChartWidget.hasGoogleCharts = function () {
+        return typeof google !== 'undefined' && typeof google.charts !== 'undefined';
+    };
+    GoogleChartWidget.prototype.initChart = function () {
+        if (GoogleChartWidget.hasGoogleCharts() && this.labelColumn >= 0
+            && this.dataColumns && this.dataColumns.length > 0) {
+            this.googleDataView =
+                new google.visualization.DataView(this.convertToGoogleFormat());
+            this.updateChartColumns();
+        }
+    };
+    GoogleChartWidget.prototype.convertToGoogleType = function (type) {
+        switch (type) {
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Date:
+                return "date";
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].DateTime:
+                return "datetime";
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Time:
+                return "timeofday";
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Byte:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Word:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Int32:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Int64:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Currency:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Float:
+                return "number";
+            default:
+                return "string";
+        }
+    };
+    GoogleChartWidget.prototype.convertToGoogleValue = function (value, type) {
+        switch (type) {
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Bool:
+                return value.toString();
+            default:
+                return value;
+        }
+    };
+    GoogleChartWidget.prototype.convertToGoogleFormat = function () {
+        var googleTable = new google.visualization.DataTable();
+        var columns = this.dataTable.columns;
+        for (var i = 0; i < columns.count; i++) {
+            var column = columns.get(i);
+            googleTable.addColumn(this.convertToGoogleType(column.type), column.label, column.id);
+        }
+        var rows = this.dataTable.getCachedRows();
+        googleTable.addRows(rows.length);
+        for (var i = 0; i < rows.length; i++) {
+            var row = rows[i];
+            for (var j = 0; j < columns.count; j++) {
+                googleTable.setCell(i, j, this.convertToGoogleValue(row.getValue(j), columns.get(j).type));
+            }
+        }
+        return googleTable;
+    };
+    GoogleChartWidget.prototype.drawCore = function () {
+        if (this.googleDataView != null) {
+            this.options.legend = this.options.legend || {};
+            var chartOptions = {
+                width: "100%",
+                height: "100%",
+                chartArea: { width: this.getChartAreaWidth }
+            };
+            if (this.chartType == _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Doughnut) {
+                chartOptions.pieHole = 0.4;
+            }
+            if (!this.options.legend.show) {
+                chartOptions.legend = 'none';
+            }
+            else {
+                chartOptions.legend = { position: this.options.legend.position };
+            }
+            var chart = this.createChart(this.chartDiv);
+            chart.draw(this.googleDataView, chartOptions);
+        }
+    };
+    GoogleChartWidget.prototype.getChartAreaWidth = function (chartType) {
+        if (chartType == _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Pie) {
+            return "100%";
+        }
+        else {
+            return "50%";
+        }
+    };
+    GoogleChartWidget.prototype.updateChartColumns = function () {
+        if (this.googleDataView) {
+            this.googleDataView.setColumns([].concat(this.labelColumn).concat(this.dataColumns));
+        }
+    };
+    GoogleChartWidget.prototype.createChart = function (slot) {
+        switch (this.chartType) {
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Column:
+                return new google.visualization.ColumnChart(slot);
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Histogram:
+                return new google.visualization.Histogram(slot);
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Bar:
+                return new google.visualization.BarChart(slot);
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Combo:
+                return new google.visualization.ComboChart(slot);
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Area:
+                return new google.visualization.AreaChart(slot);
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Line:
+                return new google.visualization.LineChart(slot);
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].SteppedLine:
+                return new google.visualization.SteppedAreaChart(slot);
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Pie:
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Doughnut:
+                return new google.visualization.PieChart(slot);
+            default:
+                return new google.visualization.PieChart(slot);
+        }
+    };
+    return GoogleChartWidget;
+}(_chart_widget__WEBPACK_IMPORTED_MODULE_1__[/* ChartWidget */ "a"]));
+
+//# sourceMappingURL=chart_widget_google.js.map
+
+/***/ }),
+/* 54 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* WEBPACK VAR INJECTION */(function(process, global) {/*!
@@ -19160,10 +19224,10 @@ return Promise$1;
 
 //# sourceMappingURL=es6-promise.map
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(117), __webpack_require__(118)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(119), __webpack_require__(120)))
 
 /***/ }),
-/* 54 */
+/* 55 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -19228,7 +19292,7 @@ var HttpRequest = /** @class */ (function () {
 //# sourceMappingURL=http_request.js.map
 
 /***/ }),
-/* 55 */
+/* 56 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -19263,6 +19327,7 @@ var DataColumn = /** @class */ (function () {
         this.groupFooterColumnTemplate = desc.gfct;
         this.style = desc.style || {};
         this.description = desc.description;
+        this.calculatedWidth = 0;
     }
     return DataColumn;
 }());
@@ -19302,9 +19367,10 @@ var 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);
@@ -19314,8 +19380,12 @@ var 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];
@@ -19346,7 +19416,7 @@ var DataColumnList = /** @class */ (function () {
 //# sourceMappingURL=data_column.js.map
 
 /***/ }),
-/* 56 */
+/* 57 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -19441,7 +19511,7 @@ var FormatParser = /** @class */ (function () {
 //# sourceMappingURL=format_parser.js.map
 
 /***/ }),
-/* 57 */
+/* 58 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -19492,7 +19562,7 @@ var AggrFunction = /** @class */ (function () {
 //# sourceMappingURL=aggr_function.js.map
 
 /***/ }),
-/* 58 */
+/* 59 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -19557,7 +19627,7 @@ var Tree = /** @class */ (function () {
 //# sourceMappingURL=tree.js.map
 
 /***/ }),
-/* 59 */
+/* 60 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -19572,13 +19642,13 @@ var ConditionPart;
 //# sourceMappingURL=cond_part.js.map
 
 /***/ }),
-/* 60 */
+/* 61 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* WEBPACK VAR INJECTION */(function(Promise) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return BrowserQueryStorage; });
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
-/* harmony import */ var _query_query__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
+/* harmony import */ var _query_query__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
 
 
 var BrowserQueryStorage = /** @class */ (function () {
@@ -19704,10 +19774,10 @@ var BrowserQueryStorage = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=query_storage.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(52)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(51)))
 
 /***/ }),
-/* 61 */
+/* 62 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -19745,10 +19815,10 @@ var EqModelLoader = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=model_loader.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(52)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(51)))
 
 /***/ }),
-/* 62 */
+/* 63 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -19759,13 +19829,12 @@ var EqAggregatesContainer = /** @class */ (function () {
         this.context = context;
         this.levels = {};
     }
-    EqAggregatesContainer.prototype.getAggregates = function (level, key) {
+    EqAggregatesContainer.prototype.getAggregateData = function (level, groupKey) {
         var _this = this;
         return new Promise(function (resolve, reject) {
-            var desc = _this.getLevelDesc(level);
             var processFunc = function (data) {
                 // map values
-                var keyStr = JSON.stringify(key);
+                var keyStr = _this.groupKeyToStr(groupKey);
                 var value = data.get(keyStr);
                 if (value) {
                     resolve(value);
@@ -19774,33 +19843,43 @@ var EqAggregatesContainer = /** @class */ (function () {
                     reject("Can't find data for " + keyStr);
                 }
             };
-            if (desc.data) {
+            var desc = _this.getLevelDesc(level, false);
+            if (desc && desc.data) {
                 processFunc(desc.data);
             }
             else {
-                desc.recivedCallbacks.push(processFunc);
+                desc.receivedCallbacks.push(processFunc);
             }
         });
     };
-    EqAggregatesContainer.prototype.setAggregates = function (level, data) {
-        var desc = this.getLevelDesc(level);
+    EqAggregatesContainer.prototype.setAggregateData = function (level, data) {
+        var desc = this.getLevelDesc(level, true);
         desc.data = data;
-        if (desc.recivedCallbacks) {
-            for (var _i = 0, _a = desc.recivedCallbacks; _i < _a.length; _i++) {
+        if (desc.receivedCallbacks) {
+            for (var _i = 0, _a = desc.receivedCallbacks; _i < _a.length; _i++) {
                 var callback = _a[_i];
                 callback(desc.data);
             }
         }
-        desc.recivedCallbacks = [];
+        desc.receivedCallbacks = [];
+    };
+    EqAggregatesContainer.prototype.updateAggregateData = function (level, groupKey, values) {
+        var desc = this.getLevelDesc(level, true);
+        var key = this.groupKeyToStr(groupKey);
+        desc.data.set(key, values);
     };
-    EqAggregatesContainer.prototype.getLevelDesc = function (level) {
+    EqAggregatesContainer.prototype.groupKeyToStr = function (groupKey) {
+        return JSON.stringify(groupKey);
+    };
+    EqAggregatesContainer.prototype.getLevelDesc = function (level, createIfNotExists) {
         var desc = this.levels[level];
-        if (!desc) {
+        if (!desc && createIfNotExists) {
             desc = {
-                recivedCallbacks: []
+                receivedCallbacks: [],
+                data: new Map()
             };
+            this.levels[level] = desc;
         }
-        this.levels[level] = desc;
         return desc;
     };
     EqAggregatesContainer.prototype.clear = function () {
@@ -19833,26 +19912,31 @@ var DefaultAggregatesCalculator = /** @class */ (function () {
             columns[i].enabled = false;
         }
         if (settings.hasGrandTotals()) {
-            this.aggrs.setAggregates(0, new Map());
+            this.aggrs.setAggregateData(0, new Map());
             if (options.resultObtained)
                 options.resultObtained({}, 0);
         }
         var groups = settings.getGroups();
         for (var level = 1; level <= groups.length && level <= options.maxLevel; level++) {
-            this.aggrs.setAggregates(level, new Map());
+            this.aggrs.setAggregateData(level, new Map());
             if (options.resultObtained)
                 options.resultObtained({}, level);
         }
         return Promise.resolve();
     };
+    DefaultAggregatesCalculator.prototype.needRecalculation = function () {
+        return true;
+    };
+    DefaultAggregatesCalculator.prototype.reset = function () {
+    };
     return DefaultAggregatesCalculator;
 }());
 
 //# sourceMappingURL=eq_aggr_container.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(52)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(51)))
 
 /***/ }),
-/* 63 */
+/* 64 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -19869,7 +19953,6 @@ var EasyQueryDataLoader = /** @class */ (function () {
         // different grids
         this.dataLoadPromise = new Promise(function (resolve, reject) {
             var fetchOptions = {
-                skipAggr: true,
                 chunk: chunk,
                 success: function (result) {
                     var dataTable = new _easydata_core__WEBPACK_IMPORTED_MODULE_0__["EasyDataTable"]({
@@ -19909,10 +19992,10 @@ var EasyQueryDataLoader = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=eq_data_loader.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(52)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(51)))
 
 /***/ }),
-/* 64 */
+/* 65 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -20550,7 +20633,7 @@ var EntitiesPanel = /** @class */ (function (_super) {
 //# sourceMappingURL=entities_panel.js.map
 
 /***/ }),
-/* 65 */
+/* 66 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -20625,7 +20708,7 @@ var browserUtils;
 //# sourceMappingURL=browser_utils.js.map
 
 /***/ }),
-/* 66 */
+/* 67 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -20728,7 +20811,7 @@ function mask(input, maskPattern) {
 //# sourceMappingURL=mask.js.map
 
 /***/ }),
-/* 67 */
+/* 68 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -20737,7 +20820,7 @@ function mask(input, maskPattern) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return DefaultProgressDialog; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return DefaultDialogSet; });
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
-/* harmony import */ var _dialog_service__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(68);
+/* harmony import */ var _dialog_service__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(69);
 /* harmony import */ var _utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(6);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -21251,10 +21334,10 @@ var DefaultDialogSet = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=default_dialog_service.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(103)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(105)))
 
 /***/ }),
-/* 68 */
+/* 69 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -21268,7 +21351,7 @@ var DialogFooterAlignment;
 //# sourceMappingURL=dialog_service.js.map
 
 /***/ }),
-/* 69 */
+/* 70 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -21279,9 +21362,9 @@ var DialogFooterAlignment;
 /* harmony import */ var _utils_popup_menu__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(9);
 /* harmony import */ var _utils_utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(4);
 /* harmony import */ var _utils_browser_utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(3);
-/* harmony import */ var _renderers_columnspanel_aggrfunc_column_renderer__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(93);
-/* harmony import */ var _renderers_columnspanel_customsql_column_renderer__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(71);
-/* harmony import */ var _renderers_columnspanel_simple_column_renderer__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(31);
+/* harmony import */ var _renderers_columnspanel_aggrfunc_column_renderer__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(94);
+/* harmony import */ var _renderers_columnspanel_customsql_column_renderer__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(72);
+/* harmony import */ var _renderers_columnspanel_simple_column_renderer__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(30);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -21655,11 +21738,12 @@ var ColumnsPanel = /** @class */ (function (_super) {
                 this.columnsBlock.appendChild(this.renderColumn(column));
             }
         }
-        catch (e) {
+        catch (err) {
+            var error = err;
             this.context.throwError({
                 action: "ColumnsPanel rendering",
-                text: e.message,
-                sourceError: e
+                text: error.message,
+                sourceError: error
             });
         }
     };
@@ -22005,7 +22089,7 @@ var ColumnsPanel = /** @class */ (function (_super) {
 //# sourceMappingURL=columns_panel.js.map
 
 /***/ }),
-/* 70 */
+/* 71 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -22016,6 +22100,13 @@ var ColumnsPanel = /** @class */ (function (_super) {
 /* harmony import */ var _utils_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
 /* harmony import */ var _utils_popup_menu__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(9);
 /* harmony import */ var _utils_browser_utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(3);
+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;
+};
 
 
 
@@ -22414,7 +22505,7 @@ var ColumnRendererCP = /** @class */ (function () {
     };
     ColumnRendererCP.prototype.renderColumnTypeButton = function () {
         var _this = this;
-        return (this.isEditable() && this.panel.options.allowAggrColumns !== false && !this.column.getQuery().enableAggregation)
+        return (this.isEditable() && this.panel.options.allowAggrColumns !== false)
             ? Object(_easydata_ui__WEBPACK_IMPORTED_MODULE_1__["domel"])('div')
                 .addClass(_utils_utils__WEBPACK_IMPORTED_MODULE_2__[/* eqCssPrefix */ "b"] + "-button-placeholder", this.cssPrefix + "-button-placeholder", this.cssPrefix + "-typebutton-placeholder", this.cssPrefix + "-button-active")
                 .data("btnplaceholder", "")
@@ -22756,7 +22847,7 @@ var ColumnRendererCP = /** @class */ (function () {
                 text: ' ',
                 items: common
             });
-            var sortItems = this.panel.options.allowSorting ? this.panel.getSortMenuList().concat(this.panel.getMoveMenuList()) :
+            var sortItems = this.panel.options.allowSorting ? __spreadArrays(this.panel.getSortMenuList(), this.panel.getMoveMenuList()) :
                 this.panel.getMoveMenuList();
             items.push({
                 id: '__group',
@@ -22765,7 +22856,7 @@ var ColumnRendererCP = /** @class */ (function () {
             });
             var extra = this.getExtraButtonMenuItems();
             if (extra && Array.isArray(extra)) {
-                items = items.concat(extra);
+                items = __spreadArrays(items, extra);
             }
             var formatItems = this.getFormatsMenuItems();
             if (formatItems.length > 1) {
@@ -22829,7 +22920,7 @@ var ColumnRendererCP = /** @class */ (function () {
 //# sourceMappingURL=column_renderer_cp.js.map
 
 /***/ }),
-/* 71 */
+/* 72 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -22837,7 +22928,7 @@ var ColumnRendererCP = /** @class */ (function () {
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
 /* harmony import */ var _easyquery_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
 /* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(1);
-/* harmony import */ var _simple_column_renderer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(31);
+/* harmony import */ var _simple_column_renderer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(30);
 /* harmony import */ var _utils_browser_utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(3);
 /* harmony import */ var _utils_popup_menu__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(9);
 var __extends = (undefined && undefined.__extends) || (function () {
@@ -23057,14 +23148,14 @@ var CustomSqlColumnRendererCP = /** @class */ (function (_super) {
 //# sourceMappingURL=customsql_column_renderer.js.map
 
 /***/ }),
-/* 72 */
+/* 73 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AggrFuncColumnRendererCB; });
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
 /* harmony import */ var _easyquery_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
-/* harmony import */ var _simple_column_renderer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(40);
+/* harmony import */ var _simple_column_renderer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(41);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -23096,7 +23187,6 @@ var AggrFuncColumnRendererCB = /** @class */ (function (_super) {
             .getAttributeByIdSafe(this.column.expr.args[0].value);
     };
     AggrFuncColumnRendererCB.prototype.getDefaultCaption = function () {
-        console.log('Calling getDefaultCaption() AGGR');
         return this.getDefaultTitleText(this.baseAttr) + ' '
             + this.bar.getContext().getModel().getAggrFunctionCaption(this.column.expr.func);
     };
@@ -23129,7 +23219,7 @@ var AggrFuncColumnRendererCB = /** @class */ (function (_super) {
 //# sourceMappingURL=aggrfunc_column_renderer.js.map
 
 /***/ }),
-/* 73 */
+/* 74 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -23446,7 +23536,6 @@ var ColumnRendererCB = /** @class */ (function () {
             .toDOM();
     };
     ColumnRendererCB.prototype.getDefaultCaption = function () {
-        console.log('Calling getDefaultCaption() BASE');
         return this.getDefaultTitleText(this.baseAttr);
     };
     ColumnRendererCB.prototype.getDefaultTitleText = function (attr) {
@@ -23516,8 +23605,7 @@ var ColumnRendererCB = /** @class */ (function () {
     };
     ColumnRendererCB.prototype.renderColumnTypeButton = function () {
         var _this = this;
-        if (!this.isEditable() || this.bar.options.allowAggrColumns === false
-            || this.column.getQuery().enableAggregation) {
+        if (!this.isEditable() || this.bar.options.allowAggrColumns === false) {
             return null;
         }
         return Object(_easydata_ui__WEBPACK_IMPORTED_MODULE_2__["domel"])('div')
@@ -23695,7 +23783,7 @@ var ColumnRendererCB = /** @class */ (function () {
 //# sourceMappingURL=column_renderer_cb.js.map
 
 /***/ }),
-/* 74 */
+/* 75 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -23741,7 +23829,7 @@ var TextRenderer = /** @class */ (function () {
 //# sourceMappingURL=text_renderer.js.map
 
 /***/ }),
-/* 75 */
+/* 76 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -23752,7 +23840,7 @@ var TextRenderer = /** @class */ (function () {
 /* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(1);
 /* harmony import */ var _condition_renderer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(35);
 /* harmony import */ var _utils_browser_utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(3);
-/* harmony import */ var _utils_dropdown__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(76);
+/* harmony import */ var _utils_dropdown__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(77);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -23985,7 +24073,7 @@ var ConditionGroupRowRenderer = /** @class */ (function (_super) {
 //# sourceMappingURL=condition_group_renderer.js.map
 
 /***/ }),
-/* 76 */
+/* 77 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -24050,7 +24138,7 @@ function dropdown(parent) {
 //# sourceMappingURL=dropdown.js.map
 
 /***/ }),
-/* 77 */
+/* 78 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -24226,7 +24314,7 @@ var InputExpressionRenderer = /** @class */ (function (_super) {
 //# sourceMappingURL=input_expression_renderer.js.map
 
 /***/ }),
-/* 78 */
+/* 79 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -24234,7 +24322,7 @@ var InputExpressionRenderer = /** @class */ (function (_super) {
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
 /* harmony import */ var _easyquery_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
 /* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(1);
-/* harmony import */ var _dropdown_renderer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(42);
+/* harmony import */ var _dropdown_renderer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(43);
 /* harmony import */ var _utils_utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(4);
 /* harmony import */ var _types_qp_editable_part__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(10);
 var __extends = (undefined && undefined.__extends) || (function () {
@@ -24325,14 +24413,14 @@ var AddRowRenderer = /** @class */ (function (_super) {
 //# sourceMappingURL=addrow_renderer.js.map
 
 /***/ }),
-/* 79 */
+/* 80 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return OperatorRenderer; });
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
 /* harmony import */ var _easyquery_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
-/* harmony import */ var _dropdown_renderer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(42);
+/* harmony import */ var _dropdown_renderer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(43);
 /* harmony import */ var _utils_popup_menu__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(9);
 /* harmony import */ var _types_qp_editable_part__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(10);
 var __extends = (undefined && undefined.__extends) || (function () {
@@ -24431,7 +24519,7 @@ var OperatorRenderer = /** @class */ (function (_super) {
 //# sourceMappingURL=operator_renderer.js.map
 
 /***/ }),
-/* 80 */
+/* 81 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -24549,7 +24637,7 @@ var DateTimeExpressionRenderer = /** @class */ (function (_super) {
 //# sourceMappingURL=datetime_expression_render.js.map
 
 /***/ }),
-/* 81 */
+/* 82 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -24799,7 +24887,7 @@ var SubQueryExpressionRenderer = /** @class */ (function (_super) {
 //# sourceMappingURL=subquery_expression_renderer.js.map
 
 /***/ }),
-/* 82 */
+/* 83 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -25069,7 +25157,7 @@ var FilterBar = /** @class */ (function (_super) {
 //# sourceMappingURL=filter_bar.js.map
 
 /***/ }),
-/* 83 */
+/* 84 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -25156,7 +25244,7 @@ var Grid = /** @class */ (function (_super) {
 //# sourceMappingURL=grid.js.map
 
 /***/ }),
-/* 84 */
+/* 85 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -25223,7 +25311,7 @@ var StatementPanel = /** @class */ (function (_super) {
 //# sourceMappingURL=statement_panel.js.map
 
 /***/ }),
-/* 85 */
+/* 86 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -25280,17 +25368,17 @@ var ProcessWidget = /** @class */ (function (_super) {
 //# sourceMappingURL=process_widget.js.map
 
 /***/ }),
-/* 86 */
+/* 87 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ChartFacet; });
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
 /* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(1);
-/* harmony import */ var _types_facet_type__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(14);
-/* harmony import */ var _result_facet__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(32);
-/* harmony import */ var _widgets_charts_chart_widget_chartjs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(45);
-/* harmony import */ var _widgets_charts_chart_widget_google__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(51);
+/* harmony import */ var _types_facet_type__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(13);
+/* harmony import */ var _result_facet__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(31);
+/* harmony import */ var _widgets_charts_chart_widget_chartjs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(46);
+/* harmony import */ var _widgets_charts_chart_widget_google__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(53);
 /* harmony import */ var _utils_browser_utils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(3);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -25527,15 +25615,15 @@ var ChartFacet = /** @class */ (function (_super) {
 //# sourceMappingURL=chart_facet.js.map
 
 /***/ }),
-/* 87 */
+/* 88 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return PivotTableFacet; });
 /* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(0);
-/* harmony import */ var _types_facet_type__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(14);
-/* harmony import */ var _result_facet__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(32);
+/* harmony import */ var _types_facet_type__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(13);
+/* harmony import */ var _result_facet__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(31);
 /* harmony import */ var _utils_browser_utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(3);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -25577,21 +25665,25 @@ var PivotTableFacet = /** @class */ (function (_super) {
     PivotTableFacet.prototype.init = function (slot) {
         var _this = this;
         _super.prototype.init.call(this, slot);
+        this.options.maxRowCount = this.options.maxRowCount || 500;
+        this.options.viewportRowsCount = this.options.viewportRowsCount || 50;
         this.grid = new _easydata_ui__WEBPACK_IMPORTED_MODULE_0__["EasyGrid"]({
             slot: this.contentDiv,
             dataTable: this.pivotTable,
             paging: {
-                enabled: false
+                enabled: false,
+                pageSize: this.options.maxRowCount
             },
+            viewportRowsCount: this.options.viewportRowsCount,
             useRowNumeration: false,
-            addColumns: false,
+            showPlusButton: false,
             allowDragDrop: false,
             onGetCellRenderer: function (column, defaultRenderer) {
                 if (column.dataColumn) {
                     if (column.dataColumn.id == "total") {
                         return function (value, column, cell, rowEl) {
                             defaultRenderer(value, column, cell, rowEl);
-                            cell.style.fontWeight = '900';
+                            cell.classList.add('pivot-cell-total');
                         };
                     }
                     if (_this.settings.totalsRow) {
@@ -25852,6 +25944,18 @@ var PivotTableFacet = /** @class */ (function (_super) {
     PivotTableFacet.prototype.refreshCore = function () {
         this.updatePivotData();
         if (this.grid) {
+            var dataSize = this.pivotTable.getTotal();
+            var maxRow = this.grid.options.paging.pageSize;
+            if (dataSize > maxRow) {
+                this.contentDiv.classList.remove('pivot-grid-with-totals');
+                this.showErrorMessage(_easydata_core__WEBPACK_IMPORTED_MODULE_1__["i18n"].getText('Facets', 'ErrTooMuchData'));
+            }
+            if (this.options.viewportRowsCount > dataSize) {
+                this.grid.options.viewportRowsCount = dataSize;
+            }
+            else {
+                this.grid.options.viewportRowsCount = this.options.viewportRowsCount;
+            }
             this.grid.refresh();
         }
     };
@@ -26026,10 +26130,10 @@ var PivotTableFacet = /** @class */ (function (_super) {
                 total_row.push(totalByCol);
             }
             this.pivotTable.addRow(total_row);
-            this.contentDiv.classList.add('pivot-grid-totals-row');
+            this.contentDiv.classList.add('pivot-grid-with-totals');
         }
         else {
-            this.contentDiv.classList.remove('pivot-grid-totals-row');
+            this.contentDiv.classList.remove('pivot-grid-with-totals');
         }
     };
     PivotTableFacet.prototype.calcAggrFunc = function (func, options) {
@@ -26191,15 +26295,15 @@ var PivotTableFacet = /** @class */ (function (_super) {
 //# sourceMappingURL=pivot_table_facet.js.map
 
 /***/ }),
-/* 88 */
+/* 89 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return DataTableFacet; });
 /* harmony import */ var _easyquery_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var _result_facet__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(32);
-/* harmony import */ var _types_facet_type__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(14);
-/* harmony import */ var _widgets_easy_grid_widget__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(43);
+/* harmony import */ var _result_facet__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(31);
+/* harmony import */ var _types_facet_type__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(13);
+/* harmony import */ var _widgets_easy_grid_widget__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(44);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -26272,14 +26376,14 @@ var DataTableFacet = /** @class */ (function (_super) {
 //# sourceMappingURL=datatable_facet.js.map
 
 /***/ }),
-/* 89 */
+/* 90 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ExportWidget; });
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
 /* harmony import */ var _easyquery_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
-/* harmony import */ var _dialog_export_dialog__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(44);
+/* harmony import */ var _dialog_export_dialog__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(45);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -26338,14 +26442,14 @@ var ExportWidget = /** @class */ (function (_super) {
 //# sourceMappingURL=export_widget.js.map
 
 /***/ }),
-/* 90 */
+/* 91 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AggregationBar; });
 /* harmony import */ var _easyquery_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var _utils_browser_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3);
-/* harmony import */ var _dialog_aggr_settings_dialog__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(91);
+/* harmony import */ var _dialog_aggr_settings_dialog__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(92);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -26492,14 +26596,14 @@ var AggregationBar = /** @class */ (function (_super) {
 //# sourceMappingURL=aggregation_bar.js.map
 
 /***/ }),
-/* 91 */
+/* 92 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* WEBPACK VAR INJECTION */(function(Promise) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AggrSettingsDialog; });
 /* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
 /* harmony import */ var _easyquery_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
-/* harmony import */ var _widgets_renderers_aggr_settings_aggr_settings_renderer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(92);
+/* harmony import */ var _widgets_renderers_aggr_settings_aggr_settings_renderer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(93);
 
 
 
@@ -26582,10 +26686,10 @@ var AggrSettingsDialog = /** @class */ (function () {
             b.on('change', _this.enableAggrCheckBoxChangeHandler.bind(_this));
         })
             .addChild('span', function (b) { return b
-            .addClass('slider round'); }); })
+            .addClass('slider round'); })
             .addChild('span', function (b) { return b
             .addClass('switch-text')
-            .addText(_easyquery_core__WEBPACK_IMPORTED_MODULE_1__["i18n"].getText('AggrSettings', 'EnableAggrLabel')); }); })
+            .addText(_easyquery_core__WEBPACK_IMPORTED_MODULE_1__["i18n"].getText('AggrSettings', 'EnableAggrLabel')); }); }); })
             .addChild('div', function (b) { return b
             .id('AggrSettingsComponent'); });
         return b.toDOM();
@@ -26607,10 +26711,10 @@ var AggrSettingsDialog = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=aggr_settings_dialog.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(53)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(54)))
 
 /***/ }),
-/* 92 */
+/* 93 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -26764,10 +26868,10 @@ var AggrSettingsRenderer = /** @class */ (function () {
             b.on('change', _this.countsCheckboxChangeHandler.bind(_this));
         })
             .addChild('span', function (b) { return b
-            .addClass('slider round'); }); })
+            .addClass('slider round'); })
             .addChild('span', function (b) { return b
             .addClass('switch-text')
-            .addText(_easyquery_core__WEBPACK_IMPORTED_MODULE_3__["i18n"].getText('AggrSettings', 'GroupCountsLabel')); }); })
+            .addText(_easyquery_core__WEBPACK_IMPORTED_MODULE_3__["i18n"].getText('AggrSettings', 'GroupCountsLabel')); }); }); })
             .addChild('div', function (b) { return b
             .addClass(_this.cssPrefix + "-grandtotals")
             .addChild('label', function (b) { return b
@@ -26780,10 +26884,10 @@ var AggrSettingsRenderer = /** @class */ (function () {
             b.on('change', _this.grandCheckboxChangeHandler.bind(_this));
         })
             .addChild('span', function (b) { return b
-            .addClass('slider round'); }); })
+            .addClass('slider round'); })
             .addChild('span', function (b) { return b
             .addClass('switch-text')
-            .addText(_easyquery_core__WEBPACK_IMPORTED_MODULE_3__["i18n"].getText('AggrSettings', 'GrandTotalsLabel')); }); });
+            .addText(_easyquery_core__WEBPACK_IMPORTED_MODULE_3__["i18n"].getText('AggrSettings', 'GrandTotalsLabel')); }); }); });
         var groups = this.slot.querySelectorAll("." + this.cssPrefix + "-group");
         groups.forEach(function (el) {
             Object(_easydata_ui__WEBPACK_IMPORTED_MODULE_1__["domel"])(el)
@@ -27051,7 +27155,7 @@ var AggrSettingsRenderer = /** @class */ (function () {
 //# sourceMappingURL=aggr_settings_renderer.js.map
 
 /***/ }),
-/* 93 */
+/* 94 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -27132,7 +27236,7 @@ var DisplayFormatParser = /** @class */ (function () {
 
 //# sourceMappingURL=display_format_parser.js.map
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/columnspanel/simple_column_renderer.js
-var simple_column_renderer = __webpack_require__(31);
+var simple_column_renderer = __webpack_require__(30);
 
 // EXTERNAL MODULE: ./dist/lib/utils/browser_utils.js
 var browser_utils = __webpack_require__(3);
@@ -27319,7 +27423,7 @@ var aggrfunc_column_renderer_AggrFuncColumnRendererCP = /** @class */ (function
 //# sourceMappingURL=aggrfunc_column_renderer.js.map
 
 /***/ }),
-/* 94 */
+/* 95 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -27842,7 +27946,7 @@ var sorting_bar_SortingBar = /** @class */ (function (_super) {
 //# sourceMappingURL=sorting_bar.js.map
 
 /***/ }),
-/* 95 */
+/* 96 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -27860,7 +27964,7 @@ var lib_public_api = __webpack_require__(0);
 var dist_lib_public_api = __webpack_require__(1);
 
 // EXTERNAL MODULE: ./dist/lib/types/facet_type.js
-var facet_type = __webpack_require__(14);
+var facet_type = __webpack_require__(13);
 
 // EXTERNAL MODULE: ./dist/lib/utils/browser_utils.js
 var browser_utils = __webpack_require__(3);
@@ -27872,16 +27976,16 @@ var popup_menu = __webpack_require__(9);
 var utils = __webpack_require__(4);
 
 // EXTERNAL MODULE: ./dist/lib/dialog/export_dialog.js
-var export_dialog = __webpack_require__(44);
+var export_dialog = __webpack_require__(45);
 
 // EXTERNAL MODULE: ./dist/lib/facets/chart_facet.js
-var chart_facet = __webpack_require__(86);
+var chart_facet = __webpack_require__(87);
 
 // EXTERNAL MODULE: ./dist/lib/facets/pivot_table_facet.js
-var pivot_table_facet = __webpack_require__(87);
+var pivot_table_facet = __webpack_require__(88);
 
 // EXTERNAL MODULE: ./dist/lib/facets/datatable_facet.js
-var datatable_facet = __webpack_require__(88);
+var datatable_facet = __webpack_require__(89);
 
 // CONCATENATED MODULE: ./dist/lib/widgets/facet_container.js
 var __extends = (undefined && undefined.__extends) || (function () {
@@ -28027,6 +28131,9 @@ var result_facets_panel_ResultFacetsPanel = /** @class */ (function (_super) {
     ResultFacetsPanel.prototype.attachQueryObserver = function () {
         var _this = this;
         var query = this.getQuery();
+        if (this.queryEventCallbackId) {
+            query.removeChangedCallback(this.queryEventCallbackId);
+        }
         this.queryEventCallbackId = query.addChangedCallback(function (event) {
             //if something has changed, and that change is related to columns
             var edata = event.data;
@@ -28449,7 +28556,7 @@ var result_facets_panel_ResultFacetsPanel = /** @class */ (function (_super) {
 //# sourceMappingURL=result_facets_panel.js.map
 
 /***/ }),
-/* 96 */
+/* 97 */
 /***/ (function(module, exports) {
 
 // shim for using process in browser
@@ -28639,7 +28746,7 @@ process.umask = function() { return 0; };
 
 
 /***/ }),
-/* 97 */
+/* 98 */
 /***/ (function(module, exports) {
 
 var g;
@@ -28665,16 +28772,16 @@ module.exports = g;
 
 
 /***/ }),
-/* 98 */
+/* 99 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* WEBPACK VAR INJECTION */(function(Promise) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return HttpResponseError; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return HttpClient; });
 /* harmony import */ var _utils_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(11);
-/* harmony import */ var _http_action_result__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(105);
+/* harmony import */ var _http_action_result__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(107);
 /* harmony import */ var _http_method__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(36);
-/* harmony import */ var _http_request__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(54);
+/* harmony import */ var _http_request__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(55);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -28746,7 +28853,7 @@ var 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
         };
@@ -28816,10 +28923,10 @@ var HttpClient = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=http_client.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(99)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(100)))
 
 /***/ }),
-/* 99 */
+/* 100 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* WEBPACK VAR INJECTION */(function(process, global) {/*!
@@ -29996,16 +30103,16 @@ return Promise$1;
 
 //# sourceMappingURL=es6-promise.map
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(96), __webpack_require__(97)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(97), __webpack_require__(98)))
 
 /***/ }),
-/* 100 */
+/* 101 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* WEBPACK VAR INJECTION */(function(Promise) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return EasyDataTable; });
-/* harmony import */ var _data_column__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55);
-/* harmony import */ var _data_row__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(48);
+/* harmony import */ var _data_column__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(56);
+/* harmony import */ var _data_row__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(49);
 /* harmony import */ var _types_data_type__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(7);
 /* harmony import */ var _utils_utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(11);
 
@@ -30016,16 +30123,23 @@ var 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__WEBPACK_IMPORTED_MODULE_0__[/* DataColumnList */ "c"]();
+        this.onUpdate = options.onUpdate;
         if (options.columns) {
             for (var _i = 0, _a = options.columns; _i < _a.length; _i++) {
                 var colDesc = _a[_i];
@@ -30056,7 +30170,7 @@ var EasyDataTable = /** @class */ (function () {
             this._chunkSize = value;
             this.total = 0;
             this.needTotal = !this.elasticChunks;
-            this.chunkMap = {};
+            this.cachedRows = [];
         },
         enumerable: true,
         configurable: true
@@ -30069,7 +30183,7 @@ var EasyDataTable = /** @class */ (function () {
             this._elasticChunks = value;
             this.total = 0;
             this.needTotal = !this.elasticChunks;
-            this.chunkMap = {};
+            this.cachedRows = [];
         },
         enumerable: true,
         configurable: true
@@ -30097,22 +30211,12 @@ var 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) {
@@ -30123,53 +30227,34 @@ var 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 })
@@ -30181,16 +30266,16 @@ var 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;
+        this.fireUpdated();
     };
     EasyDataTable.prototype.createRow = function (dataOrRow) {
         var _this = this;
@@ -30221,60 +30306,33 @@ var 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 _data_row__WEBPACK_IMPORTED_MODULE_1__[/* DataRow */ "a"](this._columns, rowOrValue);
+            newRow = new _data_row__WEBPACK_IMPORTED_MODULE_1__[/* DataRow */ "a"](this._columns, values);
         }
         else {
-            newRow = this.createRow(rowOrValue);
+            newRow = this.createRow(rowOrValues);
         }
-        var lastChunk = this.getLastChunk();
-        if (!lastChunk || lastChunk.rows.length >= this._chunkSize) {
-            lastChunk = this.createChunk();
-        }
-        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) {
@@ -30283,14 +30341,19 @@ var EasyDataTable = /** @class */ (function () {
         }
         return !this.needTotal;
     };
+    EasyDataTable.prototype.fireUpdated = function () {
+        if (this.onUpdate) {
+            this.onUpdate(this);
+        }
+    };
     return EasyDataTable;
 }());
 
 //# sourceMappingURL=easy_data_table.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(99)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(100)))
 
 /***/ }),
-/* 101 */
+/* 102 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -30472,7 +30535,34 @@ var GoogleDataConverter = /** @class */ (function () {
 //# sourceMappingURL=google_data_converter.js.map
 
 /***/ }),
-/* 102 */
+/* 103 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(Promise) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return InMemoryModelStorage; });
+/* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
+
+var InMemoryModelStorage = /** @class */ (function () {
+    function InMemoryModelStorage(models) {
+        this.models = [];
+        if (models) {
+            _easydata_core__WEBPACK_IMPORTED_MODULE_0__["utils"].assign(this.models, [], models);
+        }
+    }
+    InMemoryModelStorage.prototype.getModels = function () {
+        var _this = this;
+        return new Promise(function (resolve, reject) {
+            resolve(_this.models);
+        });
+    };
+    return InMemoryModelStorage;
+}());
+
+//# sourceMappingURL=model_storage.js.map
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(51)))
+
+/***/ }),
+/* 104 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -30481,8 +30571,9 @@ var GoogleDataConverter = /** @class */ (function () {
 /* harmony import */ var _utils_drag_manager__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(37);
 /* harmony import */ var _utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(6);
 /* harmony import */ var _utils_ui_utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(18);
-/* harmony import */ var _easy_grid_columns__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(21);
-/* harmony import */ var _easy_grid_cell_renderer__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(28);
+/* harmony import */ var _easy_grid_options__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(34);
+/* harmony import */ var _easy_grid_columns__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(21);
+/* harmony import */ var _easy_grid_cell_renderer__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(39);
 var __assign = (undefined && undefined.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -30494,6 +30585,14 @@ var __assign = (undefined && undefined.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+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;
+};
+
 
 
 
@@ -30526,14 +30625,42 @@ var EasyGrid = /** @class */ (function () {
                 pageSize: 30,
                 pageSizeItems: [20, 30, 50, 100, 200]
             },
-            addColumns: false,
+            columnWidths: {
+                autoResize: _easy_grid_options__WEBPACK_IMPORTED_MODULE_4__[/* AutoResizeColumns */ "a"].Always,
+                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
+                }
+            },
+            showPlusButton: false,
             viewportRowsCount: null,
             showActiveRow: true
         };
         this.rowsOnPagePromise = null;
         this.containerInitialHeight = 0;
         this.firstRender = true;
-        this.compareValues = this.strictCompare;
         this.prevRowTotals = null;
         this.landingIndex = -1;
         this.landingSlot = Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])('div')
@@ -30545,18 +30672,55 @@ var EasyGrid = /** @class */ (function () {
         if (options && options.paging) {
             options.paging = _easydata_core__WEBPACK_IMPORTED_MODULE_0__["utils"].assign(this.defaultDataGridOptions.paging, options.paging);
         }
-        this.options = __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)
             throw Error('"dataTable" parameter is required to initialize EasyDataGrid');
         this.dataTable = options.dataTable;
         this.eventEmitter = new _easydata_core__WEBPACK_IMPORTED_MODULE_0__["EventEmitter"](this);
-        this.cellRendererStore = new _easy_grid_cell_renderer__WEBPACK_IMPORTED_MODULE_5__[/* GridCellRendererStore */ "c"](options);
-        this.columns = new _easy_grid_columns__WEBPACK_IMPORTED_MODULE_4__[/* GridColumnList */ "c"](this.dataTable.columns, this);
+        this.cellRendererStore = new _easy_grid_cell_renderer__WEBPACK_IMPORTED_MODULE_6__[/* GridCellRendererStore */ "c"](options);
+        this.columns = new _easy_grid_columns__WEBPACK_IMPORTED_MODULE_5__[/* GridColumnList */ "c"](this.dataTable.columns, this);
         this.setSlot(this.options.slot);
         this.init(this.options);
     }
+    EasyGrid.prototype.mergeOptions = function (options) {
+        var colWidthOptions = _easydata_core__WEBPACK_IMPORTED_MODULE_0__["utils"].assignDeep({}, this.defaultDataGridOptions.columnWidths, options.columnWidths);
+        var pagingOptions = _easydata_core__WEBPACK_IMPORTED_MODULE_0__["utils"].assignDeep({}, this.defaultDataGridOptions.paging, options.paging);
+        var result = _easydata_core__WEBPACK_IMPORTED_MODULE_0__["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
+        _easydata_core__WEBPACK_IMPORTED_MODULE_0__["utils"].getStringDataTypes().forEach(function (dataType) {
+            widthOptions[dataType] = __assign(__assign({}, widthOptions.stringColumns), widthOptions[dataType]);
+        });
+        //numeric columns
+        _easydata_core__WEBPACK_IMPORTED_MODULE_0__["utils"].getNumericDataTypes().forEach(function (dataType) {
+            widthOptions[dataType] = __assign(__assign({}, widthOptions.numberColumns), widthOptions[dataType]);
+        });
+        //bool columns
+        widthOptions[_easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Bool] = __assign(__assign({}, widthOptions.boolColumns), widthOptions[_easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Bool]);
+        //date columns
+        _easydata_core__WEBPACK_IMPORTED_MODULE_0__["utils"].getDateDataTypes().forEach(function (dataType) {
+            widthOptions[dataType] = __assign(__assign({}, widthOptions.dateColumns), widthOptions[dataType]);
+        });
+        //other columns
+        var knownTypes = __spreadArrays(_easydata_core__WEBPACK_IMPORTED_MODULE_0__["utils"].getStringDataTypes(), _easydata_core__WEBPACK_IMPORTED_MODULE_0__["utils"].getNumericDataTypes(), _easydata_core__WEBPACK_IMPORTED_MODULE_0__["utils"].getDateDataTypes(), [
+            _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Bool
+        ]);
+        _easydata_core__WEBPACK_IMPORTED_MODULE_0__["utils"].getAllDataTypes().forEach(function (dataType) {
+            if (!(dataType in knownTypes)) {
+                widthOptions[dataType] = __assign(__assign({}, widthOptions.otherColumns), widthOptions[dataType]);
+            }
+        });
+    };
     EasyGrid.prototype.setSlot = function (slot) {
         if (typeof slot === 'string') {
             if (slot.length) {
@@ -30589,8 +30753,8 @@ var EasyGrid = /** @class */ (function () {
         if (options.onRowDbClick) {
             this.addEventListener('rowDbClick', options.onRowDbClick);
         }
-        if (options.onAddColumnClick) {
-            this.addEventListener('addColumnClick', options.onAddColumnClick);
+        if (options.onPlusButtonClick) {
+            this.addEventListener('plusButtonClick', options.onPlusButtonClick);
         }
         if (options.onColumnChanged) {
             this.addEventListener('columnChanged', options.onColumnChanged);
@@ -30676,7 +30840,7 @@ var EasyGrid = /** @class */ (function () {
     };
     EasyGrid.prototype.render = function () {
         var _this = this;
-        if (!this.hasData() && !this.options.addColumns)
+        if (!this.hasData() && !this.options.showPlusButton)
             return;
         this.containerInitialHeight = this.slot.clientHeight;
         this.rootDiv = document.createElement('div');
@@ -30693,6 +30857,7 @@ var EasyGrid = /** @class */ (function () {
         gridContainer.classList.add(this.cssPrefix + "-container");
         gridContainer.appendChild(this.rootDiv);
         this.slot.appendChild(gridContainer);
+        var needAutoResize = this.options.columnWidths.autoResize !== _easy_grid_options__WEBPACK_IMPORTED_MODULE_4__[/* AutoResizeColumns */ "a"].Never;
         if (this.rowsOnPagePromise) {
             this.rowsOnPagePromise
                 .then(function () { return _this.updateHeight(); })
@@ -30703,8 +30868,13 @@ var EasyGrid = /** @class */ (function () {
         }
         else {
             setTimeout(function () {
-                _this.updateHeight();
-                _this.firstRender = false;
+                _this.updateHeight()
+                    .then(function () {
+                    _this.firstRender = false;
+                    if (needAutoResize) {
+                        _this.resizeColumns();
+                    }
+                });
             }, 100);
         }
     };
@@ -30715,14 +30885,14 @@ var EasyGrid = /** @class */ (function () {
                 var firstRow = _this.bodyCellContainerDiv.firstElementChild;
                 var rowHeight = firstRow ? firstRow.offsetHeight : DEFAULT_ROW_HEIGHT;
                 var rowCount = _this.options.viewportRowsCount; // || DEFAULT_ROW_COUNT;
-                var bodyHeight_1 = rowHeight * rowCount;
-                Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])(_this.bodyDiv)
-                    .setStyle('height', bodyHeight_1 + "px");
+                var viewportHeight_1 = rowHeight * rowCount;
+                Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])(_this.bodyViewportDiv)
+                    .setStyle('height', viewportHeight_1 + "px");
                 setTimeout(function () {
                     var sbHeight = _this.bodyViewportDiv.offsetHeight - _this.bodyViewportDiv.clientHeight;
-                    bodyHeight_1 = bodyHeight_1 + sbHeight;
-                    Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])(_this.bodyDiv)
-                        .setStyle('height', bodyHeight_1 + "px");
+                    viewportHeight_1 = viewportHeight_1 + sbHeight;
+                    Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])(_this.bodyViewportDiv)
+                        .setStyle('height', viewportHeight_1 + "px");
                     resolve();
                 }, 100);
                 return;
@@ -30769,7 +30939,7 @@ var EasyGrid = /** @class */ (function () {
             _this.headerRowDiv.appendChild(hd);
             if (column.isRowNum) {
                 Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])(hd)
-                    .addChildElement(_this.renderAddColumnButton());
+                    .addChildElement(_this.renderHeaderButtons());
             }
         });
         var containerWidth = this.getContainerWidth();
@@ -30783,7 +30953,7 @@ var EasyGrid = /** @class */ (function () {
         var _this = this;
         var colBuilder = Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])('div')
             .addClass(this.cssPrefix + "-header-cell")
-            .data('col-idx', "" + (index + 1))
+            .data('col-idx', "" + index)
             .setStyle('width', column.width + "px");
         if (column.dataColumn) {
             colBuilder
@@ -30821,14 +30991,6 @@ var 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 = Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])('div')
@@ -30842,10 +31004,6 @@ var 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()
@@ -30855,15 +31013,22 @@ var 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)) {
@@ -30871,10 +31036,16 @@ var EasyGrid = /** @class */ (function () {
                         _this.updateTotalsState(groups_1, row, true);
                     }
                 }
-                var containerWidth = _this.getContainerWidth();
-                Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])(_this.bodyCellContainerDiv)
-                    .setStyle('width', containerWidth + "px");
-                return rows.length;
+                var needAutoResize = _this.options.columnWidths.autoResize !== _easy_grid_options__WEBPACK_IMPORTED_MODULE_4__[/* AutoResizeColumns */ "a"].Never;
+                if (needAutoResize) {
+                    _this.resizeColumns();
+                }
+                else {
+                    var containerWidth = _this.getContainerWidth();
+                    Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])(_this.bodyCellContainerDiv)
+                        .setStyle('width', containerWidth + "px");
+                }
+                return rowsToRender;
             })
                 .catch(function (error) { console.error(error); return 0; });
         }
@@ -30882,7 +31053,7 @@ var EasyGrid = /** @class */ (function () {
             Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])(_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) {
@@ -30908,7 +31079,7 @@ var 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;
                     }
@@ -30969,8 +31140,8 @@ var 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];
@@ -31011,34 +31182,20 @@ var 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;
@@ -31092,13 +31249,17 @@ var 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);
@@ -31123,23 +31284,26 @@ var EasyGrid = /** @class */ (function () {
         var pageInfoDiv = Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])('div')
             .addClass(this.cssPrefix + "-page-info")
             .toDOM();
-        var fistPageRecordNum = count
-            ? (this.pagination.page - 1) * this.pagination.pageSize + 1
-            : 0;
-        var lastPageRecordNum = count
-            ? fistPageRecordNum + count - 1
-            : 0;
-        var totalStr = this.dataTable.getTotal().toString();
-        if (this.dataTable.elasticChunks) {
-            var count_1 = this.dataTable.getCachedCount();
-            var total = this.dataTable.getTotal();
-            if (count_1 !== total)
-                totalStr = '?';
-        }
-        pageInfoDiv.innerHTML = _easydata_core__WEBPACK_IMPORTED_MODULE_0__["i18n"].getText('GridPageInfo')
-            .replace('{FirstPageRecordNum}', "<span>" + fistPageRecordNum.toString() + "</span>")
-            .replace('{LastPageRecordNum}', "<span>" + lastPageRecordNum.toString() + "</span>")
-            .replace('{Total}', "<span>" + totalStr + "</span>");
+        var rowCount = this.dataTable.getTotal();
+        if (rowCount > 0) {
+            var fistPageRecordNum = count
+                ? (this.pagination.page - 1) * this.pagination.pageSize + 1
+                : 0;
+            var lastPageRecordNum = count
+                ? fistPageRecordNum + count - 1
+                : 0;
+            var totalStr = this.dataTable.getTotal().toString();
+            if (this.dataTable.elasticChunks) {
+                var count_1 = this.dataTable.getCachedCount();
+                var total = this.dataTable.getTotal();
+                if (count_1 !== total)
+                    totalStr = '?';
+            }
+            pageInfoDiv.innerHTML = _easydata_core__WEBPACK_IMPORTED_MODULE_0__["i18n"].getText('GridPageInfo')
+                .replace('{FirstPageRecordNum}', "<span>" + fistPageRecordNum.toString() + "</span>")
+                .replace('{LastPageRecordNum}', "<span>" + lastPageRecordNum.toString() + "</span>")
+                .replace('{Total}', "<span>" + totalStr + "</span>");
+        }
         return pageInfoDiv;
     };
     EasyGrid.prototype.showProgress = function () {
@@ -31194,13 +31358,13 @@ var 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;
     };
@@ -31210,13 +31374,13 @@ var EasyGrid = /** @class */ (function () {
             .data('col-idx', "" + colIndex)
             .attr('tabindex', '-1')
             .setStyle('width', column.width + "px");
-        if (column.align == _easy_grid_columns__WEBPACK_IMPORTED_MODULE_4__[/* GridColumnAlign */ "b"].LEFT) {
+        if (column.align == _easy_grid_columns__WEBPACK_IMPORTED_MODULE_5__[/* GridColumnAlign */ "b"].LEFT) {
             builder.addClass(this.cssPrefix + "-cell-align-left");
         }
-        else if (column.align == _easy_grid_columns__WEBPACK_IMPORTED_MODULE_4__[/* GridColumnAlign */ "b"].RIGHT) {
+        else if (column.align == _easy_grid_columns__WEBPACK_IMPORTED_MODULE_5__[/* GridColumnAlign */ "b"].RIGHT) {
             builder.addClass(this.cssPrefix + "-cell-align-right");
         }
-        else if (column.align == _easy_grid_columns__WEBPACK_IMPORTED_MODULE_4__[/* GridColumnAlign */ "b"].CENTER) {
+        else if (column.align == _easy_grid_columns__WEBPACK_IMPORTED_MODULE_5__[/* GridColumnAlign */ "b"].CENTER) {
             builder.addClass(this.cssPrefix + "-cell-align-center");
         }
         if (column.cellRenderer) {
@@ -31234,7 +31398,8 @@ var EasyGrid = /** @class */ (function () {
         var _this = this;
         var paginateDiv = document.createElement('div');
         paginateDiv.className = this.cssPrefix + "-pagination-wrapper";
-        if (this.options.paging && this.options.paging.enabled) {
+        var rowCount = this.dataTable.getTotal();
+        if (this.options.paging && this.options.paging.enabled && rowCount > 0) {
             var prefix_1 = this.paginationOptions.useBootstrap ? '' : this.cssPrefix + "-";
             var buttonClickHandler_1 = function (ev) {
                 var element = ev.target;
@@ -31360,18 +31525,18 @@ var EasyGrid = /** @class */ (function () {
     EasyGrid.prototype.removeEventListener = function (eventType, handlerId) {
         this.eventEmitter.unsubscribe(eventType, handlerId);
     };
-    EasyGrid.prototype.renderAddColumnButton = function () {
+    EasyGrid.prototype.renderHeaderButtons = function () {
         var _this = this;
-        if (this.options.addColumns) {
+        if (this.options.showPlusButton) {
             return Object(_utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__[/* domel */ "e"])('div')
-                .addClass(this.cssPrefix + "-addrow")
-                .title(this.options.addColumnsTitle || 'Add column')
+                .addClass(this.cssPrefix + "-header-btn-plus")
+                .title(this.options.plusButtonTitle || 'Add')
                 .addChild('a', function (builder) { return builder
                 .attr('href', 'javascript:void(0)')
                 .on('click', function (e) {
                 e.preventDefault();
                 _this.fireEvent({
-                    type: 'addColumnClick',
+                    type: 'plusButtonClick',
                     sourceEvent: e
                 });
             }); })
@@ -31472,14 +31637,105 @@ var EasyGrid = /** @class */ (function () {
     EasyGrid.prototype.focus = function () {
         this.bodyViewportDiv.focus();
     };
+    EasyGrid.prototype.resizeColumns = function () {
+        if (this.options.columnWidths.autoResize === _easy_grid_options__WEBPACK_IMPORTED_MODULE_4__[/* AutoResizeColumns */ "a"].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 !== _easy_grid_options__WEBPACK_IMPORTED_MODULE_4__[/* AutoResizeColumns */ "a"].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 (_easydata_core__WEBPACK_IMPORTED_MODULE_0__["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;
 }());
 
 //# sourceMappingURL=easy_grid.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(103)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(105)))
 
 /***/ }),
-/* 103 */
+/* 105 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* WEBPACK VAR INJECTION */(function(process, global) {/*!
@@ -32656,10 +32912,10 @@ return Promise$1;
 
 //# sourceMappingURL=es6-promise.map
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(96), __webpack_require__(97)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(97), __webpack_require__(98)))
 
 /***/ }),
-/* 104 */
+/* 106 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -32669,7 +32925,7 @@ return Promise$1;
 /* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(1);
 /* harmony import */ var _utils_popup_menu__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(9);
 /* harmony import */ var _utils_browser_utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(3);
-/* harmony import */ var _views_view__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(33);
+/* harmony import */ var _views_view__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(32);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -33385,10 +33641,10 @@ var AdvancedSearchView = /** @class */ (function (_super) {
 }(_views_view__WEBPACK_IMPORTED_MODULE_5__[/* View */ "a"]));
 
 //# sourceMappingURL=adv_search_view.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(53)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(54)))
 
 /***/ }),
-/* 105 */
+/* 107 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -33419,84 +33675,84 @@ var HttpActionResult = /** @class */ (function () {
 //# sourceMappingURL=http_action_result.js.map
 
 /***/ }),
-/* 106 */
+/* 108 */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(107);
-module.exports = __webpack_require__(122);
+__webpack_require__(109);
+module.exports = __webpack_require__(124);
 
 
 /***/ }),
-/* 107 */
+/* 109 */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(108);
-__webpack_require__(109);
 __webpack_require__(110);
-
 __webpack_require__(111);
 __webpack_require__(112);
+
 __webpack_require__(113);
 __webpack_require__(114);
 __webpack_require__(115);
-__webpack_require__(116);
+__webpack_require__(116);
+__webpack_require__(117);
+__webpack_require__(118);
 
 /***/ }),
-/* 108 */
+/* 110 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // extracted by mini-css-extract-plugin
 
 /***/ }),
-/* 109 */
+/* 111 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // extracted by mini-css-extract-plugin
 
 /***/ }),
-/* 110 */
+/* 112 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // extracted by mini-css-extract-plugin
 
 /***/ }),
-/* 111 */
+/* 113 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // extracted by mini-css-extract-plugin
 
 /***/ }),
-/* 112 */
+/* 114 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // extracted by mini-css-extract-plugin
 
 /***/ }),
-/* 113 */
+/* 115 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // extracted by mini-css-extract-plugin
 
 /***/ }),
-/* 114 */
+/* 116 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // extracted by mini-css-extract-plugin
 
 /***/ }),
-/* 115 */
+/* 117 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // extracted by mini-css-extract-plugin
 
 /***/ }),
-/* 116 */
+/* 118 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // extracted by mini-css-extract-plugin
 
 /***/ }),
-/* 117 */
+/* 119 */
 /***/ (function(module, exports) {
 
 // shim for using process in browser
@@ -33686,7 +33942,7 @@ process.umask = function() { return 0; };
 
 
 /***/ }),
-/* 118 */
+/* 120 */
 /***/ (function(module, exports) {
 
 var g;
@@ -33712,10 +33968,10 @@ module.exports = g;
 
 
 /***/ }),
-/* 119 */,
-/* 120 */,
 /* 121 */,
-/* 122 */
+/* 122 */,
+/* 123 */,
+/* 124 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -33797,22 +34053,22 @@ __webpack_require__.d(public_api_namespaceObject, "AggrSettingsDialog", function
 var public_api = __webpack_require__(2);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/entities_panel.js
-var entities_panel = __webpack_require__(64);
+var entities_panel = __webpack_require__(65);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/columns_panel.js
-var columns_panel = __webpack_require__(69);
+var columns_panel = __webpack_require__(70);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/columns_bar.js
-var columns_bar = __webpack_require__(39);
+var columns_bar = __webpack_require__(40);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/sorting_bar.js + 1 modules
-var sorting_bar = __webpack_require__(94);
+var sorting_bar = __webpack_require__(95);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/query_panel.js + 1 modules
 var query_panel = __webpack_require__(24);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/filter_bar.js
-var filter_bar = __webpack_require__(82);
+var filter_bar = __webpack_require__(83);
 
 // CONCATENATED MODULE: ./dist/lib/widgets/html_content_widget.js
 var __extends = (undefined && undefined.__extends) || (function () {
@@ -34074,16 +34330,16 @@ var eq_result_html_grid_EqHtmlGrid = /** @class */ (function (_super) {
 
 //# sourceMappingURL=eq_result_html_grid.js.map
 // EXTERNAL MODULE: ./dist/lib/widgets/grid.js
-var grid = __webpack_require__(83);
+var grid = __webpack_require__(84);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/easy_grid_widget.js
-var easy_grid_widget = __webpack_require__(43);
+var easy_grid_widget = __webpack_require__(44);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/statement_panel.js
-var statement_panel = __webpack_require__(84);
+var statement_panel = __webpack_require__(85);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/process_widget.js
-var process_widget = __webpack_require__(85);
+var process_widget = __webpack_require__(86);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/public_api.js + 7 modules
 var dist_lib_public_api = __webpack_require__(1);
@@ -34246,106 +34502,106 @@ var manage_drilldown_widget_ManageDrillDownWidget = /** @class */ (function (_su
 
 //# sourceMappingURL=manage_drilldown_widget.js.map
 // EXTERNAL MODULE: ./dist/lib/widgets/result_facets_panel.js + 1 modules
-var result_facets_panel = __webpack_require__(95);
+var result_facets_panel = __webpack_require__(96);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/export_widget.js
-var export_widget = __webpack_require__(89);
+var export_widget = __webpack_require__(90);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/aggregation_bar.js
-var aggregation_bar = __webpack_require__(90);
+var aggregation_bar = __webpack_require__(91);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/charts/chart_type.js
 var chart_type = __webpack_require__(5);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/charts/chart_widget.js
-var chart_widget = __webpack_require__(46);
+var chart_widget = __webpack_require__(47);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/charts/chart_widget_google.js
-var chart_widget_google = __webpack_require__(51);
+var chart_widget_google = __webpack_require__(53);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/charts/chart_widget_chartjs.js
-var chart_widget_chartjs = __webpack_require__(45);
+var chart_widget_chartjs = __webpack_require__(46);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/base_element_renderer.js
-var base_element_renderer = __webpack_require__(41);
+var base_element_renderer = __webpack_require__(42);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/dropdown_renderer.js
-var dropdown_renderer = __webpack_require__(42);
+var dropdown_renderer = __webpack_require__(43);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/aggr_settings/aggr_settings_renderer.js
-var aggr_settings_renderer = __webpack_require__(92);
+var aggr_settings_renderer = __webpack_require__(93);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/columnsbar/aggrfunc_column_renderer.js
-var aggrfunc_column_renderer = __webpack_require__(72);
+var aggrfunc_column_renderer = __webpack_require__(73);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/columnsbar/simple_column_renderer.js
-var simple_column_renderer = __webpack_require__(40);
+var simple_column_renderer = __webpack_require__(41);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/columnsbar/column_renderer_cb.js
-var column_renderer_cb = __webpack_require__(73);
+var column_renderer_cb = __webpack_require__(74);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/columnspanel/aggrfunc_column_renderer.js + 1 modules
-var columnspanel_aggrfunc_column_renderer = __webpack_require__(93);
+var columnspanel_aggrfunc_column_renderer = __webpack_require__(94);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/columnspanel/simple_column_renderer.js
-var columnspanel_simple_column_renderer = __webpack_require__(31);
+var columnspanel_simple_column_renderer = __webpack_require__(30);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/columnspanel/column_renderer_cp.js
-var column_renderer_cp = __webpack_require__(70);
+var column_renderer_cp = __webpack_require__(71);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/columnspanel/customsql_column_renderer.js
-var customsql_column_renderer = __webpack_require__(71);
+var customsql_column_renderer = __webpack_require__(72);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/input_expression_renderer.js
-var input_expression_renderer = __webpack_require__(77);
+var input_expression_renderer = __webpack_require__(78);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/datetime_expression_render.js
-var datetime_expression_render = __webpack_require__(80);
+var datetime_expression_render = __webpack_require__(81);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/condition_renderer.js
 var condition_renderer = __webpack_require__(35);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/condition_group_renderer.js
-var condition_group_renderer = __webpack_require__(75);
+var condition_group_renderer = __webpack_require__(76);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/attribute_expression_renderer.js
-var attribute_expression_renderer = __webpack_require__(50);
+var attribute_expression_renderer = __webpack_require__(52);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/expression_renderer.js
 var expression_renderer = __webpack_require__(23);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/operator_renderer.js
-var operator_renderer = __webpack_require__(79);
+var operator_renderer = __webpack_require__(80);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/subquery_expression_renderer.js
-var subquery_expression_renderer = __webpack_require__(81);
+var subquery_expression_renderer = __webpack_require__(82);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/list_expression_renderer.js
 var list_expression_renderer = __webpack_require__(25);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/text_renderer.js
-var text_renderer = __webpack_require__(74);
+var text_renderer = __webpack_require__(75);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/addrow_renderer.js
-var addrow_renderer = __webpack_require__(78);
+var addrow_renderer = __webpack_require__(79);
 
 // EXTERNAL MODULE: ./dist/lib/facets/result_facet.js
-var result_facet = __webpack_require__(32);
+var result_facet = __webpack_require__(31);
 
 // EXTERNAL MODULE: ./dist/lib/facets/datatable_facet.js
-var datatable_facet = __webpack_require__(88);
+var datatable_facet = __webpack_require__(89);
 
 // EXTERNAL MODULE: ./dist/lib/facets/chart_facet.js
-var chart_facet = __webpack_require__(86);
+var chart_facet = __webpack_require__(87);
 
 // EXTERNAL MODULE: ./dist/lib/facets/pivot_table_facet.js
-var pivot_table_facet = __webpack_require__(87);
+var pivot_table_facet = __webpack_require__(88);
 
 // EXTERNAL MODULE: ./dist/lib/views/view.js + 2 modules
-var view = __webpack_require__(33);
+var view = __webpack_require__(32);
 
 // EXTERNAL MODULE: ./dist/lib/views/adv_search_view.js
-var adv_search_view = __webpack_require__(104);
+var adv_search_view = __webpack_require__(106);
 
 // CONCATENATED MODULE: ./dist/lib/views/data_filter_view.js
 var data_filter_view_extends = (undefined && undefined.__extends) || (function () {
@@ -34369,7 +34625,9 @@ var data_filter_view_extends = (undefined && undefined.__extends) || (function (
 var data_filter_view_DataFilterView = /** @class */ (function (_super) {
     data_filter_view_extends(DataFilterView, _super);
     function DataFilterView() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super.call(this) || this;
+        _this.resultOptions.fetchEmptyQueries = true;
+        return _this;
     }
     DataFilterView.prototype.initOptions = function (options) {
         var _this = this;
@@ -34447,7 +34705,9 @@ var html_data_filter_view_extends = (undefined && undefined.__extends) || (funct
 var html_data_filter_view_HtmlDataFilterView = /** @class */ (function (_super) {
     html_data_filter_view_extends(HtmlDataFilterView, _super);
     function HtmlDataFilterView() {
-        return _super.call(this) || this;
+        var _this = _super.call(this) || this;
+        _this.resultOptions.fetchEmptyQueries = true;
+        return _this;
     }
     /**
     * Creates the widget that represents Grid Widget.
@@ -34520,7 +34780,7 @@ var report_view_ReportView = /** @class */ (function (_super) {
         _this.loadReportButtonClickHandler = _this.loadReportButtonClick.bind(_this);
         _this.saveReportButtonClickHandler = _this.saveReportButtonClick.bind(_this);
         _this.removeReportButtonClickHandler = _this.removeReportButtonClick.bind(_this);
-        _this.updateReportButtonClickHandler = _this.updateReportButtonClick.bind(_this);
+        _this.reloadReportDataButtonClickHandler = _this.reloadReportDataButtonClick.bind(_this);
         browser_utils["a" /* browserUtils */].onMobileModeChanged(function (_) {
             document.location.reload();
         });
@@ -34607,7 +34867,7 @@ var report_view_ReportView = /** @class */ (function (_super) {
         var loadReportButton = "LoadReportButton";
         var saveReportButton = "SaveReportButton";
         var removeReportButton = "RemoveReportButton";
-        var updateReportButton = "UpdateReportButton";
+        var reloadReportDataButton = "ReloadReportDataButton";
         var resultCountSpan = "ResultCount";
         var exportButtons = "ResultExportButtons";
         var exportClass = this.exportClass;
@@ -34619,7 +34879,7 @@ var report_view_ReportView = /** @class */ (function (_super) {
             loadReportButton = options.slots.loadReportButton || loadReportButton;
             saveReportButton = options.slots.saveReportButton || saveReportButton;
             removeReportButton = options.slots.removeReportButton || removeReportButton;
-            updateReportButton = options.slots.updateReportButton || updateReportButton;
+            reloadReportDataButton = options.slots.reloadReportDataButton || reloadReportDataButton;
             exportClass = options.slots.exportClass || exportClass;
         }
         this.exportButtons = this.domRoots.reduce(function (elems, root) {
@@ -34666,10 +34926,14 @@ var report_view_ReportView = /** @class */ (function (_super) {
                 this.removeReportButton.addEventListener('click', this.removeReportButtonClickHandler);
             }
         }
-        if (!this.updateReportButton) {
-            this.updateReportButton = this.resolveElement(updateReportButton);
-            if (this.updateReportButton) {
-                this.updateReportButton.addEventListener('click', this.updateReportButtonClickHandler);
+        if (!this.reloadReportDataButton) {
+            this.reloadReportDataButton = this.resolveElement(reloadReportDataButton);
+            //OBSOLETE: remove the next 3 lines. We just support the old default button ID here
+            if (!this.reloadReportDataButton) {
+                this.reloadReportDataButton = this.resolveElement('UpdateReportButton');
+            }
+            if (this.reloadReportDataButton) {
+                this.reloadReportDataButton.addEventListener('click', this.reloadReportDataButtonClickHandler);
             }
         }
         this.reportListSlot = document.getElementById('ReportList');
@@ -34747,6 +35011,7 @@ var report_view_ReportView = /** @class */ (function (_super) {
         var query = self.context.getQuery();
         var reportLoaded = function () {
             _this.renderReportProps();
+            _this.context.resultTable.clear();
             query.fireChangedEvent({
                 part: public_api["QueryChangePart"].All,
                 noSync: true,
@@ -34973,8 +35238,8 @@ var report_view_ReportView = /** @class */ (function (_super) {
             this.removeReportButton.removeEventListener('click', this.removeReportButtonClickHandler);
             this.removeReportButton = null;
         }
-        if (this.updateReportButton) {
-            this.updateReportButton.removeEventListener('click', this.updateReportButtonClickHandler);
+        if (this.reloadReportDataButton) {
+            this.reloadReportDataButton.removeEventListener('click', this.reloadReportDataButtonClickHandler);
             this.removeReportButton = null;
         }
         if (this.reportListSlot) {
@@ -35075,7 +35340,7 @@ var report_view_ReportView = /** @class */ (function (_super) {
     /**
     * The handler of the "Update" button click.
     */
-    ReportView.prototype.updateReportButtonClick = function () {
+    ReportView.prototype.reloadReportDataButtonClick = function () {
         this.fetchData();
     };
     /**
@@ -35190,7 +35455,7 @@ var report_view_ReportView = /** @class */ (function (_super) {
 
 //# sourceMappingURL=report_view.js.map
 // EXTERNAL MODULE: ./dist/lib/utils/dropdown.js
-var dropdown = __webpack_require__(76);
+var dropdown = __webpack_require__(77);
 
 // EXTERNAL MODULE: ./dist/lib/utils/popup_menu.js
 var popup_menu = __webpack_require__(9);
@@ -35199,13 +35464,13 @@ var popup_menu = __webpack_require__(9);
 var qp_editable_part = __webpack_require__(10);
 
 // EXTERNAL MODULE: ./dist/lib/types/facet_type.js
-var facet_type = __webpack_require__(14);
+var facet_type = __webpack_require__(13);
 
 // EXTERNAL MODULE: ./dist/lib/dialog/export_dialog.js
-var export_dialog = __webpack_require__(44);
+var export_dialog = __webpack_require__(45);
 
 // EXTERNAL MODULE: ./dist/lib/dialog/aggr_settings_dialog.js
-var aggr_settings_dialog = __webpack_require__(91);
+var aggr_settings_dialog = __webpack_require__(92);
 
 // CONCATENATED MODULE: ./dist/lib/i18n/text_resources.js
 
@@ -35397,6 +35662,7 @@ function addEasyQueryUITexts() {
             TabNameLabel: 'Tab name',
             ErrQueryChanged: 'FAILED TO DISPLAY. QUERY WAS CHANGED',
             ErrNotEnoughData: "We can't display the graph because not all data for this query is loaded. \n        The total number of records: {totalRecs}, currently loaded: {cachedRecs}. \n        You can [download the result]. Please note: this may take some time and consume a lot of memory.",
+            ErrTooMuchData: 'Too much data. The grid is not able to display it',
             Chart: {
                 FacetTitle: 'Chart',
                 DlgTitle: 'Chart settings',