@easyquery/ui 7.2.4-rc01 → 7.2.4-rc02

package/dist/assets/css/eqview.css

@@ -265,17 +265,16 @@
     color: white !important; 
 }
 
-.eqv-button-execute {
+.eqv-button-fetch {
 	border-color: #237901;
-	margin-top: 40px;
 }
 
-.eqv-button-execute:hover {
+.eqv-button-fetch:hover {
 	background-color: #237901;
 }
 
-/* sql panel */
-.eqv-sql-panel{
+/* SQL panel */
+.eqv-sql-panel {
     width: 25%;
     border: 1px solid #C4D6E5;
     background: white;

package/dist/browser/eq.community.js

@@ -1,5 +1,5 @@
 /** 
- * EasyQuery.JS Community 7.2.4-rc01 (https://korzh.com/easyquery/javascript)
+ * EasyQuery.JS Community 7.2.4-rc02 (https://korzh.com/easyquery/javascript)
  * Copyright 2023 Korzh.com. All rights reserved.
  * 
  * EasyQuery.JS commercial licenses may be obtained at
@@ -14590,6 +14590,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(this);
         this.root = new Condition(this, CondTag.Group);
         this.extraConditions = new Condition(this, CondTag.Group);
@@ -14685,7 +14692,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; }
@@ -15026,7 +15033,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) {
@@ -15353,6 +15360,7 @@ 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);
@@ -15378,12 +15386,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(_this.sortedColumns, colIdx, idx);
+                    idx++;
+                }
+            }
+        });
+        this.fixupSortingIndices();
+    };
     Query.prototype.createColumn = function (justsorted) {
         if (justsorted === void 0) { justsorted = false; }
         return new QueryColumn(this, justsorted);
@@ -15600,6 +15630,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.
@@ -16024,7 +16055,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) {
@@ -16479,7 +16510,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); };
@@ -16830,7 +16861,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;
@@ -16960,8 +16993,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 || {};
@@ -17123,8 +17156,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();
@@ -22848,7 +22880,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 {
@@ -23403,10 +23435,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');
+                    }
                 }
             });
         }
@@ -24039,6 +24076,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);
@@ -24048,6 +24086,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())
@@ -24150,10 +24205,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;
@@ -24212,6 +24270,7 @@ var SortingBar = /** @class */ (function (_super) {
             showAddRow: true,
             attrElementFormat: '{entity} {attr}',
             titleElementFormat: null,
+            allowDragDrop: true,
             menuOptions: {
                 showSearchBoxAfter: 30,
                 searchBoxAutoFocus: true,
@@ -24223,8 +24282,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());
@@ -24242,10 +24310,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);
@@ -24424,6 +24519,81 @@ var SortingBar = /** @class */ (function (_super) {
     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));
 
@@ -28323,7 +28493,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) {