@easyquery/core 7.2.4-rc01 → 7.2.4-rc03

package/dist/bundles/easyquery.core.js

@@ -5677,6 +5677,13 @@ 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 */.vp(this);
         this.root = new Condition(this, CondTag.Group);
         this.extraConditions = new Condition(this, CondTag.Group);
@@ -5772,7 +5779,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; }
@@ -6113,7 +6120,7 @@ var Query = /** @class */ (function () {
                 }
             }
             this.sortedColumns.sort(function (col1, col2) {
-                return col1.sortIndex - col2.sortIndex;
+                return col1._sortIndex - col2._sortIndex;
             });
             this.fixupSortingIndices();
             if (data.extraData) {
@@ -6440,6 +6447,7 @@ var Query = /** @class */ (function () {
         }
         public_api/* utils.moveArrayItem */.P6.moveArrayItem(this.sortedColumns, colIdx, index);
         this.fixupSortingIndices();
+        this.fireColumnsChangedEvent(QueryChangeAction.All);
     };
     Query.prototype.getColumnSorting = function (col) {
         var idx = this.getColumnSortIndex(col);
@@ -6465,12 +6473,34 @@ var Query = /** @class */ (function () {
                 this.fixupSortingIndices();
             }
         }
+        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 */.P6.moveArrayItem(_this.sortedColumns, colIdx, idx);
+                    idx++;
+                }
+            }
+        });
+        this.fixupSortingIndices();
+    };
     Query.prototype.createColumn = function (justsorted) {
         if (justsorted === void 0) { justsorted = false; }
         return new QueryColumn(this, justsorted);
@@ -6687,6 +6717,7 @@ var Query = /** @class */ (function () {
     Query.prototype.moveColumn = function (index1, index2) {
         var columns = this.getColumns();
         public_api/* utils.moveArrayItem */.P6.moveArrayItem(columns, index1, index2);
+        this.adjustColumnsSorting();
     };
     /**
      * Removes the column.
@@ -7110,7 +7141,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) {
@@ -7563,7 +7594,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); };
@@ -7912,7 +7943,9 @@ var context_assign = (undefined && undefined.__assign) || function () {
 var EqContext = /** @class */ (function () {
     function EqContext() {
         var _this = this;
-        this.options = {};
+        this.options = {
+            syncSortOrderWithColumnsOrder: true
+        };
         this.servicesInitialized = false;
         this.internalListCache = {};
         this.loadModelOnStart = true;
@@ -8042,8 +8075,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 || {};
@@ -8205,8 +8238,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();