@easyquery/core 7.2.0-rc04 → 7.2.0-rc05

package/dist/bundles/easyquery.core.js

@@ -1570,6 +1570,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_utils.getIfDefined(dto.nul, this.isNullable);
             this.isEditable = utils_utils.getIfDefined(dto.ied, this.isEditable);
             this.showOnView = utils_utils.getIfDefined(dto.ivis || dto.sov, this.showOnView);
@@ -5594,8 +5595,6 @@ var query_Query = /** @class */ (function () {
         }
         this.setDefaultName();
         this.description = "";
-        this.modelId = "";
-        this.modelName = "";
         this.model = (model) ? model : new data_model_DataModel();
         if (data) {
             this.loadFromData(data);
@@ -5609,10 +5608,14 @@ var query_Query = /** @class */ (function () {
             this.parentQuery = options.parent;
         }
         this.addChangedCallback(function (ev) {
-            if (ev.data && ev.data.part === QueryChangePart.Columns
-                && ev.data.action !== QueryChangeAction.Modify
+            if (ev.data
+                && ((ev.data.part & QueryChangePart.Columns) > 0)
                 && !ev.data.aggregation) {
-                _this.aggrSettings.clear();
+                if (_this._enableAggregation && _this.updateAggregationSettings()) {
+                    _this.fireChangedEvent({
+                        part: QueryChangePart.Aggregation
+                    });
+                }
             }
         });
     }
@@ -5633,19 +5636,6 @@ var query_Query = /** @class */ (function () {
                 this.processQueryForAggregation();
                 var aggrCols = this.columns.filter(function (c) { return c.enabled
                     && c.expr.tag == ExprTag.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();
@@ -5654,6 +5644,40 @@ var query_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);
     };