@easyquery/ui 7.2.0-rc04 → 7.2.0-rc05

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-rc05 (https://korzh.com/easyquery/javascript)
  * Copyright 2022 Korzh.com. All rights reserved.
  * 
  * EasyQuery.JS commercial licenses may be obtained at
@@ -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);
@@ -9619,8 +9620,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 +9633,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 +9661,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 +9669,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);
     };
@@ -15341,21 +15365,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 +25661,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 +25755,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 +25766,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 +25790,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 +25848,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 +25870,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 +25890,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 +26657,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())
@@ -35705,6 +35737,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',