@easyquery/enterprise 7.2.4-beta03 → 7.2.4-rc02

package/dist/browser/eq.enterprise.js

@@ -1,5 +1,5 @@
 /** 
- * EasyQuery.JS Enterprise 7.2.4-beta03 (https://korzh.com/easyquery/javascript)
+ * EasyQuery.JS Enterprise 7.2.4-rc02 (https://korzh.com/easyquery/javascript)
  * Copyright 2023 Korzh.com. All rights reserved.
  * 
  * EasyQuery.JS commercial licenses may be obtained at
@@ -13092,6 +13092,7 @@ __webpack_require__.d(public_api_namespaceObject, {
   DataModel: () => (DataModel),
   DefaultAggregatesCalculator: () => (DefaultAggregatesCalculator),
   EasyQueryDataLoader: () => (EasyQueryDataLoader),
+  EmptyChunk: () => (EmptyChunk),
   Entity: () => (Entity),
   EntityAttr: () => (EntityAttr),
   EqAction: () => (EqAction),
@@ -13480,6 +13481,14 @@ var eqconsts;
     ];
 })(eqconsts || (eqconsts = {}));
 //# sourceMappingURL=constants.js.map
+;// CONCATENATED MODULE: ../core/dist/lib/export/exporter.js
+//possibly move it to the EasyData lib on the next update
+var EmptyChunk = {
+    offset: 0,
+    limit: 0,
+    needTotal: false
+};
+//# sourceMappingURL=exporter.js.map
 ;// CONCATENATED MODULE: ../core/dist/lib/dm/aggr_function.js
 
 /**
@@ -15066,12 +15075,14 @@ var QueryColumn = /** @class */ (function () {
         /** The parameters associated with this column */
         this.params = [];
         this._isHidden = false;
+        this.query = query;
         this._id = public_api.utils.generateId('col');
         this.caption = '';
-        this.sorting = SortDirection.None;
-        this.sortIndex = -1;
+        this._sorting = SortDirection.None;
+        this._sortIndex = -1;
         this.expr = new Expression(this);
         this.blockId = '';
+        this.justsorted = justsorted;
     }
     Object.defineProperty(QueryColumn.prototype, "id", {
         get: function () {
@@ -15080,6 +15091,51 @@ var QueryColumn = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(QueryColumn.prototype, "sorting", {
+        /** Column sorting direction */
+        get: function () {
+            if (this.query) {
+                return this.query.getColumnSorting(this);
+            }
+            else {
+                return this._sorting;
+            }
+        },
+        set: function (direction) {
+            if (this.query) {
+                this.query.setColumnSorting(this, direction);
+            }
+            else {
+                this._sorting = direction;
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
+    ;
+    Object.defineProperty(QueryColumn.prototype, "sortIndex", {
+        /** The index of the column in the sorting list. */
+        get: function () {
+            if (this.query) {
+                return this.query.getColumnSortIndex(this);
+            }
+            else {
+                return this._sortIndex;
+            }
+        },
+        set: function (index) {
+            if (this.query) {
+                this.query.setColumnSortIndex(this, index);
+            }
+            else {
+                this._sortIndex = index;
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
+    ;
+    ;
     QueryColumn.prototype.getModel = function () {
         return this.query.getModel();
     };
@@ -15134,8 +15190,8 @@ var QueryColumn = /** @class */ (function () {
             }
             this.caption = colData.cptn;
             if (typeof colData.srt !== 'undefined') {
-                this.sorting = colData.srt;
-                this.sortIndex = (typeof colData.srtidx !== 'undefined')
+                this._sorting = colData.srt;
+                this._sortIndex = (typeof colData.srtidx !== 'undefined')
                     ? colData.srtidx
                     : -1;
             }
@@ -15161,7 +15217,7 @@ var QueryColumn = /** @class */ (function () {
         if (typeof this.caption !== 'undefined') {
             obj.cptn = this.caption;
         }
-        if (typeof this.sorting !== 'undefined' && this.sorting != SortDirection.None) {
+        if (this.sorting != SortDirection.None) {
             obj.srt = this.sorting;
             obj.srtidx = this.sortIndex;
         }
@@ -15625,11 +15681,19 @@ var Query = /** @class */ (function () {
         this._enableAggregation = false;
         this.parentQuery = null;
         this.drillDowns = [];
+        this.syncSortOrderWithColumnsOrder = true;
+        if (options) {
+            this.context = options.context;
+            if (this.context) {
+                this.syncSortOrderWithColumnsOrder = this.context.options.syncSortOrderWithColumnsOrder;
+            }
+        }
         this.eventEmitter = new public_api.EventEmitter(this);
         this.root = new Condition(this, CondTag.Group);
         this.extraConditions = new Condition(this, CondTag.Group);
         this.columns = new Array();
-        this.justsorted = new Array();
+        //this.justsorted = new Array<QueryColumn>();
+        this.sortedColumns = new Array();
         if (!this.id) {
             this.regenerateId();
         }
@@ -15719,7 +15783,7 @@ var Query = /** @class */ (function () {
         return hasChanged;
     };
     Query.prototype.createSubQuery = function () {
-        return new Query(this.model);
+        return new Query(this.model, null, { context: this.context });
     };
     Query.prototype.useAggregation = function (settingsTuner, silent) {
         if (silent === void 0) { silent = false; }
@@ -15780,6 +15844,7 @@ var Query = /** @class */ (function () {
         });
     };
     Query.prototype.processQueryForAggregation = function (silent) {
+        var _this = this;
         if (silent === void 0) { silent = false; }
         var aggrSettings = this.getAggregationSettings();
         var groups = aggrSettings.getGroups();
@@ -15793,19 +15858,21 @@ var Query = /** @class */ (function () {
                 if (groupColIds.indexOf(col.id) >= 0) {
                     groupedCols.push(col);
                 }
-                else if (col.sorting != SortDirection.None) {
+                else if (this.getColumnSorting(col) != SortDirection.None) {
                     sortedCols.push(col);
                 }
             }
             var sortIndex_1 = 0;
             groupedCols.forEach(function (col) {
-                if (col.sorting == SortDirection.None) {
-                    col.sorting = SortDirection.Ascending;
+                if (_this.getColumnSorting(col) == SortDirection.None) {
+                    _this.setColumnSorting(col, SortDirection.Ascending);
                 }
-                col.sortIndex = sortIndex_1++;
+                _this.setColumnSortIndex(col, sortIndex_1++);
+                //col.sortIndex = sortIndex++;
             });
             sortedCols.forEach(function (col) {
-                col.sortIndex = sortIndex_1++;
+                _this.setColumnSortIndex(col, sortIndex_1++);
+                //     col.sortIndex = sortIndex++;
             });
             if (!silent) {
                 this.fireChangedEvent({
@@ -16036,12 +16103,14 @@ var Query = /** @class */ (function () {
             }
             this.name = data.name;
             this.description = data.desc;
-            this.justsorted = [];
+            //this.justsorted = [];
+            this.sortedColumns = [];
             if (data.justsortcols) {
                 for (var i = 0; i < data.justsortcols.length; i++) {
                     var newCol = this.createColumn(true);
                     newCol.loadFromData(this.model, data.justsortcols[i]);
-                    this.justsorted.push(newCol);
+                    //this.justsorted.push(newCol);
+                    this.addColumnToSorted(newCol);
                 }
             }
             if (data.cols) {
@@ -16049,8 +16118,15 @@ var Query = /** @class */ (function () {
                     var newCol = this.createColumn();
                     newCol.loadFromData(this.model, data.cols[i]);
                     this.columns.push(newCol);
+                    if (newCol._sorting != SortDirection.None) {
+                        this.addColumnToSorted(newCol);
+                    }
                 }
             }
+            this.sortedColumns.sort(function (col1, col2) {
+                return col1._sortIndex - col2._sortIndex;
+            });
+            this.fixupSortingIndices();
             if (data.extraData) {
                 this.extraData = data.extraData;
             }
@@ -16140,6 +16216,7 @@ var Query = /** @class */ (function () {
      */
     Query.prototype.toJSONData = function () {
         var _this = this;
+        this.fixupSortingIndices();
         var obj = {
             modelId: this.model ? this.model.getId() : null,
             modelName: this.model ? this.model.getName() : null
@@ -16154,9 +16231,14 @@ var Query = /** @class */ (function () {
             obj.cols.push(this.columns[i].saveToData());
         }
         obj.justsortcols = [];
-        for (var i = 0; i < this.justsorted.length; i++) {
-            obj.justsortcols.push(this.justsorted[i].saveToData());
-        }
+        // for (let i = 0; i < this.justsorted.length; i++) {
+        //     obj.justsortcols.push(this.justsorted[i].saveToData());
+        // }
+        this.sortedColumns.forEach(function (col) {
+            if (col.isJustSorted()) {
+                obj.justsortcols.push(col.saveToData());
+            }
+        });
         if (this.extraData) {
             obj.extraData = this.extraData;
         }
@@ -16229,7 +16311,8 @@ var Query = /** @class */ (function () {
      */
     Query.prototype.clearColumns = function () {
         this.columns = [];
-        this.justsorted = [];
+        //this.justsorted = [];   
+        this.sortedColumns = [];
     };
     /**
      * Clears all conditions in query.
@@ -16321,31 +16404,34 @@ var Query = /** @class */ (function () {
             cols.pop();
         return cols;
     };
+    Query.prototype.addColumnToSorted = function (col) {
+        var colJson = JSON.stringify(col.expr.saveToData());
+        var isUnique = true;
+        this.sortedColumns.forEach(function (scol) {
+            var qcolJson = JSON.stringify(scol.expr.saveToData());
+            if (qcolJson === colJson) {
+                isUnique = false;
+            }
+        });
+        if (isUnique) {
+            this.sortedColumns.push(col);
+        }
+    };
     /**
      * Get array of columns used only in sorting.
      * @retruns Columns.
      */
     Query.prototype.getJustSortedColumns = function () {
-        return this.justsorted;
+        return this.sortedColumns.filter(function (col) {
+            return col.isJustSorted();
+        });
     };
     /**
      * Gets array of columns used in sorting
      * @retruns Columns
      */
     Query.prototype.getSortedColumns = function () {
-        var sortedCols = new Array();
-        var cols = this.getColumns()
-            .concat(this.getJustSortedColumns());
-        for (var i = 0; i < cols.length; i++) {
-            var col = cols[i];
-            if (col.sortIndex >= 0) {
-                sortedCols.push(col);
-            }
-        }
-        sortedCols.sort(function (col1, col2) {
-            return col1.sortIndex - col2.sortIndex;
-        });
-        return sortedCols;
+        return this.sortedColumns;
     };
     /**
      * Gets Colummn sorting index.
@@ -16353,17 +16439,71 @@ var Query = /** @class */ (function () {
      * @retruns The index.
      */
     Query.prototype.getColumnSortIndex = function (col) {
-        if (col.sorting != SortDirection.None) {
-            if (col.sortIndex < 0) {
-                var cols = this.getColumns()
-                    .concat(this.getJustSortedColumns());
-                return public_api.utils.indexOfArrayItem(cols, col);
+        return this.sortedColumns.indexOf(col);
+    };
+    Query.prototype.setColumnSortIndex = function (col, index) {
+        if (index < 0)
+            return;
+        var colIdx = this.getColumnSortIndex(col);
+        if (colIdx < 0) {
+            this.addColumnToSorted(col);
+            colIdx = this.sortedColumns.length - 1;
+        }
+        public_api.utils.moveArrayItem(this.sortedColumns, colIdx, index);
+        this.fixupSortingIndices();
+        this.fireColumnsChangedEvent(QueryChangeAction.All);
+    };
+    Query.prototype.getColumnSorting = function (col) {
+        var idx = this.getColumnSortIndex(col);
+        if (idx >= 0) {
+            return col._sorting != SortDirection.None ? col._sorting : SortDirection.Ascending;
+        }
+        else {
+            return SortDirection.None;
+        }
+    };
+    Query.prototype.setColumnSorting = function (col, direction) {
+        var idx = this.getColumnSortIndex(col);
+        col._sorting = direction;
+        if (idx >= 0) {
+            if (direction == SortDirection.None) {
+                public_api.utils.removeArrayItem(this.sortedColumns, col);
+                this.fixupSortingIndices();
             }
-            else {
-                return col.sortIndex;
+        }
+        else {
+            if (direction != SortDirection.None) {
+                this.addColumnToSorted(col);
+                this.fixupSortingIndices();
             }
         }
-        return -1;
+        this.adjustColumnsSorting();
+        this.fireColumnsChangedEvent(QueryChangeAction.Modify, col, col.isJustSorted());
+    };
+    Query.prototype.fixupSortingIndices = function () {
+        this.sortedColumns.forEach(function (col, index) {
+            col._sortIndex = index;
+        });
+    };
+    Query.prototype.adjustColumnsSorting = function () {
+        var _this = this;
+        if (!this.syncSortOrderWithColumnsOrder) {
+            return;
+        }
+        if (this.getJustSortedColumns().length > 0) {
+            return;
+        }
+        var idx = 0;
+        this.columns.forEach(function (col) {
+            if (col.sorting != SortDirection.None) {
+                var colIdx = _this.getColumnSortIndex(col);
+                if (colIdx >= 0) {
+                    public_api.utils.moveArrayItem(_this.sortedColumns, colIdx, idx);
+                    idx++;
+                }
+            }
+        });
+        this.fixupSortingIndices();
     };
     Query.prototype.createColumn = function (justsorted) {
         if (justsorted === void 0) { justsorted = false; }
@@ -16388,9 +16528,9 @@ var Query = /** @class */ (function () {
      * }});
      */
     Query.prototype.addColumn = function (descriptor, author) {
-        var columns = (descriptor.justsorted)
-            ? this.justsorted
-            : this.columns;
+        // let columns = (descriptor.justsorted) 
+        //     ? this.justsorted 
+        //     : this.columns;
         var newColumn;
         if (descriptor.column) {
             newColumn = descriptor.column;
@@ -16452,17 +16592,22 @@ var Query = /** @class */ (function () {
                 newColumn.expr.dataType = attr.dataType;
             }
             newColumn.caption = descriptor.caption || newColumn.caption;
-            newColumn.sorting = descriptor.sorting || SortDirection.None;
-            newColumn.sortIndex = descriptor.sortIndex || -1;
+            newColumn._sorting = descriptor.sorting || SortDirection.None;
+            newColumn._sortIndex = descriptor.sortIndex || -1;
             newColumn.enabled = public_api.utils.getIfDefined(descriptor.enabled, true);
             newColumn.setReadOnly(public_api.utils.getIfDefined(descriptor.readonly, false));
         }
-        if (descriptor.index && descriptor.index >= 0 && descriptor.index < columns.length) {
-            columns.splice(descriptor.index, 0, newColumn);
-        }
-        else {
-            columns.push(newColumn);
+        var justsorted = descriptor.justsorted || (descriptor.column && descriptor.column.isJustSorted());
+        if (!justsorted) {
+            if (descriptor.index && descriptor.index >= 0 && descriptor.index < this.columns.length) {
+                this.columns.splice(descriptor.index, 0, newColumn);
+            }
+            else {
+                this.columns.push(newColumn);
+            }
         }
+        this.setColumnSorting(newColumn, newColumn._sorting);
+        this.fireColumnsChangedEvent(QueryChangeAction.Add, newColumn, justsorted);
         return newColumn;
     };
     /**
@@ -16477,6 +16622,7 @@ var Query = /** @class */ (function () {
      * query.addColumn(column, 1)
      */
     Query.prototype.addColumnObj = function (column, index, author) {
+        var _this = this;
         var columns = this.columns;
         if (typeof column.length == "undefined") {
             if (typeof index == "number") {
@@ -16485,6 +16631,10 @@ var Query = /** @class */ (function () {
             else {
                 columns.push(column);
             }
+            if (column.sorting != SortDirection.None) {
+                this.addColumnToSorted(column);
+            }
+            this.fixupSortingIndices();
         }
         else {
             if (typeof index == "number") {
@@ -16493,6 +16643,12 @@ var Query = /** @class */ (function () {
             else {
                 columns.push.apply(columns, [].concat(column));
             }
+            column.forEach(function (col) {
+                if (col.sorting != SortDirection.None) {
+                    _this.addColumnToSorted(col);
+                }
+            });
+            this.fixupSortingIndices();
         }
     };
     /**
@@ -16565,6 +16721,7 @@ var Query = /** @class */ (function () {
     Query.prototype.moveColumn = function (index1, index2) {
         var columns = this.getColumns();
         public_api.utils.moveArrayItem(columns, index1, index2);
+        this.adjustColumnsSorting();
     };
     /**
      * Removes the column.
@@ -16572,10 +16729,11 @@ var Query = /** @class */ (function () {
      * @param author The author
      */
     Query.prototype.removeColumn = function (column, author) {
-        var columns = (column.isJustSorted())
-            ? this.getJustSortedColumns()
-            : this.getColumns();
-        public_api.utils.removeArrayItem(columns, column);
+        // const columns = (column.isJustSorted()) 
+        //     ? this.getJustSortedColumns()
+        //     : this.getColumns();
+        public_api.utils.removeArrayItem(this.columns, column);
+        public_api.utils.removeArrayItem(this.sortedColumns, column);
     };
     /**
      * Adds a condition group - a group of simple conditions (predicates) linked by AND or OR
@@ -16681,10 +16839,13 @@ var Query = /** @class */ (function () {
         }
         if (columns.length > 0) {
             removeFromArray(this.getColumns(), columns);
+            removeFromArray(this.sortedColumns, columns);
         }
         if (justSortedColumns.length > 0) {
-            removeFromArray(this.getJustSortedColumns(), justSortedColumns);
+            //removeFromArray(this.getJustSortedColumns(), justSortedColumns);
+            removeFromArray(this.sortedColumns, justSortedColumns);
         }
+        this.fixupSortingIndices();
     };
     /**
      * Fires process event.
@@ -16985,7 +17146,7 @@ var BrowserQueryStorage = /** @class */ (function () {
     BrowserQueryStorage.prototype.newQuery = function (options) {
         var _this = this;
         return new Promise(function (resolve, reject) {
-            var query = new Query(_this.context.getModel());
+            var query = new Query(_this.context.getModel(), null, { context: _this.context });
             query.reset();
             query.setDefaultName();
             if (options) {
@@ -17263,7 +17424,7 @@ var EqQueryFileLoader = /** @class */ (function () {
         });
         var request = actionResult.getRequest();
         return actionResult.then(function (responseData) {
-            var blob = new Blob([JSON.stringify(responseData)]);
+            var blob = new Blob([responseData]);
             var dispositionHeader = request.getXMLHttpRequest().getResponseHeader("Content-Disposition");
             var fileName = dispositionHeader
                 ? dispositionHeader.match(/filename="(.*)"/)[1]
@@ -17440,7 +17601,7 @@ var EqServiceProvider = /** @class */ (function () {
         this.httpClient.defaultHeaders['x-eqjs-version'] = '7.2.0';
         this.modelResolver = function (_) { return new DataModel(); };
         this.modelStorageResolver = null;
-        this.queryResolver = function (context) { return new Query(context.getModel()); };
+        this.queryResolver = function (context) { return new Query(context.getModel(), null, { context: context }); };
         this.modelLoaderResolver = function (context) { return new EqServerModelLoader(context); };
         this.queryStorageResolver = function (context) { return new BrowserQueryStorage(context); };
         this.querySynchronizerResolver = function (context) { return new EqServerQuerySynchronizer(context); };
@@ -17695,6 +17856,7 @@ var EqActionResult;
 })(EqActionResult || (EqActionResult = {}));
 //# sourceMappingURL=action.js.map
 ;// CONCATENATED MODULE: ../core/dist/lib/eqs/eqs_exporter.js
+
 var EqServerExporter = /** @class */ (function () {
     function EqServerExporter(context) {
         this.context = context;
@@ -17710,7 +17872,8 @@ var EqServerExporter = /** @class */ (function () {
         var query = exportOptions.query || this.context.getQuery();
         var modelId = query.getModel().getId();
         var requestData = {
-            'settings': exportOptions.settings
+            'settings': exportOptions.settings,
+            'chunk': EmptyChunk
         };
         if (typeof (exportOptions.queryId) !== 'undefined') {
             requestData.queryId = exportOptions.queryId;
@@ -17775,6 +17938,8 @@ var context_assign = (undefined && undefined.__assign) || function () {
 
 
 
+
+
 /**
  * Encapsulates all information about EasyQuery components on some webpage
  * and provides some basic operation over those components
@@ -17787,6 +17952,9 @@ var context_assign = (undefined && undefined.__assign) || function () {
 var EqContext = /** @class */ (function () {
     function EqContext() {
         var _this = this;
+        this.options = {
+            syncSortOrderWithColumnsOrder: true
+        };
         this.servicesInitialized = false;
         this.internalListCache = {};
         this.loadModelOnStart = true;
@@ -17916,8 +18084,8 @@ var EqContext = /** @class */ (function () {
         return Array.from(this.exporters.keys());
     };
     EqContext.prototype.addDefaultExporters = function () {
-        this.registerServerExporter('csv', '');
-        this.registerServerExporter('excel-html', '');
+        this.registerServerExporter('csv', 'arraybuffer');
+        this.registerServerExporter('excel-html', 'arraybuffer');
     };
     EqContext.prototype.resolveEndpoint = function (endpointKey, options) {
         options = options || {};
@@ -17980,6 +18148,7 @@ var EqContext = /** @class */ (function () {
         if (!this.servicesInitialized)
             this.initStart();
         options = options || {};
+        this.setOptions(options);
         if (typeof (options.debugMode) !== 'undefined') {
             this.debugMode = options.debugMode;
         }
@@ -18078,8 +18247,7 @@ var EqContext = /** @class */ (function () {
             this.exporters.clear();
             for (var _i = 0, _a = options.serverExporters; _i < _a.length; _i++) {
                 var format = _a[_i];
-                var responseType = format == 'csv' || format == 'excel-html' ? '' : 'arraybuffer';
-                this.registerServerExporter(format, responseType);
+                this.registerServerExporter(format, "arraybuffer");
             }
         }
         var query = this.getQuery();
@@ -18101,6 +18269,9 @@ var EqContext = /** @class */ (function () {
             this.fireEvent('ready');
         }
     };
+    EqContext.prototype.setOptions = function (options) {
+        public_api.utils.assignDeep(this.options, options);
+    };
     Object.defineProperty(EqContext.prototype, "backendInfo", {
         get: function () {
             return this._backendInfo;
@@ -18558,6 +18729,7 @@ var EqContext = /** @class */ (function () {
                         validate: false
                     });
                 }
+                _this.limitCustomSqlColumns();
                 _this.fireEvent('loadQuery');
                 _this.endProcess({
                     result: EqActionResult.Success,
@@ -19141,6 +19313,7 @@ var EqContext = /** @class */ (function () {
     EqContext.prototype.exportResult = function (options) {
         var _this = this;
         options = options || {};
+        options.chunk = options.chunk || EmptyChunk;
         if (this.beforeExportResult) {
             this.beforeExportResult(this, options);
         }
@@ -19190,6 +19363,15 @@ var EqContext = /** @class */ (function () {
             }
         }
     };
+    EqContext.prototype.limitCustomSqlColumns = function () {
+        if (!this.options.allowCustomExpressions) {
+            this.query.getColumns().forEach(function (col) {
+                if (col.expr.tag === ExprTag.CustomSql) {
+                    col.enabled = false;
+                }
+            });
+        }
+    };
     return EqContext;
 }());
 
@@ -21409,10 +21591,20 @@ var ColumnRendererCP = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(ColumnRendererCP.prototype, "columnEnabled", {
+        get: function () {
+            return this.column.enabled;
+        },
+        set: function (value) {
+            this.column.enabled = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
     ColumnRendererCP.prototype.render = function () {
         var _this = this;
         this.baseAttr = this.getAttribute();
-        if (this.getButtonsToShow().indexOf("sorting") >= 0 && this.column.enabled) {
+        if (this.getButtonsToShow().indexOf("sorting") >= 0 && this.columnEnabled) {
             this.sortingButton = this.renderSoringButton(this.column.sorting);
             if (this.column.sorting !== SortDirection.None) {
                 this.sortingButton.style.display = 'block';
@@ -21482,12 +21674,12 @@ var ColumnRendererCP = /** @class */ (function () {
             }
             //end enable button
             //start aggr func button
-            if (_this.getButtonsToShow().indexOf("type") >= 0 && _this.column.enabled) {
+            if (_this.getButtonsToShow().indexOf("type") >= 0 && _this.columnEnabled) {
                 builder.addChildElement(_this.renderColumnTypeButton());
             }
             //end aggr func button
             //start format selector button
-            if (_this.getButtonsToShow().indexOf("format") >= 0 && _this.column.enabled) {
+            if (_this.getButtonsToShow().indexOf("format") >= 0 && _this.columnEnabled) {
                 builder.addChildElement(_this.renderColumnFormatButton());
             }
             //end format selector button
@@ -21700,9 +21892,9 @@ var ColumnRendererCP = /** @class */ (function () {
                 .title(public_api.i18n.getText('CmdToggleEnable'))
                 .attr('tabIndex', '0')
                 .addClass("".concat(this.cssPrefix, "-colelement ").concat(this.cssPrefix, "-column-checkbox"))
-                .addClass("".concat(this.column.enabled ? 'enabled' : ''))
+                .addClass("".concat(this.columnEnabled ? 'enabled' : ''))
                 .on('click', function () {
-                _this.column.enabled = !_this.column.enabled;
+                _this.columnEnabled = !_this.columnEnabled;
                 _this.column.fireChangedEvent();
                 return false;
             })
@@ -21758,8 +21950,8 @@ var ColumnRendererCP = /** @class */ (function () {
     };
     ColumnRendererCP.prototype.getClassesToAdd = function () {
         var result = "";
-        result += this.column.enabled ? '' : " ".concat(this.cssPrefix, "-disabled");
-        if (this.column.enabled) {
+        result += this.columnEnabled ? '' : " ".concat(this.cssPrefix, "-disabled");
+        if (this.columnEnabled) {
             result += this.column.isReadOnly() ? " ".concat(this.cssPrefix, "-readonly") : '';
         }
         result += this.column.isHidden() ? " ".concat(this.cssPrefix, "-hidden") : '';
@@ -21816,7 +22008,7 @@ var ColumnRendererCP = /** @class */ (function () {
             .addChild('div', function (b) { return b
             .addClass("".concat(utils/* eqCssPrefix */.YR, "-button"), "".concat(utils/* eqCssPrefix */.YR, "-column-button"), "".concat(utils/* eqCssPrefix */.YR, "-column-button-enable"))
             .title(public_api.i18n.getText('CmdToggleEnable'))
-            .addClass(_this.column.enabled ? 'enabled' : '')
+            .addClass(_this.columnEnabled ? 'enabled' : '')
             .attr('tabIndex', '0')
             .on('click', function (evt) { return _this.buttonMenuHandler(ColumnAction.Enable, evt); }) //touchstart
             .on('keypress', function (evt) { if (evt.keyCode == 13) {
@@ -21824,7 +22016,7 @@ var ColumnRendererCP = /** @class */ (function () {
         } }); }).toDOM();
     };
     ColumnRendererCP.prototype.isEditable = function () {
-        return this.column.enabled && !this.column.isReadOnly();
+        return this.columnEnabled && !this.column.isReadOnly();
     };
     ColumnRendererCP.prototype.changeFormatHandler = function (ev) {
         var _this = this;
@@ -21990,7 +22182,7 @@ var ColumnRendererCP = /** @class */ (function () {
                 curQuery.fireColumnsChangedEvent(QueryChangeAction.Delete, this.column);
                 break;
             case ColumnAction.Enable:
-                this.column.enabled = !this.column.enabled;
+                this.columnEnabled = !this.columnEnabled;
                 this.fireColumnChanged();
                 break;
             case ColumnAction.Hidden:
@@ -22064,7 +22256,7 @@ var ColumnRendererCP = /** @class */ (function () {
                         _this.buttonMenuHandler(action, evt);
                     },
                     itemFilterCallback: function (item) {
-                        var result = _this.column.enabled || item.id === "__group" || item.id === "enable" || item.id === "delete";
+                        var result = _this.columnEnabled || item.id === "__group" || item.id === "enable" || item.id === "delete";
                         return result;
                     },
                     menuClosedCallback: function () {
@@ -22157,7 +22349,7 @@ var ColumnRendererCP = /** @class */ (function () {
     ColumnRendererCP.prototype.getButtonMenuSelectedItems = function () {
         var _this = this;
         var arrSelected = [];
-        if (this.column.enabled) {
+        if (this.columnEnabled) {
             arrSelected.push("enable");
         }
         ;
@@ -22573,13 +22765,6 @@ var CustomSqlColumnRendererCP = /** @class */ (function (_super) {
         _this.dataTypeMenu = null;
         return _this;
     }
-    CustomSqlColumnRendererCP.prototype.render = function () {
-        if (!this.panel.areCustomExpressionsAllowed() && this.column.enabled) {
-            this.column.enabled = false;
-            this.fireColumnChanged();
-        }
-        return _super.prototype.render.call(this);
-    };
     CustomSqlColumnRendererCP.prototype.renderEnabledButton = function () {
         var elem = _super.prototype.renderEnabledButton.call(this);
         var child = elem.children[0];
@@ -23137,6 +23322,7 @@ var ColumnsPanel = /** @class */ (function (_super) {
     };
     ColumnsPanel.prototype.setOptions = function (options) {
         public_api.utils.assignDeep(this.options, options);
+        this.getContext().options.allowCustomExpressions = options.allowCustomExpressions;
         if (browser_utils/* browserUtils.isMobileMode */.z.isMobileMode()) {
             this.options.buttons = ["menu"];
             this.options.showHeader = false;
@@ -23356,7 +23542,7 @@ var ColumnsPanel = /** @class */ (function (_super) {
     };
     ColumnsPanel.prototype.areCustomExpressionsAllowed = function () {
         var query = this.getQuery();
-        return query.isEx() && this.options.allowCustomExpressions;
+        return query.isEx() && this.getContext().options.allowCustomExpressions;
     };
     ColumnsPanel.prototype.addAllColumnsToEntitiesList = function (list) {
         var _this = this;
@@ -23785,7 +23971,7 @@ var ColumnRendererCB = /** @class */ (function () {
                 if (data.id == 'None' || data.id == "Ascending" || data.id == "Descending") {
                     var query = _this.bar.getQuery();
                     _this.column.sorting = strToSortDirection(data.id);
-                    _this.column.sortIndex = query.getColumnSortIndex(_this.column);
+                    _this.column._sortIndex = query.getColumnSortIndex(_this.column);
                     _this.fireColumnChanged();
                 }
                 else {
@@ -24340,10 +24526,15 @@ var ColumnsBar = /** @class */ (function (_super) {
                     _this.hideLandingSlot();
                 },
                 onDrop: function (container, ev) {
-                    var query = _this.getQuery();
-                    var columns = query.getColumns();
-                    var index = columns.indexOf(ev.data.column);
-                    _this.moveColumnCore(index, _this.landingIndex);
+                    if (_this.landingIndex >= 0) {
+                        var query = _this.getQuery();
+                        var columns = query.getColumns();
+                        var index = columns.indexOf(ev.data.column);
+                        _this.moveColumnCore(index, _this.landingIndex);
+                    }
+                    else {
+                        ev.item.element.removeAttribute('style');
+                    }
                 }
             });
         }
@@ -24976,6 +25167,7 @@ var ColumnRendererSB = /** @class */ (function () {
         configurable: true
     });
     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);
@@ -24985,6 +25177,23 @@ var ColumnRendererSB = /** @class */ (function () {
                 .replaceChild(builder.toDOM(), this.element);
         }
         this.element = builder.toDOM();
+        if (this.bar.options.allowDragDrop) {
+            lib_public_api.eqDragManager.registerDraggableItem({
+                element: this.element,
+                scope: "entityAttrSortSB",
+                beforeDragStart: function () { return _this.element.dispatchEvent((0,lib_public_api.createBrowserEvent)('mouseleave')); },
+                onDragStart: function (ev) {
+                    _this.element.style.display = 'none';
+                    ev.dropEffect = lib_public_api.DropEffect.Allow;
+                },
+                onDragEnd: function (ev) {
+                    if (!ev.data.finishedSuccessfully) {
+                        _this.element.removeAttribute('style');
+                    }
+                },
+                data: { column: this.column }
+            });
+        }
         builder
             .addClass(this.getClassesToAdd())
             .addClass(browser_utils/* browserUtils.getMobileCssClass */.z.getMobileCssClass())
@@ -25087,10 +25296,13 @@ var ColumnRendererSB = /** @class */ (function () {
                     }
                     else {
                         _this.column.sorting = strToSortDirection(data.id);
-                        _this.column.sortIndex = query.getColumnSortIndex(_this.column);
+                        _this.column._sortIndex = query.getColumnSortIndex(_this.column);
                         _this.fireColumnChanged();
                     }
                 }
+                else {
+                    _this.bar.moveColumn(_this.column, data.id);
+                }
             },
             menuClosedCallback: function () {
                 _this.keepShowingButtons = false;
@@ -25149,6 +25361,7 @@ var SortingBar = /** @class */ (function (_super) {
             showAddRow: true,
             attrElementFormat: '{entity} {attr}',
             titleElementFormat: null,
+            allowDragDrop: true,
             menuOptions: {
                 showSearchBoxAfter: 30,
                 searchBoxAutoFocus: true,
@@ -25160,8 +25373,17 @@ var SortingBar = /** @class */ (function (_super) {
         _this.sortMenuList = [
             { id: 'None', text: public_api.i18n.getText('CmdNotSorted') },
             { id: 'Ascending', text: public_api.i18n.getText('CmdAscending') },
-            { id: 'Descending', text: public_api.i18n.getText('CmdDescending') }
+            { id: 'Descending', text: public_api.i18n.getText('CmdDescending') },
+            { id: '---', text: '---' },
+            { id: 'MoveTop', text: public_api.i18n.getText('CmdMoveToFirst') },
+            { id: 'MoveUp', text: public_api.i18n.getText('CmdMoveToPrev') },
+            { id: 'MoveDown', text: public_api.i18n.getText('CmdMoveToNext') },
+            { id: 'MoveBottom', text: public_api.i18n.getText('CmdMoveToLast') }
         ];
+        _this.landingSlot = (0,lib_public_api.domel)('div')
+            .addClass("".concat(utils/* eqCssPrefix */.YR, "-highlight"))
+            .toDOM();
+        _this.landingIndex = -1;
         (0,lib_public_api.domel)(_this.slot)
             .addClass("".concat(_this.cssPrefix, "-panel"))
             .addClass(browser_utils/* browserUtils.getMobileCssClass */.z.getMobileCssClass());
@@ -25179,10 +25401,37 @@ var SortingBar = /** @class */ (function (_super) {
         return 'sortingBar';
     };
     SortingBar.prototype.init = function (context, options) {
+        var _this = this;
         _super.prototype.init.call(this, context, options);
         this.setOptions(options);
         this.destroyCore();
         this.attachQueryObserver();
+        lib_public_api.eqDragManager.removeDropContainer(this.slot);
+        if (this.options.allowDragDrop) {
+            lib_public_api.eqDragManager.registerDropContainer({
+                element: this.slot,
+                scopes: ["entityAttrSortSB"],
+                onDragEnter: function (container, ev) {
+                    _this.showLandingSlot(ev.pageX, ev.pageY);
+                },
+                onDragOver: function (container, ev) {
+                    _this.showLandingSlot(ev.pageX, ev.pageY);
+                },
+                onDragLeave: function (container, ev) {
+                    ev.dropEffect = lib_public_api.DropEffect.Forbid;
+                    _this.hideLandingSlot();
+                },
+                onDrop: function (container, ev) {
+                    if (_this.landingIndex >= 0) {
+                        var query = _this.getQuery();
+                        query.setColumnSortIndex(ev.data.column, _this.landingIndex);
+                    }
+                    else {
+                        ev.item.element.removeAttribute('style');
+                    }
+                }
+            });
+        }
     };
     SortingBar.prototype.setOptions = function (options) {
         public_api.utils.assignDeep(this.options, options);
@@ -25197,66 +25446,21 @@ var SortingBar = /** @class */ (function (_super) {
                 && edata.part != QueryChangePart.Columns && edata.part != QueryChangePart.All)) {
                 return;
             }
-            switch (edata.action) {
-                case QueryChangeAction.Modify: {
-                    var columns = edata.changee;
-                    var modifyColumn_1 = function (column) {
-                        var colEl = _this.columnsBlock.querySelector("div[data-id='".concat(column.id, "']"));
-                        if (colEl) {
-                            _this.renderColumn(column, colEl);
-                        }
-                    };
-                    if (Array.isArray(columns)) {
-                        columns.forEach(function (col) { return modifyColumn_1(col); });
-                    }
-                    else {
-                        modifyColumn_1(columns);
-                    }
-                    break;
-                }
-                case QueryChangeAction.Add: {
-                    var columns = edata.changee;
-                    var addColumn_1 = function (column) {
-                        _this.addColumnElement(column);
-                    };
-                    if (Array.isArray(columns)) {
-                        columns.forEach(function (col) { return addColumn_1(col); });
-                    }
-                    else {
-                        addColumn_1(columns);
-                    }
-                    break;
-                }
-                case QueryChangeAction.Delete: {
-                    var columns = edata.changee;
-                    var deleteColumn_1 = function (column) {
-                        var colEl = _this.columnsBlock.querySelector("div[data-id='".concat(column.id, "']"));
-                        if (colEl)
-                            _this.columnsBlock.removeChild(colEl);
-                    };
-                    if (Array.isArray(columns)) {
-                        columns.forEach(function (col) { return deleteColumn_1(col); });
-                    }
-                    else {
-                        deleteColumn_1(columns);
-                    }
-                    break;
-                }
-                default:
-                    _this.refresh();
-                    break;
-            }
+            _this.refresh();
         });
     };
     SortingBar.prototype.detachQueryObserver = function () {
         if (this.queryEventCallbackId) {
-            var query = this.getContext().getQuery();
+            var query = this.getQuery();
             query.removeChangedCallback(this.queryEventCallbackId);
         }
     };
     SortingBar.prototype.getQuery = function () {
         return this.getContext().getQuery();
     };
+    SortingBar.prototype.getModel = function () {
+        return this.getContext().getModel();
+    };
     SortingBar.prototype.destroyCore = function () {
         this.detachQueryObserver();
         this.clear();
@@ -25294,7 +25498,7 @@ var SortingBar = /** @class */ (function (_super) {
         this.entitiesMenu.showMenu(menuOptions);
     };
     SortingBar.prototype.createEntitiesMenu = function () {
-        var model = this.getContext().getModel();
+        var model = this.getModel();
         if (!model || model.isEmpty())
             return null;
         var menuId = this.slot.id;
@@ -25307,7 +25511,7 @@ var SortingBar = /** @class */ (function (_super) {
         this.entitiesMenu = new PopupMenu(options);
     };
     SortingBar.prototype.createSortMenu = function () {
-        var model = this.getContext().getModel();
+        var model = this.getModel();
         if (!model || model.isEmpty())
             return null;
         var menuId = this.slot.id;
@@ -25344,8 +25548,8 @@ var SortingBar = /** @class */ (function (_super) {
         }
         (0,lib_public_api.domel)(this.slot)
             .addChildElement(this.columnsBlock);
-        var query = this.context.getQuery();
-        var columns = query.getColumns().concat(query.getJustSortedColumns());
+        var query = this.getQuery();
+        var columns = query.getSortedColumns(); // .getColumns().concat(query.getJustSortedColumns());
         columns.forEach(function (column, index) {
             var slot = _this.renderColumn(column);
             _this.columnsBlock.appendChild(slot);
@@ -25353,8 +25557,8 @@ var SortingBar = /** @class */ (function (_super) {
     };
     SortingBar.prototype.addNewColumn = function (attrId) {
         var _this = this;
-        var model = this.getContext().getModel();
-        var query = this.getContext().getQuery();
+        var model = this.getModel();
+        var query = this.getQuery();
         var getColumnByAttrId = function (attrid) {
             var attribute = model.getAttributeById(attrid);
             if (!attribute) {
@@ -25373,60 +25577,28 @@ var SortingBar = /** @class */ (function (_super) {
             }
             var column = query.createColumn(true);
             column.caption = _this.getDefaultColumnCaption(attribute);
-            column.sorting = SortDirection.Ascending;
-            column.sortIndex = _this.getQuery().getColumnSortIndex(column);
+            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.getContext().getQuery()) {
+        if (!this.getQuery()) {
             return;
         }
-        return this.addColumn(getColumnByAttrId(attrId));
+        var newCol = getColumnByAttrId(attrId);
+        return this.getQuery().addColumn({
+            column: newCol
+        });
     };
     SortingBar.prototype.getDefaultColumnCaption = function (attr) {
         var format = this.options.titleElementFormat || this.options.attrElementFormat;
-        var model = this.getContext().getModel();
+        var model = this.getModel();
         return model.getAttributeText(attr, format);
     };
-    SortingBar.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,
-            justsorted: true
-        });
-        query.fireChangedEvent({
-            part: QueryChangePart.SortingColumns,
-            action: QueryChangeAction.Add,
-            changee: column
-        });
-        return column;
-    };
-    SortingBar.prototype.checkColumn = function (col) {
-        var query = this.getContext().getQuery();
-        var columns = query.getColumns()
-            .concat(query.getJustSortedColumns());
-        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;
-    };
     SortingBar.prototype.renderColumn = function (column, elem) {
         var renderer = new ColumnRendererSB(this, column, elem);
         if (renderer) {
@@ -25435,17 +25607,84 @@ var SortingBar = /** @class */ (function (_super) {
         }
         return null;
     };
-    //adds one column to the bar on the specified position
-    SortingBar.prototype.addColumnElement = function (column) {
-        var newColBlock = this.renderColumn(column);
-        this.columnsBlock.appendChild(newColBlock);
-        if (this.options.columnRenderedCallback) {
-            this.options.columnRenderedCallback(newColBlock);
-        }
-    };
     SortingBar.prototype.clear = function () {
         this.slot.innerHTML = '';
     };
+    SortingBar.prototype.moveColumn = function (column, direction) {
+        var query = this.getQuery();
+        var columns = query.getSortedColumns();
+        var index = query.getColumnSortIndex(column);
+        if (index >= 0) {
+            switch (direction) {
+                case 'MoveTop':
+                    query.setColumnSortIndex(column, 0);
+                    break;
+                case 'MoveUp':
+                    query.setColumnSortIndex(column, index > 0 ? index - 1 : 0);
+                    break;
+                case 'MoveDown':
+                    query.setColumnSortIndex(column, index < columns.length - 1 ? index + 1 : columns.length - 1);
+                    break;
+                case 'MoveBottom':
+                    query.setColumnSortIndex(column, columns.length - 1);
+                    break;
+            }
+            ;
+        }
+    };
+    SortingBar.prototype.showLandingSlot = function (pageX, pageY) {
+        var elements = this.columnsBlock.querySelectorAll("[class*=".concat(this.cssPrefix, "-row]"));
+        var columnSlots = [];
+        for (var i = 0; i < elements.length; i++) {
+            if (elements[i].style.display !== 'none') {
+                columnSlots.push(elements[i]);
+            }
+        }
+        if (columnSlots.length === 0) {
+            this.landingIndex = 0;
+            return;
+        }
+        var landingPos = (0,lib_public_api.getElementAbsolutePos)(this.landingSlot);
+        if (pageX >= landingPos.x && pageX <= landingPos.x + this.landingSlot.offsetWidth
+            && pageY >= landingPos.y && pageY <= landingPos.y + this.landingSlot.offsetHeight) {
+            return;
+        }
+        var newLandingIndex = this.landingIndex;
+        for (var i = 0; i < columnSlots.length; i++) {
+            var colSlot = columnSlots[i];
+            var absPos = (0,lib_public_api.getElementAbsolutePos)(colSlot);
+            var colWidth = colSlot.offsetWidth;
+            var colHeight = colSlot.offsetHeight;
+            var paddingWidth = 0.2 * colWidth;
+            var paddingHeight = 2;
+            if (pageX >= absPos.x + paddingWidth && pageX <= absPos.x + colWidth - paddingWidth
+                && pageY >= absPos.y + paddingHeight && pageY <= absPos.y + colHeight - paddingHeight) {
+                if (pageX > landingPos.x)
+                    newLandingIndex = i + 1;
+                else
+                    newLandingIndex = i;
+                break;
+            }
+        }
+        if (newLandingIndex != this.landingIndex || this.landingSlot.parentElement) {
+            this.landingIndex = newLandingIndex;
+            if (this.landingIndex <= 0) {
+                this.columnsBlock.insertBefore(this.landingSlot, columnSlots[0]);
+            }
+            if (this.landingIndex < columnSlots.length) {
+                this.columnsBlock.insertBefore(this.landingSlot, columnSlots[this.landingIndex]);
+            }
+            else {
+                this.columnsBlock.appendChild(this.landingSlot);
+            }
+        }
+    };
+    SortingBar.prototype.hideLandingSlot = function () {
+        this.landingIndex = -1;
+        if (this.landingSlot.parentElement) {
+            this.landingSlot.parentElement.removeChild(this.landingSlot);
+        }
+    };
     return SortingBar;
 }(Widget));
 
@@ -29345,7 +29584,8 @@ var ManageDrillDownWidget = /** @class */ (function (_super) {
             }
         }, null);
         this.ddQuery = new Query(model, null, {
-            parent: query
+            parent: query,
+            context: this.context
         });
         var dds = this.context.getQuery().getDrillDowns();
         if (dds.length) {
@@ -35793,14 +36033,14 @@ var query_ex_extends = (undefined && undefined.__extends) || (function () {
 
 var QueryEx = /** @class */ (function (_super) {
     query_ex_extends(QueryEx, _super);
-    function QueryEx(model) {
-        return _super.call(this, model) || this;
+    function QueryEx(model, options) {
+        return _super.call(this, model, null, options) || this;
     }
     QueryEx.prototype.isEx = function () {
         return lcv.__kt > 1;
     };
     QueryEx.prototype.createSubQuery = function () {
-        return new QueryEx(this.model);
+        return new QueryEx(this.model, { context: this.context });
     };
     QueryEx.prototype.createCondition = function (tag) {
         if (tag === void 0) { tag = CondTag.Simple; }
@@ -36607,7 +36847,7 @@ EqContext.prototype.useEnterprise = function (keyOrInitCallback) {
         if (lcv.__kt > 1) {
             var services = _this.getServices();
             services.registerDataModelResolver(function (context) { return new DataModelEx(); });
-            services.registerQueryResolver(function (context) { return new QueryEx(context.getModel()); });
+            services.registerQueryResolver(function (context) { return new QueryEx(context.getModel(), { context: context }); });
             services.registerQueryStorageResolver(function (context) { return new EqServerQueryStorage(context); });
             services.registerAggregatesCalculator(function (context) { return new DataTableAggregatesCalculator(context); });
             if (lcv.__kt === 2) {