@easyquery/core 7.2.4-rc04 → 7.2.4

package/dist/bundles/easyquery.core.js

@@ -130,7 +130,7 @@ var GoogleDataConverter = /** @class */ (function () {
     };
     GoogleDataConverter.prototype.convertValue = function (value, colIndex) {
         var colType = this.googleDataTypeToDataType(this.getColumnType(colIndex));
-        if ([_easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType.Date */ .g.Date, _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType.DateTime */ .g.DateTime, _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType.Time */ .g.Time].includes(colType)) {
+        if ([_easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType */ .g.Date, _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType */ .g.DateTime, _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType */ .g.Time].includes(colType)) {
             return eval("new ".concat(value));
         }
         return value;
@@ -174,19 +174,19 @@ var GoogleDataConverter = /** @class */ (function () {
     GoogleDataConverter.prototype.googleDataTypeToDataType = function (googleDataType) {
         switch (googleDataType) {
             case 'string':
-                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType.String */ .g.String;
+                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType */ .g.String;
             case 'number':
-                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType.Float */ .g.Float;
+                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType */ .g.Float;
             case 'boolean':
-                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType.Bool */ .g.Bool;
+                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType */ .g.Bool;
             case 'date':
-                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType.Date */ .g.Date;
+                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType */ .g.Date;
             case 'datetime':
-                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType.DateTime */ .g.DateTime;
+                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType */ .g.DateTime;
             case 'timeofday':
-                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType.Time */ .g.Time;
+                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType */ .g.Time;
             default:
-                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType.String */ .g.String;
+                return _easydata_core__WEBPACK_IMPORTED_MODULE_0__/* .DataType */ .g.String;
         }
     };
     return GoogleDataConverter;
@@ -3355,9 +3355,9 @@ var equtils;
      * @param operator
      */
     function parseOperatorFormat(operator) {
-        var format = public_api/* i18n.getText */.ag.getText('Operators', operator.id, 'format');
+        var format = public_api/* i18n */.ag.getText('Operators', operator.id, 'format');
         if (!format) {
-            format = public_api/* i18n.getText */.ag.getText('Operators', operator.id, 'displayFormat');
+            format = public_api/* i18n */.ag.getText('Operators', operator.id, 'displayFormat');
         }
         if (!format) {
             format = operator.displayFormat;
@@ -3375,12 +3375,12 @@ var equtils;
      */
     function convertValue(value, fromDataType, toDataType) {
         switch (toDataType) {
-            case public_api/* DataType.String */.g.String:
+            case public_api/* DataType */.g.String:
                 return value;
-            case (public_api/* DataType.Autoinc */.g.Autoinc, public_api/* DataType.Byte */.g.Byte, public_api/* DataType.Int32 */.g.Int32, public_api/* DataType.Int64 */.g.Int64, public_api/* DataType.Word */.g.Word):
+            case (public_api/* DataType */.g.Autoinc, public_api/* DataType */.g.Byte, public_api/* DataType */.g.Int32, public_api/* DataType */.g.Int64, public_api/* DataType */.g.Word):
                 var resInt = parseInt(value);
                 return isNaN(resInt) ? '' : resInt.toString();
-            case (public_api/* DataType.Currency */.g.Currency, public_api/* DataType.Float */.g.Float):
+            case (public_api/* DataType */.g.Currency, public_api/* DataType */.g.Float):
                 var resFloat = parseFloat(value);
                 return isNaN(resFloat) ? '' : resFloat.toString();
             default:
@@ -3481,14 +3481,14 @@ var AggrFunction = /** @class */ (function () {
         if (this.appliedTypes.length > 0)
             return this.appliedTypes;
         if (this.id === 'SUM' || this.id === 'AVG') {
-            return [public_api/* DataType.Autoinc */.g.Autoinc, public_api/* DataType.Byte */.g.Byte, public_api/* DataType.Currency */.g.Currency, public_api/* DataType.Float */.g.Float, public_api/* DataType.Int32 */.g.Int32,
-                public_api/* DataType.Int64 */.g.Int64, public_api/* DataType.Word */.g.Word];
+            return [public_api/* DataType */.g.Autoinc, public_api/* DataType */.g.Byte, public_api/* DataType */.g.Currency, public_api/* DataType */.g.Float, public_api/* DataType */.g.Int32,
+                public_api/* DataType */.g.Int64, public_api/* DataType */.g.Word];
         }
         else if (this.id === 'MIN' || this.id === 'MAX') {
-            return [public_api/* DataType.Autoinc */.g.Autoinc, public_api/* DataType.BCD */.g.BCD, public_api/* DataType.Byte */.g.Byte, public_api/* DataType.Currency */.g.Currency, public_api/* DataType.Date */.g.Date, public_api/* DataType.DateTime */.g.DateTime, public_api/* DataType.Time */.g.Time,
-                public_api/* DataType.Float */.g.Float, public_api/* DataType.Int32 */.g.Int32, public_api/* DataType.Int64 */.g.Int64, public_api/* DataType.Word */.g.Word];
+            return [public_api/* DataType */.g.Autoinc, public_api/* DataType */.g.BCD, public_api/* DataType */.g.Byte, public_api/* DataType */.g.Currency, public_api/* DataType */.g.Date, public_api/* DataType */.g.DateTime, public_api/* DataType */.g.Time,
+                public_api/* DataType */.g.Float, public_api/* DataType */.g.Int32, public_api/* DataType */.g.Int64, public_api/* DataType */.g.Word];
         }
-        return public_api/* utils.getAllDataTypes */.P6.getAllDataTypes();
+        return public_api/* utils */.P6.getAllDataTypes();
     };
     return AggrFunction;
 }());
@@ -3622,7 +3622,7 @@ var Operand = /** @class */ (function () {
     /** The default constructor. */
     function Operand() {
         this.kind = DataKind.Scalar;
-        this.dataType = public_api/* DataType.Unknown */.g.Unknown;
+        this.dataType = public_api/* DataType */.g.Unknown;
         this.editor = new EqValueEditor();
         this.defValue = "";
     }
@@ -3646,7 +3646,7 @@ var Operand = /** @class */ (function () {
      * @param scr The operand.
      */
     Operand.prototype.copyFrom = function (src) {
-        public_api/* utils.assign */.P6.assign(this, src);
+        public_api/* utils */.P6.assign(this, src);
     };
     return Operand;
 }());
@@ -4073,11 +4073,11 @@ var DataModel = /** @class */ (function (_super) {
             for (var entIdx = 0; entIdx < subEntityCount; entIdx++) {
                 ent = entity.subEntities[entIdx];
                 if (!filterFunc || filterFunc(ent, null)) {
-                    caption = public_api/* i18n.getText */.ag.getText('Entities', ent.name);
+                    caption = public_api/* i18n */.ag.getText('Entities', ent.name);
                     if (!caption) {
                         caption = ent.caption;
                     }
-                    var newEnt = public_api/* utils.assign */.P6.assign(new Entity(), { id: ent.name, text: caption, items: [], isEntity: true });
+                    var newEnt = public_api/* utils */.P6.assign(new Entity(), { id: ent.name, text: caption, items: [], isEntity: true });
                     newEnt.items = this._listByEntityWithFilter(ent, filterFunc);
                     if (newEnt.items.length > 0)
                         result.push(newEnt);
@@ -4090,10 +4090,10 @@ var DataModel = /** @class */ (function (_super) {
             for (var attrIdx = 0; attrIdx < attrCount; attrIdx++) {
                 attr = entity.attributes[attrIdx];
                 if (!filterFunc || filterFunc(entity, attr)) {
-                    caption = public_api/* i18n.getText */.ag.getText('Attributes', attr.id);
+                    caption = public_api/* i18n */.ag.getText('Attributes', attr.id);
                     if (!caption)
                         caption = attr.caption;
-                    var newEnt = public_api/* utils.assign */.P6.assign(new Entity(), { id: attr.id, text: caption, dataType: attr.dataType });
+                    var newEnt = public_api/* utils */.P6.assign(new Entity(), { id: attr.id, text: caption, dataType: attr.dataType });
                     result.push(newEnt);
                 }
             }
@@ -4114,15 +4114,15 @@ var DataModel = /** @class */ (function (_super) {
                     if (opts.addUIC !== false && ent.useInConditions !== false ||
                         opts.addUIR !== false && ent.useInResult !== false ||
                         opts.addUIS !== false && ent.useInSorting !== false) {
-                        caption = public_api/* i18n.getText */.ag.getText('Entities', ent.name) || ent.caption;
-                        var newEnt = public_api/* utils.assign */.P6.assign(new Entity(), {
+                        caption = public_api/* i18n */.ag.getText('Entities', ent.name) || ent.caption;
+                        var newEnt = public_api/* utils */.P6.assign(new Entity(), {
                             id: ent.name,
                             text: caption,
                             items: [],
                             isEntity: true,
                             description: ent.description
                         });
-                        var newOpts = public_api/* utils.assign */.P6.assign({}, opts);
+                        var newOpts = public_api/* utils */.P6.assign({}, opts);
                         newOpts.includeRootData = false;
                         newEnt.items = this._listByEntity(ent, newOpts, filterFunc);
                         if (newEnt.items.length > 0) {
@@ -4141,8 +4141,8 @@ var DataModel = /** @class */ (function (_super) {
                     if (opts.addUIC !== false && attr.useInConditions !== false ||
                         opts.addUIR !== false && attr.useInResult !== false ||
                         opts.addUIS !== false && attr.useInSorting !== false) {
-                        caption = public_api/* i18n.getText */.ag.getText('Attributes', attr.id) || attr.caption;
-                        resultAttributes.push(public_api/* utils.assign */.P6.assign(new EntityAttr(entity), { id: attr.id, text: caption, dataType: attr.dataType, lookupAttr: attr.lookupAttr, description: attr.description }));
+                        caption = public_api/* i18n */.ag.getText('Attributes', attr.id) || attr.caption;
+                        resultAttributes.push(public_api/* utils */.P6.assign(new EntityAttr(entity), { id: attr.id, text: caption, dataType: attr.dataType, lookupAttr: attr.lookupAttr, description: attr.description }));
                     }
                 }
             }
@@ -4171,7 +4171,7 @@ var DataModel = /** @class */ (function (_super) {
             result.sort(sortCheck);
         }
         if (opts.includeRootData) {
-            caption = public_api/* i18n.getText */.ag.getText('Entities', entity.name);
+            caption = public_api/* i18n */.ag.getText('Entities', entity.name);
             if (!caption)
                 caption = entity.caption;
             return { id: entity.name, text: caption, items: result };
@@ -4194,7 +4194,7 @@ var DataModel = /** @class */ (function (_super) {
      * @returns The operator.
      */
     DataModel.prototype.addOrUpdateOperator = function (desc) {
-        var op = public_api/* utils.findItemById */.P6.findItemById(this.operators, desc.id);
+        var op = public_api/* utils */.P6.findItemById(this.operators, desc.id);
         if (!op) {
             op = new Operator();
             op.id = desc.id;
@@ -4225,12 +4225,12 @@ var DataModel = /** @class */ (function (_super) {
      */
     DataModel.prototype.removeOperator = function (id, soft) {
         if (soft === void 0) { soft = false; }
-        var op = public_api/* utils.findItemById */.P6.findItemById(this.operators, id);
+        var op = public_api/* utils */.P6.findItemById(this.operators, id);
         if (op) {
             if (!soft)
-                public_api/* utils.removeArrayItem */.P6.removeArrayItem(this.operators, op);
+                public_api/* utils */.P6.removeArrayItem(this.operators, op);
             this.runThroughEntities(function (attr, opts) {
-                public_api/* utils.removeArrayItem */.P6.removeArrayItem(attr.operators, op.id);
+                public_api/* utils */.P6.removeArrayItem(attr.operators, op.id);
             });
         }
     };
@@ -4241,27 +4241,27 @@ var DataModel = /** @class */ (function (_super) {
      */
     DataModel.prototype.getOperatorIdsByDataType = function (type) {
         switch (type) {
-            case public_api/* DataType.String */.g.String:
-            case public_api/* DataType.Memo */.g.Memo:
+            case public_api/* DataType */.g.String:
+            case public_api/* DataType */.g.Memo:
                 return 'StartsWith,EndsWith,Contains,Equal,InList,NotStartsWith,NotEndsWith,NotContains,NotEqual,NotInList,IsNull,IsNotNull'.split(',');
-            case public_api/* DataType.Guid */.g.Guid:
+            case public_api/* DataType */.g.Guid:
                 return 'Equal,NotEqual'.split(',');
-            case public_api/* DataType.Date */.g.Date:
-            case public_api/* DataType.DateTime */.g.DateTime:
+            case public_api/* DataType */.g.Date:
+            case public_api/* DataType */.g.DateTime:
                 return 'DateWithinToday,DateWithinThisWeek,DateWithinPrevWeek,DateWithinThisMonth,DateWithinPrevMonth,DateWithinThisYear,DateWithinPrevYear,DateBeforePrecise,DateAfterPrecise,DatePeriodPrecise,IsNull,IsNotNull'.split(',');
-            case public_api/* DataType.Time */.g.Time:
+            case public_api/* DataType */.g.Time:
                 return 'TimeBeforePrecise,TimeAfterPrecise,TimePeriodPrecise,IsNull,IsNotNull'.split(',');
-            case public_api/* DataType.Byte */.g.Byte:
-            case public_api/* DataType.Word */.g.Word:
-            case public_api/* DataType.Int32 */.g.Int32:
-            case public_api/* DataType.Int64 */.g.Int64:
-            case public_api/* DataType.Float */.g.Float:
-            case public_api/* DataType.Currency */.g.Currency:
-            case public_api/* DataType.BCD */.g.BCD:
-            case public_api/* DataType.Autoinc */.g.Autoinc:
-            case public_api/* DataType.Unknown */.g.Unknown:
+            case public_api/* DataType */.g.Byte:
+            case public_api/* DataType */.g.Word:
+            case public_api/* DataType */.g.Int32:
+            case public_api/* DataType */.g.Int64:
+            case public_api/* DataType */.g.Float:
+            case public_api/* DataType */.g.Currency:
+            case public_api/* DataType */.g.BCD:
+            case public_api/* DataType */.g.Autoinc:
+            case public_api/* DataType */.g.Unknown:
                 return 'Equal,Between,LessThan,LessOrEqual,GreaterThan,GreaterOrEqual,InList,NotEqual,NotBetween,NotInList,IsNull,IsNotNull'.split(',');
-            case public_api/* DataType.Bool */.g.Bool:
+            case public_api/* DataType */.g.Bool:
                 return 'IsTrue,NotTrue'.split(',');
             default:
                 var result = [];
@@ -4345,7 +4345,7 @@ var DataModel = /** @class */ (function (_super) {
         if (attrId) {
             var attr = this.getAttributeById(attrId);
             if (attr) {
-                if (attr.entity && public_api/* utils.indexOfArrayItem */.P6.indexOfArrayItem(entities, attr.entity) < 0) {
+                if (attr.entity && public_api/* utils */.P6.indexOfArrayItem(entities, attr.entity) < 0) {
                     entities.push(attr.entity);
                 }
             }
@@ -4531,12 +4531,12 @@ var DataModel = /** @class */ (function (_super) {
      * @returns The caption.
      */
     DataModel.prototype.getAggrFunctionCaption = function (funcId) {
-        var funcTexts = public_api/* i18n.getText */.ag.getText('AggregateFunctions', funcId);
-        var funcCaption = funcTexts ? funcTexts.caption : public_api/* i18n.getText */.ag.getText('Aggr' + funcId.replace(' ', '') + '_Caption');
+        var funcTexts = public_api/* i18n */.ag.getText('AggregateFunctions', funcId);
+        var funcCaption = funcTexts ? funcTexts.caption : public_api/* i18n */.ag.getText('Aggr' + funcId.replace(' ', '') + '_Caption');
         if (funcCaption) {
             return funcCaption;
         }
-        var func = public_api/* utils.findItemById */.P6.findItemById(this.aggrFunctions, funcId);
+        var func = public_api/* utils */.P6.findItemById(this.aggrFunctions, funcId);
         if (!func || !func.caption)
             return funcId;
         return func.caption;
@@ -4547,12 +4547,12 @@ var DataModel = /** @class */ (function (_super) {
      * @returns The caption.
      */
     DataModel.prototype.getAggrFunctionFormat = function (funcId) {
-        var funcTexts = public_api/* i18n.getText */.ag.getText('AggregateFunctions', funcId);
-        var funcFormat = funcTexts ? funcTexts.displayFormat : public_api/* i18n.getText */.ag.getText('Aggr' + funcId.replace(' ', '') + '_Format');
+        var funcTexts = public_api/* i18n */.ag.getText('AggregateFunctions', funcId);
+        var funcFormat = funcTexts ? funcTexts.displayFormat : public_api/* i18n */.ag.getText('Aggr' + funcId.replace(' ', '') + '_Format');
         if (funcFormat) {
             return funcFormat;
         }
-        var func = public_api/* utils.findItemById */.P6.findItemById(this.aggrFunctions, funcId);
+        var func = public_api/* utils */.P6.findItemById(this.aggrFunctions, funcId);
         if (!func || !func.displayFormat)
             return '';
         return func.displayFormat;
@@ -4592,12 +4592,12 @@ var DataModel = /** @class */ (function (_super) {
             defOperand.editor = null;
         }
         var result = defOperand;
-        if (result.dataType === public_api/* DataType.Unknown */.g.Unknown && attr) {
+        if (result.dataType === public_api/* DataType */.g.Unknown && attr) {
             result.dataType = attr.dataType;
         }
         if (operator && (index >= 0)) {
             if (operator.operands && operator.operands[index - 1]) {
-                result = public_api/* utils.assign */.P6.assign(result, operator.operands[index - 1]);
+                result = public_api/* utils */.P6.assign(result, operator.operands[index - 1]);
             }
         }
         ;
@@ -4611,8 +4611,8 @@ var DataModel = /** @class */ (function (_super) {
             else if (attr && attr.defaultEditor) {
                 result.editor = attr.defaultEditor;
             }
-            else if (result.dataType === public_api/* DataType.Date */.g.Date || result.dataType === public_api/* DataType.DateTime */.g.DateTime
-                || result.dataType === public_api/* DataType.Time */.g.Time) {
+            else if (result.dataType === public_api/* DataType */.g.Date || result.dataType === public_api/* DataType */.g.DateTime
+                || result.dataType === public_api/* DataType */.g.Time) {
                 result.editor.tag = EqEditorTag.DateTime;
             }
             else {
@@ -4637,7 +4637,7 @@ var DataModel = /** @class */ (function (_super) {
         var match = macroExpr.match(/\${{?(.*?)}?}/);
         if (match != null) {
             var macroId = match[1];
-            if (public_api/* utils.indexOfArrayItem */.P6.indexOfArrayItem(this.dateMacros, macroId) >= 0) {
+            if (public_api/* utils */.P6.indexOfArrayItem(this.dateMacros, macroId) >= 0) {
                 if (macroProcessor) {
                     macroProcessor(macroId);
                 }
@@ -4655,7 +4655,7 @@ var DataModel = /** @class */ (function (_super) {
         var match = macroExpr.match(/\${{?(.*?)}?}/);
         if (match != null) {
             var macroId = match[1];
-            if (public_api/* utils.indexOfArrayItem */.P6.indexOfArrayItem(this.timeMacros, macroId) >= 0) {
+            if (public_api/* utils */.P6.indexOfArrayItem(this.timeMacros, macroId) >= 0) {
                 if (macroProcessor) {
                     macroProcessor(macroId);
                 }
@@ -4801,7 +4801,7 @@ var Expression = /** @class */ (function () {
         /** The data kind. */
         this.kind = DataKind.Scalar;
         /** The data type. */
-        this.dataType = public_api/* DataType.Unknown */.g.Unknown;
+        this.dataType = public_api/* DataType */.g.Unknown;
         /** The value. */
         this._value = ''; //DO NOT forget remove any
         /**
@@ -5037,7 +5037,7 @@ var QueryColumn = /** @class */ (function () {
         this.params = [];
         this._isHidden = false;
         this.query = query;
-        this._id = public_api/* utils.generateId */.P6.generateId('col');
+        this._id = public_api/* utils */.P6.generateId('col');
         this.caption = '';
         this._sorting = SortDirection.None;
         this._sortIndex = -1;
@@ -5122,11 +5122,11 @@ var QueryColumn = /** @class */ (function () {
         this._isHidden = value;
     };
     QueryColumn.prototype.getDataType = function () {
-        if (this.expr.dataType === public_api/* DataType.Unknown */.g.Unknown) {
+        if (this.expr.dataType === public_api/* DataType */.g.Unknown) {
             var attrId = null;
             if (this.expr.func) {
                 if (this.expr.func == "COUNT" || this.expr.func == "CNTDST")
-                    return public_api/* DataType.Int64 */.g.Int64;
+                    return public_api/* DataType */.g.Int64;
                 attrId = this.expr.args[0].value;
             }
             else {
@@ -5264,7 +5264,7 @@ var Condition = /** @class */ (function () {
          */
         this.linkType = LinkType.All; //only for predicates
         this.parent = null;
-        this._id = public_api/* utils.generateId */.P6.generateId('cond');
+        this._id = public_api/* utils */.P6.generateId('cond');
         this.justAdded = false;
         this.tag = tag || CondTag.Unknown;
         this.enabled = true;
@@ -5465,12 +5465,12 @@ var Condition = /** @class */ (function () {
             while (i < operator.paramCount) {
                 var oldOperand = model.getOperand(attr, oldOperator, i);
                 var operand = model.getOperand(attr, operator, i);
-                if (operand.dataType == public_api/* DataType.Unknown */.g.Unknown) {
+                if (operand.dataType == public_api/* DataType */.g.Unknown) {
                     operand.dataType = attr.dataType;
                 }
-                var editor = operand.editor && operand.editor.tag !== public_api/* EditorTag.Unknown */.mb.Unknown
+                var editor = operand.editor && operand.editor.tag !== public_api/* EditorTag */.mb.Unknown
                     ? operand.editor
-                    : (attr.defaultEditor && attr.defaultEditor.tag !== public_api/* EditorTag.Unknown */.mb.Unknown
+                    : (attr.defaultEditor && attr.defaultEditor.tag !== public_api/* EditorTag */.mb.Unknown
                         ? attr.defaultEditor
                         : new EqValueEditor());
                 if (i >= exprCount) {
@@ -5497,7 +5497,7 @@ var Condition = /** @class */ (function () {
             this.expressions.splice(1, this.expressions.length - 1);
             for (var i = 1; i < operator.paramCount; i++) {
                 var operand = model.getOperand(attr, operator, i);
-                if (operand.dataType == public_api/* DataType.Unknown */.g.Unknown) {
+                if (operand.dataType == public_api/* DataType */.g.Unknown) {
                     operand.dataType = attr.dataType;
                 }
                 var valExpr = this.createValueExpr(operand);
@@ -5507,7 +5507,7 @@ var Condition = /** @class */ (function () {
     };
     Condition.prototype.areCompitableEditors = function (oldEditor, newEditor) {
         if (newEditor.tag == EqEditorTag.CustomList || newEditor.tag == EqEditorTag.List
-            || newEditor.tag == EqEditorTag.SqlList || newEditor.tag == public_api/* EditorTag.Unknown */.mb.Unknown) {
+            || newEditor.tag == EqEditorTag.SqlList || newEditor.tag == public_api/* EditorTag */.mb.Unknown) {
             return false;
         }
         return true;
@@ -5792,10 +5792,10 @@ var Query = /** @class */ (function () {
                 // query does not has any aggr columns
                 var colToAggr = _this.getColumns()
                     .filter(function (c) { return c.enabled && c.expr.tag == ExprTag.EntityAttribute
-                    && _this.model.getAttributeById(c.expr.value).dataType === public_api/* DataType.Currency */.g.Currency; })[0];
+                    && _this.model.getAttributeById(c.expr.value).dataType === public_api/* DataType */.g.Currency; })[0];
                 var colToGroup = _this.getColumns()
                     .filter(function (c) { return c.enabled && c.expr.tag == ExprTag.EntityAttribute
-                    && _this.model.getAttributeById(c.expr.value).dataType === public_api/* DataType.String */.g.String; })[0];
+                    && _this.model.getAttributeById(c.expr.value).dataType === public_api/* DataType */.g.String; })[0];
                 if ((!colToAggr && !settings.hasAggregates()) || !colToGroup)
                     return;
                 settings.addGrandTotals()
@@ -5898,7 +5898,7 @@ var Query = /** @class */ (function () {
             && col.expr.tag === ExprTag.AggregateFunction; }).length > 0;
     };
     Query.prototype.setDefaultName = function () {
-        this.setName(public_api/* i18n.getText */.ag.getText('NewQueryName'));
+        this.setName(public_api/* i18n */.ag.getText('NewQueryName'));
         return this.getName();
     };
     /**
@@ -5983,7 +5983,7 @@ var Query = /** @class */ (function () {
                 if (expr.tag !== ExprTag.Constant)
                     continue;
                 //validate number exprs
-                if (public_api/* utils.isNumericType */.P6.isNumericType(expr.dataType)) {
+                if (public_api/* utils */.P6.isNumericType(expr.dataType)) {
                     if (!expr.value)
                         continue;
                     var values = [];
@@ -5999,7 +5999,7 @@ var Query = /** @class */ (function () {
                         if (isNaN(parsedVal)) {
                             throw new InvalidQueryError("Expression constant is NaN in condition:" + curCond.id);
                         }
-                        if (public_api/* utils.isIntType */.P6.isIntType(expr.dataType) && parsedVal != parseInt(value, 10)) {
+                        if (public_api/* utils */.P6.isIntType(expr.dataType) && parsedVal != parseInt(value, 10)) {
                             throw new InvalidQueryError("Expression constant is wrong interger in condition: " + curCond.id);
                         }
                     }
@@ -6040,7 +6040,7 @@ var Query = /** @class */ (function () {
      */
     Query.prototype.loadFromData = function (data, options) {
         var _this = this;
-        options = public_api/* utils.assign */.P6.assign({
+        options = public_api/* utils */.P6.assign({
             changeStatus: true,
             validate: true
         }, options || {});
@@ -6231,7 +6231,7 @@ var Query = /** @class */ (function () {
             }
         }
         obj.timezoneOffset = this.timezoneOffset;
-        obj.locale = public_api/* i18n.getCurrentLocale */.ag.getCurrentLocale();
+        obj.locale = public_api/* i18n */.ag.getCurrentLocale();
         return obj;
     };
     /**
@@ -6314,7 +6314,7 @@ var Query = /** @class */ (function () {
      * @param id New Query ID.
      */
     Query.prototype.regenerateId = function () {
-        this.id = public_api/* utils.generateId */.P6.generateId("quer");
+        this.id = public_api/* utils */.P6.generateId("quer");
     };
     /**
      * Gets name of the query.
@@ -6410,9 +6410,8 @@ var Query = /** @class */ (function () {
             this.addColumnToSorted(col);
             colIdx = this.sortedColumns.length - 1;
         }
-        public_api/* utils.moveArrayItem */.P6.moveArrayItem(this.sortedColumns, colIdx, index);
+        public_api/* utils */.P6.moveArrayItem(this.sortedColumns, colIdx, index);
         this.fixupSortingIndices();
-        this.fireColumnsChangedEvent(QueryChangeAction.All);
     };
     Query.prototype.getColumnSorting = function (col) {
         var idx = this.getColumnSortIndex(col);
@@ -6428,7 +6427,7 @@ var Query = /** @class */ (function () {
         col._sorting = direction;
         if (idx >= 0) {
             if (direction == SortDirection.None) {
-                public_api/* utils.removeArrayItem */.P6.removeArrayItem(this.sortedColumns, col);
+                public_api/* utils */.P6.removeArrayItem(this.sortedColumns, col);
                 this.fixupSortingIndices();
             }
         }
@@ -6439,7 +6438,6 @@ var Query = /** @class */ (function () {
             }
         }
         this.adjustColumnsSorting();
-        this.fireColumnsChangedEvent(QueryChangeAction.Modify, col, col.isJustSorted());
     };
     Query.prototype.fixupSortingIndices = function () {
         this.sortedColumns.forEach(function (col, index) {
@@ -6459,7 +6457,7 @@ var Query = /** @class */ (function () {
             if (col.sorting != SortDirection.None) {
                 var colIdx = _this.getColumnSortIndex(col);
                 if (colIdx >= 0) {
-                    public_api/* utils.moveArrayItem */.P6.moveArrayItem(_this.sortedColumns, colIdx, idx);
+                    public_api/* utils */.P6.moveArrayItem(_this.sortedColumns, colIdx, idx);
                     idx++;
                 }
             }
@@ -6471,7 +6469,7 @@ var Query = /** @class */ (function () {
         return new QueryColumn(this, justsorted);
     };
     Query.prototype.getColumnById = function (id) {
-        return public_api/* utils.findItemById */.P6.findItemById(this.columns, id);
+        return public_api/* utils */.P6.findItemById(this.columns, id);
     };
     /**
      * Adds a new column with specified parameters
@@ -6488,10 +6486,8 @@ var Query = /** @class */ (function () {
      *     sortIndex: SortDirection.Ascending
      * }});
      */
-    Query.prototype.addColumn = function (descriptor, author) {
-        // let columns = (descriptor.justsorted) 
-        //     ? this.justsorted 
-        //     : this.columns;
+    Query.prototype.addColumn = function (descriptor, silent) {
+        if (silent === void 0) { silent = false; }
         var newColumn;
         if (descriptor.column) {
             newColumn = descriptor.column;
@@ -6508,10 +6504,10 @@ var Query = /** @class */ (function () {
                     throw new Error("Incorrect attribute id (".concat(descriptor.attributeId, "): addColumn"));
                 }
             }
-            else {
-                throw new Error('Not enought data for addColumn operation. Need attribute or attributeId');
+            else if (typeof descriptor.constValue === 'undefined' && !descriptor.customSql) {
+                throw new Error('Not enought data for addColumn operation. One of the following options must be defined: attribute, attributeId, constValue or customSlq');
             }
-            if (!attr.useInResult) {
+            if (attr && !attr.useInResult) {
                 if (attr.lookupAttr) {
                     attr = this.model.getAttributeById(attr.lookupAttr);
                 }
@@ -6519,22 +6515,29 @@ var Query = /** @class */ (function () {
                     throw new Error("Can't use this attribute for a column");
                 }
             }
-            if (descriptor.aggrFuncId && descriptor.cusomtSql) {
+            if (descriptor.aggrFuncId && descriptor.customSql) {
                 console.warn("Column cannot be created using aggrFuncId and customSql at the same time. " +
                     "cusomSql will be used.");
             }
-            if (descriptor.cusomtSql) {
+            if (typeof descriptor.constValue !== 'undefined') {
+                newColumn.expr.tag = ExprTag.Constant;
+                newColumn.expr.setValue(descriptor.constValue);
+                newColumn.expr.kind = DataKind.Scalar;
+                newColumn.expr.dataType = descriptor.constType || public_api/* DataType */.g.String;
+            }
+            else if (descriptor.customSql) {
                 newColumn.caption = 'Custom SQL Column';
                 newColumn.expr.tag = ExprTag.CustomSql;
-                newColumn.expr.baseAttrId = attr.id;
-                newColumn.expr.sql = descriptor.cusomtSql;
+                newColumn.expr.sql = descriptor.customSql;
                 newColumn.expr.kind = DataKind.Query;
-                newColumn.expr.dataType = public_api/* DataType.Unknown */.g.Unknown;
+                newColumn.expr.dataType = public_api/* DataType */.g.Unknown;
+                newColumn.expr.baseAttrId = descriptor.attributeId;
+                if (!this.context.options.allowCustomExpressions) {
+                    newColumn.enabled = false;
+                }
             }
             else if (descriptor.aggrFuncId) {
                 var funcId = descriptor.aggrFuncId;
-                newColumn.caption = attr.caption + ' '
-                    + this.model.getAggrFunctionCaption(descriptor.aggrFuncId);
                 newColumn.expr.tag = ExprTag.AggregateFunction;
                 newColumn.expr.func = descriptor.aggrFuncId;
                 newColumn.expr.kind = DataKind.Scalar;
@@ -6543,20 +6546,22 @@ var Query = /** @class */ (function () {
                 var arg = new Expression(newColumn);
                 arg.setValue(attr.id, true);
                 arg.tag = ExprTag.EntityAttribute;
+                arg.kind = DataKind.Attribute;
                 arg.dataType = attr.dataType;
                 newColumn.expr.args.push(arg);
             }
             else {
-                newColumn.caption = attr.caption;
                 newColumn.expr.setValue(attr.id, true);
                 newColumn.expr.tag = ExprTag.EntityAttribute;
+                newColumn.expr.kind = DataKind.Attribute;
                 newColumn.expr.dataType = attr.dataType;
+                newColumn.params.concat(attr.params);
             }
-            newColumn.caption = descriptor.caption || newColumn.caption;
+            newColumn.caption = descriptor.caption || this.context.getDefaultColumnCaption(newColumn);
             newColumn._sorting = descriptor.sorting || SortDirection.None;
             newColumn._sortIndex = descriptor.sortIndex || -1;
-            newColumn.enabled = public_api/* utils.getIfDefined */.P6.getIfDefined(descriptor.enabled, true);
-            newColumn.setReadOnly(public_api/* utils.getIfDefined */.P6.getIfDefined(descriptor.readonly, false));
+            newColumn.enabled = public_api/* utils */.P6.getIfDefined(descriptor.enabled, true);
+            newColumn.setReadOnly(public_api/* utils */.P6.getIfDefined(descriptor.readonly, false));
         }
         var justsorted = descriptor.justsorted || (descriptor.column && descriptor.column.isJustSorted());
         if (!justsorted) {
@@ -6568,7 +6573,9 @@ var Query = /** @class */ (function () {
             }
         }
         this.setColumnSorting(newColumn, newColumn._sorting);
-        this.fireColumnsChangedEvent(QueryChangeAction.Add, newColumn, justsorted);
+        if (!silent) {
+            this.fireColumnsChangedEvent(QueryChangeAction.Add, newColumn, justsorted);
+        }
         return newColumn;
     };
     /**
@@ -6622,9 +6629,6 @@ var Query = /** @class */ (function () {
         if (column.isJustSorted())
             return;
         args = args || {};
-        column.caption = (typeof args.caption !== 'undefined')
-            ? args.caption
-            : '';
         if (tag === ExprTag.AggregateFunction) {
             if (!args.funcId)
                 throw Error('"funcId" argument is not defined');
@@ -6652,7 +6656,7 @@ var Query = /** @class */ (function () {
             }
             var customSqlExpr = new Expression(column);
             customSqlExpr.tag = ExprTag.CustomSql;
-            customSqlExpr.dataType = public_api/* DataType.String */.g.String; //the default data type
+            customSqlExpr.dataType = public_api/* DataType */.g.String; //the default data type
             customSqlExpr.sql = sqlText;
             customSqlExpr.baseAttrId = attrId;
             column.expr = customSqlExpr;
@@ -6662,39 +6666,37 @@ var Query = /** @class */ (function () {
                 || column.expr.tag === ExprTag.ParentEntityAttribute) {
                 return;
             }
-            var exprId = (column.expr.tag === ExprTag.CustomSql)
-                ? column.expr.baseAttrId
-                : column.expr.args[0].value;
-            var attr = this.model.getAttributeById(exprId);
+            var attrId = (column.expr.tag == ExprTag.AggregateFunction)
+                ? column.expr.args[0].value
+                : column.expr.baseAttrId;
+            var attr = attrId
+                ? this.model.getAttributeById(attrId)
+                : this.model.getFirstUICAttr();
             var expr = new Expression(column);
             expr.tag = ExprTag.EntityAttribute;
-            expr.dataType = attr != null ? attr.dataType : public_api/* DataType.Unknown */.g.Unknown;
-            expr.setValue(exprId, true);
+            expr.dataType = attr.dataType;
+            expr.setValue(attr.id, true);
             column.expr = expr;
         }
+        column.caption = this.context.getDefaultColumnCaption(column);
     };
     /**
      * Moves the column with specified index to another position.
      * @param index1 The index of the column that should be moved.
      * @param index2 The index of the position the column should be moved to
-     * @param author The author
      */
     Query.prototype.moveColumn = function (index1, index2) {
         var columns = this.getColumns();
-        public_api/* utils.moveArrayItem */.P6.moveArrayItem(columns, index1, index2);
+        public_api/* utils */.P6.moveArrayItem(columns, index1, index2);
         this.adjustColumnsSorting();
     };
     /**
      * Removes the column.
      * @param column The column to be removed.
-     * @param author The author
      */
-    Query.prototype.removeColumn = function (column, author) {
-        // const columns = (column.isJustSorted()) 
-        //     ? this.getJustSortedColumns()
-        //     : this.getColumns();
-        public_api/* utils.removeArrayItem */.P6.removeArrayItem(this.columns, column);
-        public_api/* utils.removeArrayItem */.P6.removeArrayItem(this.sortedColumns, column);
+    Query.prototype.removeColumn = function (column) {
+        public_api/* utils */.P6.removeArrayItem(this.columns, column);
+        public_api/* utils */.P6.removeArrayItem(this.sortedColumns, column);
     };
     /**
      * Adds a condition group - a group of simple conditions (predicates) linked by AND or OR
@@ -6742,8 +6744,8 @@ var Query = /** @class */ (function () {
         }
         var cond = this.createSimpleConditionObject(descriptor.attribute, descriptor.operator, descriptor.value);
         parent.addCondition(cond);
-        cond.enabled = public_api/* utils.getIfDefined */.P6.getIfDefined(descriptor.enabled, true);
-        cond.setReadOnly(public_api/* utils.getIfDefined */.P6.getIfDefined(descriptor.readonly, false));
+        cond.enabled = public_api/* utils */.P6.getIfDefined(descriptor.enabled, true);
+        cond.setReadOnly(public_api/* utils */.P6.getIfDefined(descriptor.readonly, false));
         return cond;
     };
     Query.prototype.addSimpleExtraCondition = function (descriptor) {
@@ -6765,10 +6767,10 @@ var Query = /** @class */ (function () {
         cond.expressions.push(attrExpr);
         var model = this.getModel();
         var valCount = operator.paramCount;
-        var values = public_api/* utils.fillArray */.P6.fillArray(new Array(valCount - 1), null);
+        var values = public_api/* utils */.P6.fillArray(new Array(valCount - 1), null);
         if (inputValues !== null && typeof inputValues !== "undefined") {
             if (Array.isArray(inputValues)) {
-                public_api/* utils.copyArrayTo */.P6.copyArrayTo(inputValues, values);
+                public_api/* utils */.P6.copyArrayTo(inputValues, values);
             }
             else if (valCount > 0) {
                 values[0] = inputValues;
@@ -6930,7 +6932,7 @@ var Query = /** @class */ (function () {
         if (!model)
             return '';
         var getConditionGroupText = function (group) {
-            var result = '', conjKey = "Conj" + equtils.linkTypeToStr(group.linkType), conjText = public_api/* i18n.getText */.ag.getText(conjKey), condText, i;
+            var result = '', conjKey = "Conj" + equtils.linkTypeToStr(group.linkType), conjText = public_api/* i18n */.ag.getText(conjKey), condText, i;
             for (i = 0; i < group.getConditions().length; i++) {
                 condText = "";
                 var cond = group.getConditions()[i];
@@ -6961,7 +6963,7 @@ var Query = /** @class */ (function () {
                                     txt = expr.getText();
                                     if (_this.model.isDateMacro(txt) || _this.model.isTimeMacro(txt)) {
                                         var macroText = txt.substring(3, txt.length - 2);
-                                        var res = public_api/* i18n.getText */.ag.getText(macroText);
+                                        var res = public_api/* i18n */.ag.getText(macroText);
                                         txt = res || txt;
                                     }
                                 }
@@ -7001,23 +7003,23 @@ var Query = /** @class */ (function () {
             else if (expr.kind == DataKind.List) {
                 return "[".concat(expr.getText(), "]");
             }
-            else if (expr.dataType == public_api/* DataType.String */.g.String
-                || expr.dataType == public_api/* DataType.Memo */.g.Memo
-                || expr.dataType == public_api/* DataType.FixedChar */.g.FixedChar) {
+            else if (expr.dataType == public_api/* DataType */.g.String
+                || expr.dataType == public_api/* DataType */.g.Memo
+                || expr.dataType == public_api/* DataType */.g.FixedChar) {
                 return "&quot;".concat(expr.getText(), "&quot;");
             }
             else {
                 var txt = expr.getText();
                 if (_this.model.isDateMacro(txt) || _this.model.isTimeMacro(txt)) {
                     var macroText = txt.substring(3, txt.length - 2);
-                    var res = public_api/* i18n.getText */.ag.getText(macroText);
+                    var res = public_api/* i18n */.ag.getText(macroText);
                     txt = res || txt;
                 }
                 return txt;
             }
         };
         var getConditionGroupText = function (group) {
-            var result = '', conjKey = "Conj" + equtils.linkTypeToStr(group.linkType), conjText = "<span class=\"eqjs-query-text-conj\">".concat(public_api/* i18n.getText */.ag.getText(conjKey), "</span>"), condText, i;
+            var result = '', conjKey = "Conj" + equtils.linkTypeToStr(group.linkType), conjText = "<span class=\"eqjs-query-text-conj\">".concat(public_api/* i18n */.ag.getText(conjKey), "</span>"), condText, i;
             for (i = 0; i < group.getConditions().length; i++) {
                 condText = "";
                 var cond = group.getConditions()[i];
@@ -7164,7 +7166,7 @@ var BrowserQueryStorage = /** @class */ (function () {
         if (itemsString) {
             queryList = JSON.parse(itemsString);
         }
-        var item = public_api/* utils.findItemById */.P6.findItemById(queryList, query.getId());
+        var item = public_api/* utils */.P6.findItemById(queryList, query.getId());
         if (!item) {
             item = { id: query.getId(), name: query.getName(), text: query.getDescription() };
             queryList.push(item);
@@ -7348,7 +7350,7 @@ var EqServerValueListResolver = /** @class */ (function () {
     }
     EqServerValueListResolver.prototype.loadValueList = function (options) {
         var modelId = options.modelId || this.context.getModel().getId();
-        var requestData = public_api/* utils.assign */.P6.assign({ modelId: modelId }, options.params);
+        var requestData = public_api/* utils */.P6.assign({ modelId: modelId }, options.params);
         var editorId = requestData.editorId;
         var http = this.context.getServices().getHttpClient();
         var url = this.context.resolveEndpoint('GetValueList', { modelId: modelId, listId: editorId });
@@ -7793,7 +7795,7 @@ var InMemoryModelStorage = /** @class */ (function () {
     function InMemoryModelStorage(models) {
         this.models = [];
         if (models) {
-            public_api/* utils.assign */.P6.assign(this.models, [], models);
+            public_api/* utils */.P6.assign(this.models, [], models);
         }
     }
     InMemoryModelStorage.prototype.getModels = function () {
@@ -7806,13 +7808,6 @@ var InMemoryModelStorage = /** @class */ (function () {
 }());
 
 
-;// CONCATENATED MODULE: ./src/main/action.ts
-var EqActionResult;
-(function (EqActionResult) {
-    EqActionResult[EqActionResult["Error"] = 0] = "Error";
-    EqActionResult[EqActionResult["Success"] = 1] = "Success";
-})(EqActionResult || (EqActionResult = {}));
-
 ;// CONCATENATED MODULE: ./src/eqs/eqs_exporter.ts
 
 var EqServerExporter = /** @class */ (function () {
@@ -7874,6 +7869,13 @@ var EqServerExporter = /** @class */ (function () {
 }());
 
 
+;// CONCATENATED MODULE: ./src/main/action.ts
+var EqActionResult;
+(function (EqActionResult) {
+    EqActionResult[EqActionResult["Error"] = 0] = "Error";
+    EqActionResult[EqActionResult["Success"] = 1] = "Success";
+})(EqActionResult || (EqActionResult = {}));
+
 ;// CONCATENATED MODULE: ./src/main/context.ts
 var context_assign = (undefined && undefined.__assign) || function () {
     context_assign = Object.assign || function(t) {
@@ -7911,7 +7913,9 @@ var EqContext = /** @class */ (function () {
     function EqContext() {
         var _this = this;
         this.options = {
-            syncSortOrderWithColumnsOrder: true
+            syncSortOrderWithColumnsOrder: true,
+            attributeFormat: '{entity} {attr}',
+            columnTitleFormat: null //means it will be the same as attributeFormat
         };
         this.servicesInitialized = false;
         this.internalListCache = {};
@@ -7930,7 +7934,7 @@ var EqContext = /** @class */ (function () {
             '_DSDE': function (params, onResult) {
                 var data = _this.getModel().getAllDateMacros()
                     .map(function (macroId) {
-                    return { id: '${{' + macroId + '}}', text: public_api/* i18n.getText */.ag.getText(macroId) };
+                    return { id: '${{' + macroId + '}}', text: public_api/* i18n */.ag.getText(macroId) };
                 });
                 onResult(data);
                 return true;
@@ -7938,7 +7942,7 @@ var EqContext = /** @class */ (function () {
             '_DSTE': function (params, onResult) {
                 var data = _this.getModel().getAllTimeMacros()
                     .map(function (macroId) {
-                    return { id: '${{' + macroId + '}}', text: public_api/* i18n.getText */.ag.getText(macroId) };
+                    return { id: '${{' + macroId + '}}', text: public_api/* i18n */.ag.getText(macroId) };
                 });
                 onResult(data);
                 return true;
@@ -7948,7 +7952,7 @@ var EqContext = /** @class */ (function () {
             if (options == null || !options.listName)
                 return;
             var query = _this.getQuery();
-            var params = public_api/* utils.assign */.P6.assign({ listName: options.listName }, options.editorParams);
+            var params = public_api/* utils */.P6.assign({ listName: options.listName }, options.editorParams);
             var reqParams = {};
             var attrPattern = /@{{(.+?)}}/;
             for (var prop in params) {
@@ -8120,10 +8124,10 @@ var EqContext = /** @class */ (function () {
             this.setExternalListCache(options.listCache);
         }
         if (options.locale) {
-            public_api/* i18n.setCurrentLocale */.ag.setCurrentLocale(options.locale);
+            public_api/* i18n */.ag.setCurrentLocale(options.locale);
         }
         if (options.localeSettings) {
-            public_api/* i18n.updateLocaleSettings */.ag.updateLocaleSettings(options.localeSettings);
+            public_api/* i18n */.ag.updateLocaleSettings(options.localeSettings);
         }
         if (options.endpoint) {
             this.baseEndpoint = options.endpoint;
@@ -8228,7 +8232,7 @@ var EqContext = /** @class */ (function () {
         }
     };
     EqContext.prototype.setOptions = function (options) {
-        public_api/* utils.assignDeep */.P6.assignDeep(this.options, options);
+        public_api/* utils */.P6.assignDeep(this.options, options);
     };
     Object.defineProperty(EqContext.prototype, "backendInfo", {
         get: function () {
@@ -8525,7 +8529,7 @@ var EqContext = /** @class */ (function () {
      * We expected an object with the struture of LocaleInfo interface here.
      */
     EqContext.prototype.addLocale = function (locale, localeInfo) {
-        public_api/* i18n.addLocale */.ag.addLocale(locale, localeInfo);
+        public_api/* i18n */.ag.addLocale(locale, localeInfo);
     };
     EqContext.prototype.addEventListener = function (eventType, handler) {
         var _this = this;
@@ -9287,7 +9291,7 @@ var EqContext = /** @class */ (function () {
                     action: EqAction.ExportResult,
                     text: 'Exporting result for query: ' + queryId_1
                 }, WidgetGroup.Result);
-                var localeSettings = public_api/* i18n.getLocaleSettings */.ag.getLocaleSettings();
+                var localeSettings = public_api/* i18n */.ag.getLocaleSettings();
                 options.settings = localeSettings;
                 var aggrSettings = this.query.getAggregationSettings();
                 if (aggrSettings.hasAggregates()
@@ -9330,6 +9334,37 @@ var EqContext = /** @class */ (function () {
             });
         }
     };
+    EqContext.prototype.getAttributeTitle = function (attr) {
+        var format = this.options.attributeFormat;
+        return this.getModel().getAttributeText(attr, format);
+    };
+    EqContext.prototype.getColumnTitle = function (attr) {
+        var format = this.options.columnTitleFormat || this.options.attributeFormat;
+        return this.getModel().getAttributeText(attr, format);
+    };
+    EqContext.prototype.getDefaultColumnCaption = function (column) {
+        var attr;
+        var model = this.getModel();
+        switch (column.expr.tag) {
+            case ExprTag.Constant:
+                return "Contant Column";
+            case ExprTag.CustomSql:
+                return "SQL Column";
+            case ExprTag.ParentColumn:
+                return "Parent Column";
+            case ExprTag.Query:
+                return "Query Column";
+            case ExprTag.EntityAttribute:
+            case ExprTag.ParentEntityAttribute:
+                attr = model.getAttributeById(column.expr.value);
+                return this.getColumnTitle(attr);
+            case ExprTag.AggregateFunction:
+                attr = model.getAttributeById(column.expr.args[0].value);
+                return this.getColumnTitle(attr) + ' ' + model.getAggrFunctionCaption(column.expr.func);
+            default:
+                return 'Column';
+        }
+    };
     return EqContext;
 }());
 
@@ -9348,7 +9383,7 @@ var Widget = /** @class */ (function () {
      */
     function Widget(slot) {
         this.slot = slot;
-        this._id = public_api/* utils.generateId */.P6.generateId(this.getWidgetType());
+        this._id = public_api/* utils */.P6.generateId(this.getWidgetType());
     }
     Object.defineProperty(Widget.prototype, "id", {
         get: function () {
@@ -9454,7 +9489,7 @@ var versionInfo = new EqVersionInfo(6, 2, 0);
 ;// CONCATENATED MODULE: ./src/i18n/text_resources.ts
 
 function addEasyQueryCoreTexts() {
-    public_api/* i18n.updateDefaultTexts */.ag.updateDefaultTexts({
+    public_api/* i18n */.ag.updateDefaultTexts({
         NewQueryName: '[New query]',
         //DateTime macroses
         Today: 'Today',