@easyquery/ui 7.2.0-rc04 → 7.2.0

package/dist/browser/eq.community.js

@@ -1,5 +1,5 @@
 /** 
- * EasyQuery.JS Community 7.2.0-rc04 (https://korzh.com/easyquery/javascript)
+ * EasyQuery.JS Community 7.2.0 (https://korzh.com/easyquery/javascript)
  * Copyright 2022 Korzh.com. All rights reserved.
  * 
  * EasyQuery.JS commercial licenses may be obtained at
@@ -129,10 +129,10 @@ __webpack_require__.d(__webpack_exports__, "combinePath", function() { return /*
 __webpack_require__.d(__webpack_exports__, "utils", function() { return /* reexport */ utils["a" /* utils */]; });
 __webpack_require__.d(__webpack_exports__, "liquid", function() { return /* reexport */ liquid; });
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/types/data_type.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/types/data_type.js
 var data_type = __webpack_require__(7);
 
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/types/entity_attr_kind.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/types/entity_attr_kind.js
 var EntityAttrKind;
 (function (EntityAttrKind) {
     EntityAttrKind[EntityAttrKind["Data"] = 0] = "Data";
@@ -140,7 +140,7 @@ var EntityAttrKind;
     EntityAttrKind[EntityAttrKind["Lookup"] = 2] = "Lookup";
 })(EntityAttrKind || (EntityAttrKind = {}));
 //# sourceMappingURL=entity_attr_kind.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/types/editor_tag.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/types/editor_tag.js
 var EditorTag = {
     /** Unknown tag value */
     Unknown: "Unknown",
@@ -156,22 +156,22 @@ var EditorTag = {
     File: "FILE"
 };
 //# sourceMappingURL=editor_tag.js.map
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/http/http_method.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/http/http_method.js
 var http_method = __webpack_require__(36);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/http/http_request.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/http/http_request.js
 var http_request = __webpack_require__(55);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/http/http_client.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/http/http_client.js
 var http_client = __webpack_require__(99);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/i18n/i18n.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/i18n/i18n.js
 var i18n = __webpack_require__(17);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/utils/utils.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/utils/utils.js
 var utils = __webpack_require__(11);
 
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/meta/meta_entity.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/meta/meta_entity.js
 
 
 
@@ -294,6 +294,7 @@ var meta_entity_MetaEntityAttr = /** @class */ (function () {
             this.lookupEntity = dto.lent;
             this.dataAttr = dto.dattr;
             this.lookupDataAttr = dto.ldattr;
+            this.defaultValue = dto.defVal;
             this.isNullable = utils["a" /* utils */].getIfDefined(dto.nul, this.isNullable);
             this.isEditable = utils["a" /* utils */].getIfDefined(dto.ied, this.isEditable);
             this.showOnView = utils["a" /* utils */].getIfDefined(dto.ivis || dto.sov, this.showOnView);
@@ -313,7 +314,7 @@ var meta_entity_MetaEntityAttr = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=meta_entity.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/meta/value_editor.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/meta/value_editor.js
 
 
 /**
@@ -379,7 +380,7 @@ var value_editor_ValueEditor = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=value_editor.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/meta/meta_data.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/meta/meta_data.js
 
 
 
@@ -871,7 +872,7 @@ var meta_data_MetaData = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=meta_data.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/data/aggr_settings.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/data/aggr_settings.js
 var __assign = (undefined && undefined.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -1065,16 +1066,16 @@ var AggregationSettings = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=aggr_settings.js.map
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/data/data_column.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/data/data_column.js
 var data_column = __webpack_require__(56);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/data/data_row.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/data/data_row.js
 var data_row = __webpack_require__(49);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/data/easy_data_table.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/data/easy_data_table.js
 var easy_data_table = __webpack_require__(101);
 
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/utils/easy_guid.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/utils/easy_guid.js
 /**
  * EasyData representation of GUID.
  */
@@ -1095,7 +1096,7 @@ var EasyGuid = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=easy_guid.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/event/event_emitter.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/event/event_emitter.js
 
 /**
  * The representation of event emitter.
@@ -1221,10 +1222,10 @@ var event_emitter_EventEmitter = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=event_emitter.js.map
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/utils/string_utils.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/utils/string_utils.js
 var string_utils = __webpack_require__(48);
 
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/utils/liquid.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/utils/liquid.js
 var liquid;
 (function (liquid) {
     function renderLiquidTemplate(template, vars) {
@@ -1240,11 +1241,11 @@ var liquid;
     liquid.renderLiquidTemplate = renderLiquidTemplate;
 })(liquid || (liquid = {}));
 //# sourceMappingURL=liquid.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/i18n/load_default_locale_settings.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/i18n/load_default_locale_settings.js
 
 i18n["a" /* i18n */].resetLocales();
 //# sourceMappingURL=load_default_locale_settings.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/public_api.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/public_api.js
 //types
 
 
@@ -1347,19 +1348,19 @@ __webpack_require__.d(__webpack_exports__, "DefaultDialogSet", function() { retu
 __webpack_require__.d(__webpack_exports__, "DialogFooterAlignment", function() { return /* reexport */ dialog_service["a" /* DialogFooterAlignment */]; });
 __webpack_require__.d(__webpack_exports__, "dialogs", function() { return /* binding */ dialogs; });
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid.js
 var easy_grid = __webpack_require__(104);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_options.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_options.js
 var easy_grid_options = __webpack_require__(34);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_columns.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_columns.js
 var easy_grid_columns = __webpack_require__(21);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_cell_renderer.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_cell_renderer.js
 var easy_grid_cell_renderer = __webpack_require__(39);
 
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/datetimepicker/calendar.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/datetimepicker/calendar.js
 var Calendar = /** @class */ (function () {
     function Calendar(slot, options) {
         this.slot = slot;
@@ -1390,10 +1391,10 @@ var Calendar = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=calendar.js.map
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/utils/ui-utils.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/utils/ui-utils.js
 var ui_utils = __webpack_require__(18);
 
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/datetimepicker/date_time_picker.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/datetimepicker/date_time_picker.js
 
 var date_time_picker_DateTimePicker = /** @class */ (function () {
     function DateTimePicker(options) {
@@ -1501,13 +1502,13 @@ var date_time_picker_DateTimePicker = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=date_time_picker.js.map
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 10 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 10 modules
 var public_api = __webpack_require__(0);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/utils/dom_elem_builder.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/utils/dom_elem_builder.js
 var dom_elem_builder = __webpack_require__(6);
 
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/datetimepicker/default_calendar.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/datetimepicker/default_calendar.js
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -1771,7 +1772,7 @@ var default_calendar_DefaultCalendar = /** @class */ (function (_super) {
 }(Calendar));
 
 //# sourceMappingURL=default_calendar.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/datetimepicker/time_picker.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/datetimepicker/time_picker.js
 var TimePicker = /** @class */ (function () {
     function TimePicker(slot, options) {
         this.slot = slot;
@@ -1799,7 +1800,7 @@ var TimePicker = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=time_picker.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/datetimepicker/default_time_picker.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/datetimepicker/default_time_picker.js
 var default_time_picker_extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -1881,7 +1882,7 @@ var default_time_picker_DefaultTimePicker = /** @class */ (function (_super) {
 }(TimePicker));
 
 //# sourceMappingURL=default_time_picker.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/datetimepicker/default_date_time_picker.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/datetimepicker/default_date_time_picker.js
 var default_date_time_picker_extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -2009,22 +2010,22 @@ var default_date_time_picker_DefaultDateTimePicker = /** @class */ (function (_s
 }(date_time_picker_DateTimePicker));
 
 //# sourceMappingURL=default_date_time_picker.js.map
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/utils/browser_utils.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/utils/browser_utils.js
 var browser_utils = __webpack_require__(66);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/utils/drag_manager.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/utils/drag_manager.js
 var drag_manager = __webpack_require__(37);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/utils/mask.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/utils/mask.js
 var mask = __webpack_require__(67);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/dialogs/default_dialog_service.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/dialogs/default_dialog_service.js
 var default_dialog_service = __webpack_require__(68);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/dialogs/dialog_service.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/dialogs/dialog_service.js
 var dialog_service = __webpack_require__(69);
 
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/i18n/text_resources.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/i18n/text_resources.js
 
 function addEasyDataUITexts() {
     public_api["i18n"].updateDefaultTexts({
@@ -2039,7 +2040,7 @@ function addEasyDataUITexts() {
 }
 addEasyDataUITexts();
 //# sourceMappingURL=text_resources.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/public_api.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/public_api.js
 // grid
 
 
@@ -2124,10 +2125,10 @@ __webpack_require__.d(__webpack_exports__, "FormatParser", function() { return /
 __webpack_require__.d(__webpack_exports__, "versionInfo", function() { return /* reexport */ versionInfo; });
 __webpack_require__.d(__webpack_exports__, "i18n", function() { return /* reexport */ public_api["i18n"]; });
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/utils/utils.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/utils/utils.js
 var utils = __webpack_require__(15);
 
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/utils/constants.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/utils/constants.js
 var eqconsts;
 (function (eqconsts) {
     /**
@@ -2179,22 +2180,22 @@ var eqconsts;
     ];
 })(eqconsts || (eqconsts = {}));
 //# sourceMappingURL=constants.js.map
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 10 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 10 modules
 var public_api = __webpack_require__(0);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/query/query.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/query/query.js
 var query_query = __webpack_require__(29);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/dm/data_model.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/dm/data_model.js
 var data_model = __webpack_require__(38);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/main/query_storage.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/main/query_storage.js
 var query_storage = __webpack_require__(61);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/main/model_loader.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/main/model_loader.js
 var model_loader = __webpack_require__(62);
 
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/eqs/eqs_model_loader.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/eqs/eqs_model_loader.js
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -2236,7 +2237,7 @@ var EqServerModelLoader = /** @class */ (function (_super) {
 }(model_loader["a" /* EqModelLoader */]));
 
 //# sourceMappingURL=eqs_model_loader.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/eqs/eqs_data_fetcher.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/eqs/eqs_data_fetcher.js
 var EqServerDataFetcher = /** @class */ (function () {
     function EqServerDataFetcher(context) {
         this.context = context;
@@ -2274,7 +2275,7 @@ var EqServerDataFetcher = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=eqs_data_fetcher.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/eqs/eqs_query_synchronizer.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/eqs/eqs_query_synchronizer.js
 var EqServerQuerySynchronizer = /** @class */ (function () {
     function EqServerQuerySynchronizer(context) {
         this.context = context;
@@ -2299,7 +2300,7 @@ var EqServerQuerySynchronizer = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=eqs_query_synchronizer.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/eqs/eqs_value_list_resolver.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/eqs/eqs_value_list_resolver.js
 
 var eqs_value_list_resolver_EqServerValueListResolver = /** @class */ (function () {
     function EqServerValueListResolver(context) {
@@ -2329,7 +2330,7 @@ var eqs_value_list_resolver_EqServerValueListResolver = /** @class */ (function
 }());
 
 //# sourceMappingURL=eqs_value_list_resolver.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/eqs/eqs_query_file_loader.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/eqs/eqs_query_file_loader.js
 var EqQueryFileLoader = /** @class */ (function () {
     function EqQueryFileLoader(context) {
         this.context = context;
@@ -2383,10 +2384,10 @@ var EqQueryFileLoader = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=eqs_query_file_loader.js.map
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/data/eq_aggr_container.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/data/eq_aggr_container.js
 var eq_aggr_container = __webpack_require__(63);
 
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/common/eq_services.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/common/eq_services.js
 
 
 
@@ -2547,34 +2548,34 @@ var eq_services_EqServiceProvider = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=eq_services.js.map
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/common/tree.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/common/tree.js
 var tree = __webpack_require__(59);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/data/eq_data_loader.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/data/eq_data_loader.js
 var eq_data_loader = __webpack_require__(64);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/data/google_data_converter.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/data/google_data_converter.js
 var google_data_converter = __webpack_require__(102);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/types/data_kind.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/types/data_kind.js
 var data_kind = __webpack_require__(12);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/types/link_type.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/types/link_type.js
 var link_type = __webpack_require__(16);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/types/cond_tag.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/types/cond_tag.js
 var cond_tag = __webpack_require__(19);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/types/cond_part.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/types/cond_part.js
 var cond_part = __webpack_require__(60);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/types/expr_tag.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/types/expr_tag.js
 var expr_tag = __webpack_require__(8);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/types/eq_editor_tag.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/types/eq_editor_tag.js
 var eq_editor_tag = __webpack_require__(26);
 
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/types/widget_group.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/types/widget_group.js
 /** Represents groups of widgets. Used to identify widgets */
 var WidgetGroup;
 (function (WidgetGroup) {
@@ -2594,19 +2595,19 @@ var WidgetGroup;
     WidgetGroup[WidgetGroup["All"] = 65535] = "All";
 })(WidgetGroup || (WidgetGroup = {}));
 //# sourceMappingURL=widget_group.js.map
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/dm/aggr_function.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/dm/aggr_function.js
 var aggr_function = __webpack_require__(58);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/dm/entity.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/dm/entity.js
 var entity = __webpack_require__(22);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/dm/operator.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/dm/operator.js
 var operator = __webpack_require__(33);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/dm/value_editor.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/dm/value_editor.js
 var value_editor = __webpack_require__(27);
 
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/main/eq_actions.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/main/eq_actions.js
 var EqAction;
 (function (EqAction) {
     EqAction["LoadModel"] = "LoadModel";
@@ -2623,20 +2624,20 @@ var EqAction;
     EqAction["UploadQueryFile"] = "UploadQueryFile";
 })(EqAction || (EqAction = {}));
 //# sourceMappingURL=eq_actions.js.map
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/main/model_storage.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/main/model_storage.js
 var model_storage = __webpack_require__(103);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/query/query_events.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/query/query_events.js
 var query_events = __webpack_require__(14);
 
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/main/action.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/main/action.js
 var EqActionResult;
 (function (EqActionResult) {
     EqActionResult[EqActionResult["Error"] = 0] = "Error";
     EqActionResult[EqActionResult["Success"] = 1] = "Success";
 })(EqActionResult || (EqActionResult = {}));
 //# sourceMappingURL=action.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/eqs/eqs_exporter.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/eqs/eqs_exporter.js
 var EqServerExporter = /** @class */ (function () {
     function EqServerExporter(context) {
         this.context = context;
@@ -2687,7 +2688,7 @@ var EqServerExporter = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=eqs_exporter.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/main/context.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/main/context.js
 var __assign = (undefined && undefined.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -4089,7 +4090,7 @@ var context_EqContext = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=context.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/main/widget.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/main/widget.js
 
 /**
  * Represents a widget - a visual element with "knows" how to render itself.
@@ -4192,19 +4193,19 @@ var widget_Widget = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=widget.js.map
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/query/query_column.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/query/query_column.js
 var query_column = __webpack_require__(28);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/query/condition.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/query/condition.js
 var condition = __webpack_require__(50);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/query/expression.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/query/expression.js
 var expression = __webpack_require__(20);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/utils/format_parser.js
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/utils/format_parser.js
 var format_parser = __webpack_require__(57);
 
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/utils/version_info.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/utils/version_info.js
 var EqVersionInfo = /** @class */ (function () {
     function EqVersionInfo(major, minor, update) {
         this.major = major;
@@ -4218,7 +4219,7 @@ var EqVersionInfo = /** @class */ (function () {
 }());
 var versionInfo = new EqVersionInfo(6, 2, 0);
 //# sourceMappingURL=version_info.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/i18n/text_resources.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/i18n/text_resources.js
 
 function addEasyQueryCoreTexts() {
     public_api["i18n"].updateDefaultTexts({
@@ -4246,7 +4247,7 @@ function addEasyQueryCoreTexts() {
 }
 addEasyQueryCoreTexts();
 //# sourceMappingURL=text_resources.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/public_api.js
+// CONCATENATED MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/public_api.js
 
 
 
@@ -4729,6 +4730,10 @@ var DomSelectElementBuilder = /** @class */ (function (_super) {
         this.element.appendChild(option);
         return this;
     };
+    DomSelectElementBuilder.prototype.value = function (value) {
+        this.element.value = value;
+        return this;
+    };
     return DomSelectElementBuilder;
 }(DomElementBuilder));
 
@@ -8205,13 +8210,13 @@ var ExpressionRenderer = /** @class */ (function (_super) {
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, "a", function() { return /* binding */ query_panel_QueryPanel; });
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 10 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 10 modules
 var public_api = __webpack_require__(0);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/public_api.js + 15 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/public_api.js + 15 modules
 var lib_public_api = __webpack_require__(2);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/public_api.js + 7 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/public_api.js + 7 modules
 var dist_lib_public_api = __webpack_require__(1);
 
 // EXTERNAL MODULE: ./dist/lib/types/qp_editable_part.js
@@ -9619,8 +9624,6 @@ var Query = /** @class */ (function () {
         }
         this.setDefaultName();
         this.description = "";
-        this.modelId = "";
-        this.modelName = "";
         this.model = (model) ? model : new _dm_data_model__WEBPACK_IMPORTED_MODULE_2__[/* DataModel */ "a"]();
         if (data) {
             this.loadFromData(data);
@@ -9634,10 +9637,14 @@ var Query = /** @class */ (function () {
             this.parentQuery = options.parent;
         }
         this.addChangedCallback(function (ev) {
-            if (ev.data && ev.data.part === _query_events__WEBPACK_IMPORTED_MODULE_10__[/* QueryChangePart */ "b"].Columns
-                && ev.data.action !== _query_events__WEBPACK_IMPORTED_MODULE_10__[/* QueryChangeAction */ "a"].Modify
+            if (ev.data
+                && ((ev.data.part & _query_events__WEBPACK_IMPORTED_MODULE_10__[/* QueryChangePart */ "b"].Columns) > 0)
                 && !ev.data.aggregation) {
-                _this.aggrSettings.clear();
+                if (_this._enableAggregation && _this.updateAggregationSettings()) {
+                    _this.fireChangedEvent({
+                        part: _query_events__WEBPACK_IMPORTED_MODULE_10__[/* QueryChangePart */ "b"].Aggregation
+                    });
+                }
             }
         });
     }
@@ -9658,19 +9665,6 @@ var Query = /** @class */ (function () {
                 this.processQueryForAggregation();
                 var aggrCols = this.columns.filter(function (c) { return c.enabled
                     && c.expr.tag == _types_expr_tag__WEBPACK_IMPORTED_MODULE_8__[/* ExprTag */ "a"].AggregateFunction; });
-                // // query contains aggregate columns
-                // if (aggrCols.length) {
-                //     for (const col of aggrCols) {
-                //         const attr = this.model.getAttributeById(col.expr.args[0].value);
-                //         this.changeColumnType(col, ExprTag.EntityAttribute, {
-                //             caption: this.model.getAttributeText(attr, `{attr}`)
-                //         });
-                //     }
-                //     this.fireChangedEvent({
-                //         part: QueryChangePart.Columns,
-                //         wasModified: true
-                //     });
-                // }    
             }
             if (!this._enableAggregation) {
                 this.aggrSettings.clear();
@@ -9679,6 +9673,40 @@ var Query = /** @class */ (function () {
         enumerable: true,
         configurable: true
     });
+    Query.prototype.updateAggregationSettings = function () {
+        var hasChanged = false;
+        var aggrSettings = this.getAggregationSettings();
+        for (var i = aggrSettings.groups.length - 1; i >= 0; i--) {
+            var group = aggrSettings.groups[i];
+            var _loop_1 = function (j) {
+                var colId = group.columns[j];
+                if (!this_1.columns.find(function (col) { return col.id === colId; })) {
+                    group.columns.splice(j, 1);
+                    hasChanged = true;
+                }
+            };
+            var this_1 = this;
+            for (var j = group.columns.length - 1; j >= 0; j--) {
+                _loop_1(j);
+            }
+            if (group.columns.length == 0) {
+                aggrSettings.groups.slice(i, 1);
+            }
+        }
+        var aggregates = aggrSettings.getAggregates();
+        var _loop_2 = function (i) {
+            var aggr = aggregates[i];
+            if (!this_2.columns.find(function (col) { return col.id === aggr.colId; })) {
+                aggregates.splice(i, 1);
+                hasChanged = true;
+            }
+        };
+        var this_2 = this;
+        for (var i = aggregates.length - 1; i >= 0; i--) {
+            _loop_2(i);
+        }
+        return hasChanged;
+    };
     Query.prototype.createSubQuery = function () {
         return new Query(this.model);
     };
@@ -11363,13 +11391,13 @@ var ResultFacet = /** @class */ (function () {
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, "a", function() { return /* binding */ view_View; });
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 10 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 10 modules
 var public_api = __webpack_require__(0);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/public_api.js + 15 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/public_api.js + 15 modules
 var lib_public_api = __webpack_require__(2);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/public_api.js + 7 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/public_api.js + 7 modules
 var dist_lib_public_api = __webpack_require__(1);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/easy_grid_widget.js
@@ -15341,21 +15369,6 @@ var EasyGridWidget = /** @class */ (function (_super) {
         this.grid.refresh();
     };
     EasyGridWidget.prototype.attachQueryObserver = function () {
-        var _this = this;
-        var query = this.getQuery();
-        this.queryEventCallbackId = query.addChangedCallback(function (event) {
-            //if something has changed, and that change is related to columns
-            var edata = event.data;
-            if (!edata || (edata.part != _easyquery_core__WEBPACK_IMPORTED_MODULE_0__["QueryChangePart"].Columns && edata.part != _easyquery_core__WEBPACK_IMPORTED_MODULE_0__["QueryChangePart"].All)) {
-                return;
-            }
-            if (event.data.source == _this) {
-                _this.grid.refresh();
-            }
-            else {
-                _this.refresh();
-            }
-        });
     };
     EasyGridWidget.prototype.destroyCore = function () {
         this.detachQueryObserver();
@@ -25652,6 +25665,12 @@ var AggrFunc;
     AggrFunc["Max"] = "MAX";
     AggrFunc["Count"] = "COUNT";
 })(AggrFunc || (AggrFunc = {}));
+var FormFieldType;
+(function (FormFieldType) {
+    FormFieldType[FormFieldType["ColumnField"] = 0] = "ColumnField";
+    FormFieldType[FormFieldType["RowField"] = 1] = "RowField";
+    FormFieldType[FormFieldType["CellData"] = 2] = "CellData";
+})(FormFieldType || (FormFieldType = {}));
 var DFMT_REGEX = /{0:(.*?)}/g;
 var PivotTableFacet = /** @class */ (function (_super) {
     __extends(PivotTableFacet, _super);
@@ -25740,9 +25759,10 @@ var PivotTableFacet = /** @class */ (function (_super) {
         }
         return csb;
     };
-    PivotTableFacet.prototype.createColumnsSelectBuilder = function (allowedTypes, colName) {
+    PivotTableFacet.prototype.createColumnsSelectBuilder = function (allowedTypes, colName, formFieldType) {
         var dataTable = this.getContextDataTable();
         var csb = Object(_easydata_ui__WEBPACK_IMPORTED_MODULE_0__["domel"])('select');
+        var firstNumericColIndex = null;
         var _loop_2 = function (i) {
             var column = dataTable.columns.get(i);
             var colLabel = column.label;
@@ -25750,6 +25770,9 @@ var PivotTableFacet = /** @class */ (function (_super) {
             var colId = column.id;
             if (allowedTypes && allowedTypes.indexOf(colType) < 0)
                 return "continue";
+            if (firstNumericColIndex === null && _easydata_core__WEBPACK_IMPORTED_MODULE_1__["utils"].isNumericType(colType)) {
+                firstNumericColIndex = i;
+            }
             csb.addChild('option', function (b) {
                 b
                     .attr('value', colId)
@@ -25771,7 +25794,20 @@ var PivotTableFacet = /** @class */ (function (_super) {
                 }
             }
             else {
-                csb.toDOM().value = options[0].value;
+                switch (formFieldType) {
+                    case FormFieldType.ColumnField: {
+                        csb.toDOM().value = options[0].value;
+                        break;
+                    }
+                    case FormFieldType.RowField: {
+                        csb.toDOM().value = options.length > 1 ? options[1].value : options[0].value;
+                        break;
+                    }
+                    case FormFieldType.CellData: {
+                        csb.toDOM().value = firstNumericColIndex === null ? options[0].value : options[firstNumericColIndex].value;
+                        break;
+                    }
+                }
             }
         }
         return csb;
@@ -25816,7 +25852,7 @@ var PivotTableFacet = /** @class */ (function (_super) {
             .addChild('div', function (b) { return b
             .addClass('kfrm-select')
             .attr('name', 'column_field')
-            .addChildElement(_this.createColumnsSelectBuilder(colTypes, settings.colName)
+            .addChildElement(_this.createColumnsSelectBuilder(colTypes, settings.colName, FormFieldType.ColumnField)
             .id('pivotTableColFieldSelector')
             .toDOM()); })
             .addChild('button', function (b) { return b
@@ -25838,7 +25874,7 @@ var PivotTableFacet = /** @class */ (function (_super) {
             .addChild('div', function (b) { return b
             .addClass('kfrm-select')
             .attr('name', 'row_field')
-            .addChildElement(_this.createColumnsSelectBuilder(colTypes, settings.rowName)
+            .addChildElement(_this.createColumnsSelectBuilder(colTypes, settings.rowName, FormFieldType.RowField)
             .id('pivotTableRowFieldSelector')
             .toDOM()); });
         current = getCurrent();
@@ -25858,7 +25894,7 @@ var PivotTableFacet = /** @class */ (function (_super) {
             .addChild('div', function (b) { return b
             .addClass('kfrm-select')
             .attr('name', 'data_column')
-            .addChildElement(_this.createColumnsSelectBuilder(fieldTypes, settings.fieldName)
+            .addChildElement(_this.createColumnsSelectBuilder(fieldTypes, settings.fieldName, FormFieldType.CellData)
             .on('change', function (ev) {
             var colId = ev.target.value;
             _this.validateSelectedField(colId);
@@ -26625,7 +26661,7 @@ var AggrSettingsDialog = /** @class */ (function () {
                 var ds = _this.context.getServices().getDialogService();
                 _this.body = _this.renderBody();
                 var dlg = ds.open({
-                    title: 'Aggregation settings',
+                    title: _easyquery_core__WEBPACK_IMPORTED_MODULE_1__["i18n"].getText('AggrSettings', 'AggrDialogTitle'),
                     body: _this.body,
                     onSubmit: function () {
                         if (_this.query.enableAggregation && !_this.renderer.isValid())
@@ -26677,7 +26713,7 @@ var AggrSettingsDialog = /** @class */ (function () {
             .addChild('div', function (b) { return b
             .addClass("eqjs-as-enableaggr")
             .addChild('label', function (b) { return b
-            .addClass('switch')
+            .addClass('eqjs-ctrl-switch')
             .addChild('input', function (b) {
             b.attr('type', 'checkbox');
             if (_this.query.enableAggregation) {
@@ -26859,7 +26895,7 @@ var AggrSettingsRenderer = /** @class */ (function () {
             .addChild('div', function (b) { return b
             .addClass(_this.cssPrefix + "-counts")
             .addChild('label', function (b) { return b
-            .addClass('switch')
+            .addClass('eqjs-ctrl-switch')
             .addChild('input', function (b) {
             b.attr('type', 'checkbox');
             if (_this.state.recordCount) {
@@ -26875,7 +26911,7 @@ var AggrSettingsRenderer = /** @class */ (function () {
             .addChild('div', function (b) { return b
             .addClass(_this.cssPrefix + "-grandtotals")
             .addChild('label', function (b) { return b
-            .addClass('switch')
+            .addClass('eqjs-ctrl-switch')
             .addChild('input', function (b) {
             b.attr('type', 'checkbox');
             if (_this.state.grandTotals) {
@@ -27163,13 +27199,13 @@ var AggrSettingsRenderer = /** @class */ (function () {
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, "a", function() { return /* binding */ aggrfunc_column_renderer_AggrFuncColumnRendererCP; });
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 10 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 10 modules
 var public_api = __webpack_require__(0);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/public_api.js + 15 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/public_api.js + 15 modules
 var lib_public_api = __webpack_require__(2);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/public_api.js + 7 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/public_api.js + 7 modules
 var dist_lib_public_api = __webpack_require__(1);
 
 // CONCATENATED MODULE: ./dist/lib/utils/display_format_parser.js
@@ -27431,13 +27467,13 @@ var aggrfunc_column_renderer_AggrFuncColumnRendererCP = /** @class */ (function
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, "a", function() { return /* binding */ sorting_bar_SortingBar; });
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 10 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 10 modules
 var public_api = __webpack_require__(0);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/public_api.js + 15 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/public_api.js + 15 modules
 var lib_public_api = __webpack_require__(2);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/public_api.js + 7 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/public_api.js + 7 modules
 var dist_lib_public_api = __webpack_require__(1);
 
 // EXTERNAL MODULE: ./dist/lib/utils/utils.js
@@ -27954,13 +27990,13 @@ var sorting_bar_SortingBar = /** @class */ (function (_super) {
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, "a", function() { return /* binding */ result_facets_panel_ResultFacetsPanel; });
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/public_api.js + 15 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/public_api.js + 15 modules
 var public_api = __webpack_require__(2);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 10 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 10 modules
 var lib_public_api = __webpack_require__(0);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/public_api.js + 7 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/public_api.js + 7 modules
 var dist_lib_public_api = __webpack_require__(1);
 
 // EXTERNAL MODULE: ./dist/lib/types/facet_type.js
@@ -34049,7 +34085,7 @@ __webpack_require__.d(public_api_namespaceObject, "FacetType", function() { retu
 __webpack_require__.d(public_api_namespaceObject, "ExportDialog", function() { return export_dialog["a" /* ExportDialog */]; });
 __webpack_require__.d(public_api_namespaceObject, "AggrSettingsDialog", function() { return aggr_settings_dialog["a" /* AggrSettingsDialog */]; });
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/public_api.js + 15 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/packs/core/dist/lib/public_api.js + 15 modules
 var public_api = __webpack_require__(2);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/entities_panel.js
@@ -34141,7 +34177,7 @@ var html_content_widget_HtmlContentWidget = /** @class */ (function (_super) {
 }(public_api["Widget"]));
 
 //# sourceMappingURL=html_content_widget.js.map
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 10 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 10 modules
 var lib_public_api = __webpack_require__(0);
 
 // CONCATENATED MODULE: ./dist/lib/widgets/eq_result_html_grid.js
@@ -34341,7 +34377,7 @@ var statement_panel = __webpack_require__(85);
 // EXTERNAL MODULE: ./dist/lib/widgets/process_widget.js
 var process_widget = __webpack_require__(86);
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/public_api.js + 7 modules
+// EXTERNAL MODULE: c:/dev/azure-devops-agent/_work/15/s/easydata/easydata.js/packs/ui/dist/lib/public_api.js + 7 modules
 var dist_lib_public_api = __webpack_require__(1);
 
 // EXTERNAL MODULE: ./dist/lib/utils/utils.js
@@ -35226,7 +35262,7 @@ var report_view_ReportView = /** @class */ (function (_super) {
             this.newReportButton.removeEventListener('click', this.newReportButtonClickHandler);
             this.newReportButton = null;
         }
-        if (!this.loadReportButton) {
+        if (this.loadReportButton) {
             this.loadReportButton.removeEventListener('click', this.loadReportButtonClickHandler);
             this.loadReportButton = null;
         }
@@ -35234,7 +35270,7 @@ var report_view_ReportView = /** @class */ (function (_super) {
             this.saveReportButton.addEventListener('click', this.saveReportButtonClickHandler);
             this.saveReportButton = null;
         }
-        if (!this.removeReportButton) {
+        if (this.removeReportButton) {
             this.removeReportButton.removeEventListener('click', this.removeReportButtonClickHandler);
             this.removeReportButton = null;
         }
@@ -35705,6 +35741,7 @@ function addEasyQueryUITexts() {
             UnaggrBtn: 'Remove column aggregation',
             GrandTotalsLabel: 'Show grand totals',
             GroupCountsLabel: 'Show record count for groups',
+            AggrDialogTitle: 'Aggregation/grouping',
             EnableAggrLabel: 'Enable aggregation',
             SelectedError: 'Complete the action with selected column(s)',
             NoGroupsOrAggrError: 'Add at least one group or aggregation',