@easyquery/ui 7.2.4-rc04 → 7.2.4

package/dist/browser/eq.community.js

@@ -1,5 +1,5 @@
 /** 
- * EasyQuery.JS Community 7.2.4-rc04 (https://korzh.com/easyquery/javascript)
+ * EasyQuery.JS Community 7.2.4 (https://korzh.com/easyquery/javascript)
  * Copyright 2023 Korzh.com. All rights reserved.
  * 
  * EasyQuery.JS commercial licenses may be obtained at
@@ -12058,6 +12058,8 @@ __webpack_require__.d(lib_public_api_namespaceObject, {
   AggrSettingsDialog: function() { return AggrSettingsDialog; },
   AggrSettingsRenderer: function() { return AggrSettingsRenderer; },
   AggregationBar: function() { return AggregationBar; },
+  AttrColumnRendererCB: function() { return AttrColumnRendererCB; },
+  AttrColumnRendererCP: function() { return AttrColumnRendererCP; },
   AttributeExpressionRenderer: function() { return AttributeExpressionRenderer; },
   BaseElementRenderer: function() { return BaseElementRenderer; },
   ChartFacet: function() { return ChartFacet; },
@@ -12073,6 +12075,7 @@ __webpack_require__.d(lib_public_api_namespaceObject, {
   ConditionGroupRenderer: function() { return ConditionGroupRenderer; },
   ConditionGroupRowRenderer: function() { return ConditionGroupRowRenderer; },
   ConditionRenderer: function() { return ConditionRenderer; },
+  ConstColumnRendererCP: function() { return ConstColumnRendererCP; },
   CustomListExpressionRenderer: function() { return CustomListExpressionRenderer; },
   CustomSqlColumnRendererCP: function() { return CustomSqlColumnRendererCP; },
   DataFilterView: function() { return DataFilterView; },
@@ -12104,8 +12107,6 @@ __webpack_require__.d(lib_public_api_namespaceObject, {
   ReportView: function() { return ReportView; },
   ResultFacet: function() { return ResultFacet; },
   ResultFacetsPanel: function() { return ResultFacetsPanel; },
-  SimpleColumnRendererCB: function() { return SimpleColumnRendererCB; },
-  SimpleColumnRendererCP: function() { return SimpleColumnRendererCP; },
   SimpleConditionRenderer: function() { return SimpleConditionRenderer; },
   SortingBar: function() { return SortingBar; },
   SqlListExpressionRenderer: function() { return SqlListExpressionRenderer; },
@@ -15354,7 +15355,6 @@ var Query = /** @class */ (function () {
         }
         public_api.utils.moveArrayItem(this.sortedColumns, colIdx, index);
         this.fixupSortingIndices();
-        this.fireColumnsChangedEvent(QueryChangeAction.All);
     };
     Query.prototype.getColumnSorting = function (col) {
         var idx = this.getColumnSortIndex(col);
@@ -15381,7 +15381,6 @@ var Query = /** @class */ (function () {
             }
         }
         this.adjustColumnsSorting();
-        this.fireColumnsChangedEvent(QueryChangeAction.Modify, col, col.isJustSorted());
     };
     Query.prototype.fixupSortingIndices = function () {
         this.sortedColumns.forEach(function (col, index) {
@@ -15430,10 +15429,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;
@@ -15450,10 +15447,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);
                 }
@@ -15461,22 +15458,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.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;
+                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;
@@ -15485,16 +15489,18 @@ 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(descriptor.enabled, true);
@@ -15510,7 +15516,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;
     };
     /**
@@ -15564,9 +15572,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');
@@ -15604,22 +15609,24 @@ 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;
-            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();
@@ -15629,12 +15636,8 @@ var Query = /** @class */ (function () {
     /**
      * 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();
+    Query.prototype.removeColumn = function (column) {
         public_api.utils.removeArrayItem(this.columns, column);
         public_api.utils.removeArrayItem(this.sortedColumns, column);
     };
@@ -16753,13 +16756,6 @@ var InMemoryModelStorage = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=model_storage.js.map
-;// CONCATENATED MODULE: ../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: ../core/dist/lib/eqs/eqs_exporter.js
 
 var EqServerExporter = /** @class */ (function () {
@@ -16821,6 +16817,13 @@ var EqServerExporter = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=eqs_exporter.js.map
+;// CONCATENATED MODULE: ../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: ../core/dist/lib/main/context.js
 var context_assign = (undefined && undefined.__assign) || function () {
     context_assign = Object.assign || function(t) {
@@ -16858,7 +16861,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 = {};
@@ -18277,6 +18282,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;
 }());
 
@@ -18596,7 +18632,6 @@ var EntitiesPanel = /** @class */ (function (_super) {
             autoClearSelection: true,
             entityRenderedCallback: null,
             attributeRenderedCallback: null,
-            columnTitleFormat: '{attr}'
         };
         if (options) {
             public_api.utils.assignDeep(this.options, options);
@@ -18725,10 +18760,8 @@ var EntitiesPanel = /** @class */ (function (_super) {
                                 if (model.checkAttrProperty(attrId, "useInResult")) {
                                     if (checkbox.checked) {
                                         var attr = model.getAttributeById(attrId);
-                                        var caption = model.getAttributeText(attr, _this.options.columnTitleFormat);
                                         var column = query.addColumn({
-                                            attribute: attr,
-                                            caption: caption
+                                            attribute: attr
                                         });
                                         query.fireColumnsChangedEvent(QueryChangeAction.Add, column);
                                     }
@@ -18737,7 +18770,7 @@ var EntitiesPanel = /** @class */ (function (_super) {
                                             .filter(function (col) { return col.expr.tag === ExprTag.EntityAttribute
                                             && col.expr.value === attrId; });
                                         if (columns.length > 0) {
-                                            query.removeColumn(columns[0], null);
+                                            query.removeColumn(columns[0]);
                                             query.fireColumnsChangedEvent(QueryChangeAction.Delete, columns[0]);
                                         }
                                     }
@@ -18951,11 +18984,9 @@ var EntitiesPanel = /** @class */ (function (_super) {
                 for (var _i = 0, attrList_3 = attrList; _i < attrList_3.length; _i++) {
                     var attrId_1 = attrList_3[_i];
                     var attr = model.getAttributeById(attrId_1);
-                    var caption = model.getAttributeText(attr, _this.options.columnTitleFormat);
                     query.addColumn({
-                        attribute: attr,
-                        caption: caption
-                    });
+                        attribute: attr
+                    }, true);
                 }
                 query.fireChangedEvent();
                 if (_this.options.autoClearSelection) {
@@ -20508,7 +20539,6 @@ var ColumnRendererCP = /** @class */ (function () {
     });
     ColumnRendererCP.prototype.render = function () {
         var _this = this;
-        this.baseAttr = this.getAttribute();
         if (this.getButtonsToShow().indexOf("sorting") >= 0 && this.columnEnabled) {
             this.sortingButton = this.renderSoringButton(this.column.sorting);
             if (this.column.sorting !== SortDirection.None) {
@@ -20631,15 +20661,8 @@ var ColumnRendererCP = /** @class */ (function () {
     ColumnRendererCP.prototype.refresh = function () {
         this.render();
     };
-    ColumnRendererCP.prototype.getAttribute = function () {
-        var model = this.panel.getContext().getModel();
-        return model.getAttributeByIdSafe(this.column.expr.value);
-    };
     ColumnRendererCP.prototype.renderCaptionBlock = function () {
         var _this = this;
-        if (!this.column.caption || this.column.caption == '') {
-            this.column.caption = this.getDefaultColumnCaption();
-        }
         var builder = (0,lib_public_api.domel)('div')
             .addClass("".concat(this.cssPrefix, "-colelement"), "".concat(this.cssPrefix, "-captionelement"))
             .addClass(browser_utils/* browserUtils.getMobileCssClass */.z.getMobileCssClass());
@@ -20842,17 +20865,6 @@ var ColumnRendererCP = /** @class */ (function () {
         } }); })
             .toDOM();
     };
-    ColumnRendererCP.prototype.getDefaultColumnCaption = function () {
-        return this.getDefaultTitleText(this.baseAttr);
-    };
-    ColumnRendererCP.prototype.getDefaultTitleText = function (attr) {
-        return this.getAttributeCaption(attr, this.panel.options.titleElementFormat);
-    };
-    ColumnRendererCP.prototype.getAttributeCaption = function (attr, format) {
-        format = format || this.panel.options.attrElementFormat;
-        var model = this.panel.getContext().getModel();
-        return model.getAttributeText(attr, format);
-    };
     ColumnRendererCP.prototype.getClassesToAdd = function () {
         var result = "";
         result += this.columnEnabled ? '' : " ".concat(this.cssPrefix, "-disabled");
@@ -21083,7 +21095,7 @@ var ColumnRendererCP = /** @class */ (function () {
         switch (action) {
             case ColumnAction.Delete:
                 var curQuery = this.column.getQuery();
-                curQuery.removeColumn(this.column, this.panel);
+                curQuery.removeColumn(this.column);
                 curQuery.fireColumnsChangedEvent(QueryChangeAction.Delete, this.column);
                 break;
             case ColumnAction.Enable:
@@ -21277,8 +21289,8 @@ var ColumnRendererCP = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=column_renderer_cp.js.map
-;// CONCATENATED MODULE: ./dist/lib/widgets/renderers/columnspanel/simple_column_renderer.js
-var simple_column_renderer_extends = (undefined && undefined.__extends) || (function () {
+;// CONCATENATED MODULE: ./dist/lib/widgets/renderers/columnspanel/attr_column_renderer_cp.js
+var attr_column_renderer_cp_extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -21298,15 +21310,15 @@ var simple_column_renderer_extends = (undefined && undefined.__extends) || (func
 
 
 
-var SimpleColumnRendererCP = /** @class */ (function (_super) {
-    simple_column_renderer_extends(SimpleColumnRendererCP, _super);
-    function SimpleColumnRendererCP() {
+var AttrColumnRendererCP = /** @class */ (function (_super) {
+    attr_column_renderer_cp_extends(AttrColumnRendererCP, _super);
+    function AttrColumnRendererCP() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    SimpleColumnRendererCP.prototype.getClassesToAdd = function () {
+    AttrColumnRendererCP.prototype.getClassesToAdd = function () {
         return "".concat(_super.prototype.getClassesToAdd.call(this), " ").concat(this.cssPrefix, "-row ").concat(this.cssPrefix, "-row-column-entattr");
     };
-    SimpleColumnRendererCP.prototype.renderExpressionBlock = function () {
+    AttrColumnRendererCP.prototype.renderExpressionBlock = function () {
         var _this = this;
         return (0,lib_public_api.domel)("div")
             .addClass("".concat(this.cssPrefix, "-expr-block"))
@@ -21317,9 +21329,14 @@ var SimpleColumnRendererCP = /** @class */ (function (_super) {
             .addChildElement(_this.renderBaseExpression()); })
             .toDOM();
     };
-    SimpleColumnRendererCP.prototype.renderBaseExpression = function () {
+    AttrColumnRendererCP.prototype.getAttribute = function () {
+        var model = this.panel.getContext().getModel();
+        return model.getAttributeByIdSafe(this.column.expr.value);
+    };
+    AttrColumnRendererCP.prototype.renderBaseExpression = function () {
         var _this = this;
-        var attrCaption = this.getAttributeCaption(this.baseAttr);
+        var baseAttr = this.getAttribute();
+        var attrCaption = this.panel.getContext().getAttributeTitle(baseAttr);
         if (this.isEditable()) {
             return (0,lib_public_api.domel)('a')
                 .attr('href', 'javascript:void(0)')
@@ -21342,14 +21359,21 @@ var SimpleColumnRendererCP = /** @class */ (function (_super) {
             .title(attrCaption)
             .toDOM();
     };
-    SimpleColumnRendererCP.prototype.baseExpressionItemSelectedCallback = function (data, item) {
+    AttrColumnRendererCP.prototype.baseExpressionItemSelectedCallback = function (data, item) {
         var attrid = data.id;
-        this.column.expr.setValue(attrid, true);
-        this.column.caption = '';
+        var context = this.panel.getContext();
+        var attr = context.getModel().getAttributeById(attrid);
+        this.updateBaseAttr(attr);
+        this.column.caption = context.getDefaultColumnCaption(this.column);
         this.fireColumnChanged();
         return false;
     };
-    SimpleColumnRendererCP.prototype.getUIS = function () {
+    AttrColumnRendererCP.prototype.updateBaseAttr = function (attr) {
+        this.column.expr.setValue(attr.id, true);
+        this.column.expr.baseAttrId = attr.id;
+        this.column.expr.dataType = attr.dataType;
+    };
+    AttrColumnRendererCP.prototype.getUIS = function () {
         var arg = this.column.expr.args[0];
         if (arg) {
             var model = this.panel.getContext().getModel();
@@ -21359,7 +21383,7 @@ var SimpleColumnRendererCP = /** @class */ (function (_super) {
             return true;
         }
     };
-    SimpleColumnRendererCP.prototype.changeTypeHandler = function (ev) {
+    AttrColumnRendererCP.prototype.changeTypeHandler = function (ev) {
         var _this = this;
         this.keepShowingButtons = true;
         this.functionMenu.showMenu({
@@ -21377,7 +21401,7 @@ var SimpleColumnRendererCP = /** @class */ (function (_super) {
             }
         });
     };
-    SimpleColumnRendererCP.prototype.changeTypeToCustomSql = function () {
+    AttrColumnRendererCP.prototype.changeTypeToCustomSql = function () {
         var _this = this;
         var query = this.column.getQuery();
         query.changeColumnType(this.column, ExprTag.CustomSql);
@@ -21390,12 +21414,12 @@ var SimpleColumnRendererCP = /** @class */ (function (_super) {
         }, 500);
         this.fireColumnChanged();
     };
-    SimpleColumnRendererCP.prototype.changeTypeToAggr = function (funcId) {
+    AttrColumnRendererCP.prototype.changeTypeToAggr = function (funcId) {
         var query = this.column.getQuery();
         query.changeColumnType(this.column, ExprTag.AggregateFunction, { funcId: funcId });
         this.fireColumnChanged();
     };
-    SimpleColumnRendererCP.prototype.processExtraButtonMenuItems = function (action, evt) {
+    AttrColumnRendererCP.prototype.processExtraButtonMenuItems = function (action, evt) {
         if (action === "CUSTOMSQL") {
             this.changeTypeToCustomSql();
         }
@@ -21404,7 +21428,7 @@ var SimpleColumnRendererCP = /** @class */ (function (_super) {
         }
         return true;
     };
-    SimpleColumnRendererCP.prototype.getExtraButtonMenuItems = function () {
+    AttrColumnRendererCP.prototype.getExtraButtonMenuItems = function () {
         var items = [];
         var funcs = this.panel.getContext().getModel().getAggrFunctions();
         var toInclude = true;
@@ -21455,12 +21479,12 @@ var SimpleColumnRendererCP = /** @class */ (function (_super) {
                 items: items
             }];
     };
-    return SimpleColumnRendererCP;
+    return AttrColumnRendererCP;
 }(ColumnRendererCP));
 
-//# sourceMappingURL=simple_column_renderer.js.map
-;// CONCATENATED MODULE: ./dist/lib/widgets/renderers/columnspanel/aggrfunc_column_renderer.js
-var aggrfunc_column_renderer_extends = (undefined && undefined.__extends) || (function () {
+//# sourceMappingURL=attr_column_renderer_cp.js.map
+;// CONCATENATED MODULE: ./dist/lib/widgets/renderers/columnspanel/aggrfunc_column_renderer_cp.js
+var aggrfunc_column_renderer_cp_extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -21483,7 +21507,7 @@ var aggrfunc_column_renderer_extends = (undefined && undefined.__extends) || (fu
 
 
 var AggrFuncColumnRendererCP = /** @class */ (function (_super) {
-    aggrfunc_column_renderer_extends(AggrFuncColumnRendererCP, _super);
+    aggrfunc_column_renderer_cp_extends(AggrFuncColumnRendererCP, _super);
     function AggrFuncColumnRendererCP() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.displayFormatParser = new DisplayFormatParser();
@@ -21498,10 +21522,6 @@ var AggrFuncColumnRendererCP = /** @class */ (function (_super) {
             .getModel()
             .getAttributeByIdSafe(this.column.expr.args[0].value);
     };
-    AggrFuncColumnRendererCP.prototype.getDefaultColumnCaption = function () {
-        return this.getDefaultTitleText(this.baseAttr) + ' '
-            + this.panel.getContext().getModel().getAggrFunctionCaption(this.column.expr.func);
-    };
     AggrFuncColumnRendererCP.prototype.renderExpressionBlock = function () {
         var _this = this;
         var model = this.panel.getContext().getModel();
@@ -21586,14 +21606,6 @@ var AggrFuncColumnRendererCP = /** @class */ (function (_super) {
         }
         return button;
     };
-    AggrFuncColumnRendererCP.prototype.baseExpressionItemSelectedCallback = function (data, item) {
-        var attrid = data.id;
-        //this.column.expr.args[0].id = attrid;
-        this.column.expr.args[0].setValue(attrid, true);
-        this.column.caption = '';
-        this.fireColumnChanged();
-        return false;
-    };
     AggrFuncColumnRendererCP.prototype.changeTypeToSimple = function () {
         var query = this.column.getQuery();
         query.changeColumnType(this.column, ExprTag.EntityAttribute);
@@ -21620,6 +21632,10 @@ var AggrFuncColumnRendererCP = /** @class */ (function (_super) {
         }
         return result;
     };
+    AggrFuncColumnRendererCP.prototype.updateBaseAttr = function (attr) {
+        this.column.expr.args[0].setValue(attr.id, true);
+        this.column.expr.baseAttrId = attr.id;
+    };
     AggrFuncColumnRendererCP.prototype.changeTypeHandler = function (ev) {
         this.changeTypeToSimple();
     };
@@ -21638,11 +21654,11 @@ var AggrFuncColumnRendererCP = /** @class */ (function (_super) {
             }];
     };
     return AggrFuncColumnRendererCP;
-}(SimpleColumnRendererCP));
+}(AttrColumnRendererCP));
 
-//# sourceMappingURL=aggrfunc_column_renderer.js.map
-;// CONCATENATED MODULE: ./dist/lib/widgets/renderers/columnspanel/customsql_column_renderer.js
-var customsql_column_renderer_extends = (undefined && undefined.__extends) || (function () {
+//# sourceMappingURL=aggrfunc_column_renderer_cp.js.map
+;// CONCATENATED MODULE: ./dist/lib/widgets/renderers/columnspanel/editable_column_renderer_cp.js
+var editable_column_renderer_cp_extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -21663,51 +21679,25 @@ var customsql_column_renderer_extends = (undefined && undefined.__extends) || (f
 
 
 
-var CustomSqlColumnRendererCP = /** @class */ (function (_super) {
-    customsql_column_renderer_extends(CustomSqlColumnRendererCP, _super);
-    function CustomSqlColumnRendererCP() {
+var EditableColumnRendererCP = /** @class */ (function (_super) {
+    editable_column_renderer_cp_extends(EditableColumnRendererCP, _super);
+    function EditableColumnRendererCP() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.dataTypeMenu = null;
         return _this;
     }
-    CustomSqlColumnRendererCP.prototype.renderEnabledButton = function () {
+    EditableColumnRendererCP.prototype.renderEnabledButton = function () {
         var elem = _super.prototype.renderEnabledButton.call(this);
         var child = elem.children[0];
         child.title = public_api.i18n.getText('CmdToggleEnableCustom');
         return elem;
     };
     ;
-    CustomSqlColumnRendererCP.prototype.getClassesToAdd = function () {
+    EditableColumnRendererCP.prototype.getClassesToAdd = function () {
         return "".concat(this.cssPrefix, "-row ").concat(this.cssPrefix, "-row-column-entattr") + _super.prototype.getClassesToAdd.call(this);
     };
-    Object.defineProperty(CustomSqlColumnRendererCP.prototype, "columnEnabled", {
-        get: function () {
-            return this.panel.areCustomExpressionsAllowed() ? this.column.enabled : false;
-        },
-        set: function (value) {
-            if (this.panel.areCustomExpressionsAllowed()) {
-                this.column.enabled = value;
-            }
-            else {
-                this.column.enabled = false;
-            }
-        },
-        enumerable: false,
-        configurable: true
-    });
-    CustomSqlColumnRendererCP.prototype.renderColumnTypeButton = function () {
-        var button = _super.prototype.renderColumnTypeButton.call(this);
-        if (button) {
-            button.firstElementChild.classList.add('aggregated');
-            button.firstElementChild.setAttribute('title', public_api.i18n.getText('ButtonToSimple'));
-        }
-        return button;
-    };
-    CustomSqlColumnRendererCP.prototype.renderExpressionBlock = function () {
+    EditableColumnRendererCP.prototype.renderExpressionBlock = function () {
         var _this = this;
-        if (!this.column.caption || this.column.caption == '') {
-            this.column.caption = this.getDefaultColumnCaption();
-        }
         var exprBlock = (0,lib_public_api.domel)("div")
             .addClass("".concat(this.cssPrefix, "-expr-block"))
             .addClass(browser_utils/* browserUtils.getMobileCssClass */.z.getMobileCssClass())
@@ -21737,7 +21727,7 @@ var CustomSqlColumnRendererCP = /** @class */ (function (_super) {
             )
                 .addChild('input', function (b) { return b
                 .hide()
-                .value(_this.column.expr.sql)
+                .value(_this.getColumnValue())
                 .on('blur keydown', function (ev) {
                 var isEndEvent = false;
                 var save = true;
@@ -21762,12 +21752,13 @@ var CustomSqlColumnRendererCP = /** @class */ (function (_super) {
                         aEl.style.removeProperty('display');
                         inputEl.style.display = 'none';
                     }
-                    if (save && _this.column.expr.sql !== inputEl.value) {
-                        _this.column.expr.sql = inputEl.value;
+                    var colVal = _this.getColumnValue();
+                    if (save && colVal !== inputEl.value) {
+                        _this.setColumnValue(inputEl.value);
                         _this.fireColumnChanged();
                     }
                     else {
-                        inputEl.value = _this.column.expr.sql;
+                        inputEl.value = colVal;
                     }
                     _this.element.removeAttribute(lib_public_api.eqDragManager.DRAG_DISABLED_ATTR);
                 }
@@ -21820,31 +21811,30 @@ var CustomSqlColumnRendererCP = /** @class */ (function (_super) {
         }
         return exprBlock;
     };
-    CustomSqlColumnRendererCP.prototype.changeTypeToSimple = function () {
+    EditableColumnRendererCP.prototype.changeTypeToSimple = function () {
         var query = this.column.getQuery();
         query.changeColumnType(this.column, ExprTag.EntityAttribute);
         this.fireColumnChanged();
     };
-    CustomSqlColumnRendererCP.prototype.getDefaultColumnCaption = function () {
-        return "Custom SQL Column";
+    EditableColumnRendererCP.prototype.getColumnValue = function () {
+        return '';
     };
-    CustomSqlColumnRendererCP.prototype.getDefaultValue = function () {
-        return this.column.expr.sql;
+    EditableColumnRendererCP.prototype.setColumnValue = function (value) {
     };
-    CustomSqlColumnRendererCP.prototype.getUIS = function () {
+    EditableColumnRendererCP.prototype.getUIS = function () {
         return true;
     };
-    CustomSqlColumnRendererCP.prototype.changeTypeHandler = function (ev) {
+    EditableColumnRendererCP.prototype.changeTypeHandler = function (ev) {
         this.changeTypeToSimple();
     };
-    CustomSqlColumnRendererCP.prototype.processExtraButtonMenuItems = function (action, evt) {
+    EditableColumnRendererCP.prototype.processExtraButtonMenuItems = function (action, evt) {
         this.changeTypeToSimple();
         return true;
     };
-    CustomSqlColumnRendererCP.prototype.createFunctionMenu = function () {
+    EditableColumnRendererCP.prototype.createFunctionMenu = function () {
         // Nothing TO DO
     };
-    CustomSqlColumnRendererCP.prototype.getExtraButtonMenuItems = function () {
+    EditableColumnRendererCP.prototype.getExtraButtonMenuItems = function () {
         return [{
                 id: '__group',
                 text: public_api.i18n.getText('ColTypeGroup'),
@@ -21854,7 +21844,7 @@ var CustomSqlColumnRendererCP = /** @class */ (function (_super) {
                     }]
             }];
     };
-    CustomSqlColumnRendererCP.prototype.createDataTypeMenu = function () {
+    EditableColumnRendererCP.prototype.createDataTypeMenu = function () {
         var items = [];
         for (var typeItem in public_api.DataType) {
             if (!isNaN(Number(typeItem))) {
@@ -21877,10 +21867,74 @@ var CustomSqlColumnRendererCP = /** @class */ (function (_super) {
         };
         this.dataTypeMenu = new PopupMenu(menuOptions);
     };
+    return EditableColumnRendererCP;
+}(AttrColumnRendererCP));
+var CustomSqlColumnRendererCP = /** @class */ (function (_super) {
+    editable_column_renderer_cp_extends(CustomSqlColumnRendererCP, _super);
+    function CustomSqlColumnRendererCP() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Object.defineProperty(CustomSqlColumnRendererCP.prototype, "columnEnabled", {
+        get: function () {
+            return this.panel.areCustomExpressionsAllowed() ? this.column.enabled : false;
+        },
+        set: function (value) {
+            if (this.panel.areCustomExpressionsAllowed()) {
+                this.column.enabled = value;
+            }
+            else {
+                this.column.enabled = false;
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
+    CustomSqlColumnRendererCP.prototype.renderColumnTypeButton = function () {
+        var button = _super.prototype.renderColumnTypeButton.call(this);
+        if (button) {
+            button.firstElementChild.classList.add('aggregated');
+            button.firstElementChild.setAttribute('title', public_api.i18n.getText('ButtonToSimple'));
+        }
+        return button;
+    };
+    CustomSqlColumnRendererCP.prototype.getColumnValue = function () {
+        return this.column.expr.sql;
+    };
+    CustomSqlColumnRendererCP.prototype.setColumnValue = function (value) {
+        this.column.expr.sql = value;
+    };
+    CustomSqlColumnRendererCP.prototype.getDefaultValue = function () {
+        return this.column.expr.sql;
+    };
     return CustomSqlColumnRendererCP;
-}(SimpleColumnRendererCP));
+}(EditableColumnRendererCP));
+
+var ConstColumnRendererCP = /** @class */ (function (_super) {
+    editable_column_renderer_cp_extends(ConstColumnRendererCP, _super);
+    function ConstColumnRendererCP() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    ConstColumnRendererCP.prototype.renderColumnTypeButton = function () {
+        var button = _super.prototype.renderColumnTypeButton.call(this);
+        if (button) {
+            button.firstElementChild.classList.add('aggregated');
+            button.firstElementChild.setAttribute('title', public_api.i18n.getText('ButtonToSimple'));
+        }
+        return button;
+    };
+    ConstColumnRendererCP.prototype.getColumnValue = function () {
+        return this.column.expr.value;
+    };
+    ConstColumnRendererCP.prototype.setColumnValue = function (value) {
+        this.column.expr.setValue(value);
+    };
+    ConstColumnRendererCP.prototype.getDefaultValue = function () {
+        return this.column.expr.value;
+    };
+    return ConstColumnRendererCP;
+}(EditableColumnRendererCP));
 
-//# sourceMappingURL=customsql_column_renderer.js.map
+//# sourceMappingURL=editable_column_renderer_cp.js.map
 ;// CONCATENATED MODULE: ./dist/lib/widgets/columns_panel.js
 var columns_panel_extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -22127,7 +22181,15 @@ var ColumnsPanel = /** @class */ (function (_super) {
                         var index = query.getColumns().indexOf(column);
                         var newEl = _this.addColumnElement(column, index);
                         if (isFocusInside) {
-                            newEl.querySelector("a").focus();
+                            var focusElem = newEl.querySelector('a');
+                            if (focusElem) {
+                                try {
+                                    focusElem.focus();
+                                }
+                                catch (_a) {
+                                    //do nothing
+                                }
+                            }
                         }
                     };
                     if (Array.isArray(columns)) {
@@ -22227,7 +22289,13 @@ var ColumnsPanel = /** @class */ (function (_super) {
     };
     ColumnsPanel.prototype.setOptions = function (options) {
         public_api.utils.assignDeep(this.options, options);
-        this.getContext().options.allowCustomExpressions = options.allowCustomExpressions;
+        this.context.options.allowCustomExpressions = options.allowCustomExpressions;
+        if (options.attrElementFormat) {
+            this.context.options.attributeFormat = options.attrElementFormat;
+        }
+        if (options.titleElementFormat) {
+            this.context.options.columnTitleFormat = options.titleElementFormat;
+        }
         if (browser_utils/* browserUtils.isMobileMode */.z.isMobileMode()) {
             this.options.buttons = ["menu"];
             this.options.showHeader = false;
@@ -22316,66 +22384,36 @@ var ColumnsPanel = /** @class */ (function (_super) {
                 .data("show-buttons", "");
         }
     };
-    ColumnsPanel.prototype.addNewColumn = function (attrId, index) {
-        var _this = this;
+    ColumnsPanel.prototype.addNewColumn = function (attrs, index) {
         var model = this.getContext().getModel();
         var query = this.getQuery();
-        var getColumnByAttrId = function (attrid) {
-            var attribute = model.getAttributeById(attrid);
-            if (!attribute) {
-                return null;
-            }
-            if (!attribute.useInResult) {
-                if (attribute.lookupAttr) {
-                    attrid = attribute.lookupAttr;
-                    attribute = model.getAttributeById(attrid);
-                    if (!attribute || !attribute.useInResult) {
-                        return null;
-                    }
-                }
-                else
-                    return null;
-            }
-            var column = query.createColumn();
-            column.caption = _this.getDefaultColumnCaption(attribute);
-            column.sorting = SortDirection.None;
-            column.sortIndex = -1;
-            column.expr.tag = ExprTag.EntityAttribute;
-            column.expr.kind = DataKind.Attribute;
-            column.expr.dataType = attribute.dataType;
-            column.expr.setValue(attrid, true);
-            column.params.concat(attribute.params);
-            return column;
-        };
-        var colToAdd, col;
-        if (Array.isArray(attrId)) {
-            colToAdd = [];
-            for (var i = 0; i < attrId.length; i++) {
-                col = getColumnByAttrId(attrId[i]);
+        if (Array.isArray(attrs)) {
+            var col = null;
+            var cols = [];
+            for (var i = 0; i < attrs.length; i++) {
+                col = query.addColumn({
+                    attributeId: attrs[i],
+                    index: index
+                }, true);
                 if (col) {
-                    colToAdd.push(col);
+                    cols.push(col);
                 }
             }
+            query.fireChangedEvent({
+                part: QueryChangePart.Columns,
+                action: QueryChangeAction.Add,
+                changee: cols,
+                source: this
+            });
+            return cols;
         }
-        else
-            colToAdd = getColumnByAttrId(attrId);
-        this.addColumn(colToAdd, index);
-        return colToAdd;
-    };
-    ColumnsPanel.prototype.addColumn = function (column, index) {
-        var query = this.getQuery();
-        if (!query) {
-            return;
-        }
-        if (Array.isArray(column))
-            column = this.checkColumnsArray(column);
-        else
-            column = this.checkColumn(column);
-        if (!column || (Array.isArray(column) && column.length == 0)) {
-            return;
+        else {
+            var col = query.addColumn({
+                attributeId: attrs,
+                index: index
+            });
+            return col;
         }
-        query.addColumnObj(column, index, self);
-        query.fireColumnsChangedEvent(QueryChangeAction.Add, column);
     };
     //adds one column to the panel on the specified position
     ColumnsPanel.prototype.addColumnElement = function (column, index) {
@@ -22425,23 +22463,19 @@ var ColumnsPanel = /** @class */ (function (_super) {
         }
         return col;
     };
-    ColumnsPanel.prototype.getDefaultColumnCaption = function (attr) {
-        var format = this.options.titleElementFormat || this.options.attrElementFormat;
-        var model = this.getContext().getModel();
-        return model.getAttributeText(attr, format);
-    };
     ColumnsPanel.prototype.getColumnsBlock = function () {
         return this.columnsBlock;
     };
     ColumnsPanel.prototype.getColumnRenderer = function (column, slot) {
         switch (column.expr.tag) {
+            case ExprTag.Constant:
+                return new ConstColumnRendererCP(this, column, slot);
             case ExprTag.AggregateFunction:
                 return new AggrFuncColumnRendererCP(this, column, slot);
             case ExprTag.CustomSql:
                 return new CustomSqlColumnRendererCP(this, column, slot);
-            case ExprTag.EntityAttribute:
-            case ExprTag.ParentEntityAttribute:
-                return new SimpleColumnRendererCP(this, column, slot);
+            default:
+                return new AttrColumnRendererCP(this, column, slot);
         }
         return null;
     };
@@ -22650,7 +22684,6 @@ var ColumnRendererCB = /** @class */ (function () {
     });
     ColumnRendererCB.prototype.render = function () {
         var _this = this;
-        this.baseAttr = this.getAttribute();
         var builder = (0,lib_public_api.domel)('div');
         builder.data('id', this.column.id);
         if (this.element) {
@@ -22707,10 +22740,6 @@ var ColumnRendererCB = /** @class */ (function () {
     ColumnRendererCB.prototype.refresh = function () {
         this.render();
     };
-    ColumnRendererCB.prototype.getAttribute = function () {
-        var model = this.bar.getContext().getModel();
-        return model.getAttributeByIdSafe(this.column.expr.value);
-    };
     ColumnRendererCB.prototype.isEditable = function () {
         return this.column.enabled && !this.column.isReadOnly();
     };
@@ -22725,19 +22754,13 @@ var ColumnRendererCB = /** @class */ (function () {
     };
     ColumnRendererCB.prototype.renderCaptionBlock = function () {
         var _this = this;
-        if (!this.column.caption || this.column.caption == '') {
-            this.column.caption = this.getDefaultCaption();
-        }
-        var model = this.column.getModel();
-        var caption = this.baseAttr !== model.nullAttribute
-            ? this.column.caption
-            : model.getAttributeText(model.nullAttribute, '{attr}');
+        var caption = this.column.caption;
         if (!this.isEditable()) {
             return (0,lib_public_api.domel)('div')
                 .addClass("".concat(this.cssPrefix, "-colelement"), "".concat(this.cssPrefix, "-captionelement"))
                 .addClass(browser_utils/* browserUtils.getMobileCssClass */.z.getMobileCssClass())
                 .addChild('div', function (b) { return b
-                .title(_this.column.caption)
+                .title(caption)
                 .text(caption)
                 .attr('tabIndex', '0'); })
                 .toDOM();
@@ -22910,7 +22933,7 @@ var ColumnRendererCB = /** @class */ (function () {
     ColumnRendererCB.prototype.buttonDeleteClickHandler = function (ev) {
         ev.stopPropagation();
         var query = this.bar.getQuery();
-        query.removeColumn(this.column, this.bar);
+        query.removeColumn(this.column);
         query.fireColumnsChangedEvent(QueryChangeAction.Delete, this.column);
         return false;
     };
@@ -22929,14 +22952,6 @@ var ColumnRendererCB = /** @class */ (function () {
         } })
             .toDOM();
     };
-    ColumnRendererCB.prototype.getDefaultCaption = function () {
-        return this.getDefaultTitleText(this.baseAttr);
-    };
-    ColumnRendererCB.prototype.getDefaultTitleText = function (attr) {
-        var format = this.bar.options.titleElementFormat || this.bar.options.attrElementFormat;
-        var model = this.bar.getContext().getModel();
-        return model.getAttributeText(attr, format);
-    };
     ColumnRendererCB.prototype.getClassesToAdd = function () {
         var result = "";
         result += this.column.enabled ? '' : " ".concat(this.cssPrefix, "-disabled");
@@ -23175,8 +23190,8 @@ var ColumnRendererCB = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=column_renderer_cb.js.map
-;// CONCATENATED MODULE: ./dist/lib/widgets/renderers/columnsbar/simple_column_renderer.js
-var columnsbar_simple_column_renderer_extends = (undefined && undefined.__extends) || (function () {
+;// CONCATENATED MODULE: ./dist/lib/widgets/renderers/columnsbar/attr_column_renderer_cb.js
+var attr_column_renderer_cb_extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -23194,23 +23209,29 @@ var columnsbar_simple_column_renderer_extends = (undefined && undefined.__extend
 
 
 
-var SimpleColumnRendererCB = /** @class */ (function (_super) {
-    columnsbar_simple_column_renderer_extends(SimpleColumnRendererCB, _super);
-    function SimpleColumnRendererCB() {
+var AttrColumnRendererCB = /** @class */ (function (_super) {
+    attr_column_renderer_cb_extends(AttrColumnRendererCB, _super);
+    function AttrColumnRendererCB() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    SimpleColumnRendererCB.prototype.getClassesToAdd = function () {
+    AttrColumnRendererCB.prototype.getClassesToAdd = function () {
         return "".concat(_super.prototype.getClassesToAdd.call(this), " ").concat(this.cssPrefix, "-row ").concat(this.cssPrefix, "-row-column-entattr");
     };
-    SimpleColumnRendererCB.prototype.baseExpressionItemSelectedCallback = function (data, item) {
+    AttrColumnRendererCB.prototype.baseExpressionItemSelectedCallback = function (data, item) {
         var attrid = data.id;
-        //this.column.expr.id = attrid;
-        this.column.expr.setValue(attrid, true);
-        this.column.caption = '';
-        this.refresh();
+        var context = this.bar.getContext();
+        var attr = context.getModel().getAttributeById(attrid);
+        this.updateBaseAttr(attr);
+        this.column.caption = context.getDefaultColumnCaption(this.column);
         this.fireColumnChanged();
+        return false;
+    };
+    AttrColumnRendererCB.prototype.updateBaseAttr = function (attr) {
+        this.column.expr.setValue(attr.id, true);
+        this.column.expr.baseAttrId = attr.id;
+        this.column.expr.dataType = attr.dataType;
     };
-    SimpleColumnRendererCB.prototype.getUIS = function () {
+    AttrColumnRendererCB.prototype.getUIS = function () {
         var arg = this.column.expr.args[0];
         if (arg) {
             var model = this.bar.getContext().getModel();
@@ -23220,17 +23241,17 @@ var SimpleColumnRendererCB = /** @class */ (function (_super) {
             return true;
         }
     };
-    SimpleColumnRendererCB.prototype.changeTypeToCustomSql = function () {
+    AttrColumnRendererCB.prototype.changeTypeToCustomSql = function () {
         var query = this.column.getQuery();
         query.changeColumnType(this.column, ExprTag.CustomSql);
         this.fireColumnChanged();
     };
-    SimpleColumnRendererCB.prototype.changeTypeToAggr = function (funcId) {
+    AttrColumnRendererCB.prototype.changeTypeToAggr = function (funcId) {
         var query = this.column.getQuery();
         query.changeColumnType(this.column, ExprTag.AggregateFunction, { funcId: funcId });
         this.fireColumnChanged();
     };
-    SimpleColumnRendererCB.prototype.changeColumnTypeHandler = function (ev) {
+    AttrColumnRendererCB.prototype.changeColumnTypeHandler = function (ev) {
         var _this = this;
         this.functionMenu.showMenu({
             anchor: ev.target,
@@ -23252,12 +23273,12 @@ var SimpleColumnRendererCB = /** @class */ (function (_super) {
             }
         });
     };
-    return SimpleColumnRendererCB;
+    return AttrColumnRendererCB;
 }(ColumnRendererCB));
 
-//# sourceMappingURL=simple_column_renderer.js.map
-;// CONCATENATED MODULE: ./dist/lib/widgets/renderers/columnsbar/aggrfunc_column_renderer.js
-var columnsbar_aggrfunc_column_renderer_extends = (undefined && undefined.__extends) || (function () {
+//# sourceMappingURL=attr_column_renderer_cb.js.map
+;// CONCATENATED MODULE: ./dist/lib/widgets/renderers/columnsbar/aggrfunc_column_renderer_cb.js
+var aggrfunc_column_renderer_cb_extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -23276,23 +23297,13 @@ var columnsbar_aggrfunc_column_renderer_extends = (undefined && undefined.__exte
 
 
 var AggrFuncColumnRendererCB = /** @class */ (function (_super) {
-    columnsbar_aggrfunc_column_renderer_extends(AggrFuncColumnRendererCB, _super);
+    aggrfunc_column_renderer_cb_extends(AggrFuncColumnRendererCB, _super);
     function AggrFuncColumnRendererCB() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     AggrFuncColumnRendererCB.prototype.getClassesToAdd = function () {
         return "".concat(_super.prototype.getClassesToAdd.call(this), " ").concat(this.cssPrefix, "-row ").concat(this.cssPrefix, "-row-column-aggr");
     };
-    AggrFuncColumnRendererCB.prototype.getAttribute = function () {
-        return this.bar
-            .getContext()
-            .getModel()
-            .getAttributeByIdSafe(this.column.expr.args[0].value);
-    };
-    AggrFuncColumnRendererCB.prototype.getDefaultCaption = function () {
-        return this.getDefaultTitleText(this.baseAttr) + ' '
-            + this.bar.getContext().getModel().getAggrFunctionCaption(this.column.expr.func);
-    };
     AggrFuncColumnRendererCB.prototype.renderColumnTypeButton = function () {
         var button = _super.prototype.renderColumnTypeButton.call(this);
         if (button) {
@@ -23301,12 +23312,9 @@ var AggrFuncColumnRendererCB = /** @class */ (function (_super) {
         }
         return button;
     };
-    AggrFuncColumnRendererCB.prototype.baseExpressionItemSelectedCallback = function (data, item) {
-        var attrid = data.id;
-        //this.column.expr.args[0].id = attrid;
-        this.column.expr.args[0].setValue(attrid, true);
-        this.column.caption = '';
-        this.fireColumnChanged();
+    AggrFuncColumnRendererCB.prototype.updateBaseAttr = function (attr) {
+        this.column.expr.args[0].setValue(attr.id, true);
+        this.column.expr.baseAttrId = attr.id;
     };
     AggrFuncColumnRendererCB.prototype.changeTypeToSimple = function () {
         var query = this.column.getQuery();
@@ -23317,9 +23325,112 @@ var AggrFuncColumnRendererCB = /** @class */ (function (_super) {
         this.changeTypeToSimple();
     };
     return AggrFuncColumnRendererCB;
-}(SimpleColumnRendererCB));
+}(AttrColumnRendererCB));
+
+//# sourceMappingURL=aggrfunc_column_renderer_cb.js.map
+;// CONCATENATED MODULE: ./dist/lib/widgets/renderers/columnsbar/editable_column_renderer_cb.js
+var editable_column_renderer_cb_extends = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+
+
+var EditableColumnRendererCB = /** @class */ (function (_super) {
+    editable_column_renderer_cb_extends(EditableColumnRendererCB, _super);
+    function EditableColumnRendererCB() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    EditableColumnRendererCB.prototype.getClassesToAdd = function () {
+        return "".concat(this.cssPrefix, "-row ").concat(this.cssPrefix, "-row-column-entattr") + _super.prototype.getClassesToAdd.call(this);
+    };
+    EditableColumnRendererCB.prototype.renderColumnTypeButton = function () {
+        var button = _super.prototype.renderColumnTypeButton.call(this);
+        if (button) {
+            button.classList.add('aggregated');
+            button.title = public_api.i18n.getText('ButtonToSimple');
+        }
+        return button;
+    };
+    EditableColumnRendererCB.prototype.changeTypeToSimple = function () {
+        var query = this.column.getQuery();
+        query.changeColumnType(this.column, ExprTag.EntityAttribute);
+        this.fireColumnChanged();
+    };
+    EditableColumnRendererCB.prototype.getColumnValue = function () {
+        return '';
+    };
+    EditableColumnRendererCB.prototype.setColumnValue = function (value) {
+    };
+    EditableColumnRendererCB.prototype.getUIS = function () {
+        return true;
+    };
+    EditableColumnRendererCB.prototype.changeColumnTypeHandler = function (ev) {
+        this.changeTypeToSimple();
+    };
+    return EditableColumnRendererCB;
+}(ColumnRendererCB));
+
+var CustomSqlColumnRendererCB = /** @class */ (function (_super) {
+    editable_column_renderer_cb_extends(CustomSqlColumnRendererCB, _super);
+    function CustomSqlColumnRendererCB() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Object.defineProperty(CustomSqlColumnRendererCB.prototype, "columnEnabled", {
+        get: function () {
+            return this.bar.areCustomExpressionsAllowed() ? this.column.enabled : false;
+        },
+        set: function (value) {
+            if (this.bar.areCustomExpressionsAllowed()) {
+                this.column.enabled = value;
+            }
+            else {
+                this.column.enabled = false;
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
+    CustomSqlColumnRendererCB.prototype.getColumnValue = function () {
+        return this.column.expr.sql;
+    };
+    CustomSqlColumnRendererCB.prototype.setColumnValue = function (value) {
+        this.column.expr.sql = value;
+    };
+    CustomSqlColumnRendererCB.prototype.getDefaultValue = function () {
+        return this.column.expr.sql;
+    };
+    return CustomSqlColumnRendererCB;
+}(EditableColumnRendererCB));
 
-//# sourceMappingURL=aggrfunc_column_renderer.js.map
+var ConstColumnRendererCB = /** @class */ (function (_super) {
+    editable_column_renderer_cb_extends(ConstColumnRendererCB, _super);
+    function ConstColumnRendererCB() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    ConstColumnRendererCB.prototype.getColumnValue = function () {
+        return this.column.expr.value;
+    };
+    ConstColumnRendererCB.prototype.setColumnValue = function (value) {
+        this.column.expr.setValue(value);
+    };
+    ConstColumnRendererCB.prototype.getDefaultValue = function () {
+        return this.column.expr.value;
+    };
+    return ConstColumnRendererCB;
+}(EditableColumnRendererCB));
+
+//# sourceMappingURL=editable_column_renderer_cb.js.map
 ;// CONCATENATED MODULE: ./dist/lib/widgets/columns_bar.js
 var columns_bar_extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -23345,6 +23456,7 @@ var columns_bar_extends = (undefined && undefined.__extends) || (function () {
 
 
 
+
 var ColumnsBar = /** @class */ (function (_super) {
     columns_bar_extends(ColumnsBar, _super);
     function ColumnsBar(slot, customQuery) {
@@ -23359,8 +23471,6 @@ var ColumnsBar = /** @class */ (function (_super) {
             allowDuplicates: true,
             allowCustomExpressions: false,
             allowSorting: true,
-            attrElementFormat: '{entity} {attr}',
-            titleElementFormat: null,
             alwaysShowButtons: false,
             accentActiveColumn: true,
             allowDragDrop: true,
@@ -23413,6 +23523,12 @@ var ColumnsBar = /** @class */ (function (_super) {
         var _this = this;
         _super.prototype.init.call(this, context, options);
         this.setOptions(options);
+        if (options.attrElementFormat) {
+            this.context.options.attributeFormat = options.attrElementFormat;
+        }
+        if (options.titleElementFormat) {
+            this.context.options.columnTitleFormat = options.titleElementFormat;
+        }
         this.detachQueryObserver();
         this.attachQueryObserver();
         lib_public_api.eqDragManager.removeDropContainer(this.slot);
@@ -23543,6 +23659,7 @@ var ColumnsBar = /** @class */ (function (_super) {
     };
     ColumnsBar.prototype.setOptions = function (options) {
         this.options = public_api.utils.assignDeep(this.options, options);
+        this.getContext().options.allowCustomExpressions = options.allowCustomExpressions;
     };
     ColumnsBar.prototype.showLandingSlot = function (pageX, pageY) {
         var elements = this.columnsBlock.querySelectorAll("[class*=".concat(this.cssPrefix, "-row]"));
@@ -23794,64 +23911,41 @@ var ColumnsBar = /** @class */ (function (_super) {
     };
     ColumnsBar.prototype.getColumnRenderer = function (column, slot) {
         switch (column.expr.tag) {
+            case ExprTag.Constant:
+                return new ConstColumnRendererCB(this, column, slot);
             case ExprTag.AggregateFunction:
                 return new AggrFuncColumnRendererCB(this, column, slot);
             case ExprTag.CustomSql:
-            //                return new CustomSqlColumnRendererCB(this, column, slot);
-            case ExprTag.EntityAttribute:
-            case ExprTag.ParentEntityAttribute:
-                return new SimpleColumnRendererCB(this, column, slot);
+                return new CustomSqlColumnRendererCB(this, column, slot);
+            default:
+                return new AttrColumnRendererCB(this, column, slot);
         }
         return null;
     };
-    ColumnsBar.prototype.addNewColumn = function (attrId, index) {
-        var _this = this;
+    ColumnsBar.prototype.addNewColumn = function (attrs, index) {
         var model = this.getContext().getModel();
         var query = this.getQuery();
-        var getColumnByAttrId = function (attrid) {
-            var attribute = model.getAttributeById(attrid);
-            if (!attribute) {
-                return null;
-            }
-            if (!attribute.useInResult) {
-                if (attribute.lookupAttr) {
-                    attrid = attribute.lookupAttr;
-                    attribute = model.getAttributeById(attrid);
-                    if (!attribute || !attribute.useInResult) {
-                        return null;
-                    }
-                }
-                else
-                    return null;
-            }
-            var column = query.createColumn();
-            column.caption = _this.getDefaultColumnCaption(attribute);
-            column.sorting = SortDirection.None;
-            column.sortIndex = -1;
-            column.expr.tag = ExprTag.EntityAttribute;
-            column.expr.kind = DataKind.Attribute;
-            column.expr.dataType = attribute.dataType;
-            column.expr.setValue(attrid, true);
-            column.params.concat(attribute.params);
-            return column;
-        };
-        if (!this.getQuery()) {
-            return;
-        }
-        var colToAdd, col;
-        if (Array.isArray(attrId)) {
-            colToAdd = [];
-            for (var i = 0; i < attrId.length; i++) {
-                col = getColumnByAttrId(attrId[i]);
+        if (Array.isArray(attrs)) {
+            var col = null;
+            var cols = [];
+            for (var i = 0; i < attrs.length; i++) {
+                col = query.addColumn({
+                    attributeId: attrs[i],
+                    index: index
+                }, true);
                 if (col) {
-                    colToAdd.push(col);
+                    cols.push(col);
                 }
             }
+            return cols;
+        }
+        else {
+            var col = query.addColumn({
+                attributeId: attrs,
+                index: index
+            });
+            return col;
         }
-        else
-            colToAdd = getColumnByAttrId(attrId);
-        this.addColumn(colToAdd, index);
-        return colToAdd;
     };
     ColumnsBar.prototype.toggleColumnPicked = function (column) {
         var el;
@@ -23876,25 +23970,6 @@ var ColumnsBar = /** @class */ (function (_super) {
                 .data("show-buttons", "");
         }
     };
-    ColumnsBar.prototype.addColumn = function (column, index) {
-        var query = this.getQuery();
-        if (!query) {
-            return;
-        }
-        if (Array.isArray(column))
-            column = this.checkColumnsArray(column);
-        else
-            column = this.checkColumn(column);
-        if (!column || (Array.isArray(column) && column.length == 0)) {
-            return;
-        }
-        query.addColumnObj(column, index, self);
-        query.fireChangedEvent({
-            part: QueryChangePart.Columns,
-            action: QueryChangeAction.Add,
-            changee: column
-        });
-    };
     //adds one column to the bar on the specified position
     ColumnsBar.prototype.addColumnElement = function (column, index) {
         var rows = this.columnsBlock.querySelectorAll("[class*=".concat(this.cssPrefix, "-row]"));
@@ -23937,11 +24012,6 @@ var ColumnsBar = /** @class */ (function (_super) {
         }
         return col;
     };
-    ColumnsBar.prototype.getDefaultColumnCaption = function (attr) {
-        var format = this.options.titleElementFormat || this.options.attrElementFormat;
-        var model = this.getContext().getModel();
-        return model.getAttributeText(attr, format);
-    };
     ColumnsBar.prototype.getColumnsBlock = function () {
         return this.columnsBlock;
     };
@@ -24043,13 +24113,13 @@ var ColumnsBar = /** @class */ (function (_super) {
     };
     ColumnsBar.prototype.areCustomExpressionsAllowed = function () {
         var query = this.getQuery();
-        return query.isEx() && this.options.allowCustomExpressions;
+        return query.isEx() && this.getContext().options.allowCustomExpressions;
     };
     ColumnsBar.globalCounter = 0;
     return ColumnsBar;
 }(Widget));
 //# sourceMappingURL=columns_bar.js.map
-;// CONCATENATED MODULE: ./dist/lib/widgets/renderers/sortingbar/column_renderer_sp.js
+;// CONCATENATED MODULE: ./dist/lib/widgets/renderers/sortingbar/column_renderer_sb.js
 
 
 
@@ -24073,7 +24143,6 @@ var ColumnRendererSB = /** @class */ (function () {
     });
     ColumnRendererSB.prototype.render = function () {
         var _this = this;
-        this.baseAttr = this.getAttribute();
         var builder = (0,lib_public_api.domel)('div');
         builder.data('id', this.column.id);
         if (this.element) {
@@ -24124,9 +24193,6 @@ var ColumnRendererSB = /** @class */ (function () {
     };
     ColumnRendererSB.prototype.renderCaptionBlock = function () {
         var _this = this;
-        if (!this.column.caption || this.column.caption == '') {
-            this.column.caption = this.getDefaultCaption();
-        }
         function getArrow(sd) {
             switch (sd) {
                 case SortDirection.Ascending:
@@ -24196,7 +24262,7 @@ var ColumnRendererSB = /** @class */ (function () {
                 if (data.id == 'None' || data.id == "Ascending" || data.id == "Descending") {
                     var query = _this.bar.getContext().getQuery();
                     if (_this.column.isJustSorted() && data.id == 'None') {
-                        query.removeColumn(_this.column, _this.bar);
+                        query.removeColumn(_this.column);
                         query.fireColumnsChangedEvent(QueryChangeAction.Delete, _this.column, true);
                     }
                     else {
@@ -24215,14 +24281,6 @@ var ColumnRendererSB = /** @class */ (function () {
         });
         return false;
     };
-    ColumnRendererSB.prototype.getDefaultCaption = function () {
-        return this.getDefaultTitleText(this.baseAttr);
-    };
-    ColumnRendererSB.prototype.getDefaultTitleText = function (attr) {
-        var format = this.bar.options.titleElementFormat || this.bar.options.attrElementFormat;
-        var model = this.bar.getContext().getModel();
-        return model.getAttributeText(attr, format);
-    };
     ColumnRendererSB.prototype.getClassesToAdd = function () {
         return "".concat(this.cssPrefix, "-row ").concat(this.cssPrefix, "-row-column-entattr");
     };
@@ -24234,7 +24292,7 @@ var ColumnRendererSB = /** @class */ (function () {
     return ColumnRendererSB;
 }());
 
-//# sourceMappingURL=column_renderer_sp.js.map
+//# sourceMappingURL=column_renderer_sb.js.map
 ;// CONCATENATED MODULE: ./dist/lib/widgets/sorting_bar.js
 var sorting_bar_extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -24264,8 +24322,6 @@ var SortingBar = /** @class */ (function (_super) {
         var _this = _super.call(this, slot) || this;
         _this.options = {
             showAddRow: true,
-            attrElementFormat: '{entity} {attr}',
-            titleElementFormat: null,
             allowDragDrop: true,
             menuOptions: {
                 showSearchBoxAfter: 30,
@@ -24309,6 +24365,12 @@ var SortingBar = /** @class */ (function (_super) {
         var _this = this;
         _super.prototype.init.call(this, context, options);
         this.setOptions(options);
+        if (options.attrElementFormat) {
+            this.context.options.attributeFormat = options.attrElementFormat;
+        }
+        if (options.titleElementFormat) {
+            this.context.options.columnTitleFormat = options.titleElementFormat;
+        }
         this.destroyCore();
         this.attachQueryObserver();
         lib_public_api.eqDragManager.removeDropContainer(this.slot);
@@ -24461,48 +24523,20 @@ var SortingBar = /** @class */ (function (_super) {
         });
     };
     SortingBar.prototype.addNewColumn = function (attrId) {
-        var _this = this;
         var model = this.getModel();
         var query = this.getQuery();
-        var getColumnByAttrId = function (attrid) {
-            var attribute = model.getAttributeById(attrid);
-            if (!attribute) {
-                return null;
-            }
-            if (!attribute.useInSorting) {
-                if (attribute.lookupAttr) {
-                    attrid = attribute.lookupAttr;
-                    attribute = model.getAttributeById(attrid);
-                    if (!attribute || !attribute.useInSorting) {
-                        return null;
-                    }
-                }
-                else
-                    return null;
-            }
-            var column = query.createColumn(true);
-            column.caption = _this.getDefaultColumnCaption(attribute);
-            column._sorting = SortDirection.Ascending;
-            //column.sortIndex = this.getQuery().getColumnSortIndex(column);
-            column.expr.tag = ExprTag.EntityAttribute;
-            column.expr.dataType = attribute.dataType;
-            //column.expr.id = attrid;
-            column.expr.setValue(attrid, true);
-            column.params.concat(attribute.params);
-            return column;
-        };
-        if (!this.getQuery()) {
-            return;
-        }
-        var newCol = getColumnByAttrId(attrId);
-        return this.getQuery().addColumn({
-            column: newCol
+        var col = query.addColumn({
+            attributeId: attrId,
+            justsorted: true,
+            sorting: SortDirection.Ascending
         });
-    };
-    SortingBar.prototype.getDefaultColumnCaption = function (attr) {
-        var format = this.options.titleElementFormat || this.options.attrElementFormat;
-        var model = this.getModel();
-        return model.getAttributeText(attr, format);
+        query.fireChangedEvent({
+            part: QueryChangePart.SortingColumns,
+            action: QueryChangeAction.Add,
+            changee: col,
+            source: this
+        });
+        return col;
     };
     SortingBar.prototype.renderColumn = function (column, elem) {
         var renderer = new ColumnRendererSB(this, column, elem);
@@ -28224,78 +28258,17 @@ var EasyGridWidget = /** @class */ (function (_super) {
         }
     };
     EasyGridWidget.prototype.addNewColumn = function (attrId) {
-        var _this = this;
-        var model = this.getContext().getModel();
-        var query = this.getContext().getQuery();
-        var getColumnByAttrId = function (attrid) {
-            var attribute = model.getAttributeById(attrid);
-            if (!attribute) {
-                return null;
-            }
-            if (!attribute.useInSorting) {
-                if (attribute.lookupAttr) {
-                    attrid = attribute.lookupAttr;
-                    attribute = model.getAttributeById(attrid);
-                    if (!attribute || !attribute.useInSorting) {
-                        return null;
-                    }
-                }
-                else
-                    return null;
-            }
-            var column = query.createColumn();
-            column.caption = _this.getDefaultColumnCaption(attribute);
-            column.sorting = SortDirection.None;
-            column.sortIndex = -1;
-            column.expr.tag = ExprTag.EntityAttribute;
-            //column.expr.id = attrid;
-            column.expr.setValue(attrid, true);
-            column.params.concat(attribute.params);
-            return column;
-        };
-        if (!this.getContext().getQuery()) {
-            return;
-        }
-        return this.addColumn(getColumnByAttrId(attrId));
-    };
-    EasyGridWidget.prototype.getDefaultColumnCaption = function (attr) {
-        var format = this.options.titleElementFormat || this.options.attrElementFormat;
         var model = this.getContext().getModel();
-        return model.getAttributeText(attr, format);
-    };
-    EasyGridWidget.prototype.addColumn = function (column) {
         var query = this.getContext().getQuery();
-        if (!query) {
-            return;
-        }
-        column = this.checkColumn(column);
-        if (!column) {
-            return;
-        }
-        column = query.addColumn({
-            caption: column.caption,
-            attributeId: column.expr.value,
-            sorting: column.sorting,
-            sortIndex: column.sortIndex
+        var col = query.addColumn({
+            attributeId: attrId
         });
         query.fireChangedEvent({
             part: QueryChangePart.Columns,
             action: QueryChangeAction.Add,
-            changee: column,
+            changee: col,
             source: this
         });
-        return column;
-    };
-    EasyGridWidget.prototype.checkColumn = function (col) {
-        var query = this.getContext().getQuery();
-        var columns = query.getColumns();
-        var colJson = JSON.stringify(col.expr.saveToData());
-        for (var i = 0; i < columns.length; i++) {
-            var qcolJson = JSON.stringify(columns[i].expr.saveToData());
-            if (qcolJson === colJson) {
-                return null;
-            }
-        }
         return col;
     };
     return EasyGridWidget;
@@ -32245,12 +32218,7 @@ var View = /** @class */ (function () {
         }
         // map columnTitleFormat option to widgets that have similar option
         if (options.columnTitleFormat) {
-            options.widgets.entitiesPanel = options.widgets.entitiesPanel || {};
-            options.widgets.entitiesPanel.columnTitleFormat = options.widgets.entitiesPanel.columnTitleFormat || options.columnTitleFormat;
-            options.widgets.columnsBar = options.widgets.columnsBar || {};
-            options.widgets.columnsBar.titleElementFormat = options.widgets.columnsBar.titleElementFormat || options.columnTitleFormat;
-            options.widgets.columnsPanel = options.widgets.columnsPanel || {};
-            options.widgets.columnsPanel.titleElementFormat = options.widgets.columnsPanel.titleElementFormat || options.columnTitleFormat;
+            this.context.options.columnTitleFormat = options.columnTitleFormat;
         }
         //to support old paging options (should be removed in the next versions)
         options.widgets.easyGrid.paging =
@@ -34105,7 +34073,6 @@ var ReportView = /** @class */ (function (_super) {
             var target = e.target;
             var rid = target.getAttribute('data-rid');
             _this.loadReport(rid);
-            _this.setActiveReport(rid);
         });
         ul.appendChild(li);
     };