@easydata/crud 1.4.0-beta01 → 1.4.1-rc01

package/dist/browser/easydata.js

@@ -82,7 +82,7 @@ window["easydata"] =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 33);
+/******/ 	return __webpack_require__(__webpack_require__.s = 34);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -152,10 +152,10 @@ var EditorTag = {
 var http_method = __webpack_require__(11);
 
 // EXTERNAL MODULE: d:/a/easydata/easydata/easydata.js/packs/core/dist/lib/http/http_request.js
-var http_request = __webpack_require__(15);
+var http_request = __webpack_require__(16);
 
 // EXTERNAL MODULE: d:/a/easydata/easydata/easydata.js/packs/core/dist/lib/http/http_client.js
-var http_client = __webpack_require__(23);
+var http_client = __webpack_require__(24);
 
 // EXTERNAL MODULE: d:/a/easydata/easydata/easydata.js/packs/core/dist/lib/i18n/i18n.js
 var i18n = __webpack_require__(5);
@@ -239,6 +239,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;
 }());
 
@@ -857,7 +863,7 @@ var meta_data_MetaData = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=meta_data.js.map
-// CONCATENATED MODULE: d:/a/easydata/easydata/easydata.js/packs/core/dist/lib/data/aggr_calculator.js
+// CONCATENATED MODULE: d:/a/easydata/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++) {
@@ -880,16 +886,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) {
@@ -914,7 +936,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;
     };
@@ -1006,18 +1028,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: d:/a/easydata/easydata/easydata.js/packs/core/dist/lib/data/data_column.js
-var data_column = __webpack_require__(16);
+var data_column = __webpack_require__(17);
 
 // EXTERNAL MODULE: d:/a/easydata/easydata/easydata.js/packs/core/dist/lib/data/data_row.js
-var data_row = __webpack_require__(14);
+var data_row = __webpack_require__(15);
 
 // EXTERNAL MODULE: d:/a/easydata/easydata/easydata.js/packs/core/dist/lib/data/easy_data_table.js
-var easy_data_table = __webpack_require__(27);
+var easy_data_table = __webpack_require__(28);
 
 // CONCATENATED MODULE: d:/a/easydata/easydata/easydata.js/packs/core/dist/lib/utils/easy_guid.js
 /**
@@ -1167,7 +1214,7 @@ var event_emitter_EventEmitter = /** @class */ (function () {
 
 //# sourceMappingURL=event_emitter.js.map
 // EXTERNAL MODULE: d:/a/easydata/easydata/easydata.js/packs/core/dist/lib/utils/string_utils.js
-var string_utils = __webpack_require__(13);
+var string_utils = __webpack_require__(14);
 
 // CONCATENATED MODULE: d:/a/easydata/easydata/easydata.js/packs/core/dist/lib/utils/liquid.js
 var liquid;
@@ -1202,7 +1249,6 @@ i18n["a" /* i18n */].resetLocales();
 
 
 
-//data
 
 
 
@@ -1245,7 +1291,7 @@ if (typeof Math.trunc !== 'function') {
 /* 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__(18);
+/* harmony import */ var _mask__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(19);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -1259,6 +1305,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) {
@@ -1329,7 +1382,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]);
         }
@@ -1341,7 +1394,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]);
         }
@@ -1605,6 +1658,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 */]; });
@@ -1653,13 +1707,16 @@ __webpack_require__.d(__webpack_exports__, "DialogFooterAlignment", function() {
 __webpack_require__.d(__webpack_exports__, "dialogs", function() { return /* binding */ dialogs; });
 
 // EXTERNAL MODULE: d:/a/easydata/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid.js
-var easy_grid = __webpack_require__(28);
+var easy_grid = __webpack_require__(29);
+
+// EXTERNAL MODULE: d:/a/easydata/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_options.js
+var easy_grid_options = __webpack_require__(10);
 
 // EXTERNAL MODULE: d:/a/easydata/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_columns.js
 var easy_grid_columns = __webpack_require__(8);
 
 // EXTERNAL MODULE: d:/a/easydata/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_cell_renderer.js
-var easy_grid_cell_renderer = __webpack_require__(9);
+var easy_grid_cell_renderer = __webpack_require__(13);
 
 // CONCATENATED MODULE: d:/a/easydata/easydata/easydata.js/packs/ui/dist/lib/datetimepicker/calendar.js
 var Calendar = /** @class */ (function () {
@@ -2312,19 +2369,19 @@ var default_date_time_picker_DefaultDateTimePicker = /** @class */ (function (_s
 
 //# sourceMappingURL=default_date_time_picker.js.map
 // EXTERNAL MODULE: d:/a/easydata/easydata/easydata.js/packs/ui/dist/lib/utils/browser_utils.js
-var browser_utils = __webpack_require__(17);
+var browser_utils = __webpack_require__(18);
 
 // EXTERNAL MODULE: d:/a/easydata/easydata/easydata.js/packs/ui/dist/lib/utils/drag_manager.js
 var drag_manager = __webpack_require__(12);
 
 // EXTERNAL MODULE: d:/a/easydata/easydata/easydata.js/packs/ui/dist/lib/utils/mask.js
-var mask = __webpack_require__(18);
+var mask = __webpack_require__(19);
 
 // EXTERNAL MODULE: d:/a/easydata/easydata/easydata.js/packs/ui/dist/lib/dialogs/default_dialog_service.js
-var default_dialog_service = __webpack_require__(19);
+var default_dialog_service = __webpack_require__(20);
 
 // EXTERNAL MODULE: d:/a/easydata/easydata/easydata.js/packs/ui/dist/lib/dialogs/dialog_service.js
-var dialog_service = __webpack_require__(20);
+var dialog_service = __webpack_require__(21);
 
 // CONCATENATED MODULE: d:/a/easydata/easydata/easydata.js/packs/ui/dist/lib/i18n/text_resources.js
 
@@ -2346,6 +2403,7 @@ addEasyDataUITexts();
 
 
 
+
 //datetimepicker
 
 
@@ -2375,7 +2433,7 @@ var dialogs = new default_dialog_service["b" /* DefaultDialogService */]();
 
 "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__(13);
+/* harmony import */ var _string_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(14);
 /* harmony import */ var _types_data_type__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
 /* harmony import */ var _i18n_i18n__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(5);
 
@@ -2384,7 +2442,7 @@ var dialogs = new default_dialog_service["b" /* DefaultDialogService */]();
 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() {
@@ -2392,12 +2450,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`
@@ -2462,7 +2524,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]);
@@ -3394,7 +3456,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__(17);
+/* harmony import */ var _browser_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(18);
 
 /**
  * Wraps all the elements inside "parent" by "wrapper" element
@@ -3667,16 +3729,10 @@ var setLocation = function (path) {
 /* 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__(9);
+/* harmony import */ var _easy_grid_cell_renderer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
 
 
-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) {
@@ -3708,31 +3764,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);
         }
@@ -3778,9 +3821,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++) {
@@ -3848,173 +3892,28 @@ var GridColumnList = /** @class */ (function () {
 /***/ (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__(8);
-/* harmony import */ var _utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(1);
-
-
-
-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);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Validator; });
+var Validator = /** @class */ (function () {
+    function Validator() {
     }
-    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;
+    return Validator;
 }());
 
-//# sourceMappingURL=easy_grid_cell_renderer.js.map
+//# sourceMappingURL=validator.js.map
 
 /***/ }),
 /* 10 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Validator; });
-var Validator = /** @class */ (function () {
-    function Validator() {
-    }
-    return Validator;
-}());
-
-//# sourceMappingURL=validator.js.map
+/* 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
 
 /***/ }),
 /* 11 */
@@ -4385,35 +4284,194 @@ var DragManager = /** @class */ (function () {
             this.updateImageClass(this.dropEffect);
         }
     };
-    DragManager.prototype.detectDragEnterEvent = function (container, ev) {
-        var containerPos = Object(_ui_utils__WEBPACK_IMPORTED_MODULE_1__[/* getElementAbsolutePos */ "g"])(container);
-        var pos = new Position(ev);
-        if (pos.y < containerPos.y || pos.y > containerPos.y + container.offsetHeight) {
-            return false;
-        }
-        if (pos.x < containerPos.x || pos.x > containerPos.x + container.offsetWidth) {
-            return false;
+    DragManager.prototype.detectDragEnterEvent = function (container, ev) {
+        var containerPos = Object(_ui_utils__WEBPACK_IMPORTED_MODULE_1__[/* getElementAbsolutePos */ "g"])(container);
+        var pos = new Position(ev);
+        if (pos.y < containerPos.y || pos.y > containerPos.y + container.offsetHeight) {
+            return false;
+        }
+        if (pos.x < containerPos.x || pos.x > containerPos.x + container.offsetWidth) {
+            return false;
+        }
+        return true;
+    };
+    DragManager.prototype.detectDragLeaveEvent = function (container, ev) {
+        var containerPos = Object(_ui_utils__WEBPACK_IMPORTED_MODULE_1__[/* getElementAbsolutePos */ "g"])(container);
+        var pos = new Position(ev);
+        if (pos.y > containerPos.y && pos.y < containerPos.y + container.offsetHeight
+            && pos.x > containerPos.x && pos.x < containerPos.x + container.offsetWidth) {
+            return false;
+        }
+        return true;
+    };
+    return DragManager;
+}());
+
+//global variable
+var eqDragManager = new DragManager();
+//# sourceMappingURL=drag_manager.js.map
+
+/***/ }),
+/* 13 */
+/***/ (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__(8);
+/* harmony import */ var _utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(1);
+
+
+
+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;
         }
-        return true;
     };
-    DragManager.prototype.detectDragLeaveEvent = function (container, ev) {
-        var containerPos = Object(_ui_utils__WEBPACK_IMPORTED_MODULE_1__[/* getElementAbsolutePos */ "g"])(container);
-        var pos = new Position(ev);
-        if (pos.y > containerPos.y && pos.y < containerPos.y + container.offsetHeight
-            && pos.x > containerPos.x && pos.x < containerPos.x + container.offsetWidth) {
-            return false;
+    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 true;
     };
-    return DragManager;
+    return GridCellRendererStore;
 }());
 
-//global variable
-var eqDragManager = new DragManager();
-//# sourceMappingURL=drag_manager.js.map
+//# sourceMappingURL=easy_grid_cell_renderer.js.map
 
 /***/ }),
-/* 13 */
+/* 14 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4455,7 +4513,7 @@ function combinePath(path1, path2) {
 //# sourceMappingURL=string_utils.js.map
 
 /***/ }),
-/* 14 */
+/* 15 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4507,7 +4565,7 @@ var DataRow = /** @class */ (function () {
 //# sourceMappingURL=data_row.js.map
 
 /***/ }),
-/* 15 */
+/* 16 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4572,7 +4630,7 @@ var HttpRequest = /** @class */ (function () {
 //# sourceMappingURL=http_request.js.map
 
 /***/ }),
-/* 16 */
+/* 17 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4607,6 +4665,7 @@ var DataColumn = /** @class */ (function () {
         this.groupFooterColumnTemplate = desc.gfct;
         this.style = desc.style || {};
         this.description = desc.description;
+        this.calculatedWidth = 0;
     }
     return DataColumn;
 }());
@@ -4646,9 +4705,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);
@@ -4658,8 +4718,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];
@@ -4690,7 +4754,7 @@ var DataColumnList = /** @class */ (function () {
 //# sourceMappingURL=data_column.js.map
 
 /***/ }),
-/* 17 */
+/* 18 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4765,7 +4829,7 @@ var browserUtils;
 //# sourceMappingURL=browser_utils.js.map
 
 /***/ }),
-/* 18 */
+/* 19 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4868,7 +4932,7 @@ function mask(input, maskPattern) {
 //# sourceMappingURL=mask.js.map
 
 /***/ }),
-/* 19 */
+/* 20 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4877,7 +4941,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__(20);
+/* harmony import */ var _dialog_service__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(21);
 /* harmony import */ var _utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(1);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -5391,10 +5455,10 @@ var DefaultDialogSet = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=default_dialog_service.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(29)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(30)))
 
 /***/ }),
-/* 20 */
+/* 21 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5408,7 +5472,7 @@ var DialogFooterAlignment;
 //# sourceMappingURL=dialog_service.js.map
 
 /***/ }),
-/* 21 */
+/* 22 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5427,11 +5491,11 @@ var __assign = (undefined && undefined.__assign) || function () {
 };
 
 var TextDataFilter = /** @class */ (function () {
-    function TextDataFilter(loader, sourceTable, entityId, isLookup) {
+    function TextDataFilter(loader, sourceTable, sourceId, isLookup) {
         if (isLookup === void 0) { isLookup = false; }
         this.loader = loader;
         this.sourceTable = sourceTable;
-        this.entityId = entityId;
+        this.sourceId = sourceId;
         this.isLookup = isLookup;
         this.filterValue = '';
         //turns off client-side search
@@ -5468,7 +5532,7 @@ var TextDataFilter = /** @class */ (function () {
                 limit: this.sourceTable.chunkSize,
                 needTotal: true,
                 filters: filters_1,
-                entityId: this.entityId,
+                sourceId: this.sourceId,
                 lookup: this.isLookup
             })
                 .then(function (data) {
@@ -5476,7 +5540,7 @@ var TextDataFilter = /** @class */ (function () {
                     chunkSize: _this.sourceTable.chunkSize,
                     loader: {
                         loadChunk: function (params) { return _this.loader
-                            .loadChunk(__assign({}, params, { filters: filters_1, entityId: _this.entityId, lookup: _this.isLookup })); }
+                            .loadChunk(__assign(__assign({}, params), { filters: filters_1, sourceId: _this.sourceId, lookup: _this.isLookup })); }
                     }
                 });
                 for (var _i = 0, _a = _this.sourceTable.columns.getItems(); _i < _a.length; _i++) {
@@ -5497,26 +5561,26 @@ var TextDataFilter = /** @class */ (function () {
         return new Promise(function (resolve, reject) {
             var filteredTable = new _easydata_core__WEBPACK_IMPORTED_MODULE_0__["EasyDataTable"]({
                 chunkSize: _this.sourceTable.chunkSize,
+                inMemory: true
             });
             for (var _i = 0, _a = _this.sourceTable.columns.getItems(); _i < _a.length; _i++) {
                 var col = _a[_i];
                 filteredTable.columns.add(col);
             }
             var words = _this.filterValue.split('||').map(function (w) { return w.trim().toLowerCase(); });
+            var suitableColumns = _this.sourceTable.columns.getItems()
+                .filter(function (col) { return _easydata_core__WEBPACK_IMPORTED_MODULE_0__["utils"].isIntType(col.type)
+                || _easydata_core__WEBPACK_IMPORTED_MODULE_0__["utils"].getStringDataTypes().indexOf(col.type) >= 0; });
             var hasEnterance = function (row) {
-                for (var _i = 0, _a = _this.sourceTable.columns.getItems(); _i < _a.length; _i++) {
-                    var col = _a[_i];
-                    if (_easydata_core__WEBPACK_IMPORTED_MODULE_0__["utils"].isIntType(col.type)
-                        || _easydata_core__WEBPACK_IMPORTED_MODULE_0__["utils"].getStringDataTypes().indexOf(col.type) >= 0) {
-                        var value = row.getValue(col.id);
-                        if (value) {
-                            var normalized = value.toString()
-                                .toLowerCase();
-                            for (var _b = 0, words_1 = words; _b < words_1.length; _b++) {
-                                var word = words_1[_b];
-                                if (normalized.indexOf(word) >= 0) {
-                                    return true;
-                                }
+                for (var _i = 0, suitableColumns_1 = suitableColumns; _i < suitableColumns_1.length; _i++) {
+                    var col = suitableColumns_1[_i];
+                    var value = row.getValue(col.id);
+                    if (value) {
+                        var normalized = value.toString().toLowerCase();
+                        for (var _a = 0, words_1 = words; _a < words_1.length; _a++) {
+                            var word = words_1[_a];
+                            if (normalized.indexOf(word) >= 0) {
+                                return true;
                             }
                         }
                     }
@@ -5529,8 +5593,7 @@ var TextDataFilter = /** @class */ (function () {
                     filteredTable.addRow(row);
                 }
             }
-            if (filteredTable.getCachedCount() == 0)
-                filteredTable.setTotal(0);
+            filteredTable.setTotal(filteredTable.getCachedCount());
             resolve(filteredTable);
         });
     };
@@ -5538,10 +5601,10 @@ var TextDataFilter = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=text_data_filter.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(30)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(31)))
 
 /***/ }),
-/* 22 */
+/* 23 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5549,7 +5612,7 @@ var TextDataFilter = /** @class */ (function () {
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
 /* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3);
 /* harmony import */ var _utils_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(7);
-/* harmony import */ var _validators_datetime_validator__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(32);
+/* harmony import */ var _validators_datetime_validator__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(33);
 
 
 
@@ -5684,19 +5747,19 @@ var EntityEditForm = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=entity_edit_form.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(30)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(31)))
 
 /***/ }),
-/* 23 */
+/* 24 */
 /***/ (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__(4);
-/* harmony import */ var _http_action_result__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(31);
+/* harmony import */ var _http_action_result__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(32);
 /* harmony import */ var _http_method__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(11);
-/* harmony import */ var _http_request__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(15);
+/* harmony import */ var _http_request__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(16);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -5768,7 +5831,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
         };
@@ -5838,10 +5901,10 @@ var HttpClient = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=http_client.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(24)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(25)))
 
 /***/ }),
-/* 24 */
+/* 25 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* WEBPACK VAR INJECTION */(function(process, global) {/*!
@@ -7018,10 +7081,10 @@ return Promise$1;
 
 //# sourceMappingURL=es6-promise.map
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(25), __webpack_require__(26)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(26), __webpack_require__(27)))
 
 /***/ }),
-/* 25 */
+/* 26 */
 /***/ (function(module, exports) {
 
 // shim for using process in browser
@@ -7211,7 +7274,7 @@ process.umask = function() { return 0; };
 
 
 /***/ }),
-/* 26 */
+/* 27 */
 /***/ (function(module, exports) {
 
 var g;
@@ -7237,13 +7300,13 @@ module.exports = g;
 
 
 /***/ }),
-/* 27 */
+/* 28 */
 /***/ (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__(16);
-/* harmony import */ var _data_row__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(14);
+/* harmony import */ var _data_column__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(17);
+/* harmony import */ var _data_row__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(15);
 /* harmony import */ var _types_data_type__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(2);
 /* harmony import */ var _utils_utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(4);
 
@@ -7254,16 +7317,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];
@@ -7294,7 +7364,7 @@ var EasyDataTable = /** @class */ (function () {
             this._chunkSize = value;
             this.total = 0;
             this.needTotal = !this.elasticChunks;
-            this.chunkMap = {};
+            this.cachedRows = [];
         },
         enumerable: true,
         configurable: true
@@ -7307,7 +7377,7 @@ var EasyDataTable = /** @class */ (function () {
             this._elasticChunks = value;
             this.total = 0;
             this.needTotal = !this.elasticChunks;
-            this.chunkMap = {};
+            this.cachedRows = [];
         },
         enumerable: true,
         configurable: true
@@ -7335,22 +7405,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) {
@@ -7361,53 +7421,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 })
@@ -7419,16 +7460,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;
@@ -7459,60 +7500,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) {
@@ -7521,14 +7535,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__(24)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(25)))
 
 /***/ }),
-/* 28 */
+/* 29 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7537,8 +7556,9 @@ var EasyDataTable = /** @class */ (function () {
 /* harmony import */ var _utils_drag_manager__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
 /* harmony import */ var _utils_dom_elem_builder__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(1);
 /* harmony import */ var _utils_ui_utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
-/* harmony import */ var _easy_grid_columns__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(8);
-/* harmony import */ var _easy_grid_cell_renderer__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(9);
+/* harmony import */ var _easy_grid_options__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(10);
+/* harmony import */ var _easy_grid_columns__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(8);
+/* harmony import */ var _easy_grid_cell_renderer__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(13);
 var __assign = (undefined && undefined.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -7550,6 +7570,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;
+};
+
 
 
 
@@ -7582,14 +7610,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')
@@ -7601,18 +7657,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) {
@@ -7645,8 +7738,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);
@@ -7732,7 +7825,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');
@@ -7749,6 +7842,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(); })
@@ -7759,8 +7853,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);
         }
     };
@@ -7771,14 +7870,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;
@@ -7825,7 +7924,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();
@@ -7839,7 +7938,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
@@ -7877,14 +7976,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')
@@ -7898,10 +7989,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()
@@ -7911,15 +7998,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)) {
@@ -7927,10 +8021,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; });
         }
@@ -7938,7 +8038,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) {
@@ -7964,7 +8064,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;
                     }
@@ -8025,8 +8125,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];
@@ -8067,34 +8167,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;
@@ -8148,13 +8234,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);
@@ -8179,23 +8269,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 () {
@@ -8250,13 +8343,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;
     };
@@ -8266,13 +8359,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) {
@@ -8290,7 +8383,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;
@@ -8416,18 +8510,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
                 });
             }); })
@@ -8528,14 +8622,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__(29)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(30)))
 
 /***/ }),
-/* 29 */
+/* 30 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* WEBPACK VAR INJECTION */(function(process, global) {/*!
@@ -9712,10 +9897,10 @@ return Promise$1;
 
 //# sourceMappingURL=es6-promise.map
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(25), __webpack_require__(26)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(26), __webpack_require__(27)))
 
 /***/ }),
-/* 30 */
+/* 31 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* WEBPACK VAR INJECTION */(function(process, global) {/*!
@@ -10892,10 +11077,10 @@ return Promise$1;
 
 //# sourceMappingURL=es6-promise.map
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(39), __webpack_require__(40)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(40), __webpack_require__(41)))
 
 /***/ }),
-/* 31 */
+/* 32 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -10926,13 +11111,13 @@ var HttpActionResult = /** @class */ (function () {
 //# sourceMappingURL=http_action_result.js.map
 
 /***/ }),
-/* 32 */
+/* 33 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return DateTimeValidator; });
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
-/* harmony import */ var _validator__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(10);
+/* harmony import */ var _validator__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
 /* harmony import */ var _utils_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(7);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -10980,48 +11165,48 @@ var DateTimeValidator = /** @class */ (function (_super) {
 //# sourceMappingURL=datetime_validator.js.map
 
 /***/ }),
-/* 33 */
+/* 34 */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(34);
-module.exports = __webpack_require__(41);
+__webpack_require__(35);
+module.exports = __webpack_require__(42);
 
 
 /***/ }),
-/* 34 */
+/* 35 */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(35);
 __webpack_require__(36);
 __webpack_require__(37);
-__webpack_require__(38);
+__webpack_require__(38);
+__webpack_require__(39);
 
 /***/ }),
-/* 35 */
+/* 36 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // extracted by mini-css-extract-plugin
 
 /***/ }),
-/* 36 */
+/* 37 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // extracted by mini-css-extract-plugin
 
 /***/ }),
-/* 37 */
+/* 38 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // extracted by mini-css-extract-plugin
 
 /***/ }),
-/* 38 */
+/* 39 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // extracted by mini-css-extract-plugin
 
 /***/ }),
-/* 39 */
+/* 40 */
 /***/ (function(module, exports) {
 
 // shim for using process in browser
@@ -11211,7 +11396,7 @@ process.umask = function() { return 0; };
 
 
 /***/ }),
-/* 40 */
+/* 41 */
 /***/ (function(module, exports) {
 
 var g;
@@ -11237,7 +11422,7 @@ module.exports = g;
 
 
 /***/ }),
-/* 41 */
+/* 42 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -11273,10 +11458,10 @@ var public_api = __webpack_require__(0);
 var lib_public_api = __webpack_require__(3);
 
 // EXTERNAL MODULE: ./dist/lib/filter/text_data_filter.js
-var text_data_filter = __webpack_require__(21);
+var text_data_filter = __webpack_require__(22);
 
 // EXTERNAL MODULE: ./dist/lib/form/entity_edit_form.js
-var entity_edit_form = __webpack_require__(22);
+var entity_edit_form = __webpack_require__(23);
 
 // EXTERNAL MODULE: ./dist/lib/utils/utils.js
 var utils = __webpack_require__(7);
@@ -11550,12 +11735,13 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                     var lookupTable = new public_api["EasyDataTable"]({
                         loader: {
                             loadChunk: function (chunkParams) { return _this.context.getDataLoader()
-                                .loadChunk(__assign({}, chunkParams, { id: lookupEntity.id })); }
+                                .loadChunk(__assign(__assign({}, chunkParams), { id: lookupEntity.id })); }
                         }
                     });
                     _this.context.getDataLoader()
-                        .loadChunk({ offset: 0, limit: 1000, needTotal: true, entityId: lookupEntity.id })
+                        .loadChunk({ offset: 0, limit: 1000, needTotal: true, sourceId: lookupEntity.id })
                         .then(function (data) {
+                        var _a;
                         var _loop_1 = function (col) {
                             var attrs = lookupEntity.attributes.filter(function (attr) {
                                 return attr.id == col.id && (attr.isPrimaryKey || attr.showInLookup);
@@ -11564,13 +11750,13 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                                 lookupTable.columns.add(col);
                             }
                         };
-                        for (var _i = 0, _a = data.table.columns.getItems(); _i < _a.length; _i++) {
-                            var col = _a[_i];
+                        for (var _i = 0, _b = data.table.columns.getItems(); _i < _b.length; _i++) {
+                            var col = _b[_i];
                             _loop_1(col);
                         }
                         lookupTable.setTotal(data.total);
-                        for (var _b = 0, _c = data.table.getCachedRows(); _b < _c.length; _b++) {
-                            var row = _c[_b];
+                        for (var _c = 0, _d = data.table.getCachedRows(); _c < _d.length; _c++) {
+                            var row = _d[_c];
                             lookupTable.addRow(row);
                         }
                         var ds = new lib_public_api["DefaultDialogService"]();
@@ -11609,7 +11795,9 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                                 .join(', ');
                         };
                         if (selectedValue) {
-                            _this.context.getEntity(selectedValue, lookupEntity.id)
+                            var attr_1 = lookupEntity.getFirstPrimaryAttr();
+                            var key = attr_1.id.substring(attr_1.id.lastIndexOf('.') + 1);
+                            _this.context.fetchRecord((_a = {}, _a[key] = selectedValue, _a), lookupEntity.id)
                                 .then(function (data) {
                                 if (data.entity) {
                                     updateSelectedValue(data.entity);
@@ -11657,7 +11845,7 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                 }); });
         });
     };
-    EntityEditFormBuilder.prototype.setupDateTimeField = function (parent, attr, readOnly, value) {
+    EntityEditFormBuilder.prototype.setupDateTimeField = function (parent, attr, value, readOnly, hidden) {
         var _this = this;
         var horizClass = isIE
             ? 'kfrm-fields-ie is-horizontal'
@@ -11678,6 +11866,8 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                 .addClass(horizClass)
                 .addChild('input', function (b) {
                 inputEl = b.toDOM();
+                b.name(attr.id);
+                b.type(hidden ? 'hidden' : _this.resolveInputType(attr.dataType));
                 if (readOnly) {
                     b.attr('readonly', '');
                 }
@@ -11701,8 +11891,6 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                         }
                     });
                 }
-                b.name(attr.id);
-                b.type(_this.resolveInputType(attr.dataType));
                 b.value((public_api["utils"].IsDefinedAndNotNull(value)
                     ? public_api["utils"].dateTimeToStr(value, editFormat)
                     : ''));
@@ -11744,7 +11932,7 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                 }).toDOM(); });
         });
     };
-    EntityEditFormBuilder.prototype.setupListField = function (parent, attr, readOnly, values, value) {
+    EntityEditFormBuilder.prototype.setupListField = function (parent, attr, value, values, readOnly) {
         var _this = this;
         Object(lib_public_api["domel"])(parent)
             .addChild('div', function (b) { return b
@@ -11777,12 +11965,14 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
             b.attr('accept', accept);
         });
     };
-    EntityEditFormBuilder.prototype.setupTextField = function (parent, attr, readOnly, value) {
+    EntityEditFormBuilder.prototype.setupTextField = function (parent, attr, value, readOnly, hidden) {
         var _this = this;
         Object(lib_public_api["domel"])(parent)
             .addChild('input', function (b) {
-            if (readOnly)
+            if (readOnly) {
                 b.attr('readonly', '');
+            }
+            b.type(hidden ? 'hidden' : _this.resolveInputType(attr.dataType));
             b.name(attr.id)
                 .type(_this.resolveInputType(attr.dataType));
             if (attr.dataType == public_api["DataType"].Bool) {
@@ -11797,7 +11987,7 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
             }
         });
     };
-    EntityEditFormBuilder.prototype.setupTextArea = function (parent, attr, readOnly, value) {
+    EntityEditFormBuilder.prototype.setupTextArea = function (parent, attr, value, readOnly) {
         // feature: modify size in value editor ??
         Object(lib_public_api["domel"])(parent)
             .addChild('textarea', function (b) {
@@ -11805,6 +11995,9 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                 b.attr('readonly', '');
             b.attr('name', attr.id);
             b.setStyle('height', "120px");
+            b.value(public_api["utils"].IsDefinedAndNotNull(value)
+                ? value.toString()
+                : '');
         });
     };
     EntityEditFormBuilder.prototype.addFormField = function (parent, attr) {
@@ -11831,16 +12024,17 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                     .setStyle('display', 'inline-block'); });
             }
         });
+        var hidden = attr.isPrimaryKey;
         if (attr.kind === public_api["EntityAttrKind"].Lookup) {
             this.setupLookupField(parent, attr, readOnly, value);
             return;
         }
         switch (editor.tag) {
             case public_api["EditorTag"].DateTime:
-                this.setupDateTimeField(parent, attr, readOnly, value);
+                this.setupDateTimeField(parent, attr, value, readOnly, hidden);
                 break;
             case public_api["EditorTag"].List:
-                this.setupListField(parent, attr, readOnly, editor.values, value);
+                this.setupListField(parent, attr, value, editor.values, readOnly);
                 break;
             case public_api["EditorTag"].File:
                 this.setupFileField(parent, attr, readOnly, editor.accept);
@@ -11848,10 +12042,10 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
             case public_api["EditorTag"].Edit:
             default:
                 if (editor.multiline) {
-                    this.setupTextArea(parent, attr, readOnly, value);
+                    this.setupTextArea(parent, attr, value, readOnly);
                 }
                 else {
-                    this.setupTextField(parent, attr, readOnly, value);
+                    this.setupTextField(parent, attr, value, readOnly, hidden);
                 }
                 break;
         }
@@ -11903,13 +12097,15 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
         this.form['setHtmlInt'](formHtml);
         for (var _i = 0, _a = this.context.getActiveEntity().attributes; _i < _a.length; _i++) {
             var attr = _a[_i];
-            if (this.params.isEditForm) {
-                if (!attr.showOnEdit)
-                    continue;
-            }
-            else {
-                if (!attr.showOnCreate)
-                    continue;
+            if (!attr.isPrimaryKey) {
+                if (this.params.isEditForm) {
+                    if (!attr.showOnEdit)
+                        continue;
+                }
+                else {
+                    if (!attr.showOnCreate)
+                        continue;
+                }
             }
             this.addFormField(fb.toDOM(), attr);
         }
@@ -11944,8 +12140,8 @@ var easy_data_server_loader_EasyDataServerLoader = /** @class */ (function () {
     }
     EasyDataServerLoader.prototype.loadChunk = function (params) {
         var _this = this;
-        var url = this.context.resolveEndpoint('GetEntities', { entityId: params.entityId || this.context.getActiveEntity().id });
-        delete params.entityId;
+        var url = this.context.resolveEndpoint('FetchDataset', { sourceId: params.sourceId || this.context.getActiveEntity().id });
+        delete params.sourceId;
         this.context.startProcess();
         var http = this.context.getHttpClient();
         return http.post(url, params)
@@ -11982,6 +12178,17 @@ var easy_data_server_loader_EasyDataServerLoader = /** @class */ (function () {
 
 //# sourceMappingURL=easy_data_server_loader.js.map
 // CONCATENATED MODULE: ./dist/lib/main/data_context.js
+var data_context_assign = (undefined && undefined.__assign) || function () {
+    data_context_assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return data_context_assign.apply(this, arguments);
+};
 
 
 
@@ -11994,15 +12201,14 @@ var data_context_DataContext = /** @class */ (function () {
         this.model = new public_api["MetaData"]();
         this.model.id = options.metaDataId || '__default';
         this.dataLoader = new easy_data_server_loader_EasyDataServerLoader(this);
-        this.data = new public_api["EasyDataTable"]({
-            loader: this.dataLoader
-        });
+        var dataTableOptions = data_context_assign({ loader: this.dataLoader }, options.dataTable);
+        this.data = new public_api["EasyDataTable"](dataTableOptions);
         this.setDefaultEndpoints(this.options.endpoint || '/api/easydata');
     }
     DataContext.prototype.getActiveEntity = function () {
         return this.activeEntity;
     };
-    DataContext.prototype.setActiveEntity = function (entityId) {
+    DataContext.prototype.setActiveSource = function (entityId) {
         this.activeEntity = this.model.getRootEntity().subEntities
             .filter(function (e) { return e.id == entityId; })[0];
     };
@@ -12015,8 +12221,8 @@ var data_context_DataContext = /** @class */ (function () {
     DataContext.prototype.getDataLoader = function () {
         return this.dataLoader;
     };
-    DataContext.prototype.createFilter = function (entityId, data, isLookup) {
-        return new text_data_filter["a" /* TextDataFilter */](this.dataLoader, data || this.getData(), entityId || this.activeEntity.id, isLookup);
+    DataContext.prototype.createFilter = function (sourceId, data, isLookup) {
+        return new text_data_filter["a" /* TextDataFilter */](this.dataLoader, data || this.getData(), sourceId || this.activeEntity.id, isLookup);
     };
     DataContext.prototype.loadMetaData = function () {
         var _this = this;
@@ -12040,7 +12246,7 @@ var data_context_DataContext = /** @class */ (function () {
     DataContext.prototype.getHttpClient = function () {
         return this.http;
     };
-    DataContext.prototype.getEntities = function () {
+    DataContext.prototype.fetchDataset = function () {
         var _this = this;
         this.data.clear();
         return this.dataLoader.loadChunk({ offset: 0, limit: this.data.chunkSize, needTotal: true })
@@ -12057,33 +12263,33 @@ var data_context_DataContext = /** @class */ (function () {
             return _this.data;
         });
     };
-    DataContext.prototype.getEntity = function (id, entityId) {
+    DataContext.prototype.fetchRecord = function (keys, sourceId) {
         var _this = this;
-        var url = this.resolveEndpoint('GetEntity', { id: id,
-            entityId: entityId || this.activeEntity.id });
+        var url = this.resolveEndpoint('FetchRecord', { sourceId: sourceId || this.activeEntity.id });
         this.startProcess();
-        return this.http.get(url).getPromise()
+        return this.http.get(url, { queryParams: keys })
             .finally(function () { return _this.endProcess(); });
     };
-    DataContext.prototype.createEntity = function (obj, entityId) {
+    DataContext.prototype.createRecord = function (obj, sourceId) {
         var _this = this;
-        var url = this.resolveEndpoint('CreateEntity', { entityId: entityId || this.activeEntity.id });
+        var url = this.resolveEndpoint('CreateRecord', { sourceId: sourceId || this.activeEntity.id });
         this.startProcess();
-        return this.http.post(url, obj, { dataType: 'json' }).getPromise().finally(function () { return _this.endProcess(); });
+        return this.http.post(url, obj, { dataType: 'json' })
+            .finally(function () { return _this.endProcess(); });
     };
-    DataContext.prototype.updateEntity = function (id, obj, entityId) {
+    DataContext.prototype.updateRecord = function (obj, sourceId) {
         var _this = this;
-        var url = this.resolveEndpoint('UpdateEntity', { id: id,
-            entityId: entityId || this.activeEntity.id });
+        var url = this.resolveEndpoint('UpdateRecord', { sourceId: sourceId || this.activeEntity.id });
         this.startProcess();
-        return this.http.post(url, obj, { dataType: 'json' }).getPromise().finally(function () { return _this.endProcess(); });
+        return this.http.post(url, obj, { dataType: 'json' })
+            .finally(function () { return _this.endProcess(); });
     };
-    DataContext.prototype.deleteEntity = function (id, entityId) {
+    DataContext.prototype.deleteRecord = function (obj, sourceId) {
         var _this = this;
-        var url = this.resolveEndpoint('DeleteEntity', { id: id,
-            entityId: entityId || this.activeEntity.id });
+        var url = this.resolveEndpoint('DeleteRecord', { sourceId: sourceId || this.activeEntity.id });
         this.startProcess();
-        return this.http.post(url, null).getPromise().finally(function () { return _this.endProcess(); });
+        return this.http.post(url, obj, { dataType: 'json' })
+            .finally(function () { return _this.endProcess(); });
     };
     DataContext.prototype.setEndpoint = function (key, value) {
         this.endpoints.set(key, value);
@@ -12108,7 +12314,7 @@ var data_context_DataContext = /** @class */ (function () {
                     if (opt == 'modelId') {
                         optVal = this.model.getId();
                     }
-                    else if (opt == 'entityId') {
+                    else if (opt == 'sourceId') {
                         optVal = this.activeEntity.id;
                     }
                     else {
@@ -12130,18 +12336,18 @@ var data_context_DataContext = /** @class */ (function () {
     };
     DataContext.prototype.setDefaultEndpoints = function (endpointBase) {
         this.setEnpointIfNotExist('GetMetaData', Object(public_api["combinePath"])(endpointBase, 'models/{modelId}'));
-        this.setEnpointIfNotExist('GetEntities', Object(public_api["combinePath"])(endpointBase, 'models/{modelId}/crud/{entityId}/fetch'));
-        this.setEnpointIfNotExist('GetEntity', Object(public_api["combinePath"])(endpointBase, 'models/{modelId}/crud/{entityId}/fetch/{id}'));
-        this.setEnpointIfNotExist('CreateEntity', Object(public_api["combinePath"])(endpointBase, 'models/{modelId}/crud/{entityId}/create'));
-        this.setEnpointIfNotExist('UpdateEntity', Object(public_api["combinePath"])(endpointBase, 'models/{modelId}/crud/{entityId}/update/{id}'));
-        this.setEnpointIfNotExist('DeleteEntity', Object(public_api["combinePath"])(endpointBase, 'models/{modelId}/crud/{entityId}/delete/{id}'));
+        this.setEnpointIfNotExist('FetchDataset', Object(public_api["combinePath"])(endpointBase, 'models/{modelId}/sources/{sourceId}/fetch'));
+        this.setEnpointIfNotExist('FetchRecord', Object(public_api["combinePath"])(endpointBase, 'models/{modelId}/sources/{sourceId}/fetch'));
+        this.setEnpointIfNotExist('CreateRecord', Object(public_api["combinePath"])(endpointBase, 'models/{modelId}/sources/{sourceId}/create'));
+        this.setEnpointIfNotExist('UpdateRecord', Object(public_api["combinePath"])(endpointBase, 'models/{modelId}/sources/{sourceId}/update'));
+        this.setEnpointIfNotExist('DeleteRecord', Object(public_api["combinePath"])(endpointBase, 'models/{modelId}/sources/{sourceId}/delete'));
     };
     return DataContext;
 }());
 
 //# sourceMappingURL=data_context.js.map
 // EXTERNAL MODULE: ./dist/lib/validators/validator.js
-var validator = __webpack_require__(10);
+var validator = __webpack_require__(9);
 
 // CONCATENATED MODULE: ./dist/lib/validators/type_validator.js
 var __extends = (undefined && undefined.__extends) || (function () {
@@ -12243,10 +12449,12 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
             showBackToEntities: true
         };
         this.defaultValidators = [new required_validator_RequiredValidator(), new type_validator_TypeValidator()];
-        options = options || {};
         this.options = public_api["utils"].assignDeep(this.options, options || {});
         this.dlg = new lib_public_api["DefaultDialogService"]();
         var ent = this.context.getActiveEntity();
+        if (!ent) {
+            throw "Can't find active entity for " + window.location.pathname;
+        }
         this.slot.innerHTML += "<h1>" + (ent.captionPlural || ent.caption) + "</h1>";
         if (this.options.showBackToEntities) {
             Object(lib_public_api["domel"])(this.slot)
@@ -12270,7 +12478,7 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
     };
     EntityDataView.prototype.renderGrid = function () {
         var _this = this;
-        this.context.getEntities()
+        this.context.fetchDataset()
             .then(function (result) {
             var gridSlot = document.createElement('div');
             _this.slot.appendChild(gridSlot);
@@ -12283,10 +12491,10 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
                     allowPageSizeChange: true,
                     pageSizeItems: [15, 30, 50, 100, 200]
                 },
-                addColumns: true,
-                addColumnsTitle: public_api["i18n"].getText('AddBtnTitle'),
+                showPlusButton: _this.context.getActiveEntity().isEditable,
+                plusButtonTitle: public_api["i18n"].getText('AddRecordBtnTitle'),
                 showActiveRow: false,
-                onAddColumnClick: _this.addClickHandler.bind(_this),
+                onPlusButtonClick: _this.addClickHandler.bind(_this),
                 onGetCellRenderer: _this.manageCellRenderer.bind(_this),
                 onRowDbClick: _this.rowDbClickHandler.bind(_this),
                 onSyncGridColumn: _this.syncGridColumnHandler.bind(_this)
@@ -12341,7 +12549,7 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
                 if (!form.validate())
                     return false;
                 form.getData()
-                    .then(function (obj) { return _this.context.createEntity(obj); })
+                    .then(function (obj) { return _this.context.createRecord(obj); })
                     .then(function () {
                     return _this.refreshData();
                 })
@@ -12372,12 +12580,10 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
                 .replace('{entity}', activeEntity.caption),
             body: form.getHtml(),
             onSubmit: function () {
-                var keyAttrs = activeEntity.attributes.filter(function (attr) { return attr.isPrimaryKey; });
-                var keys = keyAttrs.map(function (attr) { return row.getValue(attr.id); });
                 if (!form.validate())
                     return false;
                 form.getData()
-                    .then(function (obj) { return _this.context.updateEntity(keys.join(':'), obj); })
+                    .then(function (obj) { return _this.context.updateRecord(obj); })
                     .then(function () {
                     return _this.refreshData();
                 })
@@ -12398,16 +12604,20 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
             .then(function (row) {
             if (row) {
                 var activeEntity = _this.context.getActiveEntity();
-                var keyAttrs = activeEntity.attributes.filter(function (attr) { return attr.isPrimaryKey; });
-                var keys_1 = keyAttrs.map(function (attr) { return row.getValue(attr.id); });
-                var entityId = keyAttrs.map(function (attr, index) { return attr.id + ":" + keys_1[index]; }).join(';');
+                var keyAttrs = activeEntity.getPrimaryAttrs();
+                var keyVals_1 = keyAttrs.map(function (attr) { return row.getValue(attr.id); });
+                var keys_1 = keyAttrs.reduce(function (val, attr, index) {
+                    var property = attr.id.substring(attr.id.lastIndexOf('.') + 1);
+                    val[property] = keyVals_1[index];
+                    return val;
+                }, {});
                 _this.dlg.openConfirm(public_api["i18n"].getText('DeleteDlgCaption')
                     .replace('{entity}', activeEntity.caption), public_api["i18n"].getText('DeleteDlgMessage')
-                    .replace('{entityId}', entityId))
+                    .replace('{recordId}', Object.keys(keys_1)
+                    .map(function (key) { return key + ":" + keys_1[key]; }).join(';')))
                     .then(function (result) {
                     if (result) {
-                        //pass entityId in future
-                        _this.context.deleteEntity(keys_1.join(':'))
+                        _this.context.deleteRecord(keys_1)
                             .then(function () {
                             return _this.refreshData();
                         })
@@ -12429,7 +12639,7 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
     };
     EntityDataView.prototype.refreshData = function () {
         var _this = this;
-        return this.context.getEntities()
+        return this.context.fetchDataset()
             .then(function () {
             _this.grid.refresh();
         });
@@ -12497,50 +12707,62 @@ var root_data_view_RootDataView = /** @class */ (function () {
 var easy_data_view_dispatcher_EasyDataViewDispatcher = /** @class */ (function () {
     function EasyDataViewDispatcher(options) {
         var _this = this;
-        this.options = { basePath: 'easydata' };
+        this.options = {
+            container: '#EasyDataContainer',
+            basePath: 'easydata'
+        };
         this.onSetLocation = function () {
             _this.setActiveView();
         };
-        options = options || {};
-        this.options = public_api["utils"].assign(this.options, options);
-        this.options.basePath = (!this.options.rootEntity)
-            ? this.pretiffyPath(this.options.basePath)
-            : this.pretiffyPath(window.location.pathname);
-        if (this.options.rootEntity)
+        this.options = public_api["utils"].assign(this.options, options || {});
+        if (this.options.rootEntity) {
             this.options.showBackToEntities = false;
-        this.setContainer(options.container);
+            this.basePath = '/';
+        }
+        else {
+            this.basePath = this.normalizeBasePath(this.options.basePath);
+        }
+        this.setContainer(this.options.container);
         var progressBarSlot = document.createElement('div');
         var bar = new ProgressBar(progressBarSlot);
         var parent = this.container.parentElement;
         parent.insertBefore(progressBarSlot, parent.firstElementChild);
         this.context = new data_context_DataContext({
-            endpoint: options.endpoint,
+            endpoint: this.options.endpoint,
+            dataTable: this.options.dataTable,
             onProcessStart: function () { return bar.show(); },
             onProcessEnd: function () { return bar.hide(); }
         });
-        this.basePath = this.getBasePath();
     }
-    EasyDataViewDispatcher.prototype.pretiffyPath = function (path) {
+    EasyDataViewDispatcher.prototype.normalizeBasePath = function (basePath) {
+        basePath = this.trimSlashes(basePath);
+        var fullPath = decodeURIComponent(window.location.pathname);
+        var idx = fullPath.toLocaleLowerCase().indexOf(basePath);
+        return idx >= 0 ? fullPath.substring(0, idx + basePath.length) : '/';
+    };
+    EasyDataViewDispatcher.prototype.trimSlashes = function (path) {
         return path.replace(/^\/|\/$/g, '');
     };
     EasyDataViewDispatcher.prototype.setContainer = function (container) {
         if (!container) {
-            this.container = document.getElementById('EasyDataContainer');
-            return;
+            throw 'Container is undefined';
         }
         if (typeof container === 'string') {
             if (container.length) {
-                if (container[0] === '#') {
-                    this.container = document.getElementById(container.substring(1));
-                }
-                else if (container[0] === '.') {
+                if (container[0] === '.') {
                     var result = document.getElementsByClassName(container.substring(1));
                     if (result.length)
                         this.container = result[0];
                 }
                 else {
-                    throw Error('Unrecognized container parameter ' +
-                        '(Must be an element ID, a class name or HTMLElement object itself): ' + container);
+                    if (container[0] === '#') {
+                        container = container.substring(1);
+                    }
+                    this.container = document.getElementById(container);
+                }
+                if (!this.container) {
+                    throw Error('Unrecognized `container` parameter: ' + container + '\n'
+                        + 'It must be an element ID, a class name (starting with .) or an HTMLElement object itself.');
                 }
             }
         }
@@ -12548,20 +12770,12 @@ var easy_data_view_dispatcher_EasyDataViewDispatcher = /** @class */ (function (
             this.container = container;
         }
     };
-    EasyDataViewDispatcher.prototype.getActiveEntityId = function () {
+    EasyDataViewDispatcher.prototype.getActiveSourceId = function () {
         if (this.options.rootEntity)
             return this.options.rootEntity;
-        var decodedUrl = decodeURIComponent(window.location.href);
-        var splitIndex = decodedUrl.lastIndexOf('/');
-        var typeName = decodedUrl.substring(splitIndex + 1);
-        return typeName && typeName.toLocaleLowerCase() !== this.options.basePath
-            ? typeName
-            : null;
-    };
-    EasyDataViewDispatcher.prototype.getBasePath = function () {
-        var decodedUrl = decodeURIComponent(window.location.href);
-        var optBasePathIndex = decodedUrl.toLocaleLowerCase().indexOf(this.options.basePath);
-        return decodedUrl.substring(0, optBasePathIndex + this.options.basePath.length);
+        var path = decodeURIComponent(window.location.pathname);
+        var idIndex = this.basePath.length + 1;
+        return idIndex < path.length ? path.substring(idIndex) : null;
     };
     EasyDataViewDispatcher.prototype.run = function () {
         var _this = this;
@@ -12574,9 +12788,9 @@ var easy_data_view_dispatcher_EasyDataViewDispatcher = /** @class */ (function (
     };
     EasyDataViewDispatcher.prototype.setActiveView = function () {
         this.clear();
-        var activeEntityId = this.getActiveEntityId();
-        if (activeEntityId) {
-            this.context.setActiveEntity(activeEntityId);
+        var sourceId = this.getActiveSourceId();
+        if (sourceId) {
+            this.context.setActiveSource(sourceId);
             window['EDView'] = new entity_data_view_EntityDataView(this.container, this.context, this.basePath, this.options);
         }
         else {
@@ -12609,13 +12823,14 @@ function addEasyDataCRUDTexts() {
         CalendarBtnTitle: 'Open calendar',
         TimerBtnTitle: 'Open timer',
         AddBtnTitle: 'Add',
+        AddRecordBtnTitle: 'Add record',
         EditBtn: 'Edit',
         DeleteBtn: 'Delete',
         SelectLink: '[ select ]',
         AddDlgCaption: 'Create {entity}',
         EditDlgCaption: 'Edit {entity}',
         DeleteDlgCaption: 'Delete {entity}',
-        DeleteDlgMessage: 'Are you shure about removing this entity: [{entityId}]?',
+        DeleteDlgMessage: 'Are you sure you want to remove this record: {{recordId}}?',
         EntityMenuDesc: 'Click on an entity to view/edit its content',
         BackToEntities: 'Back to entities',
         SearchBtn: 'Search',